sr-dev July 2022

sr-dev@lists.kamailio.org

11 participants
232 discussions

git:5.6:d49c4b49: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 06 Jul '22

06 Jul '22

Module: kamailio Branch: 5.6 Commit: d49c4b498a0c835d4f3a36d0494b7a131bdfd332 URL: https://github.com/kamailio/kamailio/commit/d49c4b498a0c835d4f3a36d0494b7a1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-07-06T09:31:48+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tm/README Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/d49c4b498a0c835d4f3a36d0494b7a1… Patch: https://github.com/kamailio/kamailio/commit/d49c4b498a0c835d4f3a36d0494b7a1… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 445630cf34..f1827a9e77 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -146,7 +146,7 @@ Daniel-Constantin Mierla 5.1. tm.list 5.2. tm.t_uac_start 5.3. tm.t_uac_wait - 5.4. tm.t_uac_wait + 5.4. tm.t_uac_wait_block 5.5. tm.cancel 5.6. tm.hash_stats 5.7. tm.reply @@ -410,7 +410,7 @@ Chapter 1. Admin Guide 5.1. tm.list 5.2. tm.t_uac_start 5.3. tm.t_uac_wait - 5.4. tm.t_uac_wait + 5.4. tm.t_uac_wait_block 5.5. tm.cancel 5.6. tm.hash_stats 5.7. tm.reply @@ -3008,7 +3008,7 @@ t_clean(); 5.1. tm.list 5.2. tm.t_uac_start 5.3. tm.t_uac_wait - 5.4. tm.t_uac_wait + 5.4. tm.t_uac_wait_block 5.5. tm.cancel 5.6. tm.hash_stats 5.7. tm.reply @@ -3043,7 +3043,7 @@ t_clean(); Similar to tm.t_uac_start, but waits asynchronously for the SIP response and tries to provide its details via RPC response. -5.4. tm.t_uac_wait +5.4. tm.t_uac_wait_block Similar to tm.t_uac_start, but blocks waiting for the SIP response and returns the SIP reply code and reason text via RPC response. It waits diff --git a/src/modules/topos/README b/src/modules/topos/README index ef7c0e9634..6c7ef0e3d8 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -140,11 +140,13 @@ Chapter 1. Admin Guide to be loaded (tune the module parameters if needed). It also works for SIP MESSAGE or other requests that do not create a - dialog -- record_route() must be used for them as well, the headers are - not going to be in the messages sent to the network, they are needed to - know local addresses used to communicate with each side. This module is - designed to work for presence (SUBSCRIBE-based) dialogs too. The - REGISTER and PUBLISH requests are skipped from processing by this + dialog (e.g., OPTIONS) -- record_route() must be used for them as well, + the headers are not going to be in the messages sent to the network, + they are needed to know local addresses used to communicate with each + side. This module is designed to work for presence (SUBSCRIBE-based) + dialogs too. + + The REGISTER and PUBLISH requests are skipped from processing by this module, expected to be terminated on a local SIP server. 2. Dependencies

1 0

git:5.6:a0addadc: tm: docs - fixed section for rpc.t_uac_wait_block
by Daniel-Constantin Mierla 06 Jul '22

06 Jul '22

Module: kamailio Branch: 5.6 Commit: a0addadc9234ce041eb0adf4d45f40ec05896f14 URL: https://github.com/kamailio/kamailio/commit/a0addadc9234ce041eb0adf4d45f40e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-06T09:25:15+02:00 tm: docs - fixed section for rpc.t_uac_wait_block (cherry picked from commit c4f5b88b1861c73bc96904eef00b0048c9550240) --- Modified: src/modules/tm/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/a0addadc9234ce041eb0adf4d45f40e… Patch: https://github.com/kamailio/kamailio/commit/a0addadc9234ce041eb0adf4d45f40e… --- diff --git a/src/modules/tm/doc/rpc.xml b/src/modules/tm/doc/rpc.xml index 18eeccd97c9..d00ae09b73a 100644 --- a/src/modules/tm/doc/rpc.xml +++ b/src/modules/tm/doc/rpc.xml @@ -70,9 +70,9 @@ </para> </section> - <section id="tm.rpc.t_uac_wait"> + <section id="tm.rpc.t_uac_wait_block"> <title> - <function moreinfo="none">tm.t_uac_wait</function> + <function moreinfo="none">tm.t_uac_wait_block</function> </title> <para> Similar to tm.t_uac_start, but blocks waiting for the SIP response and

1 0

git:5.6:b2a64563: topos: docs - small updates to module description
by Daniel-Constantin Mierla 06 Jul '22

06 Jul '22

