sr-dev January 2024

sr-dev@lists.kamailio.org

19 participants
311 discussions

git:master:42b9fe97: src/Makefile.defs: recognize GCC 14 as recent â not too old compiler

by Victor Seva

Module: kamailio Branch: master Commit: 42b9fe9781e6805436227e0e7b88db73767a94b1 URL: https://github.com/kamailio/kamailio/commit/42b9fe9781e6805436227e0e7b88db7… Author: �� <git-dpa(a)aegee.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-01-13T18:51:06+01:00 src/Makefile.defs: recognize GCC 14 as recent �� not too old compiler similar to 87ed3d9c3ae3ecfabe6 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/42b9fe9781e6805436227e0e7b88db7… Patch: https://github.com/kamailio/kamailio/commit/42b9fe9781e6805436227e0e7b88db7… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 68225943982..7a4b7418670 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -307,8 +307,8 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) -e 's/8\.[0-9]$$/8.0+/' \ -e 's/9\.[0-9]\..*/9.0+/' \ -e 's/9\.[0-9]$$/9.0+/' \ - -e 's/1[0-3]\.[0-9]\..*/9.0+/' \ - -e 's/1[0-3]\.[0-9]$$/9.0+/') + -e 's/1[0-4]\.[0-9]\..*/9.0+/' \ + -e 's/1[0-4]\.[0-9]$$/9.0+/') ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER)))) # dependencies can be generated on-the-fly while compiling *.c CC_MKDEP_OPTS=-MMD -MP

11 months, 2 weeks

