- sr-dev - kamailio.org

[kamailio/kamailio] trailing comma left on exclude_hf_value function (Issue #3180)
by patrickarton 11 Jul '22

11 Jul '22

### Description when using exclude_hf_value function to exclude values on Supported header there is a comma left after applying the exclude  ### Troubleshooting Before exclude_hf_value call : **Supported: 100rel, path, replaces** After exclude_hf_value call : **Supported: 100rel,** #### Reproduction simple with sipp ``` route { exclude_hf_value("Supported", "replaces"); exclude_hf_value("Supported", "path"); } ```  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` tested on kamailio 5.5.4 and kamailio 5.6.0 ``` * **Operating System**:  ``` debian bullseye ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3180 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3180(a)github.com>

2 2

git:master:0080e06d: app_perl: Makefile - option to set the path to perl binary
by Daniel-Constantin Mierla 11 Jul '22

11 Jul '22

Module: kamailio Branch: master Commit: 0080e06d36bc0263795fa7ff716fe0b2d218f5c1 URL: https://github.com/kamailio/kamailio/commit/0080e06d36bc0263795fa7ff716fe0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-11T10:16:02+02:00 app_perl: Makefile - option to set the path to perl binary --- Modified: src/modules/app_perl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/0080e06d36bc0263795fa7ff716fe0b… Patch: https://github.com/kamailio/kamailio/commit/0080e06d36bc0263795fa7ff716fe0b… --- diff --git a/src/modules/app_perl/Makefile b/src/modules/app_perl/Makefile index 70e440e77d..36820a3c89 100644 --- a/src/modules/app_perl/Makefile +++ b/src/modules/app_perl/Makefile @@ -1,4 +1,4 @@ -# perl module makefile +# app_perl module makefile # # # WARNING: do not run this directly, it should be run by the main Makefile @@ -8,14 +8,16 @@ auto_gen=kamailioxs.c NAME=app_perl.so LIBS= +PERLBIN ?= perl + ifeq ($(PERLLDOPTS),) - LIBS+=`perl -MExtUtils::Embed -e ldopts` + LIBS+=`$(PERLBIN) -MExtUtils::Embed -e ldopts` else LIBS+=$(PERLLDOPTS) endif ifeq ($(PERLCCOPTS),) - PERLCCOPTS=$(shell perl -MExtUtils::Embed -e ccopts) + PERLCCOPTS=$(shell $(PERLBIN) -MExtUtils::Embed -e ccopts) endif DEFS+=$(PERLCCOPTS) @@ -25,7 +27,7 @@ PODFILES=kamailioxs.xs `find lib/perl -name *.pm` ifeq ($(TYPEMAP),) ifeq ($(PERLLIBPATH),) - PERLLIBPATH=`perl -MConfig -e 'print $$Config{installprivlib}'` + PERLLIBPATH=`$(PERLBIN) -MConfig -e 'print $$Config{installprivlib}'` endif TYPEMAP=$(PERLLIBPATH)/ExtUtils/typemap endif

1 0

git:master:7856251f: modules: readme files regenerated - app_perl ... [skip ci]
by Kamailio Dev 11 Jul '22

11 Jul '22

Module: kamailio Branch: master Commit: 7856251f372688cf6835a3468d2a4277f7575f87 URL: https://github.com/kamailio/kamailio/commit/7856251f372688cf6835a3468d2a427… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-07-11T10:01:28+02:00 modules: readme files regenerated - app_perl ... [skip ci] --- Modified: src/modules/app_perl/README --- Diff: https://github.com/kamailio/kamailio/commit/7856251f372688cf6835a3468d2a427… Patch: https://github.com/kamailio/kamailio/commit/7856251f372688cf6835a3468d2a427… --- diff --git a/src/modules/app_perl/README b/src/modules/app_perl/README index f2b6ffb7a1..780fd683fd 100644 --- a/src/modules/app_perl/README +++ b/src/modules/app_perl/README @@ -30,6 +30,7 @@ Bastian Friedrich 5.3. reset_cycles (int) 5.4. perl_destroy_func (string) 5.5. parse_mode (int) + 5.6. warn_mode (int) 6. Functions @@ -198,10 +199,11 @@ Bastian Friedrich 1.3. Set reset_cycles parameter 1.4. Set perl_destroy_func parameter 1.5. Set parse_mode parameter - 1.6. perl_exec_simple() usage - 1.7. perl_exec() usage - 1.8. app_perl.set_reset_cycles usage - 1.9. app_perl.get_reset_cycles usage + 1.6. Set warn_mode parameter + 1.7. perl_exec_simple() usage + 1.8. perl_exec() usage + 1.9. app_perl.set_reset_cycles usage + 1.10. app_perl.get_reset_cycles usage Chapter 1. Admin Guide @@ -222,6 +224,7 @@ Chapter 1. Admin Guide 5.3. reset_cycles (int) 5.4. perl_destroy_func (string) 5.5. parse_mode (int) + 5.6. warn_mode (int) 6. Functions @@ -343,6 +346,7 @@ if (perl_exec("ldap_alias")) { 5.3. reset_cycles (int) 5.4. perl_destroy_func (string) 5.5. parse_mode (int) + 5.6. warn_mode (int) 5.1. filename (string) @@ -419,6 +423,19 @@ modparam("app_perl", "perl_destroy_func", "my_perl_destroy") modparam("app_perl", "parse_mode", 1) ... +5.6. warn_mode (int) + + Allows to enable warning for perl_parse(). If set to 1, "-w" is passed + to perl_parse() and detected warnings in the Perl script should be + printed to the log. + + Default value is 0. + + Example 1.6. Set warn_mode parameter +... +modparam("app_perl", "warn_mode", 1) +... + 6. Functions 6.1. perl_exec_simple(func, [param]) @@ -437,7 +454,7 @@ modparam("app_perl", "parse_mode", 1) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE and BRANCH_ROUTE. - Example 1.6. perl_exec_simple() usage + Example 1.7. perl_exec_simple() usage ... if (method=="INVITE") { perl_exec_simple("dosomething", "on invite messages"); @@ -456,7 +473,7 @@ if (method=="INVITE") { This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE and BRANCH_ROUTE. - Example 1.7. perl_exec() usage + Example 1.8. perl_exec() usage ... if (perl_exec("ldapalias")) { ... @@ -473,7 +490,7 @@ if (perl_exec("ldapalias")) { Set the value of the reset_cycle. The command has one integer parameter. - Example 1.8. app_perl.set_reset_cycles usage + Example 1.9. app_perl.set_reset_cycles usage ... kamcmd app_perl.set_reset_cycles 20000 ... @@ -482,7 +499,7 @@ kamcmd app_perl.set_reset_cycles 20000 Return the value of the reset_cycle. - Example 1.9. app_perl.get_reset_cycles usage + Example 1.10. app_perl.get_reset_cycles usage ... kamcmd app_perl.get_reset_cycles ...

1 0

git:master:ec78caf6: app_perl: new parameter to set warn flag for perl parse
by Daniel-Constantin Mierla 11 Jul '22

11 Jul '22

Module: kamailio Branch: master Commit: ec78caf6e0efffcc8f4f78954ae88d083734c442 URL: https://github.com/kamailio/kamailio/commit/ec78caf6e0efffcc8f4f78954ae88d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-11T08:55:30+02:00 app_perl: new parameter to set warn flag for perl parse --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ec78caf6e0efffcc8f4f78954ae88d0… Patch: https://github.com/kamailio/kamailio/commit/ec78caf6e0efffcc8f4f78954ae88d0… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index ce3eff3699..67120d49e4 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -72,6 +72,7 @@ int _ap_reset_cycles_init = 0; int _ap_exec_cycles = 0; int *_ap_reset_cycles = 0; int _ap_parse_mode = 0; +static int _ap_warn_mode = 0; /* Reference to the running Perl interpreter instance */ PerlInterpreter *my_perl = NULL; @@ -125,6 +126,7 @@ static param_export_t params[] = { {"reset_cycles", INT_PARAM, &_ap_reset_cycles_init}, {"perl_destroy_func", PARAM_STRING, &perl_destroy_func}, {"parse_mode", PARAM_INT, &_ap_parse_mode}, + {"warn_mode", PARAM_INT, &_ap_warn_mode}, { 0, 0, 0 } }; @@ -185,7 +187,7 @@ EXTERN_C void xs_init(pTHX) { */ int parser_init(void) { int argc = 0; - char *argv[MAX_LIB_PATHS + 3]; + char *argv[MAX_LIB_PATHS + 6]; char *entry, *stop, *end; int modpathset_start = 0; int modpathset_end = 0; @@ -208,6 +210,10 @@ int parser_init(void) { argv[0] = ""; argc++; /* First param _needs_ to be empty */ + if(_ap_warn_mode==1) { + argv[argc] = "-w"; argc++; + } + /* Possible Include path extension by modparam */ if (modpath && (strlen(modpath) > 0)) { modpathset_start = argc;

1 0

git:master:e038a212: app_perl: docs for warn_mode parameter
by Daniel-Constantin Mierla 11 Jul '22

11 Jul '22

Module: kamailio Branch: master Commit: e038a2122d9ed5858bbafc088f3cfc18666b95fd URL: https://github.com/kamailio/kamailio/commit/e038a2122d9ed5858bbafc088f3cfc1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-11T09:50:13+02:00 app_perl: docs for warn_mode parameter --- Modified: src/modules/app_perl/doc/app_perl_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e038a2122d9ed5858bbafc088f3cfc1… Patch: https://github.com/kamailio/kamailio/commit/e038a2122d9ed5858bbafc088f3cfc1… --- diff --git a/src/modules/app_perl/doc/app_perl_admin.xml b/src/modules/app_perl/doc/app_perl_admin.xml index aad43c2348..22b8c10308 100644 --- a/src/modules/app_perl/doc/app_perl_admin.xml +++ b/src/modules/app_perl/doc/app_perl_admin.xml @@ -259,6 +259,25 @@ modparam("app_perl", "perl_destroy_func", "my_perl_destroy") ... modparam("app_perl", "parse_mode", 1) ... +</programlisting> + </example> + </section> + <section id="app_perl.p.warn_mode"> + <title><varname>warn_mode</varname> (int)</title> + <para> + Allows to enable warning for perl_parse(). If set to 1, "-w" is + passed to perl_parse() and detected warnings in the Perl script + should be printed to the log. + </para> + <para> + Default value is <emphasis>0</emphasis>. + </para> + <example> + <title>Set <varname>warn_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("app_perl", "warn_mode", 1) +... </programlisting> </example> </section>

1 0

(Off-topic) Vienna, meeting
by Henning Westerholt 09 Jul '22

09 Jul '22

(Off-topic) Hello, In about two weeks I will be a few days in Vienna (12h - 14th July). If you want to meet for a drink to chat about Kamailio and other topics, just contact me off-list. Thanks, and regards, Henning

1 1

git:master:a466d0b7: app_perl: more debug messages to catch per execution errors
by Daniel-Constantin Mierla 08 Jul '22

08 Jul '22

Module: kamailio Branch: master Commit: a466d0b73a66b18419555eca437136f1bcaebff9 URL: https://github.com/kamailio/kamailio/commit/a466d0b73a66b18419555eca437136f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-08T13:37:33+02:00 app_perl: more debug messages to catch per execution errors --- Modified: src/modules/app_perl/perlfunc.c --- Diff: https://github.com/kamailio/kamailio/commit/a466d0b73a66b18419555eca437136f… Patch: https://github.com/kamailio/kamailio/commit/a466d0b73a66b18419555eca437136f… --- diff --git a/src/modules/app_perl/perlfunc.c b/src/modules/app_perl/perlfunc.c index ddb442220d..cf53895fd2 100644 --- a/src/modules/app_perl/perlfunc.c +++ b/src/modules/app_perl/perlfunc.c @@ -149,7 +149,7 @@ int perl_exec2(struct sip_msg* _msg, char* fnc, char* mystr) { call_pv(fnc, G_EVAL|G_SCALAR); /* call the function */ if(SvTRUE(ERRSV)) { - LM_WARN("perl error: %s\n", SvPV_nolen(ERRSV)); + LM_WARN("perl error for [%s]: %s\n", ZSW(fnc), SvPV_nolen(ERRSV)); } SPAGAIN; /* refresh stack pointer */ @@ -160,5 +160,6 @@ int perl_exec2(struct sip_msg* _msg, char* fnc, char* mystr) { FREETMPS; /* free that return value */ LEAVE; /* ...and the XPUSHed "mortal" args.*/ + LM_DBG("executed [%s] with return code: %d\n", ZSW(fnc), retval); return retval; }

1 0

git:master:8c910452: app_perl: print the error string if execution of perl script sets it
by Daniel-Constantin Mierla 08 Jul '22

08 Jul '22

Module: kamailio Branch: master Commit: 8c910452cf6090f87156d7c0e14477ef5956b59d URL: https://github.com/kamailio/kamailio/commit/8c910452cf6090f87156d7c0e14477e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-08T13:19:14+02:00 app_perl: print the error string if execution of perl script sets it --- Modified: src/modules/app_perl/perlfunc.c --- Diff: https://github.com/kamailio/kamailio/commit/8c910452cf6090f87156d7c0e14477e… Patch: https://github.com/kamailio/kamailio/commit/8c910452cf6090f87156d7c0e14477e… --- diff --git a/src/modules/app_perl/perlfunc.c b/src/modules/app_perl/perlfunc.c index 1f67628169..ddb442220d 100644 --- a/src/modules/app_perl/perlfunc.c +++ b/src/modules/app_perl/perlfunc.c @@ -147,6 +147,11 @@ int perl_exec2(struct sip_msg* _msg, char* fnc, char* mystr) { PUTBACK; /* make local stack pointer global */ call_pv(fnc, G_EVAL|G_SCALAR); /* call the function */ + + if(SvTRUE(ERRSV)) { + LM_WARN("perl error: %s\n", SvPV_nolen(ERRSV)); + } + SPAGAIN; /* refresh stack pointer */ /* pop the return value from stack */ retval = POPi;

1 0

git:master:eb052e85: app_perl: work only with my_perl global variable
by Daniel-Constantin Mierla 08 Jul '22

08 Jul '22

Module: kamailio Branch: master Commit: eb052e85ea4efe29eeb4181f49a14a3fd64e9bda URL: https://github.com/kamailio/kamailio/commit/eb052e85ea4efe29eeb4181f49a14a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-08T12:26:11+02:00 app_perl: work only with my_perl global variable - some macros link to it --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/eb052e85ea4efe29eeb4181f49a14a3… Patch: https://github.com/kamailio/kamailio/commit/eb052e85ea4efe29eeb4181f49a14a3… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index 2e3fc3683d..ce3eff3699 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -183,24 +183,28 @@ EXTERN_C void xs_init(pTHX) { * Initialize the perl interpreter. * This might later be used to reinit the module. */ -PerlInterpreter *parser_init(void) { +int parser_init(void) { int argc = 0; char *argv[MAX_LIB_PATHS + 3]; - PerlInterpreter *new_perl = NULL; char *entry, *stop, *end; int modpathset_start = 0; int modpathset_end = 0; int i; int pr; - new_perl = perl_alloc(); + if (my_perl) { + LM_ERR("perl interpreter already initialized\n"); + return 1; + } + + my_perl = perl_alloc(); - if (!new_perl) { - LM_ERR("could not allocate perl.\n"); - return NULL; + if (!my_perl) { + LM_ERR("could not allocate perl interpreter\n"); + return -1; } - perl_construct(new_perl); + perl_construct(my_perl); argv[0] = ""; argc++; /* First param _needs_ to be empty */ @@ -220,7 +224,10 @@ PerlInterpreter *parser_init(void) { argv[argc] = pkg_malloc(strlen(entry)+20); if (!argv[argc]) { PKG_MEM_ERROR; - return NULL; + perl_destruct(my_perl); + perl_free(my_perl); + my_perl = NULL; + return -1; } snprintf(argv[argc], strlen(entry)+20, "-I%s", entry); modpathset_end = argc; @@ -236,7 +243,7 @@ PerlInterpreter *parser_init(void) { argv[argc] = filename; /* The script itself */ argc++; - pr=perl_parse(new_perl, xs_init, argc, argv, NULL); + pr=perl_parse(my_perl, xs_init, argc, argv, NULL); if (pr) { if(_ap_parse_mode==0) { @@ -250,9 +257,9 @@ PerlInterpreter *parser_init(void) { pkg_free(argv[i]); } } - perl_destruct(new_perl); - perl_free(new_perl); - return NULL; + perl_destruct(my_perl); + perl_free(my_perl); + my_perl = NULL; } } else { LM_INFO("successfully parsed perl file \"%s\"\n", argv[argc-1]); @@ -263,21 +270,26 @@ PerlInterpreter *parser_init(void) { pkg_free(argv[i]); } } - pr = perl_run(new_perl); + pr = perl_run(my_perl); LM_INFO("perl run return code %d\n", pr); - return new_perl; + return 0; } /* * */ -int unload_perl(PerlInterpreter *p) { +int unload_perl(void) { + if (!my_perl) { + LM_ERR("perl interpreter not initialized\n"); + return -1; + } /* clean and reset everything */ PL_perl_destruct_level = 1; - perl_destruct(p); - perl_free(p); + perl_destruct(my_perl); + perl_free(my_perl); + my_perl = NULL; return 0; } @@ -291,9 +303,9 @@ int unload_perl(PerlInterpreter *p) { int perl_reload(void) { if(my_perl) { - unload_perl(my_perl); + unload_perl(); } - my_perl = parser_init(); + parser_init(); if(my_perl) { LM_DBG("new perl interpreter initialized\n"); @@ -353,7 +365,7 @@ static int mod_init(void) { PERL_SYS_INIT3(&argc, &argv, &environ); gettimeofday(&t1, NULL); - my_perl = parser_init(); + parser_init(); gettimeofday(&t2, NULL); if (my_perl==NULL) @@ -389,7 +401,7 @@ static void destroy(void) if(my_perl==NULL) return; - unload_perl(my_perl); + unload_perl(); PERL_SYS_TERM(); my_perl = NULL; }

1 0

git:master:5cd4e817: core: use memcpy and set end of string
by Daniel-Constantin Mierla 08 Jul '22

08 Jul '22

Module: kamailio Branch: master Commit: 5cd4e817a24308b82fc3f631fb18f354dadf2b7e URL: https://github.com/kamailio/kamailio/commit/5cd4e817a24308b82fc3f631fb18f35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-08T11:14:27+02:00 core: use memcpy and set end of string --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/5cd4e817a24308b82fc3f631fb18f35… Patch: https://github.com/kamailio/kamailio/commit/5cd4e817a24308b82fc3f631fb18f35… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 8c91e873fe..354cbc75b6 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1551,7 +1551,8 @@ static int build_iface_list(void) } if(strlen(ifaces[index].name)==0 && strlen(name)>0) { - strncpy(ifaces[index].name, name, MAX_IF_LEN-1); + memcpy(ifaces[index].name, name, MAX_IF_LEN-1); + ifaces[index].name[MAX_IF_LEN-1] = '\0'; } ifaces[index].index = index;

1 0

[kamailio/kamailio] Location for git submodules in the source tree (Issue #3164)
by Daniel-Constantin Mierla 08 Jul '22

08 Jul '22

With the introduction of an external project reference via git submodule by `tls_wolfssl`, I am opening this to discuss where it would be the _best_ place for them. Now it is in the folder of the tls_wolfssl module, but I noticed that many projects have a dedicated folder like `vendor` (or `extern`, `import`), and I would somehow that approach more because it is easier to locate the external code and figure out its implications in licensing, dependencies, etc ... Moreover, it can happen that many modules would need to use that external project/repo. For example, now crypto uses libssl, but for someone that wants to get rid of it and use only libwolfssl may contribute an alternative of that module. Then two modules would need same external repo and having it inside another module would not be straightforward to manage. Given the above, I would suggest to place them in a folder like `misc/vendor` or similar inside the `misc/` directory, not to get back into growing the root folder. I would like to keep `src/` folder only for Kamailio specific code. If someone has other suggestions, propose them in comments and let's try to get to a decision soon. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3164 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3164(a)github.com>

4 7

git:master:b1233557: app_perl: log the perl function name when not found
by Daniel-Constantin Mierla 08 Jul '22

08 Jul '22

Module: kamailio Branch: master Commit: b12335579437d12a5de12aa415477a832d6224cd URL: https://github.com/kamailio/kamailio/commit/b12335579437d12a5de12aa415477a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-08T10:19:03+02:00 app_perl: log the perl function name when not found --- Modified: src/modules/app_perl/perlfunc.c --- Diff: https://github.com/kamailio/kamailio/commit/b12335579437d12a5de12aa415477a8… Patch: https://github.com/kamailio/kamailio/commit/b12335579437d12a5de12aa415477a8… --- diff --git a/src/modules/app_perl/perlfunc.c b/src/modules/app_perl/perlfunc.c index 122ece95a9..1f67628169 100644 --- a/src/modules/app_perl/perlfunc.c +++ b/src/modules/app_perl/perlfunc.c @@ -100,7 +100,7 @@ int perl_exec2(struct sip_msg* _msg, char* fnc, char* mystr) { dSP; if (!perl_checkfnc(fnc)) { - LM_ERR("unknown perl function called.\n"); + LM_ERR("unknown perl function called [%s]\n", ZSW(fnc)); reason.s = "Internal error"; reason.len = sizeof("Internal error")-1; if (slb.freply(_msg, 500, &reason) == -1) @@ -109,7 +109,7 @@ int perl_exec2(struct sip_msg* _msg, char* fnc, char* mystr) { } return -1; } - + switch ((_msg->first_line).type) { case SIP_REQUEST: if (parse_sip_msg_uri(_msg) < 0) {

1 0

git:master:840b4f90: modules: readme files regenerated - app_perl ... [skip ci]
by Kamailio Dev 07 Jul '22

07 Jul '22

Module: kamailio Branch: master Commit: 840b4f9054fe9f8a29cb41deeb421b0ebe75e4b8 URL: https://github.com/kamailio/kamailio/commit/840b4f9054fe9f8a29cb41deeb421b0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-07-07T09:31:19+02:00 modules: readme files regenerated - app_perl ... [skip ci] --- Modified: src/modules/app_perl/README --- Diff: https://github.com/kamailio/kamailio/commit/840b4f9054fe9f8a29cb41deeb421b0… Patch: https://github.com/kamailio/kamailio/commit/840b4f9054fe9f8a29cb41deeb421b0… --- diff --git a/src/modules/app_perl/README b/src/modules/app_perl/README index c6f42f585e..f2b6ffb7a1 100644 --- a/src/modules/app_perl/README +++ b/src/modules/app_perl/README @@ -29,6 +29,7 @@ Bastian Friedrich 5.2. modpath (string) 5.3. reset_cycles (int) 5.4. perl_destroy_func (string) + 5.5. parse_mode (int) 6. Functions @@ -196,10 +197,11 @@ Bastian Friedrich 1.2. Set modpath parameter 1.3. Set reset_cycles parameter 1.4. Set perl_destroy_func parameter - 1.5. perl_exec_simple() usage - 1.6. perl_exec() usage - 1.7. app_perl.set_reset_cycles usage - 1.8. app_perl.get_reset_cycles usage + 1.5. Set parse_mode parameter + 1.6. perl_exec_simple() usage + 1.7. perl_exec() usage + 1.8. app_perl.set_reset_cycles usage + 1.9. app_perl.get_reset_cycles usage Chapter 1. Admin Guide @@ -219,6 +221,7 @@ Chapter 1. Admin Guide 5.2. modpath (string) 5.3. reset_cycles (int) 5.4. perl_destroy_func (string) + 5.5. parse_mode (int) 6. Functions @@ -339,6 +342,7 @@ if (perl_exec("ldap_alias")) { 5.2. modpath (string) 5.3. reset_cycles (int) 5.4. perl_destroy_func (string) + 5.5. parse_mode (int) 5.1. filename (string) @@ -399,6 +403,22 @@ modparam("app_perl", "reset_cycles", 100000) modparam("app_perl", "perl_destroy_func", "my_perl_destroy") ... +5.5. parse_mode (int) + + Control how to behave on perl_parse() return code - on some versions it + is the value for application exit and can break reloading. + + If set to 0, continue even of perl_parse() returns non-zero, logging a + warning. If set to 1, realod fails on non-zero return code and triggers + an exit. + + Default value is 0. + + Example 1.5. Set parse_mode parameter +... +modparam("app_perl", "parse_mode", 1) +... + 6. Functions 6.1. perl_exec_simple(func, [param]) @@ -417,7 +437,7 @@ modparam("app_perl", "perl_destroy_func", "my_perl_destroy") This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE and BRANCH_ROUTE. - Example 1.5. perl_exec_simple() usage + Example 1.6. perl_exec_simple() usage ... if (method=="INVITE") { perl_exec_simple("dosomething", "on invite messages"); @@ -436,7 +456,7 @@ if (method=="INVITE") { This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE and BRANCH_ROUTE. - Example 1.6. perl_exec() usage + Example 1.7. perl_exec() usage ... if (perl_exec("ldapalias")) { ... @@ -453,7 +473,7 @@ if (perl_exec("ldapalias")) { Set the value of the reset_cycle. The command has one integer parameter. - Example 1.7. app_perl.set_reset_cycles usage + Example 1.8. app_perl.set_reset_cycles usage ... kamcmd app_perl.set_reset_cycles 20000 ... @@ -462,7 +482,7 @@ kamcmd app_perl.set_reset_cycles 20000 Return the value of the reset_cycle. - Example 1.8. app_perl.get_reset_cycles usage + Example 1.9. app_perl.get_reset_cycles usage ... kamcmd app_perl.get_reset_cycles ...

1 0

git:master:42f42baf: app_perl: docs for parse_mode parameter
by Daniel-Constantin Mierla 07 Jul '22

07 Jul '22

Module: kamailio Branch: master Commit: 42f42baf7753402e9506c45d4e53d548978c168a URL: https://github.com/kamailio/kamailio/commit/42f42baf7753402e9506c45d4e53d54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-07T09:15:12+02:00 app_perl: docs for parse_mode parameter --- Modified: src/modules/app_perl/doc/app_perl_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/42f42baf7753402e9506c45d4e53d54… Patch: https://github.com/kamailio/kamailio/commit/42f42baf7753402e9506c45d4e53d54… --- diff --git a/src/modules/app_perl/doc/app_perl_admin.xml b/src/modules/app_perl/doc/app_perl_admin.xml index 2a71c4bad6e..aad43c2348b 100644 --- a/src/modules/app_perl/doc/app_perl_admin.xml +++ b/src/modules/app_perl/doc/app_perl_admin.xml @@ -235,6 +235,30 @@ modparam("app_perl", "reset_cycles", 100000) ... modparam("app_perl", "perl_destroy_func", "my_perl_destroy") ... +</programlisting> + </example> + </section> + + <section id="app_perl.p.parse_mode"> + <title><varname>parse_mode</varname> (int)</title> + <para> + Control how to behave on perl_parse() return code - on some versions + it is the value for application exit and can break reloading. + </para> + <para> + If set to 0, continue even of perl_parse() returns non-zero, logging + a warning. If set to 1, realod fails on non-zero return code and + triggers an exit. + </para> + <para> + Default value is <emphasis>0</emphasis>. + </para> + <example> + <title>Set <varname>parse_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("app_perl", "parse_mode", 1) +... </programlisting> </example> </section>

1 0

git:master:d90d15dd: app_perl: continue on perl_parse() non-0 return code
by Daniel-Constantin Mierla 07 Jul '22

07 Jul '22

Module: kamailio Branch: master Commit: d90d15ddaf937222e8634a18b61de779c87a3c90 URL: https://github.com/kamailio/kamailio/commit/d90d15ddaf937222e8634a18b61de77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-07T08:55:21+02:00 app_perl: continue on perl_parse() non-0 return code - it is application return code on some perl versions --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d90d15ddaf937222e8634a18b61de77… Patch: https://github.com/kamailio/kamailio/commit/d90d15ddaf937222e8634a18b61de77… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index 854268f398..ec373c7bf6 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -235,16 +235,12 @@ PerlInterpreter *parser_init(void) { argc++; pr=perl_parse(new_perl, xs_init, argc, argv, NULL); + if (pr) { - LM_ERR("failed to load perl file \"%s\" with code %d.\n", argv[argc-1], pr); - if (modpathset_start) { - for (i = modpathset_start; i <= modpathset_end; i++) { - pkg_free(argv[i]); - } - } - return NULL; + LM_WARN("parsed perl file \"%s\" returned with code %d - continue\n", + argv[argc-1], pr); } else { - LM_INFO("successfully loaded perl file \"%s\"\n", argv[argc-1]); + LM_INFO("successfully parsed perl file \"%s\"\n", argv[argc-1]); } if (modpathset_start) { @@ -252,7 +248,8 @@ PerlInterpreter *parser_init(void) { pkg_free(argv[i]); } } - perl_run(new_perl); + pr = perl_run(new_perl); + LM_INFO("perl run return code %d\n", pr); return new_perl;

1 0

git:master:c2ad115e: app_perl: added modparam to control behaviour on perl_parse() code
by Daniel-Constantin Mierla 07 Jul '22

07 Jul '22

Module: kamailio Branch: master Commit: c2ad115ec1b96e99bc956f0f8e83cacc214da6b6 URL: https://github.com/kamailio/kamailio/commit/c2ad115ec1b96e99bc956f0f8e83cac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-07T09:04:37+02:00 app_perl: added modparam to control behaviour on perl_parse() code --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c2ad115ec1b96e99bc956f0f8e83cac… Patch: https://github.com/kamailio/kamailio/commit/c2ad115ec1b96e99bc956f0f8e83cac… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index ec373c7bf6..2e3fc3683d 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -71,6 +71,7 @@ int unsafemodfnc = 0; int _ap_reset_cycles_init = 0; int _ap_exec_cycles = 0; int *_ap_reset_cycles = 0; +int _ap_parse_mode = 0; /* Reference to the running Perl interpreter instance */ PerlInterpreter *my_perl = NULL; @@ -123,6 +124,7 @@ static param_export_t params[] = { {"unsafemodfnc", INT_PARAM, &unsafemodfnc}, {"reset_cycles", INT_PARAM, &_ap_reset_cycles_init}, {"perl_destroy_func", PARAM_STRING, &perl_destroy_func}, + {"parse_mode", PARAM_INT, &_ap_parse_mode}, { 0, 0, 0 } }; @@ -237,8 +239,21 @@ PerlInterpreter *parser_init(void) { pr=perl_parse(new_perl, xs_init, argc, argv, NULL); if (pr) { - LM_WARN("parsed perl file \"%s\" returned with code %d - continue\n", + if(_ap_parse_mode==0) { + LM_WARN("parsed perl file \"%s\" returned with code %d - continue\n", argv[argc-1], pr); + } else { + LM_ERR("failed parsing perl file \"%s\" with code %d.\n", + argv[argc-1], pr); + if (modpathset_start) { + for (i = modpathset_start; i <= modpathset_end; i++) { + pkg_free(argv[i]); + } + } + perl_destruct(new_perl); + perl_free(new_perl); + return NULL; + } } else { LM_INFO("successfully parsed perl file \"%s\"\n", argv[argc-1]); }

1 0

git:master:22b405e1: app_perl: check returned my_perl value on reload
by Daniel-Constantin Mierla 07 Jul '22

07 Jul '22

Module: kamailio Branch: master Commit: 22b405e12631a33d02823bf2816538b5f2102259 URL: https://github.com/kamailio/kamailio/commit/22b405e12631a33d02823bf2816538b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-07T08:12:33+02:00 app_perl: check returned my_perl value on reload - related to GH #3134 --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/22b405e12631a33d02823bf2816538b… Patch: https://github.com/kamailio/kamailio/commit/22b405e12631a33d02823bf2816538b… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index 31b001c9b94..854268f398a 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -283,6 +283,13 @@ int perl_reload(void) } my_perl = parser_init(); + if(my_perl) { + LM_DBG("new perl interpreter initialized\n"); + } else { + LM_CRIT("failed to initialize a new perl interpreter - exiting\n"); + exit(-1); + } + #ifdef PERL_EXIT_DESTRUCT_END PL_exit_flags |= PERL_EXIT_DESTRUCT_END; #else @@ -291,13 +298,7 @@ int perl_reload(void) PL_exit_flags |= PERL_EXIT_EXPECTED; #endif - if(my_perl) { - LM_DBG("new perl interpreter initialized\n"); - return 0; - } else { - LM_CRIT("failed to initialize a new perl interpreter - exiting\n"); - exit(-1); - } + return 0; }

1 0

[kamailio/kamailio] CANCELLED on the fifth call (Issue #3176)
by Egor Taran 07 Jul '22

07 Jul '22

Hello dear Kamailio Community. I am faced with the problem. Kamailio perfectly copes with ims server task. But 5 phone call does not work. I used the sngrep to track traffic, found that on the 5th call, instead of UPDATE, there is a CANCEL with Reason: RELEASE_CAUSE ;cause=3 ;text="Media bearer loss". All packets from the start of the call are the same up to this point. Here is a detailed description of the normal call and bad call package. Normal call package ``` 2022/07/04 08:55:04.887359 192.168.101.3:5060 -> 172.22.0.21:5060 UPDATE sip:1337@192.168.101.2:7700;alias=192.168.101.2~7700~2 SIP/2.0 Max-Forwards: 70 To: <tel:1337;phone-context=ims.mnc001.mcc001.3gppnetwork.org>;tag=aa64262d From: <sip:1339@ims.mnc001.mcc001.3gppnetwork.org>;tag=908707735 Call-ID: 908707729_2065538424(a)192.168.101.3 CSeq: 908707731 UPDATE P-Access-Network-Info: 3GPP-E-UTRAN-FDD; utran-cell-id-3gpp=0010100010019B01 Content-Length: 463 Via: SIP/2.0/TCP 192.168.101.3:5060;branch=z9hG4bK495826873 Route: <sip:mo@172.22.0.21;transport=tcp;r2=on;lr=on;ftag=908707735;rm=8;did=e99.70a>,<sip:mo@172.22.0.21;r2=on;lr=on;ftag=908707735;rm=8;did=e99.70a>,<sip:mo@172.22.0.20:6060;transport cp;r2=on;lr=on;ftag=908707735;did=e99.83e1>,<sip:mo@172.22.0.20:6060;r2=on;lr=on;ftag=908707735;did=e99.83e1>,<sip:mt@172.22.0.20:6060;lr=on;ftag=908707735;did=e99.93e1>,<sip:mt@172.22. 21;r2=on;lr=on;ftag=908707735;rm=7;did=e99.80a>,<sip:mt@172.22.0.21:5100;transport=tcp;r2=on;lr=on;ftag=908707735;rm=7;did=e99.80a> Allow: INVITE,ACK,CANCEL,BYE,UPDATE,PRACK,MESSAGE,REFER,NOTIFY,INFO,OPTIONS User-Agent: XXXX Content-Type: application/sdp Require: precondition Contact: <sip:XXXX@192.168.101.3:5060>;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel";audio;video ``` Broken Call Package ``` 2022/07/04 08:55:21.187316 192.168.101.3:5060 -> 172.22.0.21:5060 CANCEL tel:1337;phone-context=ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Content-Length: 453 Content-Type: application/sdp Reason: RELEASE_CAUSE ;cause=3 ;text="Media bearer loss" From: <sip:1339@ims.mnc001.mcc001.3gppnetwork.org>;tag=908718152 To: <tel:1337;phone-context=ims.mnc001.mcc001.3gppnetwork.org> Call-ID: 908718145_2063316408(a)192.168.101.3 Max-Forwards: 70 CSeq: 908718145 CANCEL Via: SIP/2.0/TCP 192.168.101.3:5060;branch=z9hG4bK1317538702;rport=5060 Route: <sip:172.22.0.21:5060;lr>,<sip:orig@scscf.ims.mnc001.mcc001.3gppnetwork.org:6060;lr> User-Agent: XXXX ``` I was looking for the reason in p-cscf, but I came to a dead end. Please tell me what the reasons for this "Media bearer loss" may be or what documentation is worth reading. I didn't find anything on the official documentation -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3176 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3176(a)github.com>

3 3

Jenkins build became unstable: kamailio56-nightly-binaries » amd64,bookworm #16
by kamailio＠sipwise.com 07 Jul '22

07 Jul '22

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

1 2

git:5.6:6d55d9f9: pkg/kamailio/deb: lintian overwrite [skip ci]
by Victor Seva 06 Jul '22

06 Jul '22

Module: kamailio Branch: 5.6 Commit: 6d55d9f903238479b6026b1d8feb8901d064e92c URL: https://github.com/kamailio/kamailio/commit/6d55d9f903238479b6026b1d8feb890… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-07-06T16:19:02+02:00 pkg/kamailio/deb: lintian overwrite [skip ci] (cherry picked from commit b7f4a7a040717cd03fdeb6d04aac653034cc759e) --- Modified: pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/6d55d9f903238479b6026b1d8feb890… Patch: https://github.com/kamailio/kamailio/commit/6d55d9f903238479b6026b1d8feb890… --- diff --git a/pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides b/pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides index 5bd22e00a9..d1e84e682f 100644 --- a/pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides +++ b/pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides @@ -1,2 +1,2 @@ kamailio-tls-modules binary: possible-gpl-code-linked-with-openssl -kamailio-tls-modules binary: library-not-linked-against-libc usr/lib/*/kamailio/openssl_mutex_shared/openssl_mutex_shared.so +kamailio-tls-modules binary: library-not-linked-against-libc

1 0

Kamailio v5.6.1 Released
by Daniel-Constantin Mierla 06 Jul '22

06 Jul '22

Hello, Kamailio SIP Server v5.6.1 stable release is out. This is a maintenance release of the latest stable branch, 5.6, that includes fixes since the release of v5.6.0. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.6.x. Deployments running previous v5.6.x versions are strongly recommended to be upgraded to v5.6.1. For more details about version 5.6.1 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2022/07/kamailio-v5-6-1-released/ RPM, Debian/Ubuntu packages will be available soon as well. Adding a short note that the dates of next Kamailio World Conference - Online have been set for September 7-8, 2022. Event website and more details will be published soon! Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:5.6:b36a13a2: ChangeLog: content updated for v5.6.1
by Daniel-Constantin Mierla 06 Jul '22

06 Jul '22

Module: kamailio Branch: 5.6 Commit: b36a13a26e2059742c663a6f429fb709af74f29d URL: https://github.com/kamailio/kamailio/commit/b36a13a26e2059742c663a6f429fb70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-06T11:23:41+02:00 ChangeLog: content updated for v5.6.1 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/b36a13a26e2059742c663a6f429fb70… Patch: https://github.com/kamailio/kamailio/commit/b36a13a26e2059742c663a6f429fb70…

1 0

git:5.6:22084e64: Makefile.defs: version set to 5.6.1
by Daniel-Constantin Mierla 06 Jul '22

06 Jul '22

Module: kamailio Branch: 5.6 Commit: 22084e646f22dfb591e72f3ec24ee4b7deb5fff9 URL: https://github.com/kamailio/kamailio/commit/22084e646f22dfb591e72f3ec24ee4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-06T10:02:43+02:00 Makefile.defs: version set to 5.6.1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/22084e646f22dfb591e72f3ec24ee4b… Patch: https://github.com/kamailio/kamailio/commit/22084e646f22dfb591e72f3ec24ee4b… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index d8887dc0ca..e5cc86b2c3 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 6 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = # memory manager switcher

1 0

git:5.6:5199d1f5: pkg: version set to 5.6.1 for rpms and alpine specs
by Daniel-Constantin Mierla 06 Jul '22

06 Jul '22

Module: kamailio Branch: 5.6 Commit: 5199d1f5615ac94aebbd56090fef895d76700cb4 URL: https://github.com/kamailio/kamailio/commit/5199d1f5615ac94aebbd56090fef895… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-06T10:01:49+02:00 pkg: version set to 5.6.1 for rpms and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/5199d1f5615ac94aebbd56090fef895… Patch: https://github.com/kamailio/kamailio/commit/5199d1f5615ac94aebbd56090fef895… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index ff4836a3d73..1081afcb650 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.6.0 +pkgver=5.6.1 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 57c8d7f3ffb..735db8de2ac 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.6.0 +%define ver 5.6.1 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.6:167237f7: tm: enable debug message to log putting transaction on wait
by Daniel-Constantin Mierla 06 Jul '22

06 Jul '22

Module: kamailio Branch: 5.6 Commit: 167237f7ce1a17b6d0e83fd90e563dc70ce0b68d URL: https://github.com/kamailio/kamailio/commit/167237f7ce1a17b6d0e83fd90e563dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-06T09:53:41+02:00 tm: enable debug message to log putting transaction on wait (cherry picked from commit c67bbca95b861f735889f14467c0192896298e84) --- Modified: src/modules/tm/t_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/167237f7ce1a17b6d0e83fd90e563dc… Patch: https://github.com/kamailio/kamailio/commit/167237f7ce1a17b6d0e83fd90e563dc… --- diff --git a/src/modules/tm/t_funcs.c b/src/modules/tm/t_funcs.c index 97c0d2568b..82b731a6cd 100644 --- a/src/modules/tm/t_funcs.c +++ b/src/modules/tm/t_funcs.c @@ -117,10 +117,7 @@ int t_release_transaction( struct cell *trans ) void put_on_wait( struct cell *Trans ) { -#ifdef EXTRA_DEBUG - LM_DBG("put on WAIT \n"); -#endif - + LM_DBG("put T [%p] on wait\n", Trans); /* we put the transaction on wait timer; we do it only once in transaction's timelife because putting it multiple-times

1 0

git:5.6:7d2b11cb: pkg: deb specs updated for v5.6.1
by Daniel-Constantin Mierla 06 Jul '22

06 Jul '22

Module: kamailio Branch: 5.6 Commit: 7d2b11cb65e2ed6812ffc3fa0f2b8735330df992 URL: https://github.com/kamailio/kamailio/commit/7d2b11cb65e2ed6812ffc3fa0f2b873… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-06T09:59:53+02:00 pkg: deb specs updated for v5.6.1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/7d2b11cb65e2ed6812ffc3fa0f2b873… Patch: https://github.com/kamailio/kamailio/commit/7d2b11cb65e2ed6812ffc3fa0f2b873…

1 0

git:master:c67bbca9: tm: enable debug message to log putting transaction on wait
by Daniel-Constantin Mierla 06 Jul '22

06 Jul '22

Module: kamailio Branch: master Commit: c67bbca95b861f735889f14467c0192896298e84 URL: https://github.com/kamailio/kamailio/commit/c67bbca95b861f735889f14467c0192… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-06T09:37:34+02:00 tm: enable debug message to log putting transaction on wait --- Modified: src/modules/tm/t_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/c67bbca95b861f735889f14467c0192… Patch: https://github.com/kamailio/kamailio/commit/c67bbca95b861f735889f14467c0192… --- diff --git a/src/modules/tm/t_funcs.c b/src/modules/tm/t_funcs.c index 2862937627..e8b84a5ac9 100644 --- a/src/modules/tm/t_funcs.c +++ b/src/modules/tm/t_funcs.c @@ -128,10 +128,7 @@ int t_release_transaction( struct cell *trans ) void put_on_wait( struct cell *Trans ) { -#ifdef EXTRA_DEBUG - LM_DBG("put on WAIT \n"); -#endif - + LM_DBG("put T [%p] on wait\n", Trans); /* we put the transaction on wait timer; we do it only once in transaction's timelife because putting it multiple-times

1 0

git:5.6:d97c59a1: tm: check T just in case before UNREF
by Victor Seva 06 Jul '22

06 Jul '22

Module: kamailio Branch: 5.6 Commit: d97c59a15bf6634d28998b3a0fa4acc845b70fa2 URL: https://github.com/kamailio/kamailio/commit/d97c59a15bf6634d28998b3a0fa4acc… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-07-06T09:37:34+02:00 tm: check T just in case before UNREF Related #3156 (cherry picked from commit dedd7ee2ddcb92b020ea40a074008a317a9553f5) --- Modified: src/modules/tm/t_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/d97c59a15bf6634d28998b3a0fa4acc… Patch: https://github.com/kamailio/kamailio/commit/d97c59a15bf6634d28998b3a0fa4acc… --- diff --git a/src/modules/tm/t_funcs.h b/src/modules/tm/t_funcs.h index 6830b13208..dbbdc1960a 100644 --- a/src/modules/tm/t_funcs.h +++ b/src/modules/tm/t_funcs.h @@ -110,7 +110,7 @@ int send_pr_buffer( struct retr_buf *rb, void *buf, int len); #define UNREF_NOSTATS(_T_cell) \ do{\ - if (atomic_dec_and_test(&(_T_cell)->ref_count)){ \ + if (_T_cell && atomic_dec_and_test(&(_T_cell)->ref_count)){ \ unlink_timers((_T_cell)); \ free_cell((_T_cell)); \ }\

1 0

git:master:dedd7ee2: tm: check T just in case before UNREF
by Victor Seva 06 Jul '22

06 Jul '22

Module: kamailio Branch: master Commit: dedd7ee2ddcb92b020ea40a074008a317a9553f5 URL: https://github.com/kamailio/kamailio/commit/dedd7ee2ddcb92b020ea40a074008a3… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-07-06T09:35:43+02:00 tm: check T just in case before UNREF Related #3156 --- Modified: src/modules/tm/t_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/dedd7ee2ddcb92b020ea40a074008a3… Patch: https://github.com/kamailio/kamailio/commit/dedd7ee2ddcb92b020ea40a074008a3… --- diff --git a/src/modules/tm/t_funcs.h b/src/modules/tm/t_funcs.h index 6830b13208..dbbdc1960a 100644 --- a/src/modules/tm/t_funcs.h +++ b/src/modules/tm/t_funcs.h @@ -110,7 +110,7 @@ int send_pr_buffer( struct retr_buf *rb, void *buf, int len); #define UNREF_NOSTATS(_T_cell) \ do{\ - if (atomic_dec_and_test(&(_T_cell)->ref_count)){ \ + if (_T_cell && atomic_dec_and_test(&(_T_cell)->ref_count)){ \ unlink_timers((_T_cell)); \ free_cell((_T_cell)); \ }\

1 0

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: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: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: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

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: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

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

git:master:b7f4a7a0: pkg/kamailio/deb: lintian overwrite [skip ci]
by Victor Seva 05 Jul '22

05 Jul '22

Module: kamailio Branch: master Commit: b7f4a7a040717cd03fdeb6d04aac653034cc759e URL: https://github.com/kamailio/kamailio/commit/b7f4a7a040717cd03fdeb6d04aac653… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-07-05T08:16:00+02:00 pkg/kamailio/deb: lintian overwrite [skip ci] --- Modified: pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/b7f4a7a040717cd03fdeb6d04aac653… Patch: https://github.com/kamailio/kamailio/commit/b7f4a7a040717cd03fdeb6d04aac653… --- diff --git a/pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides b/pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides index f04c65e8e3..d1e84e682f 100644 --- a/pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides +++ b/pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides @@ -1,2 +1,2 @@ kamailio-tls-modules binary: possible-gpl-code-linked-with-openssl -kamailio-tls-modules binary: library-not-linked-against-libc */kamailio/openssl_mutex_shared/openssl_mutex_shared.so +kamailio-tls-modules binary: library-not-linked-against-libc

1 0

git:master:2bd6985b: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: 2bd6985b8a6f87cfe8238a095e5d63a1bebf82d4 URL: https://github.com/kamailio/kamailio/commit/2bd6985b8a6f87cfe8238a095e5d63a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-07-04T16:01:16+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/2bd6985b8a6f87cfe8238a095e5d63a… Patch: https://github.com/kamailio/kamailio/commit/2bd6985b8a6f87cfe8238a095e5d63a… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 91250b9de7..e9fdc28416 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -147,7 +147,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 @@ -413,7 +413,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 @@ -3030,7 +3030,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 @@ -3065,7 +3065,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

1 0

git:master:c4f5b88b: tm: docs - fixed section for rpc.t_uac_wait_block
by Daniel-Constantin Mierla 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: c4f5b88b1861c73bc96904eef00b0048c9550240 URL: https://github.com/kamailio/kamailio/commit/c4f5b88b1861c73bc96904eef00b004… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T15:52:15+02:00 tm: docs - fixed section for rpc.t_uac_wait_block --- Modified: src/modules/tm/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/c4f5b88b1861c73bc96904eef00b004… Patch: https://github.com/kamailio/kamailio/commit/c4f5b88b1861c73bc96904eef00b004… --- diff --git a/src/modules/tm/doc/rpc.xml b/src/modules/tm/doc/rpc.xml index 18eeccd97c..d00ae09b73 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:master:ebbe6268: modules: readme files regenerated - ndb_redis ... [skip ci]
by Kamailio Dev 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: ebbe6268de3aff6ba830f1722942c2f10c6de2f3 URL: https://github.com/kamailio/kamailio/commit/ebbe6268de3aff6ba830f1722942c2f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-07-04T15:46:14+02:00 modules: readme files regenerated - ndb_redis ... [skip ci] --- Modified: src/modules/ndb_redis/README Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/ebbe6268de3aff6ba830f1722942c2f… Patch: https://github.com/kamailio/kamailio/commit/ebbe6268de3aff6ba830f1722942c2f… --- diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 2ca2c52c58..46081b7ec8 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -50,6 +50,7 @@ Carsten Bock 3.7. disable_time (integer) 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) + 3.10. debug (integer) 4. Functions @@ -69,9 +70,10 @@ Carsten Bock 1.7. Set disable_time parameter 1.8. Set flush_on_reconnect parameter 1.9. Set allow_dynamic_nodes parameter - 1.10. redis_cmd usage - 1.11. redis_execute usage - 1.12. redis_free usage + 1.10. Set debug parameter + 1.11. redis_cmd usage + 1.12. redis_execute usage + 1.13. redis_free usage Chapter 1. Admin Guide @@ -94,6 +96,7 @@ Chapter 1. Admin Guide 3.7. disable_time (integer) 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) + 3.10. debug (integer) 4. Functions @@ -138,6 +141,7 @@ Chapter 1. Admin Guide 3.7. disable_time (integer) 3.8. flush_on_reconnect (integer) 3.9. allow_dynamic_nodes (integer) + 3.10. debug (integer) 3.1. server (str) @@ -319,6 +323,18 @@ modparam("ndb_redis", "cluster", 1) modparam("ndb_redis", "allow_dynamic_nodes", 1) ... +3.10. debug (integer) + + Set the verbosity level for some of the log messages. It has to be a + log level value. + + Default value is “3” (L_DBG). + + Example 1.10. Set debug parameter +... +modparam("ndb_redis", "debug", 1) +... + 4. Functions 4.1. redis_cmd(srvname, command, ..., replyid) @@ -359,7 +375,7 @@ modparam("ndb_redis", "allow_dynamic_nodes", 1) value. The key can be: rpl_str, rpl_arr, rpl_int, rpl_err, rpl_sts, rpl_nil. - Example 1.10. redis_cmd usage + Example 1.11. redis_cmd usage ... if(redis_cmd("srvN", "INCR cnt", "r")) { # success - the incremented value is in $redis(r=>value) @@ -438,7 +454,7 @@ if (redis_cmd("srvN", "EXEC", "r")) { If cluster parameter is set to 1, this function will log an error and do nothing. - Example 1.11. redis_execute usage + Example 1.12. redis_execute usage ... After several redis command calls: redis_pipe_cmd("srvA", "SET foo bar", "r1"); @@ -486,7 +502,7 @@ d commands. The call is not necessary function. When ndb_redis module closes, all pending replies are freed automatically. - Example 1.12. redis_free usage + Example 1.13. redis_free usage ... After a redis command call: redis_cmd("srvN", "INCR cnt", "r"); diff --git a/src/modules/topos/README b/src/modules/topos/README index 4c6c4532ad..b63965cd5d 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -143,11 +143,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:master:b8fc507c: topos: docs - small updates to module description
by Daniel-Constantin Mierla 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: b8fc507c9dee07f1a0b7af01d24142240bcd8fa4 URL: https://github.com/kamailio/kamailio/commit/b8fc507c9dee07f1a0b7af01d241422… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T15:34:47+02:00 topos: docs - small updates to module description --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b8fc507c9dee07f1a0b7af01d241422… Patch: https://github.com/kamailio/kamailio/commit/b8fc507c9dee07f1a0b7af01d241422… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 1fb1d1f960..02e7e232d7 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:master:f1714283: ndb_redis: new param to control the verbosity of some log messages
by Daniel-Constantin Mierla 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: f171428374ecabb16e4f7621f2fcc7840bd22100 URL: https://github.com/kamailio/kamailio/commit/f171428374ecabb16e4f7621f2fcc78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T15:20:30+02:00 ndb_redis: new param to control the verbosity of some log messages --- Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/f171428374ecabb16e4f7621f2fcc78… Patch: https://github.com/kamailio/kamailio/commit/f171428374ecabb16e4f7621f2fcc78…

1 0

git:master:fdb7c2f6: ndb_redis: docs for debug parameter
by Daniel-Constantin Mierla 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: fdb7c2f635bf7145730444cafb129c4df37a1b7a URL: https://github.com/kamailio/kamailio/commit/fdb7c2f635bf7145730444cafb129c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T15:30:09+02:00 ndb_redis: docs for debug parameter --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fdb7c2f635bf7145730444cafb129c4… Patch: https://github.com/kamailio/kamailio/commit/fdb7c2f635bf7145730444cafb129c4… --- diff --git a/src/modules/ndb_redis/doc/ndb_redis_admin.xml b/src/modules/ndb_redis/doc/ndb_redis_admin.xml index e71ce806a11..217a3d75d3d 100644 --- a/src/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/src/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -304,6 +304,26 @@ modparam("ndb_redis", "server", "name=redis_cluster;addr=127.0.0.1;port=26008") ... modparam("ndb_redis", "cluster", 1) modparam("ndb_redis", "allow_dynamic_nodes", 1) +... + </programlisting> + </example> + </section> + <section id="ndb_redis.p.debug"> + <title><varname>debug</varname> (integer)</title> + <para> + Set the verbosity level for some of the log messages. It has to be + a log level value. + </para> + <para> + <emphasis> + Default value is <quote>3</quote> (L_DBG). + </emphasis> + </para> + <example> + <title>Set <varname>debug</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ndb_redis", "debug", 1) ... </programlisting> </example>

1 0

git:master:ef00062f: ndb_redis: clean up response on moved reply with cluster mode on
by Daniel-Constantin Mierla 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: ef00062fb3feb051e3e11c62ce3c529579d23f5b URL: https://github.com/kamailio/kamailio/commit/ef00062fb3feb051e3e11c62ce3c529… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-07-04T14:08:58+02:00 ndb_redis: clean up response on moved reply with cluster mode on --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/ef00062fb3feb051e3e11c62ce3c529… Patch: https://github.com/kamailio/kamailio/commit/ef00062fb3feb051e3e11c62ce3c529… --- 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:master:5f26491e: tls_wolfssl: cert serial number can exceed uint64
by S-P Chan 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: 5f26491e288092629fcd508b9acefe6edf175845 URL: https://github.com/kamailio/kamailio/commit/5f26491e288092629fcd508b9acefe6… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-07-04T19:48:54+08:00 tls_wolfssl: cert serial number can exceed uint64 - GH #3168 --- Modified: src/modules/tls_wolfssl/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/5f26491e288092629fcd508b9acefe6… Patch: https://github.com/kamailio/kamailio/commit/5f26491e288092629fcd508b9acefe6… --- diff --git a/src/modules/tls_wolfssl/tls_select.c b/src/modules/tls_wolfssl/tls_select.c index 0cb2d59c36..b61c7c2a59 100644 --- a/src/modules/tls_wolfssl/tls_select.c +++ b/src/modules/tls_wolfssl/tls_select.c @@ -632,24 +632,32 @@ 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]; // > log(2^256,10) X509* cert; struct tcp_connection* c; - char* sn; - int num; + char* sn = NULL; + WOLFSSL_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 = wolfSSL_BN_new())) goto error; + if (!wolfSSL_ASN1_INTEGER_to_BN(X509_get_serialNumber(cert), bn)) goto error; + if (!(sn = wolfSSL_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); + wolfSSL_OPENSSL_free(sn); + wolfSSL_BN_free(bn); return 0; + error: + if (sn) wolfSSL_OPENSSL_free(sn); + if (bn) wolfSSL_BN_free(bn); + return -1; } static int sel_sn(str* res, select_t* s, sip_msg_t* msg) @@ -664,7 +672,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); } @@ -681,11 +689,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:master:06e2363a: tls_wolfssl: move git submodule to misc/external/wolfssl
by S-P Chan 04 Jul '22

04 Jul '22

Module: kamailio Branch: master Commit: 06e2363a961a1f7f866faee81aeac737db2359fc URL: https://github.com/kamailio/kamailio/commit/06e2363a961a1f7f866faee81aeac73… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-07-04T19:43:35+08:00 tls_wolfssl: move git submodule to misc/external/wolfssl - GH #3164 --- Added: misc/external/wolfssl/.gitignore Added: misc/external/wolfssl/wolfssl Modified: .gitmodules Modified: src/modules/tls_wolfssl/Makefile Removed: src/modules/tls_wolfssl/lib/wolfssl --- Diff: https://github.com/kamailio/kamailio/commit/06e2363a961a1f7f866faee81aeac73… Patch: https://github.com/kamailio/kamailio/commit/06e2363a961a1f7f866faee81aeac73… --- diff --git a/.gitmodules b/.gitmodules index 97045b8acd8..1d8f99966ed 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,5 +2,5 @@ path = pkg/docker url = https://github.com/kamailio/kamailio-ci.git [submodule "src/modules/tls_wolfssl/lib/wolfssl"] - path = src/modules/tls_wolfssl/lib/wolfssl + path = misc/external/wolfssl/wolfssl url = https://github.com/wolfSSL/wolfssl.git diff --git a/misc/external/wolfssl/.gitignore b/misc/external/wolfssl/.gitignore new file mode 100644 index 00000000000..567609b1234 --- /dev/null +++ b/misc/external/wolfssl/.gitignore @@ -0,0 +1 @@ +build/ diff --git a/src/modules/tls_wolfssl/lib/wolfssl b/misc/external/wolfssl/wolfssl similarity index 100% rename from src/modules/tls_wolfssl/lib/wolfssl rename to misc/external/wolfssl/wolfssl diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index 687fe1a4947..f6a27f7f34e 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -8,15 +8,17 @@ include ../../Makefile.defs auto_gen= NAME=tls_wolfssl.so -LIBS += lib/lib/libwolfssl.a -INCLUDES += -I./lib/include/ +WOLFSSL_PREFIX = ../../../misc/external/wolfssl/build +WOLFSSL_SRC = ../../../misc/external/wolfssl/wolfssl +LIBS += $(WOLFSSL_PREFIX)/lib/libwolfssl.a +INCLUDES += -I$(WOLFSSL_PREFIX)/include/ include ../../Makefile.modules -$(objs): lib/include/wolfssl/options.h +$(objs): $(WOLFSSL_PREFIX)/include/wolfssl/options.h -lib/include/wolfssl/options.h lib/lib/libwolfssl.a: - @cd ./lib/wolfssl; \ +$(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: + @cd $(WOLFSSL_SRC); \ if [ ! -f "configure" ]; then \ ./autogen.sh; \ fi; \ @@ -24,16 +26,16 @@ lib/include/wolfssl/options.h lib/lib/libwolfssl.a: env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -fPIC -Wno-error=array-bounds -Wno-error=stringop-overflow" ./configure \ --enable-all --enable-pkcs11 --enable-static --enable-aligndata=no \ --disable-shared --disable-examples \ - --prefix=$(CURDIR)/lib \ - --exec-prefix=$(CURDIR)/lib; \ + --prefix=$(CURDIR)/$(WOLFSSL_PREFIX) \ + --exec-prefix=$(CURDIR)/$(WOLFSSL_PREFIX); \ fi; - @$(MAKE) -C ./lib/wolfssl install + @$(MAKE) -C $(WOLFSSL_SRC) install -$(NAME): lib/lib/libwolfssl.a +$(NAME): $(WOLFSSL_PREFIX)/lib/libwolfssl.a clean-wolfssl: - @rm -rf ./lib/{bin,include,share,lib}; \ - (cd ./lib/wolfssl; make distclean) || /bin/true + @rm -rf $(WOLFSSL_PREFIX)/{bin,include,share,lib}; \ + (cd $(WOLFSSL_SRC); make distclean) || /bin/true clean-module: @rm -f *.o *.so

1 0

[kamailio/kamailio] Errormessage TLS read:error:0D0E10DF:asn1 encoding routines:asn1_get_uint64:too large (Issue #3168)
by MartinPalmAGDS 04 Jul '22

04 Jul '22

We use Kamilio as a proxy server to connect softphones to our PBX systems. We have run into some TLS problems. These problems result in a shut down of the TLS connection after the error is encountered. We have looked into serial numbers of certificates. The current code in kamailio seems to be broken due to changes in the world around... many certificates today do not adhere to the previously assumed behaviour of certificate serial numbers anymore. The error which causes the connection to drop seems to be related to a comparison of the certificate serial numbers during renegotiation. tls_err_ret(): TLS read:error:0D0E10DF:asn1 encoding routines:asn1_get_uint64:too large Kamailio expects serial numbers to fit in a 64 bit unsigned, however during the last years, starting around 2003 more and more systems use automatically generated serial numbers, which are frequently 128 bit long. The serialnumber of our own Auerswald root certificate looks to be only 64 bit long, but during the negotiation is presented as 9 bytes starting with 00h, which is interpreted as a 72bit value. Trying to put this serial number in a 64 bit long kills the connection. Due to the different ways that are used to generate serial numbers now, there is no simple algorithm to condense the number into a 64bit value, and the whole number should be compared to see if it is same or higher. We currently have disabled renegotiation to avoid the connection being dropped during renegotiation. Which however can lead to the connection being dropped by the other side during renegotiation, but this is not a good permanent workaround! #### Reproduction This issue happens infrequently ### Possible Solutions No workaround possible on our side ### Additional Information Kamailio Version 5.5.4 LibSSL 1.1.1.n * **Operating System**: Linux, Debian oldstable -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3168 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3168(a)github.com>

3 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev