sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

by Daniel-Constantin Mierla

Hello, I am considering to release Kamailio v5.4.2 sometime next week, likely on Tuesday, October 27, 2020. This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Funding: https://www.paypal.me/dcmierla

3 years, 8 months

git:master:134c6b4b: rtpengine: fix wrong codec action strings being used

by Richard Fuchs

Module: kamailio Branch: master Commit: 134c6b4b63f8fee3b94e3caed956b080477022d4 URL: https://github.com/kamailio/kamailio/commit/134c6b4b63f8fee3b94e3caed956b08… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2020-10-26T14:19:09-04:00 rtpengine: fix wrong codec action strings being used --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/134c6b4b63f8fee3b94e3caed956b08… Patch: https://github.com/kamailio/kamailio/commit/134c6b4b63f8fee3b94e3caed956b08… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index c3e7e75601..7b2573b246 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2084,7 +2084,7 @@ static const char *transports[] = { }; static int parse_codec_flag(struct ng_flags_parse *ng_flags, const str *key, const str *val, - const char *cmp1, const char *cmp2, + const char *cmp1, const char *cmp2, const char *dictstr, bencode_item_t **dictp) { str s; @@ -2098,7 +2098,7 @@ static int parse_codec_flag(struct ng_flags_parse *ng_flags, const str *key, con if (!*dictp) { *dictp = bencode_list(ng_flags->dict->buffer); - bencode_dictionary_add(ng_flags->codec, "transcode", + bencode_dictionary_add(ng_flags->codec, dictstr, *dictp); } bencode_list_add_str(*dictp, &s); @@ -2159,17 +2159,17 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu goto next; } - if (parse_codec_flag(ng_flags, &key, &val, "transcode", "codec-transcode", &ng_flags->codec_transcode)) + if (parse_codec_flag(ng_flags, &key, &val, "transcode", "codec-transcode", "transcode", &ng_flags->codec_transcode)) goto next; - if (parse_codec_flag(ng_flags, &key, &val, "codec-strip", NULL, &ng_flags->codec_strip)) + if (parse_codec_flag(ng_flags, &key, &val, "codec-strip", NULL, "strip", &ng_flags->codec_strip)) goto next; - if (parse_codec_flag(ng_flags, &key, &val, "codec-offer", NULL, &ng_flags->codec_offer)) + if (parse_codec_flag(ng_flags, &key, &val, "codec-offer", NULL, "offer", &ng_flags->codec_offer)) goto next; - if (parse_codec_flag(ng_flags, &key, &val, "codec-mask", NULL, &ng_flags->codec_mask)) + if (parse_codec_flag(ng_flags, &key, &val, "codec-mask", NULL, "mask", &ng_flags->codec_mask)) goto next; - if (parse_codec_flag(ng_flags, &key, &val, "codec-set", NULL, &ng_flags->codec_set)) + if (parse_codec_flag(ng_flags, &key, &val, "codec-set", NULL, "set", &ng_flags->codec_set)) goto next; - if (parse_codec_flag(ng_flags, &key, &val, "codec-except", NULL, &ng_flags->codec_except)) + if (parse_codec_flag(ng_flags, &key, &val, "codec-except", NULL, "except", &ng_flags->codec_except)) goto next; /* check for specially handled items */

3 years, 8 months

[kamailio/kamailio] rms_bridge() doesn't send out B-leg: run_onsend(): required parameters are not available - ignoring (#2524)

by Anthony Messina

