sr-dev

sr-dev@lists.kamailio.org

14 participants
44965 discussions

[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

git:master:b875e736: pv: free next field on error when parsing xav* names
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: b875e7368dcc8e221007caafa3599c3e354404f7 URL: https://github.com/kamailio/kamailio/commit/b875e7368dcc8e221007caafa3599c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T11:45:06+01:00 pv: free next field on error when parsing xav* names --- Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/b875e7368dcc8e221007caafa3599c3… Patch: https://github.com/kamailio/kamailio/commit/b875e7368dcc8e221007caafa3599c3… --- diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index 89d9ba131d0..8858c376367 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -516,6 +516,10 @@ int pv_parse_xavp_name(pv_spec_p sp, str *in) error: if(xname != NULL) { + if(xname->next != NULL) { + pkg_free(xname->next); + xname->next = NULL; + } pv_xavp_name_destroy(xname); pkg_free(xname); } @@ -964,6 +968,10 @@ int pv_parse_xavu_name(pv_spec_t *sp, str *in) error: if(xname != NULL) { + if(xname->next != NULL) { + pkg_free(xname->next); + xname->next = NULL; + } pv_xavu_name_destroy(xname); pkg_free(xname); } @@ -1111,6 +1119,10 @@ int pv_parse_xavi_name(pv_spec_p sp, str *in) error: if(xname != NULL) { + if(xname->next != NULL) { + pkg_free(xname->next); + xname->next = NULL; + } pv_xavi_name_destroy(xname); pkg_free(xname); }

1 0

git:master:d0cd3c4b: topoh: check on pointer only for via decode return
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: d0cd3c4b40fd791143122622a6d74703e1375832 URL: https://github.com/kamailio/kamailio/commit/d0cd3c4b40fd791143122622a6d7470… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T11:01:20+01:00 topoh: check on pointer only for via decode return - code reformatted --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/d0cd3c4b40fd791143122622a6d7470… Patch: https://github.com/kamailio/kamailio/commit/d0cd3c4b40fd791143122622a6d7470… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 1984875e0c6..54d3caffe62 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -177,10 +177,8 @@ int th_mask_via(sip_msg_t *msg, str *via_prefix) vlen = th_skip_rw(via->name.s, via->bsize); LM_DBG("body: %d: [%.*s]\n", vlen, vlen, via->name.s); if(i != 1) { - out.s = th_mask_encode( - via->name.s, vlen, via_prefix, &out.len); - if(out.s == NULL) - { + out.s = th_mask_encode(via->name.s, vlen, via_prefix, &out.len); + if(out.s == NULL) { LM_ERR("cannot encode via %d\n", i); return -1; } @@ -372,11 +370,11 @@ int th_unmask_via(sip_msg_t *msg, str *ip, str *cookie) LM_DBG("body: %d: [%.*s]\n", vlen, vlen, via->name.s); if(i != 1) { /* Skip if via is not encoded */ - if (th_uri_prefix_checks - && (via->host.len != ip->len - || strncasecmp(via->host.s, ip->s, ip->len) - != 0)) { - LM_DBG("via %d is not encoded - skip\n",i); + if(th_uri_prefix_checks + && (via->host.len != ip->len + || strncasecmp(via->host.s, ip->s, ip->len) + != 0)) { + LM_DBG("via %d is not encoded - skip\n", i); continue; } @@ -404,7 +402,7 @@ int th_unmask_via(sip_msg_t *msg, str *ip, str *cookie) out.s = th_mask_decode(vp->value.s, vp->value.len, &th_vparam_prefix, 0, &out.len); } - if(out.s == NULL || out.len <= 0) { + if(out.s == NULL) { LM_ERR("cannot decode via %d\n", i); return -1; } @@ -599,7 +597,7 @@ int th_flip_record_route(sip_msg_t *msg, str *uri_prefix, str *ip, int mode) case 1: /* encode */ if(act != 0 && mode == 1) { out.s = th_mask_encode(rr->nameaddr.uri.s, - rr->nameaddr.uri.len, uri_prefix, &out.len); + rr->nameaddr.uri.len, uri_prefix, &out.len); if(out.s == NULL) { LM_ERR("cannot encode r-r %d\n", i); return -1; @@ -665,10 +663,10 @@ int th_unmask_route(sip_msg_t *msg, str *uri_prefix) i++; if(i != 1) { /* Skip if route is not encoded */ - if (th_uri_prefix_checks - && ((rr->nameaddr.uri.len<uri_prefix->len) - || (strncasecmp(rr->nameaddr.uri.s, - uri_prefix->s, uri_prefix->len) + if(th_uri_prefix_checks + && ((rr->nameaddr.uri.len < uri_prefix->len) + || (strncasecmp(rr->nameaddr.uri.s, + uri_prefix->s, uri_prefix->len) != 0))) { LM_DBG("rr %d is not encoded: [%.*s] - missing prefix\n", i, rr->nameaddr.uri.len, rr->nameaddr.uri.s); @@ -721,12 +719,12 @@ int th_unmask_ruri(sip_msg_t *msg, str *uri_prefix) str out; /* Do nothing if ruri is not encoded */ - if (th_uri_prefix_checks - && ((REQ_LINE(msg).uri.len<uri_prefix->len) + if(th_uri_prefix_checks + && ((REQ_LINE(msg).uri.len < uri_prefix->len) || (strncasecmp(REQ_LINE(msg).uri.s, uri_prefix->s, uri_prefix->len) != 0))) { - LM_DBG("ruri [%.*s] is not encoded",REQ_LINE(msg).uri.len, + LM_DBG("ruri [%.*s] is not encoded", REQ_LINE(msg).uri.len, REQ_LINE(msg).uri.s); return 0; } @@ -784,11 +782,11 @@ int th_unmask_refer_to(sip_msg_t *msg, str *uri_prefix) uri = &(get_refer_to(msg)->uri); /* Do nothing if refer_to is not encoded */ - if (th_uri_prefix_checks - && ((uri->len<uri_prefix->len) + if(th_uri_prefix_checks + && ((uri->len < uri_prefix->len) || (strncasecmp(uri->s, uri_prefix->s, uri_prefix->len) != 0))) { - LM_DBG("refer-to [%.*s] is not encoded",uri->len,uri->s); + LM_DBG("refer-to [%.*s] is not encoded", uri->len, uri->s); return 0; }

1 0

git:master:aa081dbd: tm: rpc uac - jump to error when failing to create delayed context
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: aa081dbd1ee1901c6174ffddd556bda47b6ef732 URL: https://github.com/kamailio/kamailio/commit/aa081dbd1ee1901c6174ffddd556bda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T10:50:32+01:00 tm: rpc uac - jump to error when failing to create delayed context --- Modified: src/modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/aa081dbd1ee1901c6174ffddd556bda… Patch: https://github.com/kamailio/kamailio/commit/aa081dbd1ee1901c6174ffddd556bda… --- diff --git a/src/modules/tm/rpc_uac.c b/src/modules/tm/rpc_uac.c index e63da4fb835..2d7bd6113d4 100644 --- a/src/modules/tm/rpc_uac.c +++ b/src/modules/tm/rpc_uac.c @@ -778,7 +778,7 @@ static void rpc_t_uac(rpc_t *rpc, void *c, int reply_wait) dctx = rpc->delayed_ctx_new(c); if(dctx == 0) { rpc->fault(c, 500, "internal error: failed to create context"); - return; + goto error01; } uac_req.cb = rpc_uac_callback; uac_req.cbp = dctx;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev