sr-dev

sr-dev@lists.kamailio.org

20 participants
45178 discussions

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev