sr-dev March 2021

sr-dev@lists.kamailio.org

28 participants
491 discussions

[kamailio/kamailio] topos module may not be able to transparently transmit the update message (#2659)
by zhangyang 17 Mar '21

17 Mar '21

**Description** We use below config to test the topology hiding function，when kamailio receive “update” message，doesn't send out，it will send to itself with destination port 5060； Sorry for raising this question again，I really don’t know what parameters need to be configured。And after I modified some codes, it could succeed probabilistically... Sorry again, excuse me **Troubleshooting** ``` loadmodule "ndb_redis.so" loadmodule "topos_redis.so" loadmodule "topos.so" modparam("ndb_redis", "server", "name=srv8;addr=127.0.0.1;port=6381;db=2") modparam("topos", "storage", "redis") modparam("topos", "db_url", "redis://127.0.0.1:6381/2") modparam("topos_redis", "serverid", "srv8") ...Omit the configuration in the middle... route[WITHINDLG] { if (has_totag()) { # sequential request withing a dialog should # take the path determined by record-routing xlog("L_INFO","yang yangyang testin to not here"); if (loose_route()){ if(is_method("INFO")){ route("INFO_SELF"); } route(BYE); route(REINVITE); route(ACK); route(RELAY); } else { if ( is_method("ACK")) { if ( t_check_trans() ) { # no loose-route, but stateful ACK; # must be an ACK after a 487 # or e.g. 404 $var(obj) = $sht(call_objects=>$ci); xlog("L_INFO","Call $ci: ACK received in A-Leg, $fU@$si:$sp -----> $rU@$Ri:$Rp relaying downstreamrouteWITHINDLG\n"); t_relay(); exit; } else { exit; } } xlog("L_INFO","yang in to not here"); sl_send_reply("404","Not here"); } exit; } } ``` -------- Call flow ``` UE-----------------PROXY-------------B2bua invite-------------->|------------------>invite 183<----------------|<------------------183 Prack------------ ->|------------------>Prack 200ok<-------------|<-----------------200ok update1---------->| |update2<-----------| | 404 not here-------> | ```` **Additional Information** ``` version: kamailio master (x86_64/linux) ``` ### Possible Solutions I set the log level to debug, and the comparison found that the logic of prack and update is different。After checking the code of topos, it is found that kamailio/src/modules/topos/tps_msg.c has a separate processing for prack.according to commit [37830f5](https://github.com/kamailio/kamailio/commit/37830f53b1f21fba5beef5… So I added update to the prack processing method，Later I found that when the B-side update message comes, it should follow the original logic。 So I distinguish whether to follow the modified logic according to ONREPLY_ROUTE。 But after probabilistic success，The problem is that the value returned by get_route_type（） is sometimes 1 and sometimes 4 Call flow after modification： ``` UE-----------------PROXY-------------B2bua invite-------------->|------------------>invite 183<----------------|<------------------183 Prack------------ ->|------------------>Prack 200ok<-------------|<-----------------200ok update1---------->|----------------->|update 200ok<-------------|<-----------------200ok |<-----------------|update2 | 404 not here---------> | ```` Here is the code I modified： /src/modules/topos/tps_msg.c ![image](https://user-images.githubusercontent.com/16113837/109925737-107b0580-7cfd-11eb-9eaf-7a66ba224b55.png) -- 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/2659

3 5

[kamailio/kamailio] modules: Add stirshaken module (#2678)
by Piotr 17 Mar '21

17 Mar '21

#### 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:  - [ x] PR should be backported to stable branches - [ x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This module uses libstirshaken to implement STIR-Shaken authentication and verification functions (STI-AS/VS). It allows for easy verification of a SIP call containing PASSporT wrapped into SIP Identity Header using a specific certificate, or a specific key, or by performing complete check on PASSporT including downloading certificate referenced in it's x5u header, and optionally checking it against trusted root certificates (X509 cert path check). Certificates may be cached and loaded from disk. Example usage: loadmodule "stirshaken" modparam("stirshaken", "as_default_key", "/path/to/key") modparam("stirshaken", "vs_verify_x509_cert_path", 1) modparam("stirshaken", "vs_ca_dir", "/path/to/ca") modparam("stirshaken", "vs_cache_certificates", 1) modparam("stirshaken", "vs_cache_dir", "/tmp/cert_cache") modparam("stirshaken", "vs_cache_expire_s", 90) request_route { (...) stirshaken_add_identity("https://sp.com/sp.pem".pem", "B", "+44100", "+44200", "ref"); (...) request_route { (...) stirshaken_check_identity(); (...) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2678 -- Commit Summary -- * modules: Add stirshaken module -- File Changes -- A src/modules/stirshaken/Makefile (28) A src/modules/stirshaken/stirshaken_mod.c (972) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2678.patch https://github.com/kamailio/kamailio/pull/2678.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/2678

1 3

git:5.3:9c6b822b: siputils: 0-ending value on deconding uri
by Ovidiu Sas 16 Mar '21

16 Mar '21

Module: kamailio Branch: 5.3 Commit: 9c6b822b4e9b297c497cec241b257a177ca804b1 URL: https://github.com/kamailio/kamailio/commit/9c6b822b4e9b297c497cec241b257a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-03-16T15:54:51-04:00 siputils: 0-ending value on deconding uri (cherry picked from commit 735911fcced21eb5c66393045bc143bd953d08bb) --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/9c6b822b4e9b297c497cec241b257a1… Patch: https://github.com/kamailio/kamailio/commit/9c6b822b4e9b297c497cec241b257a1… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index 427bf3bb13..20c76efdd6 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -163,12 +163,14 @@ int ki_decode_contact(sip_msg_t *msg) return res; } else { /* we do not modify the original first line */ - if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) + if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) { msg->new_uri = newUri; - else { + } else { pkg_free(msg->new_uri.s); msg->new_uri = newUri; } + msg->parsed_uri_ok=0; + ruri_mark_new(); } return 1; } @@ -575,7 +577,7 @@ int decode_uri(str uri, char separator, str *result) uri.len); /* adding one comes from * */ - result->s = pkg_malloc(result->len); + result->s = pkg_malloc(result->len + 1); /* NULL termination */ if(result->s == NULL) { LM_ERR("unable to allocate pkg memory\n"); return -4; @@ -624,6 +626,7 @@ int decode_uri(str uri, char separator, str *result) memcpy(pos, uri.s + format.second, uri.len - format.second); /* till end: */ + result->s[result->len] = '\0'; LM_DBG("New decoded uri [%.*s]\n", result->len, result->s); return 0;

1 0

git:5.3:a6fa3dee: mangler: 0-ending value on deconding uri
by Ovidiu Sas 16 Mar '21

16 Mar '21

Module: kamailio Branch: 5.3 Commit: a6fa3dee5b1642e3285a1d92c890bff39810e804 URL: https://github.com/kamailio/kamailio/commit/a6fa3dee5b1642e3285a1d92c890bff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-03-16T15:54:45-04:00 mangler: 0-ending value on deconding uri (cherry picked from commit 3b038ed6761a5818441a7610a8305491aa358377) --- Modified: src/modules/mangler/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/a6fa3dee5b1642e3285a1d92c890bff… Patch: https://github.com/kamailio/kamailio/commit/a6fa3dee5b1642e3285a1d92c890bff… --- diff --git a/src/modules/mangler/contact_ops.c b/src/modules/mangler/contact_ops.c index de94edb534..c3e1a2ff2e 100644 --- a/src/modules/mangler/contact_ops.c +++ b/src/modules/mangler/contact_ops.c @@ -610,28 +610,28 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) { LOG(L_ERR,"ERROR: decode_uri: Unable to decode host address \n"); return -2;/* should I quit or ignore ? */ - } + } if ((format.password.len > 0) && (format.username.len <= 0)) { LOG(L_ERR,"ERROR: decode_uri: Password decoded but no username available\n"); return -3; } - + /* a complete uri would be sip:username:password@ip:port;transport=protocol goes to * sip:enc_pref#username#password#ip#port#protocol@public_ip */ result->len = format.first + (uri->len - format.second); /* not NULL terminated */ if (format.username.len > 0) result->len += format.username.len + 1; //: or @ if (format.password.len > 0) result->len += format.password.len + 1; //@ - + /* if (format.ip.len > 0) */ result->len += format.ip.len; - + if (format.port.len > 0) result->len += 1 + format.port.len; //: if (format.protocol.len > 0) result->len += 1 + 10 + format.protocol.len; //;transport= - + /* adding one comes from * */ - result->s = pkg_malloc (result->len); + result->s = pkg_malloc (result->len + 1); /* NULL termination */ if (result->s == NULL) { LOG(L_ERR,"ERROR: decode_contact: Unable to allocate memory\n"); @@ -640,7 +640,7 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) pos = result->s; memcpy (pos, uri->s, format.first); /* till sip: */ pos = pos + format.first; - + if (format.username.len > 0) { memcpy (pos, format.username.s, format.username.len); @@ -662,7 +662,7 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) memcpy (pos, format.ip.s, format.ip.len); pos = pos + format.ip.len; - + if (format.port.len > 0) { memcpy (pos, ":", 1); @@ -677,9 +677,11 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) memcpy (pos, format.protocol.s, format.protocol.len); pos = pos + format.protocol.len; } - + memcpy (pos, uri->s + format.second, uri->len - format.second); /* till end: */ - + + result->s[result->len] = '\0'; + /* dst_uri */ if (dst_uri && format.rcv_ip.s){ dst_uri->len=4 /* sip: */ + format.rcv_ip.len;

1 0

git:5.4:a779c66d: mangler: 0-ending value on deconding uri
by Ovidiu Sas 16 Mar '21

16 Mar '21

Module: kamailio Branch: 5.4 Commit: a779c66dbb19cc5b7938072439327003acd5dc7a URL: https://github.com/kamailio/kamailio/commit/a779c66dbb19cc5b793807243932700… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-03-16T13:17:30-04:00 mangler: 0-ending value on deconding uri (cherry picked from commit 3b038ed6761a5818441a7610a8305491aa358377) --- Modified: src/modules/mangler/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/a779c66dbb19cc5b793807243932700… Patch: https://github.com/kamailio/kamailio/commit/a779c66dbb19cc5b793807243932700… --- diff --git a/src/modules/mangler/contact_ops.c b/src/modules/mangler/contact_ops.c index de94edb534..c3e1a2ff2e 100644 --- a/src/modules/mangler/contact_ops.c +++ b/src/modules/mangler/contact_ops.c @@ -610,28 +610,28 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) { LOG(L_ERR,"ERROR: decode_uri: Unable to decode host address \n"); return -2;/* should I quit or ignore ? */ - } + } if ((format.password.len > 0) && (format.username.len <= 0)) { LOG(L_ERR,"ERROR: decode_uri: Password decoded but no username available\n"); return -3; } - + /* a complete uri would be sip:username:password@ip:port;transport=protocol goes to * sip:enc_pref#username#password#ip#port#protocol@public_ip */ result->len = format.first + (uri->len - format.second); /* not NULL terminated */ if (format.username.len > 0) result->len += format.username.len + 1; //: or @ if (format.password.len > 0) result->len += format.password.len + 1; //@ - + /* if (format.ip.len > 0) */ result->len += format.ip.len; - + if (format.port.len > 0) result->len += 1 + format.port.len; //: if (format.protocol.len > 0) result->len += 1 + 10 + format.protocol.len; //;transport= - + /* adding one comes from * */ - result->s = pkg_malloc (result->len); + result->s = pkg_malloc (result->len + 1); /* NULL termination */ if (result->s == NULL) { LOG(L_ERR,"ERROR: decode_contact: Unable to allocate memory\n"); @@ -640,7 +640,7 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) pos = result->s; memcpy (pos, uri->s, format.first); /* till sip: */ pos = pos + format.first; - + if (format.username.len > 0) { memcpy (pos, format.username.s, format.username.len); @@ -662,7 +662,7 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) memcpy (pos, format.ip.s, format.ip.len); pos = pos + format.ip.len; - + if (format.port.len > 0) { memcpy (pos, ":", 1); @@ -677,9 +677,11 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) memcpy (pos, format.protocol.s, format.protocol.len); pos = pos + format.protocol.len; } - + memcpy (pos, uri->s + format.second, uri->len - format.second); /* till end: */ - + + result->s[result->len] = '\0'; + /* dst_uri */ if (dst_uri && format.rcv_ip.s){ dst_uri->len=4 /* sip: */ + format.rcv_ip.len;

1 0

git:5.4:b739727c: siputils: 0-ending value on deconding uri
by Ovidiu Sas 16 Mar '21

16 Mar '21

Module: kamailio Branch: 5.4 Commit: b739727cfb66eb56683d236540d8463b870080f5 URL: https://github.com/kamailio/kamailio/commit/b739727cfb66eb56683d236540d8463… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-03-16T13:17:15-04:00 siputils: 0-ending value on deconding uri (cherry picked from commit 735911fcced21eb5c66393045bc143bd953d08bb) --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/b739727cfb66eb56683d236540d8463… Patch: https://github.com/kamailio/kamailio/commit/b739727cfb66eb56683d236540d8463… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index f21d7705b3..1964ef59ee 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -165,12 +165,14 @@ int ki_decode_contact(sip_msg_t *msg) return res; } else { /* we do not modify the original first line */ - if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) + if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) { msg->new_uri = newUri; - else { + } else { pkg_free(msg->new_uri.s); msg->new_uri = newUri; } + msg->parsed_uri_ok=0; + ruri_mark_new(); } return 1; } @@ -577,7 +579,7 @@ int decode_uri(str uri, char separator, str *result) uri.len); /* adding one comes from * */ - result->s = pkg_malloc(result->len); + result->s = pkg_malloc(result->len + 1); /* NULL termination */ if(result->s == NULL) { LM_ERR("unable to allocate pkg memory\n"); return -4; @@ -626,6 +628,7 @@ int decode_uri(str uri, char separator, str *result) memcpy(pos, uri.s + format.second, uri.len - format.second); /* till end: */ + result->s[result->len] = '\0'; LM_DBG("New decoded uri [%.*s]\n", result->len, result->s); return 0;

1 0

Errored: kamailio/kamailio#9971 (master - a089d62)
by Travis CI 16 Mar '21

16 Mar '21

Build Update for kamailio/kamailio ------------------------------------- Build: #9971 Status: Errored Duration: 6 mins and 19 secs Commit: a089d62 (master) Author: Daniel-Constantin Mierla Message: dmq: docs - examples with TLS URI for nodes View the changeset: https://github.com/kamailio/kamailio/compare/b06ed377323c...a089d62b59a3 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/763114493?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:b06927cd: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev 16 Mar '21

16 Mar '21

Module: kamailio Branch: master Commit: b06927cdc8d4a5444be0a584ecf02f6a48105e59 URL: https://github.com/kamailio/kamailio/commit/b06927cdc8d4a5444be0a584ecf02f6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-16T14:31:18+01:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/b06927cdc8d4a5444be0a584ecf02f6… Patch: https://github.com/kamailio/kamailio/commit/b06927cdc8d4a5444be0a584ecf02f6… --- diff --git a/src/modules/dmq/README b/src/modules/dmq/README index 2ea40a2642..085fe3c9df 100644 --- a/src/modules/dmq/README +++ b/src/modules/dmq/README @@ -216,6 +216,8 @@ sip:192.168.40.17:5060;status=active ... modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... +modparam("dmq", "server_address", "sip:10.0.0.20:5061;transport=tls") +... 3.2. notification_address(str) @@ -228,6 +230,8 @@ modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... modparam("dmq", "notification_address", "sip:10.0.0.21:5060") ... +modparam("dmq", "notification_address", "sip:10.0.0.21:5061;transport=tls") +... 3.3. notification_channel(str)

1 0

git:master:a089d62b: dmq: docs - examples with TLS URI for nodes
by Daniel-Constantin Mierla 16 Mar '21

16 Mar '21

Module: kamailio Branch: master Commit: a089d62b59a31b943bb273d996636a58a3e96133 URL: https://github.com/kamailio/kamailio/commit/a089d62b59a31b943bb273d996636a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T14:25:22+01:00 dmq: docs - examples with TLS URI for nodes --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a089d62b59a31b943bb273d996636a5… Patch: https://github.com/kamailio/kamailio/commit/a089d62b59a31b943bb273d996636a5… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 3b4121fdb3..d8b94614e2 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -132,6 +132,8 @@ sip:192.168.40.17:5060;status=active ... modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... +modparam("dmq", "server_address", "sip:10.0.0.20:5061;transport=tls") +... </programlisting> </example> </section> @@ -149,6 +151,8 @@ modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... modparam("dmq", "notification_address", "sip:10.0.0.21:5060") ... +modparam("dmq", "notification_address", "sip:10.0.0.21:5061;transport=tls") +... </programlisting> </example> </section>

1 0

git:master:b06ed377: dmq: request nodes list in worker one init callback instead of main proc
by Daniel-Constantin Mierla 16 Mar '21

16 Mar '21

Module: kamailio Branch: master Commit: b06ed377323ce11a8ae0442af6558b453c4872bb URL: https://github.com/kamailio/kamailio/commit/b06ed377323ce11a8ae0442af6558b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T13:40:03+01:00 dmq: request nodes list in worker one init callback instead of main proc - ensure availability of all transports --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/b06ed377323ce11a8ae0442af6558b4… Patch: https://github.com/kamailio/kamailio/commit/b06ed377323ce11a8ae0442af6558b4… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 0a807a983f..06e091038a 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -286,6 +286,11 @@ static int child_init(int rank) { int i, newpid; + if(rank == PROC_TCP_MAIN) { + /* do nothing for the tcp main process */ + return 0; + } + if(rank == PROC_INIT) { for(i = 0; i < dmq_num_workers; i++) { if (init_worker(&dmq_workers[i]) < 0) { @@ -312,6 +317,10 @@ static int child_init(int rank) dmq_workers[i].pid = newpid; } } + return 0; + } + + if(rank == PROC_SIPINIT) { /* notification_node - the node from which the Kamailio instance * gets the server list on startup. * the address is given as a module parameter in dmq_notification_address @@ -326,11 +335,6 @@ static int child_init(int rank) STR_FMT(&dmq_notification_address)); } } - return 0; - } - if(rank == PROC_TCP_MAIN) { - /* do nothing for the tcp main process */ - return 0; } dmq_pid = my_pid();

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2021