sr-dev July 2022

sr-dev@lists.kamailio.org

11 participants
230 discussions

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

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

(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

← Newer
1
...
14
15
16
17
18
19
20
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2022