sr-dev June 2022

sr-dev@lists.kamailio.org

20 participants
281 discussions

git:master:64ae9ed7: siputils: removed duplicated function for e164 check

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 64ae9ed7212c1db352ab583b8d319358da23775f URL: https://github.com/kamailio/kamailio/commit/64ae9ed7212c1db352ab583b8d31935… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-10T14:05:41+02:00 siputils: removed duplicated function for e164 check --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/rpid.c Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/64ae9ed7212c1db352ab583b8d31935… Patch: https://github.com/kamailio/kamailio/commit/64ae9ed7212c1db352ab583b8d31935… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 3e01eb97829..792cfca94aa 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -656,7 +656,7 @@ int tel2sip(struct sip_msg* _msg, char* _uri, char* _hostpart, char* _res) /* * Check if parameter is an e164 number. */ -static inline int e164_check(str* _user) +int siputils_e164_check(str* _user) { int i; char c; @@ -675,7 +675,7 @@ static inline int e164_check(str* _user) /* * Check if user part of URI in pseudo variable is an e164 number */ -int is_e164(struct sip_msg* _m, char* _sp, char* _s2) +int w_is_e164(struct sip_msg* _m, char* _sp, char* _s2) { pv_spec_t *sp; pv_value_t pv_val; @@ -688,7 +688,7 @@ int is_e164(struct sip_msg* _m, char* _sp, char* _s2) LM_DBG("missing argument\n"); return -1; } - return e164_check(&(pv_val.rs)); + return siputils_e164_check(&(pv_val.rs)); } else { LM_ERR("pseudo variable value is not string\n"); return -1; @@ -743,7 +743,7 @@ int is_uri_user_e164(str *uri) if (chr == NULL) return -1; user.len = chr - user.s; - return e164_check(&user); + return siputils_e164_check(&user); } /* diff --git a/src/modules/siputils/checks.h b/src/modules/siputils/checks.h index 2a05bdd53d8..164f086f26e 100644 --- a/src/modules/siputils/checks.h +++ b/src/modules/siputils/checks.h @@ -89,7 +89,9 @@ int is_uri_user_e164(str *uri); /* * Check if pseudo variable argument value is an e164 number */ -int is_e164(struct sip_msg* _m, char* _sp, char* _s2); +int w_is_e164(struct sip_msg* _m, char* _sp, char* _s2); + +int siputils_e164_check(str* _user); /* * Set userpart of URI diff --git a/src/modules/siputils/rpid.c b/src/modules/siputils/rpid.c index 617f3d4220a..c725116034c 100644 --- a/src/modules/siputils/rpid.c +++ b/src/modules/siputils/rpid.c @@ -37,6 +37,7 @@ #include "../../core/parser/parser_f.h" #include "../../core/ut.h" #include "../../core/pvar.h" +#include "checks.h" #include "rpid.h" @@ -95,29 +96,6 @@ void get_rpid_avp( int_str *rpid_avp_p, int *rpid_avp_type_p ) } -/*! - * \brief Check if user is a E164 number - * \param _user user - * \note Copy of is_e164 from enum module - * \return 1 if its a E164 number, -1 if not - */ -static inline int is_e164(str* _user) -{ - int i; - char c; - - if ((_user->len > 2) && (_user->len < 17) && ((_user->s)[0] == '+')) { - for (i = 1; i < _user->len; i++) { - c = (_user->s)[i]; - if ((c < '0') || (c > '9')) return -1; - } - return 1; - } else { - return -1; - } -} - - /*! * \brief Append RPID helper function * \param _m SIP message @@ -325,7 +303,7 @@ int is_rpid_user_e164(struct sip_msg* _m, char* _s1, char* _s2) goto err; } - return is_e164(&uri.user); + return siputils_e164_check(&uri.user); err: return -1; diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 704f3e9a299..2e7ddeb7c08 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -141,7 +141,7 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE}, {"is_uri", (cmd_function)is_uri, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, - {"is_e164", (cmd_function)is_e164, 1, fixup_pvar_null, + {"is_e164", (cmd_function)w_is_e164, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, {"is_uri_user_e164", (cmd_function)w_is_uri_user_e164, 1, fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE},

2 years, 5 months