### Description  Testing out rtp_media_server module's `rms_bridge()` function with the intention of bridging A-leg to B-leg (an Asterisk conference server). The B-leg never gets sent out and after the call times out, this testing instance crashes. Config slightly modified from https://github.com/kamailio/kamailio/blob/master/src/modules/rtp_media_serv… ``` ... loadmodule "uac.so" event_route[rms:bridged] { xnotice("[rms:bridged] ...\n"); } route { if (t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); if (is_method("REGISTER")) { save("location"); exit; } xnotice("[$rm][$ci]\n"); if (is_method("INVITE") && !has_totag()) { fix_nated_contact(); if ($rU == "888") { $var(target) = "sip:conference@example.com:5080;"; if (!rms_bridge("$var(target)", "rms:bridged")) { send_reply("503", "server error"); xerr("rtp_media_server bridge error!\n"); } exit; } if (!rms_answer("rms:answered")) { t_reply("503", "server error"); xerr("rtp_media_server error!\n"); exit; } } if(rms_dialog_check()) rms_sip_request(); exit; } ``` ### Troubleshooting I added `loadmodule "uac.so"`, though I'm not sure it's required. #### Reproduction  #### Debugging Data  I can only do a stack trace at the moment running this test in a systemd-nspawn container ``` Stack trace of thread 589: #0 0x00007fb449848518 n/a (/usr/lib64/kamailio/modules/rtp_media_server.so + 0x2f518) #1 0x00007fb44982682b n/a (/usr/lib64/kamailio/modules/rtp_media_server.so + 0xd82b) #2 0x00000000005cca6b n/a (/usr/sbin/kamailio + 0x1cca6b) #3 0x000000000041cf90 n/a (/usr/sbin/kamailio + 0x1cf90) #4 0x000000000041e9ea n/a (/usr/sbin/kamailio + 0x1e9ea) #5 0x0000000000421c65 n/a (/usr/sbin/kamailio + 0x21c65) #6 0x000000000042c61c n/a (/usr/sbin/kamailio + 0x2c61c) #7 0x0000000000434cbd n/a (/usr/sbin/kamailio + 0x34cbd) #8 0x00007fb44a8b0042 __libc_start_main (libc.so.6 + 0x27042) #9 0x000000000041bbde n/a (/usr/sbin/kamailio + 0x1bbde) ``` #### Log Messages  ``` kamailio[275]: 10(275) INFO: rtp_media_server [rtp_media_server.c:254]: rms_dialog_action_check(): dialog action RMS_BRIDGING [0_3746724993@2001:db8::99] kamailio[275]: 10(275) INFO: rtp_media_server [rtp_media_server.c:583]: rms_bridging_call(): parsed[sip:conference@example.com:5080][0] kamailio[275]: 10(275) INFO: rtp_media_server [rtp_media_server.c:599]: rms_bridging_call(): si[0x7f83fddb78e0]call-id[0_3746724993@2001:db8::99]cseq[0]ruri[32|sip:conference@example.com:5080]remote_uri[<sip:conference@example.com:5080>]local_uri[<sip:888@example.com>] kamailio[275]: 10(275) DEBUG: tm [uac.c:450]: t_uac_prepare(): next_hop=<sip:conference@example.com:508> kamailio[275]: 10(275) DEBUG: <core> [core/dns_cache.c:527]: _dns_hash_find(): (example.com(12), 1), h=205 kamailio[275]: 10(275) DEBUG: <core> [core/resolve.c:985]: get_record(): skipping 2 NS (p=0x9a0e6e, end=0x9a0ef2) kamailio[275]: 10(275) DEBUG: <core> [core/resolve.c:998]: get_record(): parsing 4 ARs (p=0x9a0e9a, end=0x9a0ef2) kamailio[275]: 10(275) DEBUG: <core> [core/dns_cache.c:1633]: dns_get_related(): (0x7f83fddbb878 (example.com, 1), 1, *0x7f8406d319f0) (0) kamailio[275]: 10(275) DEBUG: <core> [core/dns_cache.c:739]: dns_cache_add_unsafe(): adding example.com(12) 1 (flags=0) at 205 kamailio[275]: 10(275) DEBUG: tm [uac.c:158]: dlg2hash(): hashid 35754 kamailio[275]: 10(275) DEBUG: tm [uac.c:678]: send_prepared_request_impl(): uac: 0x7f83fddb9a10 branch: 0 to 10.77.79.3:508 kamailio[275]: 10(275) DEBUG: <core> [core/onsend.c:50]: run_onsend(): required parameters are not available - ignoring kamailio[275]: 10(275) ERROR: rtp_media_server [rtp_media_server.c:622]: rms_bridging_call(): tmb.t_request_within ok ``` #### SIP Traffic  There is no SIP traffic generated to `<sip:conference@example.com:5080>` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.1-8.gitd43872c11e.fc32.1 (x86_64/linux) 09fd6a 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_BLACKLIST, 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: 09fd6a compiled on 00:00:00 Oct 21 2020 with gcc 10.2.1 ``` * **Operating System**:  ``` Linux kamtest 5.8.16-200.fc32.x86_64 #1 SMP Mon Oct 19 14:17:16 UTC 2020 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/2524

3 years, 8 months

