sr-dev February 2025

sr-dev@lists.kamailio.org

9 participants
163 discussions

git:master:8a96379c: call_control: free pv field in case of error
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 8a96379cc1ef7aa42bc4be49834c538a3bffdf14 URL: https://github.com/kamailio/kamailio/commit/8a96379cc1ef7aa42bc4be49834c538… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 call_control: free pv field in case of error --- Modified: src/modules/call_control/call_control.c --- Diff: https://github.com/kamailio/kamailio/commit/8a96379cc1ef7aa42bc4be49834c538… Patch: https://github.com/kamailio/kamailio/commit/8a96379cc1ef7aa42bc4be49834c538… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index fd1bf0736fc..83febe1f5b1 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -290,6 +290,9 @@ int cc_parse_param(void *val, AVP_List **avps) if(!(mp->next)) { PKG_MEM_ERROR; pkg_free(p0); + if(mp->pv) { + pkg_free(mp->pv); + } pkg_free(mp); return -1; }

1 0

git:master:34743f40: sdpops: check the limit for computed rtcp port
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 34743f40056e230e6c6d1ae6bf72e369b6f6890f URL: https://github.com/kamailio/kamailio/commit/34743f40056e230e6c6d1ae6bf72e36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 sdpops: check the limit for computed rtcp port --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/34743f40056e230e6c6d1ae6bf72e36… Patch: https://github.com/kamailio/kamailio/commit/34743f40056e230e6c6d1ae6bf72e36… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 164b97f1ba3..7631779c70f 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -25,6 +25,7 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> +#include <limits.h> #include "../../core/sr_module.h" #include "../../core/dprint.h" @@ -2212,7 +2213,10 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } if(sdp->sessions->streams->port.s != NULL && sdp->sessions->streams->port.len > 0) { - str2int(&sdp->sessions->streams->port, &uport); + if(str2int(&sdp->sessions->streams->port, &uport) < 0 + || uport >= USHRT_MAX) { + return pv_get_null(msg, param, res); + } uport++; s.s = int2strbuf(uport, uport_buf, INT2STR_MAX_LEN, &s.len); return pv_get_strval(msg, param, res, &s);

1 0

git:master:01782191: sca: free replaces hdr on anchor lump failure
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 01782191418f3d65c4aa5cb273140fec928d153a URL: https://github.com/kamailio/kamailio/commit/01782191418f3d65c4aa5cb273140fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 sca: free replaces hdr on anchor lump failure --- Modified: src/modules/sca/sca_call_info.c --- Diff: https://github.com/kamailio/kamailio/commit/01782191418f3d65c4aa5cb273140fe… Patch: https://github.com/kamailio/kamailio/commit/01782191418f3d65c4aa5cb273140fe… --- diff --git a/src/modules/sca/sca_call_info.c b/src/modules/sca/sca_call_info.c index b15a7251746..3d5471178c0 100644 --- a/src/modules/sca/sca_call_info.c +++ b/src/modules/sca/sca_call_info.c @@ -615,6 +615,7 @@ int sca_call_info_seize_held_call(sip_msg_t *msg, sca_call_info *call_info, anchor = anchor_lump(msg, msg->eoh - msg->buf, 0, HDR_OTHER_T); if(anchor == NULL) { LM_ERR("Failed to anchor lump\n"); + pkg_free(replaces_hdr.s); goto done; } @@ -638,7 +639,6 @@ int sca_call_info_seize_held_call(sip_msg_t *msg, sca_call_info *call_info, // we restore the original owner and dialog. if(sca_appearance_update_owner_unsafe(app, contact_uri) < 0) { LM_ERR("sca_call_info_seize_held_call: failed to update owner\n"); - pkg_free(replaces_hdr.s); goto done; }

1 0