Module: kamailio Branch: 5.6 Commit: b2a64563acc69a6c69ca462e137a1b5b84062248 URL: https://github.com/kamailio/kamailio/commit/b2a64563acc69a6c69ca462e137a1b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-06T09:25:06+02:00 topos: docs - small updates to module description (cherry picked from commit b8fc507c9dee07f1a0b7af01d24142240bcd8fa4) --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b2a64563acc69a6c69ca462e137a1b5… Patch: https://github.com/kamailio/kamailio/commit/b2a64563acc69a6c69ca462e137a1b5… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index dee94df414c..e0c7a2288c7 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -27,10 +27,12 @@ </para> <para> It also works for SIP MESSAGE or other requests that do not create - a dialog -- record_route() must be used for them as well, the - headers are not going to be in the messages sent to the network, they + a dialog (e.g., OPTIONS) -- record_route() must be used for them as well, + the headers are not going to be in the messages sent to the network, they are needed to know local addresses used to communicate with each side. - This module is designed to work for presence (SUBSCRIBE-based) dialogs too. + This module is designed to work for presence (SUBSCRIBE-based) dialogs too. + </para> + <para> The REGISTER and PUBLISH requests are skipped from processing by this module, expected to be terminated on a local SIP server. </para>

1 0

git:5.6:bc1e222e: ndb_redis: clean up response on moved reply with cluster mode on
by Daniel-Constantin Mierla 06 Jul '22

06 Jul '22

Module: kamailio Branch: 5.6 Commit: bc1e222ea3375dc52dab135016af7d73712a05f1 URL: https://github.com/kamailio/kamailio/commit/bc1e222ea3375dc52dab135016af7d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-06T09:24:45+02:00 ndb_redis: clean up response on moved reply with cluster mode on (cherry picked from commit ef00062fb3feb051e3e11c62ce3c529579d23f5b) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/bc1e222ea3375dc52dab135016af7d7… Patch: https://github.com/kamailio/kamailio/commit/bc1e222ea3375dc52dab135016af7d7… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index aad0b6c1b62..c26154930b9 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -1165,6 +1165,7 @@ redisReply* redisc_exec_argv(redisc_server_t *rsrv, int argc, const char **argv, if(res) { if (check_cluster_reply(res, &rsrv)) { + freeReplyObject(res); goto again; } return res; @@ -1175,6 +1176,7 @@ redisReply* redisc_exec_argv(redisc_server_t *rsrv, int argc, const char **argv, res = redisCommandArgv(rsrv->ctxRedis, argc, argv, argvlen); if (res) { if (check_cluster_reply(res, &rsrv)) { + freeReplyObject(res); goto again; } }

1 0

git:5.6:c4465cf3: tls: cert serial number can exceed uint64
by Daniel-Constantin Mierla 06 Jul '22

06 Jul '22

Module: kamailio Branch: 5.6 Commit: c4465cf37bbc925377d1eff0c2290203497dd36b URL: https://github.com/kamailio/kamailio/commit/c4465cf37bbc925377d1eff0c229020… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-06T09:24:30+02:00 tls: cert serial number can exceed uint64 - GH #3168 (cherry picked from commit 996bf4cad1d5645761fb80e66e435cedf29fa749) --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/c4465cf37bbc925377d1eff0c229020… Patch: https://github.com/kamailio/kamailio/commit/c4465cf37bbc925377d1eff0c229020… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index 985e6dcec17..9e597c1d789 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -630,24 +630,35 @@ static int pv_validity(sip_msg_t* msg, pv_param_t* param, pv_value_t* res) } -static int get_sn(str* res, int* ires, int local, sip_msg_t* msg) +static int get_sn(str* res, int local, sip_msg_t* msg) { - static char buf[INT2STR_MAX_LEN]; + static char buf[80]; // handle 256-bit > log(2^256,10) X509* cert; struct tcp_connection* c; - char* sn; - int num; + char* sn = NULL; + BIGNUM* bn = NULL; if (get_cert(&cert, &c, msg, local) < 0) return -1; - num = ASN1_INTEGER_get(X509_get_serialNumber(cert)); - sn = int2str(num, &res->len); + if (!(bn = BN_new())) goto error; + if (!ASN1_INTEGER_to_BN(X509_get_serialNumber(cert), bn)) goto error; + if (!(sn = BN_bn2dec(bn)) || strlen(sn) > 80) goto error; + + res->len = strlen(sn); memcpy(buf, sn, res->len); res->s = buf; - if (ires) *ires = num; + if (!local) X509_free(cert); tcpconn_put(c); + + BN_free(bn); + OPENSSL_free(sn); return 0; + + error: + if (sn) OPENSSL_free(sn); + if (bn) BN_free(bn); + return -1; } static int sel_sn(str* res, select_t* s, sip_msg_t* msg) @@ -662,7 +673,7 @@ static int sel_sn(str* res, select_t* s, sip_msg_t* msg) return -1; } - return get_sn(res, NULL, local, msg); + return get_sn(res, local, msg); } @@ -679,11 +690,11 @@ static int pv_sn(sip_msg_t* msg, pv_param_t* param, pv_value_t* res) return pv_get_null(msg, param, res); } - if (get_sn(&res->rs, &res->ri, local, msg) < 0) { + if (get_sn(&res->rs, local, msg) < 0) { return pv_get_null(msg, param, res); } - res->flags = PV_VAL_STR | PV_VAL_INT; + res->flags = PV_VAL_STR; return 0; }

