sr-dev November 2021

sr-dev@lists.kamailio.org

20 participants
309 discussions

[kamailio/kamailio] A problem appeared after the latest changes in pv set_var_value function (Issue #2928)

by alexyosifov

### Description With the latest master, I am trying to register UE in the IMS core. In the S-CSCF Diameter MAR message Authentication scheme is sent as 'unknown". With Kamailio 5.5.1 works fine. What I see the problem appears because of the following commits: 6eb67eaa4fc27d1eb7da7b2b674ffe8e7f86ecbc pv: handle case when var value ha flag str but null pointer ffe311939ebf58e7418940ec6c71bfaf9b21afad pv: fix condition in detecting the null string value when setting $var(...) - issue introduced in previous commit Check the log messages below for detailed debug data. pv $aa is empty but after line 711 $var(alg) is with len=1 and printed value '0'. #### Reproduction Try to Register UE to the IMS core with the latest master. Check MAR message AVP 612->avp 608 3GPP-SIP-Authentication-Scheme: unknown #### Log Messages In s-cscf kamailio.cfg route[REGISTER] I have the following code: 709 route[REGISTER] { 710 xlog("ALGORITHM IS [$aa] and User-Agent is [$ua]\n"); 711 $var(alg) = $aa; 712 xlog("ALGORITHM IS [$var(alg)] and User-Agent is [$ua]\n"); 733 #user has not been authenticated. Lets send a challenge via 401 Unauthorized 734 xlog("L_DBG","About to challenge! auth_ims\n"); 735 ims_www_challenge("REG_MAR_REPLY", "$td", "$var(alg)"); 736 exit; **LOG from master branch:** Log output for lines 710 and 712: Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/etc/kamailio_scscf/kamailio.cfg] l=710 a=25 n=xlog Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) ERROR: <script>: ALGORITHM IS [] and User-Agent is [EE VOLTE] Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/etc/kamailio_scscf/kamailio.cfg] l=711 a=63 n=assign Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/etc/kamailio_scscf/kamailio.cfg] l=712 a=25 n=xlog Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) ERROR: <script>: ALGORITHM IS [0] and User-Agent is [EE VOLTE] Added and debug log into authorize.c:356 file: ... LM_DBG(" #################### Sending MAR - 0, algo.len=%d algo[%.*s]\n", algo.len, algo.len, algo.s); .... Log output: Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) DEBUG: ims_auth [authorize.c:356]: challenge(): #################### Sending MAR - 0, algo.len=1 algo[0] **LOG from Kamailio 5.5.1:** 117528 Nov 11 14:43:53 kamailio_scscf[19016]: 1(19060) ERROR: <script>: ALGORITHM IS [] and User-Agent is [EE VOLTE] 117529 Nov 11 14:43:53 kamailio_scscf[19016]: 1(19060) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/etc/kamailio_scscf/kamailio.cfg] l=711 a=63 n=assign 117530 Nov 11 14:43:53 kamailio_scscf[19016]: 1(19060) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/etc/kamailio_scscf/kamailio.cfg] l=712 a=25 n=xlog 117531 Nov 11 14:43:53 kamailio_scscf[19016]: 1(19060) ERROR: <script>: ALGORITHM IS [] and User-Agent is [EE VOLTE] Nov 11 14:43:53 mnc234 kamailio_scscf[19016]: 1(19060) DEBUG: ims_auth [authorize.c:356]: challenge(): #################### Sending MAR - 0, algo.len=0 algo[]] #### SIP Traffic ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.6.0-dev2 (x86_64/linux) ffe311-dirty flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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: ffe311 -dirty compiled on 14:44:53 Nov 11 2021 with gcc 7.4.0 * **Operating System**: DISTRIB_ID=Ubuntu DISTRIB_RELEASE=18.04 DISTRIB_CODENAME=bionic DISTRIB_DESCRIPTION="Ubuntu 18.04.2 LTS" -- 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/2928

2 years, 6 months

git:master:e85f33d7: pv: check source for memcpy

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e85f33d7c827b85634f6fe0377ff9f30b3bc4e84 URL: https://github.com/kamailio/kamailio/commit/e85f33d7c827b85634f6fe0377ff9f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-19T08:57:25+01:00 pv: check source for memcpy --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/e85f33d7c827b85634f6fe0377ff9f3… Patch: https://github.com/kamailio/kamailio/commit/e85f33d7c827b85634f6fe0377ff9f3… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 255f9f2040..f04fa9818b 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -134,7 +134,9 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) } var->v.flags |= VAR_VAL_STR; } - memcpy(var->v.value.s.s, value->s.s, value->s.len); + if(value->s.s) { + memcpy(var->v.value.s.s, value->s.s, value->s.len); + } var->v.value.s.len = value->s.len; var->v.value.s.s[value->s.len] = '\0'; } else {

2 years, 6 months

git:master:bd206729: Revert "pv: handle case when var value ha flag str but null pointer"

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bd206729cf46bc32b3a92f870d6b77105ab35902 URL: https://github.com/kamailio/kamailio/commit/bd206729cf46bc32b3a92f870d6b771… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-19T08:45:09+01:00 Revert "pv: handle case when var value ha flag str but null pointer" This reverts commit 6eb67eaa4fc27d1eb7da7b2b674ffe8e7f86ecbc. --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/bd206729cf46bc32b3a92f870d6b771… Patch: https://github.com/kamailio/kamailio/commit/bd206729cf46bc32b3a92f870d6b771… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 456e21963a..255f9f2040 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) + if(value==NULL) { if(var->v.flags&VAR_VAL_STR) {

2 years, 6 months

git:master:f19cff46: Revert "pv: fix condition in detecting the null string value when setting $var(...)"

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f19cff46ae1f27a456e276ea891154aeb0a51e08 URL: https://github.com/kamailio/kamailio/commit/f19cff46ae1f27a456e276ea891154a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-19T08:44:49+01:00 Revert "pv: fix condition in detecting the null string value when setting $var(...)" This reverts commit ffe311939ebf58e7418940ec6c71bfaf9b21afad. --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/f19cff46ae1f27a456e276ea891154a… Patch: https://github.com/kamailio/kamailio/commit/f19cff46ae1f27a456e276ea891154a… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 5f4626b8d6..456e21963a 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (value->s.s==NULL))) + if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

2 years, 6 months

[kamailio/kamailio] ASAN: (Issue #2932)

by sergey-safarov

I have compiled Kamailio with ASAN When I start Kamailio I this error ``` core/re.c:390:2: runtime error: null pointer passed as argument 2, which is declared to never be null ``` [Link to code](https://github.com/kamailio/kamailio/blob/master/src/core/re.c#L390) ``` Breakpoint 1, replace_build (match=0xffffb0140fc0 "KZQ_CHECK_MEDIA_SERVER_INSERT", nmatch=1, pmatch=0xffffb01410a8, se=0xffffb00b9bc0, msg=0x332ebe0 <_faked_msg>, rpl=0xffffb0141120) at core/re.c:390 390 RBUF_APPEND(dest, p, end-p); (gdb) Continuing. Breakpoint 1, replace_build (match=0xffffb0162a78 "auth_cache=>size=16;autoexpire=7200;REGISTRAR_S_WARM_CACHE", nmatch=1, pmatch=0xffffb0162b60, se=0xffffb0162730, msg=0x332ebe0 <_faked_msg>, rpl=0xffffb0162bd8) at core/re.c:390 390 RBUF_APPEND(dest, p, end-p); (gdb) p p $4 = 0x0 (gdb) list 385 default: 386 LM_CRIT("unknown type %d\n", se->replace[r].type); 387 /* ignore it */ 388 } 389 } 390 RBUF_APPEND(dest, p, end-p); 391 rpl->len = dest - rbuf; 392 if ((rpl->s = pkg_malloc(rpl->len)) == NULL) { 393 PKG_MEM_ERROR; 394 goto error; (gdb) bt #0 replace_build (match=0xffffb0162a78 "auth_cache=>size=16;autoexpire=7200;REGISTRAR_S_WARM_CACHE", nmatch=1, pmatch=0xffffb0162b60, se=0xffffb0162730, msg=0x332ebe0 <_faked_msg>, rpl=0xffffb0162bd8) at core/re.c:390 #1 0x0000000000f91dc4 in subst_run (se=0xffffb0162730, input=0xffffb0162a78 "auth_cache=>size=16;autoexpire=7200;REGISTRAR_S_WARM_CACHE", msg=0x332ebe0 <_faked_msg>, count=0x0) at core/re.c:460 #2 0x0000000000f926a0 in subst_str (input=0xffffb0162a78 "auth_cache=>size=16;autoexpire=7200;REGISTRAR_S_WARM_CACHE", msg=0x332ebe0 <_faked_msg>, se=0xffffb0162730, count=0x0) at core/re.c:502 #3 0x00000000011e7d0c in pp_subst_run (data=0x338ba20 <s_buf>) at core/ppcfg.c:216 #4 0x00000000018b1f98 in yylex () at core/cfg.lex:1278 #5 0x0000000001900660 in yyparse () at core/cfg.tab.c:5160 #6 0x000000000048c4e4 in main (argc=11, argv=0xfffffffff3b8) at main.c:2487 ``` -- 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/2932

2 years, 6 months

git:master:136071c4: core: re - check source of memcpy

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 136071c4a3cd306ef1043b02d1b61ce7d37efa52 URL: https://github.com/kamailio/kamailio/commit/136071c4a3cd306ef1043b02d1b61ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-19T08:25:45+01:00 core: re - check source of memcpy --- Modified: src/core/re.c --- Diff: https://github.com/kamailio/kamailio/commit/136071c4a3cd306ef1043b02d1b61ce… Patch: https://github.com/kamailio/kamailio/commit/136071c4a3cd306ef1043b02d1b61ce… --- diff --git a/src/core/re.c b/src/core/re.c index 4ce18d8c4d..47322284b6 100644 --- a/src/core/re.c +++ b/src/core/re.c @@ -339,8 +339,10 @@ static int replace_build(const char* match, int nmatch, regmatch_t* pmatch, LM_ERR("Buffer too small\n"); \ goto error; \ } \ - memcpy((dst), (src), (size)); \ - (dst) += (size); + if(likely(src)) { \ + memcpy((dst), (src), (size)); \ + (dst) += (size); \ + } p=se->replacement.s; end=p+se->replacement.len;

2 years, 6 months

git:master:7f89e4cc: core: mechanism to execute child_init() for special ranks on demand

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7f89e4cc5c84b720928c2936c9e2e0630aebec9e URL: https://github.com/kamailio/kamailio/commit/7f89e4cc5c84b720928c2936c9e2e06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-18T14:33:28+01:00 core: mechanism to execute child_init() for special ranks on demand - new special rank PROC_POSTCHILDINIT, to execute child_init() for main process only when ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT) is executed in mod_init() --- Modified: src/core/sr_module.c Modified: src/core/sr_module.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/7f89e4cc5c84b720928c2936c9e2e06… Patch: https://github.com/kamailio/kamailio/commit/7f89e4cc5c84b720928c2936c9e2e06…

2 years, 6 months

[kamailio/kamailio] pv: new variable $xavp_count (PR #2936)

by Nicolas C

Retrieve the number of rows stored in an xavp As discussed on the mailing list, this is useful to at least two people. #### 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: - [ x ] PR should be backported to stable branches - [ x ] Tested changes locally You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2936 -- Commit Summary -- * pv: new variable $xavp_count -- File Changes -- M src/modules/pv/pv.c (3) M src/modules/pv/pv_xavp.c (33) M src/modules/pv/pv_xavp.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2936.patch https://github.com/kamailio/kamailio/pull/2936.diff -- 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/pull/2936

2 years, 6 months

git:5.4:52c6c54e: nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted

by Victor Seva

Module: kamailio Branch: 5.4 Commit: 52c6c54ecefaad4d0fab514b0e11169bdd99e25e URL: https://github.com/kamailio/kamailio/commit/52c6c54ecefaad4d0fab514b0e11169… Author: Dmitry Wagin <dmitry.wagin(a)ya.ru> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-18T11:42:21+01:00 nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted - doesn't throw an error while "a=rtcp" param is omitted (RFC1889 behavior) or address is omitted - replace_sdp_ip() returns 0 on omitted IP-address - added param can_omit to replace_sdp_ip() fixes #2784 regression introduced by #2497 (cherry picked from commit fa6038172c0095287096c7021ca5dadad728cfaa) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/52c6c54ecefaad4d0fab514b0e11169… Patch: https://github.com/kamailio/kamailio/commit/52c6c54ecefaad4d0fab514b0e11169… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 81b89b46c7..3acb2937f7 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1609,13 +1609,12 @@ static int is_rfc1918_f(struct sip_msg *msg, char *str1, char *str2) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) -/* replace ip addresses in SDP and return umber of replacements */ +/* replace ip addresses in SDP and return number of replacements */ static inline int replace_sdp_ip( - struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen) + struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen, int can_omit) { str body1, oldip, newip; str body = *org_body; - unsigned hasreplaced = 0; int pf, pf1 = 0; str body2; char *bodylimit = body.s + body.len; @@ -1631,10 +1630,17 @@ static inline int replace_sdp_ip( } body1 = body; for(;;) { - if(nh_extract_mediaip(&body1, &oldip, &pf, line, linelen) == -1) + ret = nh_extract_mediaip(&body1, &oldip, &pf, line, linelen); + if(ret == 0) break; - if(pf != AF_INET) { - LM_ERR("not an IPv4 address in '%s' SDP\n", line); + if(ret == -1) { + if(can_omit) { + body2.s = body1.s + linelen; + body2.len = bodylimit - body2.s; + body1 = body2; + continue; + } + LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } if(!pf1) @@ -1652,13 +1658,8 @@ static inline int replace_sdp_ip( return -1; } count += ret; - hasreplaced = 1; body1 = body2; } - if(!hasreplaced) { - LM_ERR("can't extract '%s' IP from the SDP\n", line); - return -1; - } return count; } @@ -1737,15 +1738,14 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & (FIX_MEDIP | FIX_ORGIP)) { /* Iterate all a=rtcp and replace ips in them. rfc3605 */ - ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6); + ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6, 1); if(ret == -1) - LM_DBG("a=rtcp parameter does not exist. nothing to do.\n"); - else - count += ret; + return -1; + count += ret; if(level & FIX_MEDIP) { /* Iterate all c= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1753,7 +1753,7 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & FIX_ORGIP) { /* Iterate all o= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1800,7 +1800,7 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = cp1 + linelen; } if(cp1 == NULL) - return -1; + return 0; mediaip->s = cp1 + linelen; mediaip->len = @@ -1835,7 +1835,6 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = eat_space_end(cp + len, mediaip->s + mediaip->len); } if(nextisip != 2 || mediaip->len == 0) { - LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } return 1;

2 years, 6 months

git:5.5:a9889437: nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted

by Victor Seva

Module: kamailio Branch: 5.5 Commit: a988943760ffecd07c10a45bd8be5bf0165057b2 URL: https://github.com/kamailio/kamailio/commit/a988943760ffecd07c10a45bd8be5bf… Author: Dmitry Wagin <dmitry.wagin(a)ya.ru> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-18T11:40:18+01:00 nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted - doesn't throw an error while "a=rtcp" param is omitted (RFC1889 behavior) or address is omitted - replace_sdp_ip() returns 0 on omitted IP-address - added param can_omit to replace_sdp_ip() fixes #2784 regression introduced by #2497 (cherry picked from commit fa6038172c0095287096c7021ca5dadad728cfaa) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/a988943760ffecd07c10a45bd8be5bf… Patch: https://github.com/kamailio/kamailio/commit/a988943760ffecd07c10a45bd8be5bf… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 1392a0af2a..9e45a61079 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1609,13 +1609,12 @@ static int is_rfc1918_f(struct sip_msg *msg, char *str1, char *str2) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) -/* replace ip addresses in SDP and return umber of replacements */ +/* replace ip addresses in SDP and return number of replacements */ static inline int replace_sdp_ip( - struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen) + struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen, int can_omit) { str body1, oldip, newip; str body = *org_body; - unsigned hasreplaced = 0; int pf, pf1 = 0; str body2; char *bodylimit = body.s + body.len; @@ -1631,10 +1630,17 @@ static inline int replace_sdp_ip( } body1 = body; for(;;) { - if(nh_extract_mediaip(&body1, &oldip, &pf, line, linelen) == -1) + ret = nh_extract_mediaip(&body1, &oldip, &pf, line, linelen); + if(ret == 0) break; - if(pf != AF_INET) { - LM_ERR("not an IPv4 address in '%s' SDP\n", line); + if(ret == -1) { + if(can_omit) { + body2.s = body1.s + linelen; + body2.len = bodylimit - body2.s; + body1 = body2; + continue; + } + LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } if(!pf1) @@ -1652,13 +1658,8 @@ static inline int replace_sdp_ip( return -1; } count += ret; - hasreplaced = 1; body1 = body2; } - if(!hasreplaced && linelen>=6 && memcmp("a=rtcp", line, 6)!=0) { - LM_ERR("can't extract '%s' IP from the SDP\n", line); - return -1; - } return count; } @@ -1737,15 +1738,14 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & (FIX_MEDIP | FIX_ORGIP)) { /* Iterate all a=rtcp and replace ips in them. rfc3605 */ - ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6); + ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6, 1); if(ret == -1) - LM_DBG("a=rtcp parameter does not exist. nothing to do.\n"); - else - count += ret; + return -1; + count += ret; if(level & FIX_MEDIP) { /* Iterate all c= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1753,7 +1753,7 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & FIX_ORGIP) { /* Iterate all o= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1800,7 +1800,7 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = cp1 + linelen; } if(cp1 == NULL) - return -1; + return 0; mediaip->s = cp1 + linelen; mediaip->len = @@ -1835,7 +1835,6 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = eat_space_end(cp + len, mediaip->s + mediaip->len); } if(nextisip != 2 || mediaip->len == 0) { - LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } return 1;

2 years, 6 months

← Newer
1
...
17
18
19
20
21
22
23
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2021