[kamailio/kamailio] ims_auth|ims_registrar_pcscf: Fix Build for CentOS 7 (PR #4145)
by Gustavo Almeida 14 Feb '25

14 Feb '25

### Description At this time, it's not possible to build Kamailio on `CentOS 7` on `master` or `6.0.0`. Some code on `ims_auth` and `ims_registrar_pcscf` is not compliant with old `gcc`. #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Additional Information Tested on my own, and build now works just fine. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4145 -- Commit Summary -- * ims_auth: Fix CentOS 7 Build * ims_auth: Fix CentOS 7 Build * ims_registrar_pcscf: Fix CentOS 7 Build * Merge branch 'master' into bundasmanu/fix_centos_7_build -- File Changes -- M src/modules/ims_auth/auth_vector.c (11) M src/modules/ims_registrar_pcscf/subscribe.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4145.patch https://github.com/kamailio/kamailio/pull/4145.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4145 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4145(a)github.com>

2 2

git:master:e458ca15: ims_registrar_pcscf: Fix CentOS 7 Build
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: e458ca15a4ca30448ea9aae20a93eb86e2ce92c0 URL: https://github.com/kamailio/kamailio/commit/e458ca15a4ca30448ea9aae20a93eb8… Author: Gustavo Almeida <gustavo.abcdef(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:39:50+01:00 ims_registrar_pcscf: Fix CentOS 7 Build - ims_registrar_pcscf: Fix non C99 compliant code --- Modified: src/modules/ims_registrar_pcscf/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/e458ca15a4ca30448ea9aae20a93eb8… Patch: https://github.com/kamailio/kamailio/commit/e458ca15a4ca30448ea9aae20a93eb8… --- diff --git a/src/modules/ims_registrar_pcscf/subscribe.c b/src/modules/ims_registrar_pcscf/subscribe.c index c507b6d272d..9259704eb10 100644 --- a/src/modules/ims_registrar_pcscf/subscribe.c +++ b/src/modules/ims_registrar_pcscf/subscribe.c @@ -56,12 +56,13 @@ int reginfo_subscribe_real(struct sip_msg *msg, pv_elem_t *uri, str extra_headers = {0}; reginfo_event_t *new_event; str *subs_outbound_proxy = 0; + int i = 0; int len = strlen(P_ASSERTED_IDENTITY_HDR_PREFIX) + pcscf_uri.len + 1 + CRLF_LEN; if(service_routes != NULL) { len += strlen(ROUTE_HDR_PREFIX) + strlen(ROUTE_HDR_END); - for(int i = 0; i < num_service_routes; i++) { + for(i = 0; i < num_service_routes; i++) { len += service_routes[i].len + strlen(ROUTE_HDR_SEPARATOR); } } @@ -87,7 +88,7 @@ int reginfo_subscribe_real(struct sip_msg *msg, pv_elem_t *uri, memcpy(extra_headers.s + extra_headers.len, ROUTE_HDR_PREFIX, strlen(ROUTE_HDR_PREFIX)); extra_headers.len += strlen(ROUTE_HDR_PREFIX); - for(int i = 0; i < num_service_routes; i++) { + for(i = 0; i < num_service_routes; i++) { memcpy(extra_headers.s + extra_headers.len, service_routes[i].s, service_routes[i].len); extra_headers.len += service_routes[i].len;

1 0

git:master:7a65b3ce: ims_auth: Fix CentOS 7 Build
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 7a65b3ce11a3afc0f5be47f61235166cb8938c78 URL: https://github.com/kamailio/kamailio/commit/7a65b3ce11a3afc0f5be47f61235166… Author: Gustavo Almeida <gustavo.abcdef(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:39:50+01:00 ims_auth: Fix CentOS 7 Build - ims_auth: Fix non C99 compliant code --- Modified: src/modules/ims_auth/auth_vector.c --- Diff: https://github.com/kamailio/kamailio/commit/7a65b3ce11a3afc0f5be47f61235166… Patch: https://github.com/kamailio/kamailio/commit/7a65b3ce11a3afc0f5be47f61235166… --- diff --git a/src/modules/ims_auth/auth_vector.c b/src/modules/ims_auth/auth_vector.c index 19fbad91409..26acf36a8da 100644 --- a/src/modules/ims_auth/auth_vector.c +++ b/src/modules/ims_auth/auth_vector.c @@ -40,6 +40,8 @@ auth_vector *auth_vector_make_local(uint8_t k[16], uint8_t op[16], int opIsOPc, uint8_t ak[6]; uint8_t authenticate[16 + 6 + 2 + 8]; + int i = 0; + // f0 - generate random f0(rand); @@ -58,7 +60,7 @@ auth_vector *auth_vector_make_local(uint8_t k[16], uint8_t op[16], int opIsOPc, // AUTN = SQN ^ AK || AMF || MAC-A // Authenticate = RAND || AUTN memcpy(authenticate, rand, 16); - for(int i = 0; i < 6; i++) + for(i = 0; i < 6; i++) authenticate[16 + i] = sqn[i] ^ ak[i]; memcpy(authenticate + 22, amf, 2); memcpy(authenticate + 24, mac_a, 8); @@ -90,6 +92,8 @@ int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, uint8_t mac_s[8]; uint8_t xmac_s[8]; + int i = 0; + if(!av->is_locally_generated) { LM_ERR("auth_vector is not locally generated - let the HSS handle " "resync\n"); @@ -114,7 +118,6 @@ int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, f5star(ak, k, op_c, rand); // Unpack the AUTS = (SQN_MS ^ AK) || MAC-S - int i = 0; for(i = 0; i < 6; i++) sqnMS[i] = auts[i] ^ ak[i]; memcpy(mac_s, auts + 6, 8);

1 0

git:master:2349e408: ims_auth: Fix CentOS 7 Build
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 2349e4088d3fd454b74de15dfcb9a3e19fc03663 URL: https://github.com/kamailio/kamailio/commit/2349e4088d3fd454b74de15dfcb9a3e… Author: Gustavo Almeida <gustavo.abcdef(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:39:50+01:00 ims_auth: Fix CentOS 7 Build ims_auth: Fix non C99 compliant code --- Modified: src/modules/ims_auth/auth_vector.c --- Diff: https://github.com/kamailio/kamailio/commit/2349e4088d3fd454b74de15dfcb9a3e… Patch: https://github.com/kamailio/kamailio/commit/2349e4088d3fd454b74de15dfcb9a3e… --- diff --git a/src/modules/ims_auth/auth_vector.c b/src/modules/ims_auth/auth_vector.c index a681490f71a..19fbad91409 100644 --- a/src/modules/ims_auth/auth_vector.c +++ b/src/modules/ims_auth/auth_vector.c @@ -114,7 +114,8 @@ int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, f5star(ak, k, op_c, rand); // Unpack the AUTS = (SQN_MS ^ AK) || MAC-S - for(int i = 0; i < 6; i++) + int i = 0; + for(i = 0; i < 6; i++) sqnMS[i] = auts[i] ^ ak[i]; memcpy(mac_s, auts + 6, 8); @@ -135,7 +136,8 @@ int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, void sqn_increment(uint8_t sqn[6]) { - for(int i = 5; i >= 0; i--) { + int i = 0; + for(i = 5; i >= 0; i--) { if(sqn[i] == 0xFF) { sqn[i] = 0; } else {

1 0

git:master:e65b03cd: xmlrpc: removed unnecessary code
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: e65b03cdd946d735a3ef33ae3582bcfad464d2c7 URL: https://github.com/kamailio/kamailio/commit/e65b03cdd946d735a3ef33ae3582bcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T10:16:00+01:00 xmlrpc: removed unnecessary code --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/e65b03cdd946d735a3ef33ae3582bcf… Patch: https://github.com/kamailio/kamailio/commit/e65b03cdd946d735a3ef33ae3582bcf… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index eb44f4450dd..24a0c375a54 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -2091,9 +2091,7 @@ static int rpc_struct_printf( goto err; } } - if(buf) - mxr_free(buf); - return 0; + err: if(buf) mxr_free(buf);

1 0

git:master:edbb5b11: ctl: refactored error handling and removed unnecessary code
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: edbb5b11e9453be3519e6e9a945937307c95709e URL: https://github.com/kamailio/kamailio/commit/edbb5b11e9453be3519e6e9a9459373… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T08:37:23+01:00 ctl: refactored error handling and removed unnecessary code --- Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/edbb5b11e9453be3519e6e9a9459373… Patch: https://github.com/kamailio/kamailio/commit/edbb5b11e9453be3519e6e9a9459373… --- diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index 70ce92deb76..2d671798cce 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -1290,7 +1290,7 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) &nm, 1); /* Escape all characters, including : and , */ if(!m) { rpc_fault(ctx, 500, "Internal Server Error"); - goto err; + goto error; } s.s = buf; @@ -1300,7 +1300,7 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) rpc_fault(ctx, 500, "Internal Server Error"); free_chunk(m); ERR("Error while creating text_chunk structure"); - goto err; + goto error; } l->flags |= CHUNK_MEMBER_VALUE; @@ -1326,13 +1326,12 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) if((buf0 = ctl_realloc(buf, buf_size)) == 0) { rpc_fault(ctx, 500, "Internal Server Error (No memory left)"); ERR("No memory left\n"); - goto err; + goto error; } buf = buf0; } - ctl_free(buf); - return 0; -err: + +error: if(buf) ctl_free(buf); return -1;

1 0

git:master:a6d692be: pv: free buf uri in case of error setting xto attr
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: a6d692be4283dc349c38b455ee71c4e21dcef6aa URL: https://github.com/kamailio/kamailio/commit/a6d692be4283dc349c38b455ee71c4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T11:58:21+01:00 pv: free buf uri in case of error setting xto attr --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/a6d692be4283dc349c38b455ee71c4e… Patch: https://github.com/kamailio/kamailio/commit/a6d692be4283dc349c38b455ee71c4e… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 38d46c01dba..56d96b20d75 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3817,6 +3817,9 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return 0; error: + if(buf_uri.s != 0) { + pkg_free(buf_uri.s); + } if(buf.s != NULL) { pkg_free(buf.s); }

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2025