[kamailio/kamailio] textops: fix append_hf function (#2526)

by Stefan Mititelu

#### 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  append after last eader occurance You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2526 -- Commit Summary -- * textops: fix append_hf function -- File Changes -- M src/modules/textops/textops.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2526.patch https://github.com/kamailio/kamailio/pull/2526.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/2526

3 years, 8 months

git:5.4:b51ea9f3: usrloc: safety check on len for user in db keepalive routine

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: b51ea9f361a81fe8117dcef51902e975f7a662d0 URL: https://github.com/kamailio/kamailio/commit/b51ea9f361a81fe8117dcef51902e97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T14:06:15+01:00 usrloc: safety check on len for user in db keepalive routine (cherry picked from commit a1620fa1b4587239835db6ed5765ce04f927172d) --- Modified: src/modules/usrloc/dlist.c --- Diff: https://github.com/kamailio/kamailio/commit/b51ea9f361a81fe8117dcef51902e97… Patch: https://github.com/kamailio/kamailio/commit/b51ea9f361a81fe8117dcef51902e97… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 96a95fe3c9..44ce3c6376 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -236,7 +236,7 @@ int ul_ka_db_records(int partidx) continue; } ur.aor.len = strlen(p); - if(ur.aor.len >= ULKA_AORBUF_SIZE) { + if(ur.aor.len >= ULKA_AORBUF_SIZE - 1) { LM_DBG("long username ->skipping\n"); continue; }

3 years, 8 months

git:5.4:e3cda7fa: core: parser rr - clean partially cloned fields in case of error

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: e3cda7fa4e873c110ee2641f6200fad52222586a URL: https://github.com/kamailio/kamailio/commit/e3cda7fa4e873c110ee2641f6200fad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T14:06:06+01:00 core: parser rr - clean partially cloned fields in case of error (cherry picked from commit e4f6c660bd75cdb9ff0855fcb511673cc8ec00c4) --- Modified: src/core/parser/parse_rr.c --- Diff: https://github.com/kamailio/kamailio/commit/e3cda7fa4e873c110ee2641f6200fad… Patch: https://github.com/kamailio/kamailio/commit/e3cda7fa4e873c110ee2641f6200fad… --- diff --git a/src/core/parser/parse_rr.c b/src/core/parser/parse_rr.c index a089b895fc..9557bffc9b 100644 --- a/src/core/parser/parse_rr.c +++ b/src/core/parser/parse_rr.c @@ -296,7 +296,8 @@ static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm) } else { PKG_MEM_ERROR; } - return -2; + ret = -2; + goto error; } memcpy(res, it, sizeof(rr_t)); @@ -313,7 +314,8 @@ static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm) LM_ERR("Error while duplicating parameters\n"); if (_shm) shm_free(res); else pkg_free(res); - return -3; + ret = -3; + goto error; } xlate_pointers(it, res); @@ -327,6 +329,18 @@ static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm) it = it->next; } return 0; + +error: + if(*_new != NULL) { + if (_shm) { + shm_free_rr(_new); + } else { + free_rr(_new); + } + *_new = NULL; + } + + return ret; }

3 years, 8 months

git:5.4:bd2204b7: regex: use var to store strlen() values

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: bd2204b7151261981bc6872928b7434e2ac7df2e URL: https://github.com/kamailio/kamailio/commit/bd2204b7151261981bc6872928b7434… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T14:05:58+01:00 regex: use var to store strlen() values - avoid doing it again in a few cases (cherry picked from commit 5d490d616132067a5e914302a24b964b73b229a2) --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bd2204b7151261981bc6872928b7434… Patch: https://github.com/kamailio/kamailio/commit/bd2204b7151261981bc6872928b7434… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 475c3542eb..2bc521040b 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -246,6 +246,7 @@ static int load_pcres(int action) int pcre_erroffset; int num_pcres_tmp = 0; pcre **pcres_tmp = NULL; + int llen; /* Get the lock */ lock_get(reload_lock); @@ -301,31 +302,37 @@ static int load_pcres(int action) } /* Start the regular expression with '(' */ patterns[i][0] = '('; + patterns[i][1] = '\0'; memset(line, 0, FILE_MAX_LINE); continue; } + llen = strlen(line); /* Check if the patter size is too big (aprox) */ - if (strlen(patterns[i]) + strlen(line) >= group_max_size - 4) { + if (strlen(patterns[i]) + llen >= group_max_size - 4) { LM_ERR("pattern max file exceeded\n"); fclose(f); goto err; } /* Append ')' at the end of the line */ - if (line[strlen(line) - 1] == '\n') { - line[strlen(line)] = line[strlen(line) - 1]; - line[strlen(line) - 2] = ')'; + if (line[llen - 1] == '\n') { + line[llen - 1] = ')'; + line[llen] = '\n'; + line[llen + 1] = '\0'; } else { /* This is the last char in the file and it's not \n */ - line[strlen(line)] = ')'; + line[llen] = ')'; + line[llen + 1] = '\0'; } /* Append '(' at the beginning of the line */ - memcpy(patterns[i]+strlen(patterns[i]), "(", 1); + llen = strlen(patterns[i]); + memcpy(patterns[i]+llen, "(", 1); + llen++; - /* Append the line to the current pattern */ - memcpy(patterns[i]+strlen(patterns[i]), line, strlen(line)); + /* Append the line to the current pattern (including the ending 0) */ + memcpy(patterns[i] + llen, line, strlen(line) + 1); memset(line, 0, FILE_MAX_LINE); }

3 years, 8 months

git:master:a1620fa1: usrloc: safety check on len for user in db keepalive routine

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a1620fa1b4587239835db6ed5765ce04f927172d URL: https://github.com/kamailio/kamailio/commit/a1620fa1b4587239835db6ed5765ce0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T14:02:48+01:00 usrloc: safety check on len for user in db keepalive routine --- Modified: src/modules/usrloc/dlist.c --- Diff: https://github.com/kamailio/kamailio/commit/a1620fa1b4587239835db6ed5765ce0… Patch: https://github.com/kamailio/kamailio/commit/a1620fa1b4587239835db6ed5765ce0… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 96a95fe3c9..44ce3c6376 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -236,7 +236,7 @@ int ul_ka_db_records(int partidx) continue; } ur.aor.len = strlen(p); - if(ur.aor.len >= ULKA_AORBUF_SIZE) { + if(ur.aor.len >= ULKA_AORBUF_SIZE - 1) { LM_DBG("long username ->skipping\n"); continue; }

3 years, 8 months

git:master:e4f6c660: core: parser rr - clean partially cloned fields in case of error

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e4f6c660bd75cdb9ff0855fcb511673cc8ec00c4 URL: https://github.com/kamailio/kamailio/commit/e4f6c660bd75cdb9ff0855fcb511673… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T13:36:36+01:00 core: parser rr - clean partially cloned fields in case of error --- Modified: src/core/parser/parse_rr.c --- Diff: https://github.com/kamailio/kamailio/commit/e4f6c660bd75cdb9ff0855fcb511673… Patch: https://github.com/kamailio/kamailio/commit/e4f6c660bd75cdb9ff0855fcb511673… --- diff --git a/src/core/parser/parse_rr.c b/src/core/parser/parse_rr.c index a089b895fc..9557bffc9b 100644 --- a/src/core/parser/parse_rr.c +++ b/src/core/parser/parse_rr.c @@ -296,7 +296,8 @@ static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm) } else { PKG_MEM_ERROR; } - return -2; + ret = -2; + goto error; } memcpy(res, it, sizeof(rr_t)); @@ -313,7 +314,8 @@ static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm) LM_ERR("Error while duplicating parameters\n"); if (_shm) shm_free(res); else pkg_free(res); - return -3; + ret = -3; + goto error; } xlate_pointers(it, res); @@ -327,6 +329,18 @@ static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm) it = it->next; } return 0; + +error: + if(*_new != NULL) { + if (_shm) { + shm_free_rr(_new); + } else { + free_rr(_new); + } + *_new = NULL; + } + + return ret; }

3 years, 8 months

git:master:5d490d61: regex: use var to store strlen() values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5d490d616132067a5e914302a24b964b73b229a2 URL: https://github.com/kamailio/kamailio/commit/5d490d616132067a5e914302a24b964… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-26T13:06:53+01:00 regex: use var to store strlen() values - avoid doing it again in a few cases --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5d490d616132067a5e914302a24b964… Patch: https://github.com/kamailio/kamailio/commit/5d490d616132067a5e914302a24b964… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 475c3542eb..2bc521040b 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -246,6 +246,7 @@ static int load_pcres(int action) int pcre_erroffset; int num_pcres_tmp = 0; pcre **pcres_tmp = NULL; + int llen; /* Get the lock */ lock_get(reload_lock); @@ -301,31 +302,37 @@ static int load_pcres(int action) } /* Start the regular expression with '(' */ patterns[i][0] = '('; + patterns[i][1] = '\0'; memset(line, 0, FILE_MAX_LINE); continue; } + llen = strlen(line); /* Check if the patter size is too big (aprox) */ - if (strlen(patterns[i]) + strlen(line) >= group_max_size - 4) { + if (strlen(patterns[i]) + llen >= group_max_size - 4) { LM_ERR("pattern max file exceeded\n"); fclose(f); goto err; } /* Append ')' at the end of the line */ - if (line[strlen(line) - 1] == '\n') { - line[strlen(line)] = line[strlen(line) - 1]; - line[strlen(line) - 2] = ')'; + if (line[llen - 1] == '\n') { + line[llen - 1] = ')'; + line[llen] = '\n'; + line[llen + 1] = '\0'; } else { /* This is the last char in the file and it's not \n */ - line[strlen(line)] = ')'; + line[llen] = ')'; + line[llen + 1] = '\0'; } /* Append '(' at the beginning of the line */ - memcpy(patterns[i]+strlen(patterns[i]), "(", 1); + llen = strlen(patterns[i]); + memcpy(patterns[i]+llen, "(", 1); + llen++; - /* Append the line to the current pattern */ - memcpy(patterns[i]+strlen(patterns[i]), line, strlen(line)); + /* Append the line to the current pattern (including the ending 0) */ + memcpy(patterns[i] + llen, line, strlen(line) + 1); memset(line, 0, FILE_MAX_LINE); }

3 years, 8 months

← Newer
1
...
15
16
17
18
19
20
21
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020