sr-dev June 2022

sr-dev@lists.kamailio.org

20 participants
280 discussions

git:master:8d7583b8: Merge pull request #3133 from sn4kebite/auth-dont-invalidate-nc

by GitHub

Module: kamailio Branch: master Commit: 8d7583b82a1ffff78fb61b2de7b51deb77ba30a4 URL: https://github.com/kamailio/kamailio/commit/8d7583b82a1ffff78fb61b2de7b51de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2022-06-14T09:49:14+02:00 Merge pull request #3133 from sn4kebite/auth-dont-invalidate-nc auth: Add flag for not invalidating nc on auth failure --- Modified: src/modules/auth/api.c Modified: src/modules/auth/api.h Modified: src/modules/auth/auth_mod.c Modified: src/modules/auth/doc/auth_functions.xml Modified: src/modules/auth/nc.c Modified: src/modules/auth/nc.h Modified: src/modules/auth/nonce.c Modified: src/modules/auth/nonce.h --- Diff: https://github.com/kamailio/kamailio/commit/8d7583b82a1ffff78fb61b2de7b51de… Patch: https://github.com/kamailio/kamailio/commit/8d7583b82a1ffff78fb61b2de7b51de…

1 year, 10 months

[kamailio/kamailio] Not able to get CDR using current documentation (Issue #3142)

by olegans1972

### Description I want to get the CDR of the whole call. For this I use the following configuration. I don't use any sql database. I want to get CDR in syslog ... loadmodule "db_text.so" loadmodule "dialog.so" loadmodule "acc.so" ... #----Dialog-------------------------- modparam("dialog", "db_mode", 0) #-----ACCounting module ----- modparam("acc", "early_media", 0) modparam("acc", "report_cancels", 1) modparam("acc", "log_facility", "LOG_LOCAL1") modparam("acc", "detect_direction", 0) modparam("acc", "log_level", ACC_LOG_LEVEL) modparam("acc", "log_flag", FLAG_ACC_LOG) modparam("acc", "log_missed_flag", FLAG_ACC_LOG_MISSED) modparam("acc", "failed_transaction_flag", FLAG_ACC_LOG_FAILED) modparam("acc", "log_extra", "ip_src=$si;ip_dst=$avp(ip_dst);sip_from=$fU;sip_to=$tU;ruri_user=$rU;spx_rs=$avp(spx_http_rs)") ## TODO modparam("acc", "cdr_enable", 1) modparam("acc", "cdr_facility", "LOG_LOCAL1") modparam("acc", "cdr_log_enable", 1) ... request_route { setflag(FLAG_ACC_LOG); setflag(FLAG_ACC_LOG_MISSED); setflag(FLAG_ACC_LOG_FAILED); ... ... ... } ... #___handle requests within SIP dialogs route[HANDLE_IN_DIALOG_REQUESTS] { if (has_totag()) { if (loose_route()) { xlog("L_INFO", "route[WITHINDLG]|$rm with to-tag and loose route|\n"); if (is_method("BYE")) { setflag(FLAG_ACC_LOG); } } } As a result, I get two separate records for INVITE and BYE transactions. But I'm expecting one CDR for the entire call.  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions I tried to find a solution on the internet, and found this message https://www.mail-archive.com/sr-users@lists.kamailio.org/msg13617.html The author talks about an additional flag in the dialog module. And also asks to add this to the documentation of the ACC module I tried adding a flag but didn't get the desired result. Probably something else needs to be done. There is nothing in the documentation about this. Maybe it makes sense to write a similar article for kamailio? https://www.opensips.org/Documentation/Tutorials-Advanced-Accounting  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [opodguyko@vms-vms-spx-1 ~]$ kamailio -v version: kamailio 5.5.3 (x86_64/linux) b02728-dirty flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: b02728 -dirty compiled on 15:35:46 Dec 15 2021 with gcc 8.3.1 ``` * **Operating System**:  ``` [opodguyko@vms-vms-spx-1 ~]$ cat /etc/redhat-release AlmaLinux release 8.5 (Arctic Sphynx) [opodguyko@vms-vms-spx-1 ~]$ ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3142 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3142(a)github.com>

1 year, 10 months

[kamailio/kamailio] packaging: on EL8 package with Python 3.9 (PR #3140)

by aalba6675

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  On EL8 package with Python 3.9; that is EoL in 2025; Python 3.6 was EoL end 2021. Python 3.9 lifecycle matches the remaining Full Support cycle of EL8. Although 5.6 packages were released with Python 3.6; this PR could be backported to 5.6 as 5.6 still has a lot of runway. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3140 -- Commit Summary -- * packaging: on EL8 package with Python 3.9 -- File Changes -- M pkg/kamailio/obs/kamailio.spec (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3140.patch https://github.com/kamailio/kamailio/pull/3140.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3140 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3140(a)github.com>

1 year, 10 months

git:5.6:b552a278: packaging: on EL8 package with Python 3.9

by Sergey Safarov

Module: kamailio Branch: 5.6 Commit: b552a27821cf083e87bf0e2cd2c05acb6cf79aea URL: https://github.com/kamailio/kamailio/commit/b552a27821cf083e87bf0e2cd2c05ac… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-06-11T14:20:06+03:00 packaging: on EL8 package with Python 3.9 (cherry picked from commit c938619e458e0efa0676e7e60c2b1a6fc7e947db) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b552a27821cf083e87bf0e2cd2c05ac… Patch: https://github.com/kamailio/kamailio/commit/b552a27821cf083e87bf0e2cd2c05ac… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5ba68a92241..fbc41f36ce0 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -794,6 +794,10 @@ BuildRequires: python2, python2-devel %if 0%{?rhel} == 7 Requires: python36, kamailio = %ver BuildRequires: python36, python36-devel +%endif +%if 0%{?rhel} == 8 +Requires: python39, kamailio = %ver +BuildRequires: python39, python39-devel %else Requires: python3, kamailio = %ver BuildRequires: python3, python3-devel @@ -1178,6 +1182,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ +%endif +%if 0%{?rhel} == 8 + PYTHON3=python3.9 \ %endif group_include="kstandard kautheph kberkeley kcarrierroute \ %if %{with cnxcc} @@ -1279,6 +1286,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ +%endif +%if 0%{?rhel} == 8 + PYTHON3=python3.9 \ %endif group_include="kstandard kautheph kberkeley kcarrierroute \ %if %{with cnxcc}

1 year, 10 months

git:master:c938619e: packaging: on EL8 package with Python 3.9

by sergey-safarov

Module: kamailio Branch: master Commit: c938619e458e0efa0676e7e60c2b1a6fc7e947db URL: https://github.com/kamailio/kamailio/commit/c938619e458e0efa0676e7e60c2b1a6… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: sergey-safarov <s.safarov(a)gmail.com> Date: 2022-06-11T14:18:50+03:00 packaging: on EL8 package with Python 3.9 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/c938619e458e0efa0676e7e60c2b1a6… Patch: https://github.com/kamailio/kamailio/commit/c938619e458e0efa0676e7e60c2b1a6… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index a2b7e1406c8..ba08d5b52d2 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -794,6 +794,10 @@ BuildRequires: python2, python2-devel %if 0%{?rhel} == 7 Requires: python36, kamailio = %ver BuildRequires: python36, python36-devel +%endif +%if 0%{?rhel} == 8 +Requires: python39, kamailio = %ver +BuildRequires: python39, python39-devel %else Requires: python3, kamailio = %ver BuildRequires: python3, python3-devel @@ -1178,6 +1182,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ +%endif +%if 0%{?rhel} == 8 + PYTHON3=python3.9 \ %endif group_include="kstandard kautheph kberkeley kcarrierroute \ %if %{with cnxcc} @@ -1279,6 +1286,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %endif %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8 FREERADIUS=1 \ +%endif +%if 0%{?rhel} == 8 + PYTHON3=python3.9 \ %endif group_include="kstandard kautheph kberkeley kcarrierroute \ %if %{with cnxcc}

1 year, 10 months

[kamailio/kamailio] KEMI Fatal Python error: failed releasing import lock after fork (Issue #3125)

by Nigel Daniels

### Description using kamailio 5.6.0 python: 3.8.10 OS : ubuntu 20.0.4 When trying to use kemi with the default configuration I get on startup. ` Fatal Python error: failed releasing import lock after fork ` #### Reproduction Using The configuration described here : https://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/kemi/#bas… #### Debugging Data ``` 0(1) INFO: <core> [core/kemi.c:106]: sr_kemi_core_info(): ===== kamailio.child_init(1) kamailio | 0(1) DEBUG: <core> [core/sr_module.c:923]: init_child(): initializing PROC_POSTCHILDINIT with rank -126 kamailio | 0(1) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 0 rank -126: app_python3 [stand-alone receiver @ 10.10.0.4:5060] kamailio | Fatal Python error: failed releasing import lock after fork kamailio | Python runtime state: initialized kamailio | kamailio | Current thread 0x00007f3faa857180 (most recent call first): kamailio | <no Python frame> kamailio | 7(14) DEBUG: <core> [core/pt.c:308]: fork_process(): seeding PRNG with 1232772928 kamailio | 7(14) DEBUG: <core> [core/rand/cryptorand.c:36]: cryptorand_seed(): seeding cryptorand generator with 1232772928 kamailio | 7(14) DEBUG: <core> [core/rand/fortuna/random.c:175]: sr_add_entropy(): additional 4 bytes entropy added to cryptographic PRNG kamailio | 7(14) DEBUG: <core> [core/pt.c:313]: fork_process(): test random numbers 987270226 561754816 1532392054 1162699744 kamailio | 7(14) DEBUG: <core> [core/sr_module.c:923]: init_child(): initializing PROC_RPC with rank -2 kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: corex [ctl handler] kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: usrloc [ctl handler] kamailio | 7(14) DEBUG: <core> [core/utils/sruid.c:121]: sruid_init(): root for sruid is [ulcx-62931156-e-] (0 / 16) kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: registrar [ctl handler] kamailio | 7(14) DEBUG: <core> [core/utils/sruid.c:121]: sruid_init(): root for sruid is [uloc-62931156-e-] (0 / 16) kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: jsonrpcs [ctl handler] kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: kex [ctl handler] kamailio | 7(14) DEBUG: kex [kex_mod.c:155]: child_init(): rank is (-2) kamailio | 7(14) DEBUG: <core> [core/utils/sruid.c:121]: sruid_init(): root for sruid is [srid-62931156-e-] (0 / 16) kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: tm [ctl handler] kamailio | 7(14) DEBUG: tm [callid.c:136]: child_init_callid(): callid: '2ef035de7699493f-14(a)10.10.0.4' kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: tmx [ctl handler] kamailio | 7(14) DEBUG: tmx [tmx_mod.c:262]: child_init(): rank is (-2) kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: sl [ctl handler] kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: ctl [ctl handler] kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: debugger [ctl handler] kamailio | 7(14) DEBUG: debugger [debugger_mod.c:224]: child_init(): rank is (-2) kamailio | 7(14) DEBUG: <core> [core/sr_module.c:875]: init_mod_child(): idx 7 rank -2: app_python3 [ctl handler] kamailio | 7(14) DEBUG: app_python3 [apy_kemi.c:234]: sr_apy_kemi_exec_func_ex(): execution of method: .info kamailio | 7(14) DEBUG: app_python3 [apy_kemi.c:266]: sr_apy_kemi_exec_func_ex(): param[1] for: info is str: ===== kamailio.child_init(-2) kamailio | kamailio | 7(14) INFO: <core> [core/kemi.c:106]: sr_kemi_core_info(): ===== kamailio.child_init(-2) kamailio | 7(14) DEBUG: ctl [ctl.c:329]: mod_child(): ctl: mod_child(0), fork_process=0, csl=0x56186255e180 kamailio | 7(14) DEBUG: ctl [ctl.c:336]: mod_child(): ctl: 0 io_listen_loop(1, 0x56186255e180) kamailio | 7(14) INFO: ctl [io_listener.c:213]: io_listen_loop(): io_listen_loop: using epoll_lt io watch method (config) kamailio | 7(14) DEBUG: ctl [io_listener.c:245]: io_listen_loop(): io_listen_loop: adding socket 8, type 2, transport 3 (/var/run/kamailio//kamailio_ctl) kamailio | 7(14) DEBUG: ctl [../../core/io_wait.h:374]: io_watch_add(): processing io_watch_add(0x7f3fa8aa2380, 8, 2, 0x56186255e180) - fd_no=0 kamailio exited with code 139 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3125 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3125(a)github.com>

1 year, 10 months

[kamailio/kamailio] WIP app_python3: need a test for a real child process (PR #3139)

by aalba6675

app_python3 needs to call `PyOS_AfterFork_Child()`/`PyOS_AfterFork()` in real child processes. We need a test for this: rank > 0 may not be sufficient due to non-forking mode. This POC uses getpid(). - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  @miconda @henningw : this PR is for discussion only: in KEMI Python there is an interpreter function that needs to be called after `fork()` in real child processes. I realise that `rank > 0` may not be a completely correct test as kamailio has a non-forking mode. Your comments would be appreciated. This POC uses `getpid()` to detect a &ldquo;real&rdquo; child process. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3139 -- Commit Summary -- * WIP app_python3: need a test for a real child process -- File Changes -- M src/modules/app_python3/app_python3_mod.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3139.patch https://github.com/kamailio/kamailio/pull/3139.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3139 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3139(a)github.com>

1 year, 10 months

git:5.6:824867fd: app_python3: use _ksr_is_main to detect child process

by Anthony Alba

Module: kamailio Branch: 5.6 Commit: 824867fd1f81c78cc0fd8c688aa4032c24e49781 URL: https://github.com/kamailio/kamailio/commit/824867fd1f81c78cc0fd8c688aa4032… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2022-06-10T22:20:06+08:00 app_python3: use _ksr_is_main to detect child process (cherry picked from commit 8683deb20a) --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/824867fd1f81c78cc0fd8c688aa4032… Patch: https://github.com/kamailio/kamailio/commit/824867fd1f81c78cc0fd8c688aa4032… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index d250640e0c..376d1c1312 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -185,9 +185,6 @@ static int child_init(int rank) * this is called before any process is forked * so the Python internal state handler * should be called now. - * - * TODO: is PyOS_AfterFork_Parent() necesary - * in the main process? */ #if PY_VERSION_HEX >= 0x03070000 PyOS_BeforeFork() ; @@ -206,7 +203,7 @@ static int child_init(int rank) } _apy_process_rank = rank; - if (rank > 0) { + if (!_ksr_is_main) { #if PY_VERSION_HEX >= 0x03070000 PyOS_AfterFork_Child(); #else

1 year, 10 months

git:master:8683deb2: app_python3: use _ksr_is_main to detect child process

by Anthony Alba

Module: kamailio Branch: master Commit: 8683deb20a3f69c3b6d2c8370d23d1451f823a6b URL: https://github.com/kamailio/kamailio/commit/8683deb20a3f69c3b6d2c8370d23d14… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2022-06-10T22:13:39+08:00 app_python3: use _ksr_is_main to detect child process --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8683deb20a3f69c3b6d2c8370d23d14… Patch: https://github.com/kamailio/kamailio/commit/8683deb20a3f69c3b6d2c8370d23d14… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index d250640e0c..376d1c1312 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -185,9 +185,6 @@ static int child_init(int rank) * this is called before any process is forked * so the Python internal state handler * should be called now. - * - * TODO: is PyOS_AfterFork_Parent() necesary - * in the main process? */ #if PY_VERSION_HEX >= 0x03070000 PyOS_BeforeFork() ; @@ -206,7 +203,7 @@ static int child_init(int rank) } _apy_process_rank = rank; - if (rank > 0) { + if (!_ksr_is_main) { #if PY_VERSION_HEX >= 0x03070000 PyOS_AfterFork_Child(); #else

1 year, 10 months

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},

1 year, 10 months

← Newer
1
...
21
22
23
24
25
26
27
28
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