1 0

git:5.6:2d2ab366: presence: be more resilient doing clean up of presentity values
by Daniel-Constantin Mierla 06 Jul '22

06 Jul '22

Module: kamailio Branch: 5.6 Commit: 2d2ab366fff589b43071360084f4ebd53d6a41d3 URL: https://github.com/kamailio/kamailio/commit/2d2ab366fff589b43071360084f4ebd… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-06T09:23:59+02:00 presence: be more resilient doing clean up of presentity values previously if an error was found we were bailing out and the value was kept so at next round the value will be there and no more values where removed (cherry picked from commit 444adb0b27d62fbd2af25e4f555b6aab5ca7bc96) --- Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/2d2ab366fff589b43071360084f4ebd… Patch: https://github.com/kamailio/kamailio/commit/2d2ab366fff589b43071360084f4ebd…

1 0

Jenkins build became unstable: kamailiodev-nightly-binaries » amd64,bookworm #2221
by kamailio＠sipwise.com 06 Jul '22

06 Jul '22

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 6

git:master:504695de: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 05 Jul '22

05 Jul '22

Module: kamailio Branch: master Commit: 504695defe5510774aa37e658d016570f99c2e4f URL: https://github.com/kamailio/kamailio/commit/504695defe5510774aa37e658d01657… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-07-05T20:46:19+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/504695defe5510774aa37e658d01657… Patch: https://github.com/kamailio/kamailio/commit/504695defe5510774aa37e658d01657… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index b63965cd5d..a2d0544f55 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -50,6 +50,7 @@ Frederic Gaisnon 3.17. rr_update (int) 3.18. context (str) 3.19. methods_nocontact (str) + 3.20. methods_noinitial (str) 4. Functions @@ -83,11 +84,12 @@ Frederic Gaisnon 1.17. Set rr_update parameter 1.18. Set context parameter 1.19. Set methods_nocontact parameter - 1.20. tps_set_context usage - 1.21. Usage of event_route[topos:msg-outgoing] - 1.22. Usage of event_route[topos:msg-sending] - 1.23. Usage of event_route[topos:msg-incoming] - 1.24. Usage of event_route[topos:msg-receoving] + 1.20. Set methods_noinitial parameter + 1.21. tps_set_context usage + 1.22. Usage of event_route[topos:msg-outgoing] + 1.23. Usage of event_route[topos:msg-sending] + 1.24. Usage of event_route[topos:msg-incoming] + 1.25. Usage of event_route[topos:msg-receoving] Chapter 1. Admin Guide @@ -120,6 +122,7 @@ Chapter 1. Admin Guide 3.17. rr_update (int) 3.18. context (str) 3.19. methods_nocontact (str) + 3.20. methods_noinitial (str) 4. Functions @@ -193,6 +196,7 @@ Chapter 1. Admin Guide 3.17. rr_update (int) 3.18. context (str) 3.19. methods_nocontact (str) + 3.20. methods_noinitial (str) 3.1. storage (str) @@ -488,6 +492,18 @@ modparam("topos", "context", "srvone") modparam("topos", "methods_nocontact", "CANCEL,PRACK") ... +3.20. methods_noinitial (str) + + List of SIP methods to skip doing topos if it is an intial request (no + To-tag). + + Default value is “” (no method). + + Example 1.20. Set methods_noinitial parameter +... +modparam("topos", "methods_noinitial", "OPTIONS,NOTIFY") +... + 4. Functions 4.1. tps_set_context(ctx) @@ -499,7 +515,7 @@ modparam("topos", "methods_nocontact", "CANCEL,PRACK") This function can be used from ANY_ROUTE. - Example 1.20. tps_set_context usage + Example 1.21. tps_set_context usage ... request_route { ... @@ -527,7 +543,7 @@ request_route { reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.21. Usage of event_route[topos:msg-outgoing] + Example 1.22. Usage of event_route[topos:msg-outgoing] ... event_route[topos:msg-outgoing] { if($sndto(ip)=="10.1.1.10") { @@ -546,7 +562,7 @@ event_route[topos:msg-outgoing] { $sndto(proto) point to the destination. The SIP message is the one to be sent out. - Example 1.22. Usage of event_route[topos:msg-sending] + Example 1.23. Usage of event_route[topos:msg-sending] ... event_route[topos:msg-sending] { if(is_request() and $fU=="alice") { @@ -566,7 +582,7 @@ event_route[topos:msg-sending] { internally generated one at startup, to avoid reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.23. Usage of event_route[topos:msg-incoming] + Example 1.24. Usage of event_route[topos:msg-incoming] ... event_route[topos:msg-incoming] { if($si=="10.1.1.10") { @@ -584,7 +600,7 @@ event_route[topos:msg-incoming] { Inside the event route the variables $si, $sp and $proto point to the source address. The SIP message is the one to be sent out. - Example 1.24. Usage of event_route[topos:msg-receoving] + Example 1.25. Usage of event_route[topos:msg-receoving] ... event_route[topos:msg-receiving] { if(is_request() and $fU=="alice") {

1 0

git:master:8c2eb726: topos: docs for methods_noinitial parameter
by Daniel-Constantin Mierla 05 Jul '22

05 Jul '22

Module: kamailio Branch: master Commit: 8c2eb726dfb235a721a9721a17714e2c90bd0120 URL: https://github.com/kamailio/kamailio/commit/8c2eb726dfb235a721a9721a17714e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-05T20:41:14+02:00 topos: docs for methods_noinitial parameter --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8c2eb726dfb235a721a9721a17714e2… Patch: https://github.com/kamailio/kamailio/commit/8c2eb726dfb235a721a9721a17714e2… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 02e7e232d7..6ddf9f2783 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -543,6 +543,26 @@ modparam("topos", "context", "srvone") ... modparam("topos", "methods_nocontact", "CANCEL,PRACK") ... +</programlisting> + </example> + </section> + <section id="topos.p.methods_noinitial"> + <title><varname>methods_noinitial</varname> (str)</title> + <para> + List of SIP methods to skip doing topos if it is an intial request + (no To-tag). + </para> + <para> + <emphasis> + Default value is <quote></quote> (no method). + </emphasis> + </para> + <example> + <title>Set <varname>methods_noinitial</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topos", "methods_noinitial", "OPTIONS,NOTIFY") +... </programlisting> </example> </section>

1 0

git:master:da4e4a7a: topos: new parameter to allow specifying initial request methods to skip topos
by Daniel-Constantin Mierla 05 Jul '22

05 Jul '22

Module: kamailio Branch: master Commit: da4e4a7aed16d3ced57a6154ac85974823ad9695 URL: https://github.com/kamailio/kamailio/commit/da4e4a7aed16d3ced57a6154ac85974… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-05T20:36:24+02:00 topos: new parameter to allow specifying initial request methods to skip topos --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/da4e4a7aed16d3ced57a6154ac85974… Patch: https://github.com/kamailio/kamailio/commit/da4e4a7aed16d3ced57a6154ac85974… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 0c78f3ee38..4c096cf298 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -87,6 +87,8 @@ extern int _tps_branch_expire; extern int _tps_dialog_expire; extern unsigned int _tps_methods_nocontact; str _tps_methods_nocontact_list = str_init(""); +extern unsigned int _tps_methods_noinitial; +str _tps_methods_noinitial_list = str_init(""); int _tps_clean_interval = 60; @@ -169,6 +171,7 @@ static param_export_t params[]={ {"rr_update", PARAM_INT, &_tps_rr_update}, {"context", PARAM_STR, &_tps_context_param}, {"methods_nocontact", PARAM_STR, &_tps_methods_nocontact_list}, + {"methods_noinitial", PARAM_STR, &_tps_methods_noinitial_list}, {0,0,0} }; @@ -225,6 +228,12 @@ static int mod_init(void) return -1; } } + if(_tps_methods_noinitial_list.len>0) { + if(parse_methods(&_tps_methods_nocontact_list, &_tps_methods_noinitial)<0) { + LM_ERR("failed to parse methods_noinitial parameter\n"); + return -1; + } + } if(_tps_storage.len==2 && strncmp(_tps_storage.s, "db", 2)==0) { /* Find a database module */ if (db_bind_mod(&_tps_db_url, &_tpsdbf)) { diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 798885df56..5e1b1be032 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -58,6 +58,7 @@ str _sr_hname_xbranch = str_init("P-SR-XBranch"); str _sr_hname_xuuid = str_init("P-SR-XUID"); unsigned int _tps_methods_nocontact = METHOD_CANCEL|METHOD_BYE|METHOD_PRACK; +unsigned int _tps_methods_noinitial = 0; /** * @@ -271,6 +272,13 @@ int tps_skip_msg(sip_msg_t *msg) if((get_cseq(msg)->method_id)&(METHOD_REGISTER|METHOD_PUBLISH)) return 1; + if(_tps_methods_noinitial!=0 && msg->first_line.type==SIP_REQUEST + && get_to(msg)->tag_value.len<=0) { + if((get_cseq(msg)->method_id) & _tps_methods_noinitial) { + return 1; + } + } + return 0; }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2022