git:master:da4f786b: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: da4f786b0c0275a6e4c8324f9b4c347351b5a48a URL: https://github.com/kamailio/kamailio/commit/da4f786b0c0275a6e4c8324f9b4c347… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-10T09:16:30+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/da4f786b0c0275a6e4c8324f9b4c347… Patch: https://github.com/kamailio/kamailio/commit/da4f786b0c0275a6e4c8324f9b4c347… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 6f0978dc6d..9d4287804f 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1458,12 +1458,13 @@ if(ds_list_exists("10")) { specific group id. The parameter can be an integer or a variable holding an integer value. * mode - (optional) - a bitmask to specify how the matching should be - done. If parameter is 0, all ip, port and proto are matched and - active status is ignored. If bit one is set, then port is ignored. - If bit two is set, then protocol is ignored. If bit three is set, - then state must be active. The parameter can be an integer or a - variable holding an integer value. It must be provided if the uri - parameter is provided. + done. If the parameter is missing, the matching is done with + ignoring the protocol (value 2). If parameter is 0, all ip, port + and proto are matched and active status is ignored. If bit one is + set, then port is ignored. If bit two is set, then protocol is + ignored. If bit three is set, then state must be active. The + parameter can be an integer or a variable holding an integer value. + It must be provided if the uri parameter is provided. * uri (optional) - if parameter is empty or missing, the matching is done against source IP, port and protocol. Otherwise the value has to be a valid SIP URI, used to match against addresses in the

2 years, 5 months

git:master:e052fd85: dispatcher: extend documentation about default behaviour with missing match mode

by Henning Westerholt

Module: kamailio Branch: master Commit: e052fd8507115065b566912a6146dce329b19408 URL: https://github.com/kamailio/kamailio/commit/e052fd8507115065b566912a6146dce… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-06-10T07:08:24Z dispatcher: extend documentation about default behaviour with missing match mode --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e052fd8507115065b566912a6146dce… Patch: https://github.com/kamailio/kamailio/commit/e052fd8507115065b566912a6146dce… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index a910b8480c5..1c9de29ba78 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1764,8 +1764,10 @@ if(ds_list_exists("10")) { </listitem> <listitem> <para><emphasis>mode</emphasis> - (optional) - a bitmask to specify - how the matching should be done. If parameter is 0, all ip, port and - proto are matched and active status is ignored. + how the matching should be done. If the parameter is missing, + the matching is done with ignoring the protocol (value 2). + If parameter is 0, all ip, port and proto are matched and + active status is ignored. If bit one is set, then port is ignored. If bit two is set, then protocol is ignored. If bit three is set, then state must be active. The parameter

2 years, 5 months

git:5.6:1dfca366: app_python3: call PyOS_AfterFork_Child() only in child processes

by Anthony Alba

Module: kamailio Branch: 5.6 Commit: 1dfca366a8eb781bfd178e01378d2f7333c67956 URL: https://github.com/kamailio/kamailio/commit/1dfca366a8eb781bfd178e01378d2f7… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2022-06-10T00:02:02+08:00 app_python3: call PyOS_AfterFork_Child() only in child processes - GH #3125: we should not call PyOS_AfterFork_Child() in the main process. (cherry picked from commit 69b4b6222e) --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1dfca366a8eb781bfd178e01378d2f7… Patch: https://github.com/kamailio/kamailio/commit/1dfca366a8eb781bfd178e01378d2f7… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index eb46f54f50..d250640e0c 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -200,19 +200,19 @@ static int child_init(int rank) * processes */ #if PY_VERSION_HEX >= 0x03070000 - /* this is causing abort on Python 3.8+ GH#3125 - * skip for now PyOS_AfterFork_Parent() ; - */ #endif return 0; } _apy_process_rank = rank; + + if (rank > 0) { #if PY_VERSION_HEX >= 0x03070000 - PyOS_AfterFork_Child(); + PyOS_AfterFork_Child(); #else - PyOS_AfterFork(); + PyOS_AfterFork(); #endif + } if (cfg_child_init()) { return -1; }

2 years, 5 months

git:master:251bb745: app_python3: call PyOS_AfterFork_Child() only in child processes

by Anthony Alba

Module: kamailio Branch: master Commit: 251bb74535594629499dfd2bb2cebfb4d728a260 URL: https://github.com/kamailio/kamailio/commit/251bb74535594629499dfd2bb2cebfb… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2022-06-09T23:53:48+08:00 app_python3: call PyOS_AfterFork_Child() only in child processes - GH #3125: we should not call PyOS_AfterFork_Child() in the main process. --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/251bb74535594629499dfd2bb2cebfb… Patch: https://github.com/kamailio/kamailio/commit/251bb74535594629499dfd2bb2cebfb… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index eb46f54f50..d250640e0c 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -200,19 +200,19 @@ static int child_init(int rank) * processes */ #if PY_VERSION_HEX >= 0x03070000 - /* this is causing abort on Python 3.8+ GH#3125 - * skip for now PyOS_AfterFork_Parent() ; - */ #endif return 0; } _apy_process_rank = rank; + + if (rank > 0) { #if PY_VERSION_HEX >= 0x03070000 - PyOS_AfterFork_Child(); + PyOS_AfterFork_Child(); #else - PyOS_AfterFork(); + PyOS_AfterFork(); #endif + } if (cfg_child_init()) { return -1; }

2 years, 5 months

git:5.6:b7162ce2: app_python3: workaround for abort in Python 3.8+

