sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
302 discussions

[kamailio/kamailio] Wrong Record-Route and Via header fields when TCP is used (#2033)

by leonid-xorcom

### Description Kamailio server has two legs that are connected to different networks. I'm using Kamailio v.5.2.3 and the "enable_double_rr" is implicitly set to "1". The leg "A" IP address is 10.28.80.1 The leg "B" IP address is 192.168.9.103 The call is initiated from 10.28.80.47 According to the "rr" module documentation, function record_route() should insert two "Record_Route" header fields when a request is accepted on one leg is should go out via the second leg. This works as expected in case of UDP protocol: INVITE sip:2601@192.168.0.178:49162;transport=udp SIP/2.0 Record-Route: <sip:192.168.9.103;r2=on;lr;did=e2c.a191> Record-Route: <sip:10.28.80.1;r2=on;lr;did=e2c.a191> Via: SIP/2.0/UDP 192.168.9.103;branch=z9hG4bKcfa5.d64ecbd87d5315b5993c4ccf16f86537.0 Via: SIP/2.0/UDP 10.28.80.47:5060;rport=5060;branch=z9hG4bK3a9e9a4d But when the TCP protocol is used AND "listen" parameters are defined: listen=udp:10.28.80.1:5060 listen=tcp:10.28.80.1:5060 listen=udp:192.168.9.103:5060 listen=tcp:192.168.9.103:5060 then the outbound message looks like this: INVITE sip:2601@192.168.0.178:48758;transport=tcp SIP/2.0 Record-Route: <sip:10.28.80.1;transport=tcp;lr;did=bcd.72f> Via: SIP/2.0/TCP 10.28.80.1;branch=z9hG4bKb9ca.26ea08654c9dbc32bb0dc6e3b6f92d45.0;i=3 Via: SIP/2.0/TCP 10.28.80.47:5060;rport=33976;branch=z9hG4bK5291fab1 There are two problems there: a) only one Record-Route with leg "A" is inserted b) the added "Via" header field contains the leg "A" IP address instead of expected leg "B" IP address (192.168.9.103). In the LAN trace, I see that in reality the message was sent from leg "B". IMPORTANT: The problem occurs only when the "listen" parameters are defined in the Kamailio configuration. When the "listens" are not configured then everything works correctly. ### Troubleshooting #### Reproduction #### Debugging Data #### Log Messages http://updates.xorcom.com/~xorcom/kam-tcp-problem.tar.gz The archive contains the following files: * syslog-bad.log and bad.cap - Kamailio log and tcpdump trace of a call when the problem occurs * syslog-good.log and good.cap - Kamailio log and tcpdump trace of a call when the problem doesn't occur #### SIP Traffic ### Possible Solutions ### Additional Information kamailio -v version: kamailio 5.2.3 (x86_64/linux) 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: unknown compiled with gcc 7.3.0 ***Operating System**: Ubuntu 18.0.4 -- 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/2033

3 years

[kamailio/kamailio] jwt: token may have a validity period (number of seconds) (#2722)

by Frédéric Gaisnon

#### 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) - [ ] New feature (non-breaking change which adds new functionality) - [x ] 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  Add a new parameter validity to jwt_generate(prvkey, alg, claims) in order to set a validity period for generated jwt token. I know branch 5.5 is almost released but I think that this functionality is very important for this new module and I hope it can be added to this release. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2722 -- Commit Summary -- * cplc: add a configuration route before redirected call (key: redirect_route) * pua_dialoginfo: disable publish notifications for subsequent requests (key: publish_dialog_req_within) * Merge branch 'master' of https://github.com/kamailio/kamailio * jwt: token may have a validity period (number of seconds) -- File Changes -- M src/modules/jwt/doc/jwt.xml (9) M src/modules/jwt/doc/jwt_admin.xml (5) M src/modules/jwt/jwt_mod.c (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2722.patch https://github.com/kamailio/kamailio/pull/2722.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/2722

3 years

topos_redis enhancement

by Juha Heinanen

Daniel, I studied a bit topos_redis source and noticed that it lacks x_context td and tt keys. Is there something else missing in order to make spirals work also when redis backend is in use? -- Juha

3 years

Development for v5.5.x is frozen

by Daniel-Constantin Mierla

Hello, the formal notification that the development for the next major version 5.5.0 is now frozen. The focus has to be on testing the master branch. Also, the master branch should not get commits with new features till the branch 5.5 is created, expected to happen in 2-4 weeks, a matter of how testing goes on. Meanwhile, the commits with new features in the C code can be pushed to personal branches, new pull requests can still be done, but they will be merged after branching 5.5. Can still be done commits with documentation improvements, enhancements to related tools (e.g., kamctl, kamcmd), merging exiting pull requests at this moment, exporting missing KEMI functions and completing the functionality of the new modules added in 5.5. Once the branch 5.5 is created, new features can be pushed again to master branch as usual. From that moment, the v5.5.0 should be out very soon, time used for further testing but also preparing the release of packages. If someone is not sure if a commit brings a new feature, just make a pull request and it can be discussed there on github portal or via sr-dev mailing list. A summary of what is new in upcoming 5.5 is going to be built at: * https://www.kamailio.org/wiki/features/new-in-5.5.x Upgrade guidelines will be collected at: * https://www.kamailio.org/wiki/install/upgrade/5.4.x-to-5.5.0 Everyone is more than welcome to contribute to the above wiki pages, especially to the upgrade guidelines, to help everyone else during the migration process from v5.4.x to 5.4.x. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

3 years

[kamailio/kamailio] CORE_TLS option in 5.4 (#2720)

by Boris Korzun

### Description There's a `CORE_TLS` option in _Makefile.defs_. But Kamailio isn't build with the option. https://github.com/kamailio/kamailio/blob/cf105d5af78963759825f5eaf9feb767c… There is no `core/tls/tls_init.h` for include. ### Additional Information Kamailio 5.4.5 * **Operating System**: FreeBSD 12.2 -- 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/2720

3 years

git:5.5:f97b189d: lost: fixed possible resource leak inside lost_get_response_issues()

by Wolfgang Kampichler

Module: kamailio Branch: 5.5 Commit: f97b189d238bd63f80a4525c56501cd394b7d2f3 URL: https://github.com/kamailio/kamailio/commit/f97b189d238bd63f80a4525c56501cd… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-30T12:26:53+02:00 lost: fixed possible resource leak inside lost_get_response_issues() (cherry picked from commit a1bbe035f1a1acc11f86d27fdc0adef1b1a3d010) --- Modified: src/modules/lost/response.c --- Diff: https://github.com/kamailio/kamailio/commit/f97b189d238bd63f80a4525c56501cd… Patch: https://github.com/kamailio/kamailio/commit/f97b189d238bd63f80a4525c56501cd… --- diff --git a/src/modules/lost/response.c b/src/modules/lost/response.c index b3389448b8..6eb13e8260 100644 --- a/src/modules/lost/response.c +++ b/src/modules/lost/response.c @@ -573,39 +573,53 @@ p_lost_issue_t lost_get_response_issues(xmlNodePtr node) cur = node->children; while(cur) { if(cur->type == XML_ELEMENT_NODE) { - /* get a new response type element */ + /* get a new response type object */ issue = lost_new_response_type(); if(issue == NULL) { /* didn't get it ... return */ break; } - /* parse properties */ - issue->source = lost_get_property(cur->parent, MAPP_PROP_SRC, &len); + /* get issue type */ tmp.s = (char *)cur->name; tmp.len = strlen((char *)cur->name); + /* copy issue type to object */ + len = 0; if(tmp.len > 0 && tmp.s != NULL) { issue->type = lost_copy_string(tmp, &len); } - if(len > 0) { + if(len == 0) { + /* issue type not found, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } + /* parse source property */ + len = 0; + issue->source = lost_get_property(cur->parent, MAPP_PROP_SRC, &len); + if(len == 0) { + /* source property not found, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } - LM_DBG("###\t[%s]\n", issue->type); + LM_DBG("###\t[%s]\n", issue->type); - if(issue->info != NULL) { - issue->info->text = lost_get_property(cur, PROP_MSG, &len); - issue->info->lang = lost_get_property(cur, PROP_LANG, &len); - } - /* get a new list element */ - new = lost_new_response_issues(); - if(new == NULL) { - /* didn't get it, delete response type element ... return */ - lost_delete_response_type(&issue); /* clean up */ - break; - } - /* append to list */ - new->issue = issue; - new->next = list; - list = new; + /* type and source property found ... parse text and copy */ + if(issue->info != NULL) { + issue->info->text = lost_get_property(cur, PROP_MSG, &len); + issue->info->lang = lost_get_property(cur, PROP_LANG, &len); } + /* get a new list element */ + new = lost_new_response_issues(); + if(new == NULL) { + /* didn't get it, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } + /* parsing done, append object to list */ + new->issue = issue; + new->next = list; + list = new; + /* get next element */ cur = cur->next; }

3 years

git:5.5:19093d83: lost: Coverity Scan fixes

by Wolfgang Kampichler

Module: kamailio Branch: 5.5 Commit: 19093d837b94cabb6e1413fa0ff1786bfc06549f URL: https://github.com/kamailio/kamailio/commit/19093d837b94cabb6e1413fa0ff1786… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-30T12:26:27+02:00 lost: Coverity Scan fixes (cherry picked from commit 328000233928fa08095889fdca7d66acba5e5825) --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/19093d837b94cabb6e1413fa0ff1786… Patch: https://github.com/kamailio/kamailio/commit/19093d837b94cabb6e1413fa0ff1786…

3 years

git:master:41b5e947: tls: declare variable based on SSL_CTX_set_ecdh_auto

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 41b5e9473d79409712d46fdbb5a0b943ab880aa7 URL: https://github.com/kamailio/kamailio/commit/41b5e9473d79409712d46fdbb5a0b94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-30T08:53:47+02:00 tls: declare variable based on SSL_CTX_set_ecdh_auto - fix unused variable warning introduced in previous commit --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/41b5e9473d79409712d46fdbb5a0b94… Patch: https://github.com/kamailio/kamailio/commit/41b5e9473d79409712d46fdbb5a0b94… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index c2231b0db0..b5160ec833 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -65,7 +65,9 @@ extern EVP_PKEY * tls_engine_private_key(const char* key_id); #if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) static void setup_ecdh(SSL_CTX *ctx) { +#if !defined(SSL_CTX_set_ecdh_auto) EC_KEY *ecdh; +#endif #if OPENSSL_VERSION_NUMBER < 0x010100000L if (SSLeay() < 0x1000005fL) {

3 years

git:master:0a2450e6: rtpengine: extract call-id/from-tag/to-tag only from sip messages

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0a2450e62d77020243530e18d93c9aa8181a5701 URL: https://github.com/kamailio/kamailio/commit/0a2450e62d77020243530e18d93c9aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-30T08:31:34+02:00 rtpengine: extract call-id/from-tag/to-tag only from sip messages - they can be provided via flags in function parameters - fix using functions in non-sip routing blocks (e.g., xhttp processing) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/0a2450e62d77020243530e18d93c9aa… Patch: https://github.com/kamailio/kamailio/commit/0a2450e62d77020243530e18d93c9aa… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index a60de52a35..6f91c222b2 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2477,17 +2477,19 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ memset(&ng_flags, 0, sizeof(ng_flags)); - if (get_callid(msg, &ng_flags.call_id) == -1 || ng_flags.call_id.len == 0) { - LM_ERR("can't get Call-Id field\n"); - return NULL; - } - if (get_to_tag(msg, &ng_flags.to_tag) == -1) { - LM_ERR("can't get To tag\n"); - return NULL; - } - if (get_from_tag(msg, &ng_flags.from_tag) == -1 || ng_flags.from_tag.len == 0) { - LM_ERR("can't get From tag\n"); - return NULL; + if(IS_SIP(msg) || IS_SIP_REPLY(msg)) { + if (get_callid(msg, &ng_flags.call_id) == -1 || ng_flags.call_id.len == 0) { + LM_ERR("can't get Call-Id field\n"); + return NULL; + } + if (get_to_tag(msg, &ng_flags.to_tag) == -1) { + LM_ERR("can't get To tag\n"); + return NULL; + } + if (get_from_tag(msg, &ng_flags.from_tag) == -1 || ng_flags.from_tag.len == 0) { + LM_ERR("can't get From tag\n"); + return NULL; + } } if (bencode_buffer_init(bencbuf)) { LM_ERR("could not initialize bencode_buffer_t\n"); @@ -2535,6 +2537,18 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ if (parse_flags(&ng_flags, msg, &op, flags_str)) goto error; + if(!IS_SIP(msg) && !IS_SIP_REPLY(msg)) { + /* check required values */ + if (ng_flags.call_id.len == 0) { + LM_ERR("can't get Call-Id field\n"); + return NULL; + } + if (ng_flags.from_tag.len == 0) { + LM_ERR("can't get From tag\n"); + return NULL; + } + } + /* trickle ice sdp fragment? */ if (cont_type == 3) bencode_list_add_string(ng_flags.flags, "fragment");

3 years

git:master:4695b48b: msrp: destroy str array on error

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4695b48b23e22135049f67a6ef362e933a0cf337 URL: https://github.com/kamailio/kamailio/commit/4695b48b23e22135049f67a6ef362e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-30T08:03:10+02:00 msrp: destroy str array on error - some code reformatting --- Modified: src/modules/msrp/msrp_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/4695b48b23e22135049f67a6ef362e9… Patch: https://github.com/kamailio/kamailio/commit/4695b48b23e22135049f67a6ef362e9… --- diff --git a/src/modules/msrp/msrp_parser.c b/src/modules/msrp/msrp_parser.c index 7defaf9353..c701d6a6ca 100644 --- a/src/modules/msrp/msrp_parser.c +++ b/src/modules/msrp/msrp_parser.c @@ -610,7 +610,7 @@ msrp_hdr_t *msrp_get_hdr_by_id(msrp_frame_t *mf, int hdrid) /** * */ -int msrp_explode_str(str **arr, str *in, str *del) +int msrp_explode_str(str_array_t *arr, str *in, str *del) { str *larr; int i; @@ -633,20 +633,20 @@ int msrp_explode_str(str **arr, str *in, str *del) } n++; - larr = pkg_malloc(n * sizeof(str)); + larr = pkg_mallocxz(n * sizeof(str)); if(larr==NULL) { LM_ERR("no more pkg\n"); return -1; } - memset(larr, 0, n * sizeof(str)); k = 0; if(n==1) { larr[k].s = in->s; larr[k].len = in->len; - *arr = larr; + arr->list = larr; + arr->size = n; return n; } @@ -657,19 +657,23 @@ int msrp_explode_str(str **arr, str *in, str *del) { if(in->s[i]==del->s[j]) { - if(k<n) + if(k<n) { larr[k].len = in->s + i - larr[k].s; + } k++; - if(k<n) + if(k<n) { larr[k].s = in->s + i + 1; + } break; } } } - if(k<n) + if(k<n) { larr[k].len = in->s + i - larr[k].s; + } - *arr = larr; + arr->list = larr; + arr->size = n; return n; } @@ -677,7 +681,7 @@ int msrp_explode_str(str **arr, str *in, str *del) /** * */ -int msrp_explode_strz(str **arr, str *in, char *del) +int msrp_explode_strz(str_array_t *arr, str *in, char *del) { str s; @@ -693,7 +697,7 @@ void msrp_str_array_destroy(void *data) return; arr = (str_array_t*)data; if(arr->list!=NULL) - pkg_free(arr->list); + pkg_free(arr->list); pkg_free(arr); } @@ -705,20 +709,19 @@ int msrp_parse_hdr_uri_list(msrp_hdr_t *hdr) str_array_t *arr; str s; - arr = pkg_malloc(sizeof(str_array_t)); + arr = pkg_mallocxz(sizeof(str_array_t)); if(arr==NULL) { LM_ERR("no more pkg\n"); return -1; } - memset(arr, 0, sizeof(str_array_t)); s = hdr->body; trim(&s); - arr->size = msrp_explode_strz(&arr->list, &s, " "); - if(arr->size<0) + if(msrp_explode_strz(arr, &s, " ")<0) { LM_ERR("failed to explode\n"); + msrp_str_array_destroy(arr); return -1; } hdr->parsed.flags |= MSRP_DATA_SET;

3 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2021