[kamailio/kamailio] src/Makefile.defs: recognize GCC 14 as recent ⇔ not too old compiler (PR #3711)

by Дилян Палаузов

similar to 87ed3d9c3ae3ecfabe6 GCC 14 will be released in April or May 2024. Adding this now will avoid backporting the change to the 5.8 branch. (Not that 87ed3d9c3ae3ecfabe6 was backported to 5.7.) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3711 -- Commit Summary -- * src/Makefile.defs: recognize GCC 14 as recent ⇔ not too old compiler -- File Changes -- M src/Makefile.defs (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3711.patch https://github.com/kamailio/kamailio/pull/3711.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3711 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3711(a)github.com>

11 months, 2 weeks

[kamailio/kamailio] Using PATH makes nathelper to send the SIP ping to itself (#2011)

by pwakano

### Description When using the PATH header option to keep track of original Kamailio node that received the REGISTER, if nathelper is also used with SIP ping enabled, the SIP OPTIONS is sent to itself following the PATH header and not sent directly to the destination. The nathelper/user location modules should have a flag similar to the "path_check_local" of the registrar module, which is meant to avoid looping the message to itself in case the next hop pointed by the PATH header is "myself".  ### Troubleshooting #### Reproduction Configure the registrar module to support PATH and before saving the contact info add the PATH header with the local Kamailio information. Also make sure to have the nathelper and usrloc modules configured to send the keepalive SIP OPTIONS to the registered extensions. By the time the SIP OPTIONS is sent, Kamailio sends to itself, then the message has to be loose_route'd to the final destination. This could be avoided by having the nathelper module to identify the next hop is Kamailio itself skipping this destination as a call to "lookup()" does for the registrar module when the flag path_check_local is true.  #### SIP Traffic  172.128.128.10 is the Kamailio IP and 172.128.128.20 is the extension IP ``` 11:51:07.224713 IP (tos 0x60, ttl 64, id 64497, offset 0, flags [none], proto UDP (17), length 518) 172.128.128.10.5060 > 172.128.128.10.5060: SIP, length: 490 OPTIONS sip:345671002@172.128.128.20:5060;rinstance=d1eb3444a5cec5a1;transport=UDP SIP/2.0 Via: SIP/2.0/UDP 172.128.128.10:5060;branch=z9hG4bK2540713 Route: <sip:172.128.128.10:5060;received=sip:172.128.128.20:5060;lr;cluster_node=192.168.156.10:5060> From: sip:sbc@mydomain.com;tag=uloc-5d2e6499-2fb5-1-0-c15309d2 To: sip:345671002@172.128.128.20:5060;rinstance=d1eb3444a5cec5a1;transport=UDP Call-ID: 40ee1573-7506bba3-5e30c05(a)172.128.128.10 CSeq: 1 OPTIONS Content-Length: 0 11:51:07.226132 IP (tos 0x60, ttl 64, id 44359, offset 0, flags [none], proto UDP (17), length 502) 172.128.128.10.5060 > 172.128.128.20.5060: SIP, length: 474 OPTIONS sip:345671002@172.128.128.20:5060;rinstance=d1eb3444a5cec5a1;transport=UDP SIP/2.0 Via: SIP/2.0/UDP 172.128.128.10;branch=z9hG4bKb958.b807e80b742db62504a45220d8f0e974.0 Via: SIP/2.0/UDP 172.128.128.10:5060;branch=z9hG4bK2540713 From: sip:sbc@mydomain.com;tag=uloc-5d2e6499-2fb5-1-0-c15309d2 To: sip:345671002@172.128.128.20:5060;rinstance=d1eb3444a5cec5a1;transport=UDP Call-ID: 40ee1573-7506bba3-5e30c05(a)172.128.128.10 CSeq: 1 OPTIONS Content-Length: 0 11:51:07.303474 IP (tos 0x0, ttl 128, id 10816, offset 0, flags [none], proto UDP (17), length 786) 172.128.128.20.5060 > 172.128.128.10.5060: SIP, length: 758 SIP/2.0 200 OK Via: SIP/2.0/UDP 172.128.128.10;branch=z9hG4bKb958.b807e80b742db62504a45220d8f0e974.0 Via: SIP/2.0/UDP 172.128.128.10:5060;branch=z9hG4bK2540713 Contact: <sip:172.128.128.20:5060> To: <sip:345671002@172.128.128.20:5060;rinstance=d1eb3444a5cec5a1;transport=UDP>;tag=bb0c1f2d From: sip:sbc@mydomain.com;tag=uloc-5d2e6499-2fb5-1-0-c15309d2 Call-ID: 40ee1573-7506bba3-5e30c05(a)172.128.128.10 CSeq: 1 OPTIONS Accept: application/sdp, application/sdp Accept-Language: en Allow: INVITE, ACK, CANCEL, BYE, NOTIFY, REFER, MESSAGE, OPTIONS, INFO, SUBSCRIBE Supported: replaces, norefersub, extended-refer, timer, outbound, path, X-cisco-serviceuri User-Agent: Z 3.15.40006 rv2.8.20 Allow-Events: presence, kpml, talk Content-Length: 0 11:51:07.306821 IP (tos 0x60, ttl 64, id 64570, offset 0, flags [none], proto UDP (17), length 727) 172.128.128.10.5060 > 172.128.128.10.5060: SIP, length: 699 SIP/2.0 200 OK Via: SIP/2.0/UDP 172.128.128.10:5060;branch=z9hG4bK2540713 Contact: <sip:172.128.128.20:5060;alias=172.128.128.20~5060~1> To: <sip:345671002@172.128.128.20:5060;rinstance=d1eb3444a5cec5a1;transport=UDP>;tag=bb0c1f2d From: sip:sbc@mydomain.com;tag=uloc-5d2e6499-2fb5-1-0-c15309d2 Call-ID: 40ee1573-7506bba3-5e30c05(a)172.128.128.10 CSeq: 1 OPTIONS Accept: application/sdp, application/sdp Accept-Language: en Allow: INVITE, ACK, CANCEL, BYE, NOTIFY, REFER, MESSAGE, OPTIONS, INFO, SUBSCRIBE Supported: replaces, norefersub, extended-refer, timer, outbound, path, X-cisco-serviceuri User-Agent: Z 3.15.40006 rv2.8.20 Allow-Events: presence, kpml, talk Content-Length: 0 ``` ### Possible Solutions  Not found. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.2.2 (x86_64/linux) 67f967 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 67f967 compiled on 11:40:41 Mar 11 2019 with gcc 4.8.5 ``` * **Operating System**:  ``` # uname -a Linux kamailio-1 3.10.0-514.21.2.el7.x86_64 #1 SMP Tue Jun 20 12:24:47 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2011

11 months, 2 weeks

[kamailio/kamailio] unistr.h: No such file or directory (#2020)

by stefan.wen

11 months, 2 weeks

git:master:1c13e99e: topoh: prefix global variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1c13e99efb119f75ddbd6a0aa4798cd27accbff5 URL: https://github.com/kamailio/kamailio/commit/1c13e99efb119f75ddbd6a0aa4798cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-12T20:02:14+01:00 topoh: prefix global variable --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1c13e99efb119f75ddbd6a0aa4798cd… Patch: https://github.com/kamailio/kamailio/commit/1c13e99efb119f75ddbd6a0aa4798cd… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 02098b1c1b0..fe63bf88c7f 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -95,7 +95,7 @@ int _th_use_mode = 0; struct str_hash_table *th_socket_hash_table; -sanity_api_t scb; +static sanity_api_t _tph_scb; int th_msg_received(sr_event_param_t *evp); int th_msg_sent(sr_event_param_t *evp); @@ -186,7 +186,7 @@ static int mod_init(void) } if(th_sanity_checks != 0) { - if(sanity_load_api(&scb) < 0) { + if(sanity_load_api(&_tph_scb) < 0) { LM_ERR("cannot bind to sanity module\n"); goto error; } @@ -515,7 +515,7 @@ int th_msg_received(sr_event_param_t *evp) th_cookie_value.len = 2; if(msg.first_line.type == SIP_REQUEST) { if(th_sanity_checks != 0) { - if(scb.check_defaults(&msg) < 1) { + if(_tph_scb.check_defaults(&msg) < 1) { LM_ERR("sanity checks failed\n"); goto done; }

11 months, 2 weeks

git:master:cb92b6a2: topos: prefix global variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cb92b6a23d622b06bcb18195b5c0525fcd273e7a URL: https://github.com/kamailio/kamailio/commit/cb92b6a23d622b06bcb18195b5c0525… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-12T19:53:57+01:00 topos: prefix global variable --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cb92b6a23d622b06bcb18195b5c0525… Patch: https://github.com/kamailio/kamailio/commit/cb92b6a23d622b06bcb18195b5c0525… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 7bcb2fea3c9..e37ca847beb 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -134,7 +134,7 @@ str _tps_xavu_field_contact_host = STR_NULL; str _tps_context_param = STR_NULL; str _tps_context_value = STR_NULL; -sanity_api_t scb; +static sanity_api_t _tps_scb; int tps_msg_received(sr_event_param_t *evp); int tps_msg_sent(sr_event_param_t *evp); @@ -297,7 +297,7 @@ static int mod_init(void) } if(_tps_sanity_checks != 0) { - if(sanity_load_api(&scb) < 0) { + if(sanity_load_api(&_tps_scb) < 0) { LM_ERR("cannot bind to sanity module\n"); goto error; } @@ -539,7 +539,7 @@ int tps_msg_received(sr_event_param_t *evp) if(msg.first_line.type == SIP_REQUEST) { if(_tps_sanity_checks != 0) { - if(scb.check_defaults(&msg) < 1) { + if(_tps_scb.check_defaults(&msg) < 1) { LM_ERR("sanity checks failed\n"); goto done; }

11 months, 2 weeks

git:master:987e21a9: xhttp: prefix for global variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 987e21a914edcebc9eafe21af19c8a476bf73b06 URL: https://github.com/kamailio/kamailio/commit/987e21a914edcebc9eafe21af19c8a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-12T19:50:28+01:00 xhttp: prefix for global variable --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/987e21a914edcebc9eafe21af19c8a4… Patch: https://github.com/kamailio/kamailio/commit/987e21a914edcebc9eafe21af19c8a4… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index 0660d409af6..af27baffa41 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -65,7 +65,7 @@ static char *xhttp_url_skip = NULL; static regex_t xhttp_url_skip_regexp; /** SL API structure */ -sl_api_t slb; +static sl_api_t _xhttp_slb; static str xhttp_event_callback = STR_NULL; @@ -149,7 +149,7 @@ static int mod_init(void) } /* bind the SL API */ - if(sl_load_api(&slb) != 0) { + if(sl_load_api(&_xhttp_slb) != 0) { LM_ERR("cannot bind to SL API\n"); return -1; } @@ -424,7 +424,7 @@ static int xhttp_send_reply( LM_DBG("response with body: %.*s\n", body->len, body->s); } LM_DBG("sending out response: %d %.*s\n", code, reason->len, reason->s); - if(slb.sreply(msg, code, reason) < 0) { + if(_xhttp_slb.sreply(msg, code, reason) < 0) { LM_ERR("Error while sending reply\n"); return -1; }

11 months, 2 weeks

git:master:0479c40f: mohqueue: rename local variables to prevent shadowing the global

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0479c40fe6fd6765de92eea8f9e0bf04dea8cbd0 URL: https://github.com/kamailio/kamailio/commit/0479c40fe6fd6765de92eea8f9e0bf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-12T14:37:02+01:00 mohqueue: rename local variables to prevent shadowing the global --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/0479c40fe6fd6765de92eea8f9e0bf0… Patch: https://github.com/kamailio/kamailio/commit/0479c40fe6fd6765de92eea8f9e0bf0… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index 75130381746..599e5eb8a1a 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -1278,17 +1278,17 @@ int form_rtp_SDP(str *pstr, call_lst *pcall, char *pSDP) **********/ char *pfncname = "form_rtp_SDP: "; - rtpmap **pmohfiles = + rtpmap **lpmohfiles = find_MOH(pcall->pmohq->mohq_mohdir, pcall->pmohq->mohq_mohfile); - if(!pmohfiles[0]) { + if(!lpmohfiles[0]) { LM_ERR("%sUnable to find any MOH files for queue (%s)!\n", pfncname, pcall->pmohq->mohq_name); return 0; } int nsize = strlen(pSDP) + 2; int nidx; - for(nidx = 0; pmohfiles[nidx]; nidx++) { - nsize += strlen(pmohfiles[nidx]->pencode) // encode length + for(nidx = 0; lpmohfiles[nidx]; nidx++) { + nsize += strlen(lpmohfiles[nidx]->pencode) // encode length + 19; // space, type number, "a=rtpmap:%d ", EOL } @@ -1707,7 +1707,7 @@ void reinvite_msg(sip_msg_t *pmsg, call_lst *pcall) * o look for hold condition and matching payload type **********/ - rtpmap **pmohfiles = + rtpmap **lpmohfiles = find_MOH(pcall->pmohq->mohq_mohdir, pcall->pmohq->mohq_mohfile); int bhold = 0; int bmatch = 0; @@ -1749,8 +1749,8 @@ void reinvite_msg(sip_msg_t *pmsg, call_lst *pcall) ppayload = ppayload->next) { int ntype = atoi(ppayload->rtp_payload.s); int nidx; - for(nidx = 0; pmohfiles[nidx]; nidx++) { - if(pmohfiles[nidx]->ntype == ntype) { + for(nidx = 0; lpmohfiles[nidx]; nidx++) { + if(lpmohfiles[nidx]->ntype == ntype) { bmatch = 1; break; }

11 months, 2 weeks

git:master:0ea60341: avp: rename local variable to prevent shadowing the global structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0ea603413de9505b5312e5930168102e816dced3 URL: https://github.com/kamailio/kamailio/commit/0ea603413de9505b5312e5930168102… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-12T13:10:33+01:00 avp: rename local variable to prevent shadowing the global structure --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/0ea603413de9505b5312e5930168102… Patch: https://github.com/kamailio/kamailio/commit/0ea603413de9505b5312e5930168102… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index 38fa08fe1cb..d04fe47f880 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1454,7 +1454,7 @@ static int attr_hdr_body2attrs2( static int attr_hdr_body2attrs_fixup(void **param, int param_no) { - char *c, *params; + char *c, *sparams; hdr_name_t *h = NULL; int n; str *s; @@ -1467,9 +1467,9 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) c); return E_CFG; } else { - params = strchr(c, PARAM_DELIM); - if(params) - n = params - c; + sparams = strchr(c, PARAM_DELIM); + if(sparams) + n = sparams - c; else n = strlen(c); if(n == 0) { @@ -1486,10 +1486,10 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) h->name.s.s = (char *)h + sizeof(hdr_name_t); memcpy(h->name.s.s, c, n + 1); } - if(params) { + if(sparams) { h->val_types = 0; - while(*params) { - switch(*params) { + while(*sparams) { + switch(*sparams) { case 'i': case 'I': h->val_types = VAL_TYPE_INT; @@ -1504,11 +1504,11 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) LOG(L_ERR, "attr_hdr_body2attrs_fixup: bad field param " "modifier near '%s'\n", - params); + sparams); pkg_free(h); return E_CFG; } - params++; + sparams++; } if(!h->val_types) { LOG(L_ERR, "attr_hdr_body2attrs_fixup: no field param modifier "

11 months, 2 weeks

[kamailio/kamailio] Rtpengine fixes (PR #3710)

by Xenofon Karamanos

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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) #### Description  This PR add support for the `codec-accept` and `codec-consume` flags of rtpengine (supported since [mr9.2.1](https://github.com/sipwise/rtpengine/commit/336cb5b280079b0e7b2412…). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3710 -- Commit Summary -- * rtpengine: Add support for codec-accept and codec-consume * rtpengine/docs: Add codec-consume docs -- File Changes -- M src/modules/rtpengine/doc/rtpengine_admin.xml (5) M src/modules/rtpengine/rtpengine.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3710.patch https://github.com/kamailio/kamailio/pull/3710.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3710 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3710(a)github.com>

11 months, 2 weeks

← Newer
1
...
19
20
21
22
23
24
25
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2024