by Anthony Alba

Module: kamailio Branch: 5.6 Commit: b7162ce2eb239cb9e9f4152440951e3aade411d3 URL: https://github.com/kamailio/kamailio/commit/b7162ce2eb239cb9e9f4152440951e3… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2022-06-09T21:32:02+08:00 app_python3: workaround for abort in Python 3.8+ - GH #3125 (cherry picked from commit 73db408a4a) --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b7162ce2eb239cb9e9f4152440951e3… Patch: https://github.com/kamailio/kamailio/commit/b7162ce2eb239cb9e9f4152440951e3… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index f710694d755..eb46f54f505 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -200,7 +200,10 @@ static int child_init(int rank) * processes */ #if PY_VERSION_HEX >= 0x03070000 + /* this is causing abort on Python 3.8+ GH#3125 + * skip for now PyOS_AfterFork_Parent() ; + */ #endif return 0; }

2 years, 5 months

git:master:73db408a: app_python3: workaround for abort in Python 3.8+

by Anthony Alba

Module: kamailio Branch: master Commit: 73db408a4a1d58d8fd4c7950ede7ac3a18f3355c URL: https://github.com/kamailio/kamailio/commit/73db408a4a1d58d8fd4c7950ede7ac3… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2022-06-09T21:24:44+08:00 app_python3: workaround for abort in Python 3.8+ --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/73db408a4a1d58d8fd4c7950ede7ac3… Patch: https://github.com/kamailio/kamailio/commit/73db408a4a1d58d8fd4c7950ede7ac3… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index f710694d755..eb46f54f505 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -200,7 +200,10 @@ static int child_init(int rank) * processes */ #if PY_VERSION_HEX >= 0x03070000 + /* this is causing abort on Python 3.8+ GH#3125 + * skip for now PyOS_AfterFork_Parent() ; + */ #endif return 0; }

2 years, 5 months

git:master:75bdb84c: modules: readme files regenerated - sipdump ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 75bdb84c8eff081f74cee383307769861c8e4500 URL: https://github.com/kamailio/kamailio/commit/75bdb84c8eff081f74cee3833077698… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-08T23:31:21+02:00 modules: readme files regenerated - sipdump ... [skip ci] --- Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/75bdb84c8eff081f74cee3833077698… Patch: https://github.com/kamailio/kamailio/commit/75bdb84c8eff081f74cee3833077698… --- diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index 8b03c3849f..e5ba03d8fb 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -320,7 +320,7 @@ modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN") ... route[TCLEAN] { - exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +1 -delete &"); + exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +2 -delete &"); } ...

2 years, 5 months

git:master:2a744a58: sipdump: docs - sync example with description

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2a744a58c57542520e4ff4c73b1419a083b17076 URL: https://github.com/kamailio/kamailio/commit/2a744a58c57542520e4ff4c73b1419a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-08T23:23:09+02:00 sipdump: docs - sync example with description --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2a744a58c57542520e4ff4c73b1419a… Patch: https://github.com/kamailio/kamailio/commit/2a744a58c57542520e4ff4c73b1419a… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index f0dd9fc1b4b..3bcdc31fc46 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -346,7 +346,7 @@ modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN") ... route[TCLEAN] { - exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +1 -delete &"); + exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +2 -delete &"); } ... </programlisting>

2 years, 5 months

[kamailio/kamailio] Crash when length($uac_req(callid)) > 128 (Issue #3135)

by hance2010

### Description Crash when length($uac_req(callid)) > 128 ### Troubleshooting #### Reproduction ``` function send_options() local KAM_DOMAIN = "192.168.100.131" -- length(callid) is 129 local callid = "0123456789-0123456789-0123456789-0123456789-0123456789-0123456789-0123456789-0123456789-0123456789-0123456789-0123456789-0000000" local tu = "sip:1001@" .. KAM_DOMAIN local sut = "sip:192.168.100.132:5080" KSR.pv.sets("$uac_req(method)", "OPTIONS") KSR.pv.sets("$uac_req(callid)", callid) KSR.pv.sets("$uac_req(furi)", "sip:" .. "kamailio" .. "@" .. KAM_DOMAIN) KSR.pv.sets("$uac_req(ruri)", tu) KSR.pv.sets("$uac_req(turi)", tu) KSR.pv.sets("$uac_req(ouri)", sut) KSR.pv.seti("$uac_req(evroute)", 1) KSR.uac.uac_req_send() end ``` #### Debugging Data  #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions https://github.com/kamailio/kamailio/blob/5.5/src/modules/uac/uac_send.c#L4… check len ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` Kamailio5.5.4 ``` * **Operating System**:  ``` Debian11 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3135 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3135(a)github.com>

2 years, 5 months

← Newer
1
...
22
23
24
25
26
27
28
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2022