- sr-dev - kamailio.org

git:master:404f4037: dialog: do not require dlg_flag parameter to be set
by Daniel-Constantin Mierla 09 Jan '19

09 Jan '19

Module: kamailio Branch: master Commit: 404f403786478a917637186446bb285e8e32cc59 URL: https://github.com/kamailio/kamailio/commit/404f403786478a917637186446bb285… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-09T14:16:19+01:00 dialog: do not require dlg_flag parameter to be set - using dlg_manage() should be enough for tracking dialogs --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/404f403786478a917637186446bb285… Patch: https://github.com/kamailio/kamailio/commit/404f403786478a917637186446bb285… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index ce69fc94ca..497176a760 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -515,8 +515,8 @@ static int mod_init(void) return -1; /* param checkings */ - if (dlg_flag>MAX_FLAG) { - LM_ERR("invalid dlg flag %d!!\n",dlg_flag); + if (dlg_flag!=-1 && dlg_flag>MAX_FLAG) { + LM_ERR("invalid dlg flag %d!!\n", dlg_flag); return -1; } diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 96406bde35..c80ca7d59f 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -761,8 +761,10 @@ void dlg_onreq(struct cell* t, int type, struct tmcb_params *param) } } if (dlg==NULL) { - if((req->flags&dlg_flag_mask)!=dlg_flag_mask) + if((dlg_flag_mask==0) || (req->flags&dlg_flag_mask)!=dlg_flag_mask) { + LM_DBG("flag not set for creating a new dialog\n"); return; + } LM_DBG("dialog creation on config flag\n"); dlg_new_dialog(req, t, 1); dlg = dlg_get_ctx_dialog();

1 0

[kamailio/kamailio] cnxcc: fix example code in doc file adding the new parameter in the cnxcc_set_max_credit() function (#1799)
by Jose Luis Verdeguer 09 Jan '19

09 Jan '19

#### Description  fix example code in doc file adding the new parameter in the cnxcc_set_max_credit() function You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1799 -- Commit Summary -- * cnxcc: fix example code in doc file adding the new parameter [skip ci] -- File Changes -- M src/modules/cnxcc/doc/cnxcc_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1799.patch https://github.com/kamailio/kamailio/pull/1799.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1799

1 1

git:master:25accffd: cnxcc: fix example code in doc file adding the new parameter [skip ci]
by Jose Luis Verdeguer 09 Jan '19

09 Jan '19

Module: kamailio Branch: master Commit: 25accffdbd9dab458e95125630b2129986656fd2 URL: https://github.com/kamailio/kamailio/commit/25accffdbd9dab458e95125630b2129… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2019-01-09T14:07:19+01:00 cnxcc: fix example code in doc file adding the new parameter [skip ci] --- Modified: src/modules/cnxcc/doc/cnxcc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/25accffdbd9dab458e95125630b2129… Patch: https://github.com/kamailio/kamailio/commit/25accffdbd9dab458e95125630b2129… --- diff --git a/src/modules/cnxcc/doc/cnxcc_admin.xml b/src/modules/cnxcc/doc/cnxcc_admin.xml index 4ffb81b449..4284437a8b 100644 --- a/src/modules/cnxcc/doc/cnxcc_admin.xml +++ b/src/modules/cnxcc/doc/cnxcc_admin.xml @@ -519,12 +519,14 @@ route[CNXCC] { $var(client) = "test-client"; $var(credit) = "50"; + $var(connect_cost) = "3.0"; $var(cost_per_sec) = "0.5"; $var(i_pulse) = 30; $var(f_pulse) = 6; if (!cnxcc_set_max_credit("$var(client)", "$var(credit)", + "$var(connect_cost)", "$var(cost_per_sec)", "$var(i_pulse)", "$var(f_pulse)")) {

1 0

[kamailio/kamailio] Wanted HTTP/2 parser (#1794)
by sergey-safarov 09 Jan '19

09 Jan '19

### Description Current `parser_fline.c` is not supports HTTP/2 protocol and generates errors like below This is happens because [`HTTP_VERSION`](https://github.com/kamailio/kamailio/blob/cfc89db53c087382c29d809dc0bc56f7351af2d1/src/core/parser/parse_fline.c#L102) macro designed to work only with [`HTTP/1.x`](https://github.com/kamailio/kamailio/blob/cfc89db53c087382c29d809dc0bc56f7351af2d1/src/core/parser/parse_fline.h#L49) protocol. ### Expected behavior Response from `HTTP/2` enabled server is parsed without error. #### Actual observed behavior ``` 246(251) ERROR: <core> [core/parser/parse_fline.c:257]: parse_first_line(): parse_first_line: bad message (offset: 11) 246(251) ERROR: <core> [core/parser/msg_parser.c:675]: parse_msg(): ERROR: parse_msg: message=<HTTP/2 200 date: Tue, 08 Jan 2019 15:12:16 GMT content-type: text/html; charset=UTF-8 server: Apache/2.4.37 (Amazon) OpenSSL/1.0.2k-fips PHP/7.2.11 cache-control: no-transform,public,max-age=300,s-maxage=900, no-cache, private set-cookie: laravel_session=eyJpdiI6ImZGbU96ajZPV2lkVGZLeHJFNlwvNEJ3PT0iLCJ2YWx1ZSI6IjZmdWdLT0JNNUNFU1ppRWtOTVlmTVphaG4yM25ZcHFWUmUrdlhpMXlYZ2dKK3NYT3JmeG82MkNrSW9VZHdhRkgiLCJtYWMiOiI5MmI1ZWY1YWY1ZDQ3N2Q5ZGMyNzY2OGM2M2ZmNGNlNmY1MGRmYzcyMDhkZTFjM2ZkOTFjMWJlNTRkZmM3MmJkIn0%3D; expires=Tue, 08-Jan-2019 18:12:16 GMT; Max-Age=10800; path=/; httponly access-control-allow-headers: origin, x-requested-with, content-type access-control-allow-methods: PUT, GET, POST, DELETE, OPTIONS {"type":"registration_update","error_code":200,"text_description":"registration_update request succedded","call_id":"FrrQl6Dp~l"}> ``` #### Debugging Data None #### Log Messages None #### SIP Traffic None ### Possible Solutions Not know by me ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` / # kamailio -v version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST, HAVE_RESOLV_RES 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: unknown compiled on 03:24:34 Nov 23 2018 with gcc 8.2.0 ``` * **Operating System**: ``` / # cat /etc/os-release NAME="Alpine Linux" ID=alpine VERSION_ID=3.8.0 PRETTY_NAME="Alpine Linux v3.8" HOME_URL="http://alpinelinux.org" BUG_REPORT_URL="http://bugs.alpinelinux.org" ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1794

2 4

[kamailio/kamailio] dialog: Error registering a dialog that causes the cnxcc module doesn't work correctly (#1783)
by Jose Luis Verdeguer 09 Jan '19

09 Jan '19

### Description I have been checking the reason why the cnxcc module doesn't work and I have seen that the problem is in the dialog module. Cnxcc uses dialog callback functions to obtain the data of the new dialogs. However there is a check that always gives incorrect and the creation of the new dialog is never executed. The check is this: ``` if((req->flags&dlg_flag_mask)!=dlg_flag_mask) return; LM_DBG("dialog creation on config flag\n"); dlg_new_dialog(req, t, 1); dlg = dlg_get_ctx_dialog(); ```  I don't know is this check is important and I don't know if this is the best solution but removing this check the cnxcc module works fine for me. ``` diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 96406bde3..ddfdffc27 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -761,8 +761,6 @@ void dlg_onreq(struct cell* t, int type, struct tmcb_params *param) } } if (dlg==NULL) { - if((req->flags&dlg_flag_mask)!=dlg_flag_mask) - return; LM_DBG("dialog creation on config flag\n"); dlg_new_dialog(req, t, 1); dlg = dlg_get_ctx_dialog(); ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.0-dev1 (x86_64/linux) eb3fd4-dirty flags: STATS: Off, 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_BLACKLIST, HAVE_RESOLV_RES 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: eb3fd4 -dirty compiled on 14:06:31 Jan 2 2019 with gcc 6.3.0 ``` * **Operating System**:  ``` Linux pepelux 3.16.0-4-amd64 #1 SMP Debian 3.16.43-2+deb8u5 (2017-09-19) x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1783

1 2

git:5.2:ead1feb8: tm: Add fixup for PVS in fixup_t_check_status
by Hugh Waite 09 Jan '19

09 Jan '19

Module: kamailio Branch: 5.2 Commit: ead1feb83283dc9c4875f8d6afd57eea4359f64a URL: https://github.com/kamailio/kamailio/commit/ead1feb83283dc9c4875f8d6afd57ee… Author: Hugh Waite <hughw273(a)gmail.com> Committer: Hugh Waite <hughw273(a)gmail.com> Date: 2019-01-09T10:18:53Z tm: Add fixup for PVS in fixup_t_check_status - Allows PVs including $avp(...) to be passed to t_check_status --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/ead1feb83283dc9c4875f8d6afd57ee… Patch: https://github.com/kamailio/kamailio/commit/ead1feb83283dc9c4875f8d6afd57ee… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 49db7d4507..c8afee9c4c 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -664,6 +664,9 @@ static int fixup_t_check_status(void** param, int param_no) { int ret; + ret = fix_param(FPARAM_PVS, param); + if (ret <= 0) return ret; + ret = fix_param(FPARAM_AVP, param); if (ret <= 0) return ret;

1 0

git:5.1:440ba8f9: tm: Add fixup for PVS in fixup_t_check_status
by Hugh Waite 09 Jan '19

09 Jan '19

Module: kamailio Branch: 5.1 Commit: 440ba8f9b37c61a6f631a5a8a0552a2215128fad URL: https://github.com/kamailio/kamailio/commit/440ba8f9b37c61a6f631a5a8a0552a2… Author: Hugh Waite <hughw273(a)gmail.com> Committer: Hugh Waite <hughw273(a)gmail.com> Date: 2019-01-09T10:19:19Z tm: Add fixup for PVS in fixup_t_check_status - Allows PVs including $avp(...) to be passed to t_check_status --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/440ba8f9b37c61a6f631a5a8a0552a2… Patch: https://github.com/kamailio/kamailio/commit/440ba8f9b37c61a6f631a5a8a0552a2… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index da569ad832..14860635a8 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -662,6 +662,9 @@ static int fixup_t_check_status(void** param, int param_no) { int ret; + ret = fix_param(FPARAM_PVS, param); + if (ret <= 0) return ret; + ret = fix_param(FPARAM_AVP, param); if (ret <= 0) return ret;

1 0

git:5.0:9e006026: tm: Add fixup for PVS in fixup_t_check_status
by Hugh Waite 09 Jan '19

09 Jan '19

Module: kamailio Branch: 5.0 Commit: 9e00602623107ccba54a3a2ddf189c0e40432fc0 URL: https://github.com/kamailio/kamailio/commit/9e00602623107ccba54a3a2ddf189c0… Author: Hugh Waite <hughw273(a)gmail.com> Committer: Hugh Waite <hughw273(a)gmail.com> Date: 2019-01-09T10:19:59Z tm: Add fixup for PVS in fixup_t_check_status - Allows PVs including $avp(...) to be passed to t_check_status --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/9e00602623107ccba54a3a2ddf189c0… Patch: https://github.com/kamailio/kamailio/commit/9e00602623107ccba54a3a2ddf189c0… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 6c493a9860..e4874108d0 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -667,6 +667,9 @@ static int fixup_t_check_status(void** param, int param_no) { int ret; + ret = fix_param(FPARAM_PVS, param); + if (ret <= 0) return ret; + ret = fix_param(FPARAM_AVP, param); if (ret <= 0) return ret;

1 0

git:master:7a619c8f: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 09 Jan '19

09 Jan '19

Module: kamailio Branch: master Commit: 7a619c8f014a3c402942ef478ee76ce237b7e21a URL: https://github.com/kamailio/kamailio/commit/7a619c8f014a3c402942ef478ee76ce… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-09T10:01:48+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/7a619c8f014a3c402942ef478ee76ce… Patch: https://github.com/kamailio/kamailio/commit/7a619c8f014a3c402942ef478ee76ce… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index d3bc615b53..4e3f43e99b 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -438,9 +438,10 @@ Chapter 1. Admin Guide 2. How it works - To create the dialog associated with an initial request, the flag - “dlg_flag” (Section 6.4, “dlg_flag (integer)”) must be set before - creating the corresponding transaction. + To create the dialog associated with an initial INVITE request, execute + the function “dlg_manage()” or set the flag specified by parameter + “dlg_flag” (Section 6.4, “dlg_flag (integer)”) before creating the + corresponding transaction. The dialog is automatically destroyed when a “BYE” is received. In case of no “BYE”, the dialog lifetime is controlled via the default timeout @@ -623,6 +624,10 @@ modparam("dialog", "rr_param", "xyz") Flag to be used for marking if a dialog should be constructed for the current request (this make sense only for initial requests). + Note: it is not needed to set this parameter and its corresponding flag + for initial request in case the “dlg_manage()” function is used. In + other words, using “dlg_manage()” alone is enough. + Default value is “none”. Example 1.4. Set dlg_flag parameter

1 0

git:master:e4dfe358: dialog: docs - more info about using the flag and dlg_manage()
by Daniel-Constantin Mierla 09 Jan '19

09 Jan '19

Module: kamailio Branch: master Commit: e4dfe3587943d69d556b15df3492cf38c3b21a5f URL: https://github.com/kamailio/kamailio/commit/e4dfe3587943d69d556b15df3492cf3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-09T09:50:12+01:00 dialog: docs - more info about using the flag and dlg_manage() --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e4dfe3587943d69d556b15df3492cf3… Patch: https://github.com/kamailio/kamailio/commit/e4dfe3587943d69d556b15df3492cf3… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index ca0109b31f..9adca735db 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -45,9 +45,10 @@ <section> <title>How it works</title> <para> - To create the dialog associated with an initial request, the flag - <quote>dlg_flag</quote> (<xref linkend="dialog.p.flag"/>) must be set before - creating the corresponding transaction. + To create the dialog associated with an initial INVITE request, execute + the function <quote>dlg_manage()</quote> or set the flag specified by + parameter <quote>dlg_flag</quote> (<xref linkend="dialog.p.flag"/>) + before creating the corresponding transaction. </para> <para> The dialog is automatically destroyed when a <quote>BYE</quote> is @@ -256,6 +257,12 @@ modparam("dialog", "rr_param", "xyz") current request (this make sense only for initial requests). </para> <para> + Note: it is not needed to set this parameter and its corresponding flag + for initial request in case the <quote>dlg_manage()</quote> function + is used. In other words, using <quote>dlg_manage()</quote> alone is + enough. + </para> + <para> <emphasis> Default value is <quote>none</quote>. </emphasis>

1 0

[kamailio/kamailio] Modules: rtpengine-rtpengine_query exported to ksr routes (#1792)
by Surendra Tiwari 09 Jan '19

09 Jan '19

#### 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) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1792 -- Commit Summary -- * Modules: rtpengine-rtpengine_query exported to ksr routes -- File Changes -- M src/modules/rtpengine/rtpengine.c (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1792.patch https://github.com/kamailio/kamailio/pull/1792.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1792

2 3

git:master:026475aa: rtpengine: exported rtpengine_query() variants to KEMI framework
by Daniel-Constantin Mierla 09 Jan '19

09 Jan '19

Module: kamailio Branch: master Commit: 026475aa9d43307442d0e57acf8e11544d00dbed URL: https://github.com/kamailio/kamailio/commit/026475aa9d43307442d0e57acf8e115… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-09T08:57:12+01:00 rtpengine: exported rtpengine_query() variants to KEMI framework - GH #1792 --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/026475aa9d43307442d0e57acf8e115… Patch: https://github.com/kamailio/kamailio/commit/026475aa9d43307442d0e57acf8e115… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 484ce05f35..6269a8c787 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3843,6 +3843,16 @@ static int ki_rtpengine_delete(sip_msg_t *msg, str *flags) return rtpengine_rtpp_set_wrap(msg, rtpengine_delete_wrap, flags->s, 1); } +static int ki_rtpengine_query0(sip_msg_t *msg) +{ + return rtpengine_rtpp_set_wrap(msg, rtpengine_query_wrap, NULL, 1); +} + +static int ki_rtpengine_query(sip_msg_t *msg, str *flags) +{ + return rtpengine_rtpp_set_wrap(msg, rtpengine_query_wrap, flags->s, 1); +} + static int ki_start_recording(sip_msg_t *msg) { return rtpengine_rtpp_set_wrap(msg, rtpengine_start_recording_wrap, NULL, 1); @@ -3977,6 +3987,16 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("rtpengine"), str_init("rtpengine_query0"), + SR_KEMIP_INT, ki_rtpengine_query0, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("rtpengine"), str_init("rtpengine_query"), + SR_KEMIP_INT, ki_rtpengine_query, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

[kamailio/kamailio] Error while initializing module carrierroute (#1798)
by Gkpanda321 09 Jan '19

09 Jan '19

Ubuntu 18.04 & Kamailio V 5.1 I am unable to start kamailio services due the below error. ● kamailio.service - Kamailio (OpenSER) - the Open Source SIP Server Loaded: loaded (/lib/systemd/system/kamailio.service; enabled; vendor preset: enabled) Active: failed (Result: exit-code) since Tue 2019-01-08 22:36:49 UTC; 12s ago Process: 12933 ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP (code=exited, status=255) Main PID: 12877 (code=exited, status=0/SUCCESS) Jan 08 22:36:49 kamatl03 kamailio[12933]: udp: kamatl03:5060 Jan 08 22:36:49 kamatl03 kamailio[12933]: udp: localhost:5060 Jan 08 22:36:49 kamatl03 kamailio[12933]: udp: localhost.localdomain:5060 Jan 08 22:36:49 kamatl03 /usr/sbin/kamailio[12955]: INFO: carrierroute [carrierroute.c:213]: mod_init(): use file as configuration source Jan 08 22:36:49 kamatl03 /usr/sbin/kamailio[12955]: ERROR: carrierroute [carrierroute.c:215]: mod_init(): can't stat config file Jan 08 22:36:49 kamatl03 /usr/sbin/kamailio[12955]: ERROR: <core> [core/sr_module.c:986]: init_mod(): Error while initializing module carrierroute (/usr/lib/x86_64-linu Jan 08 22:36:49 kamatl03 /usr/sbin/kamailio[12955]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized Jan 08 22:36:49 kamatl03 systemd[1]: kamailio.service: Control process exited, code=exited status=255 Jan 08 22:36:49 kamatl03 systemd[1]: kamailio.service: Failed with result 'exit-code'. Jan 08 22:36:49 kamatl03 systemd[1]: Failed to start Kamailio (OpenSER) - the Open Source SIP Server. ***********************Here is the Module Selection in configuraiton file*************** ####### Modules Section ######## # set paths to location of modules (to sources or installation folders) #!ifdef WITH_SRCPATH mpath="/usr/local/lib64/kamailio/modules" #!else mpath="/usr/lib/x86_64-linux-gnu/kamailio/modules/" #!endif -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1798

3 3

No Media in SIP Incoming calls
by Prashant Gupta 09 Jan '19

09 Jan '19

Hi, I have the following architecture - SIP provider <-> Kamailio <-> Asterisk servers Currently I have everything setup and incoming calls from Sip are routed to my asterisk server. The issue is however that when I answer the call, there is no media in the call. I have tried connecting with a normal local extension(not SIP,eg 1001) and there is a normal flow of media. When i try to sniff my connection via Wireshark on the asterisk server, there is an outflow of RTP packets but the same RTP traffic does not appear on the Wireshark of my Kamailio server connection. I am not sure if this is an RTP engine issue and how to resolve this. I have - modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:45038") this in my kamailio cfg but I don;t know which port to use here. Any suggestions?

2 1

[kamailio/kamailio] Cannot use AVPs with t_check_status (#1795)
by Hugh Waite 09 Jan '19

09 Jan '19

### Description If an AVP containing a regex is passed to the t_check_status function, it does not match. Example: ``` failure_route[DEFAULT] { $avp(FAILURE_CODES) = "5[0-9][0-9]"; xlog("L_WARN", "Status code: $T_reply_code\n"); if ($avp(FAILURE_CODES) != $null) { xlog("L_WARN", "resp codes regex: $avp(FAILURE_CODES)\n"); if (t_check_status("$avp(FAILURE_CODES)")) { xlog("L_WARN", "t_check_status matched\n"); } } } ``` #### Reproduction Using the code above in a failure_route should match a 500 response, but it does not. ### Possible Solutions The fixup_t_check_status in tm.c:663 attempts to match FPARAM_AVP/FPARAM_SELECT/FPARAM_REGEX parameter types. If another check for the FPARAM_PVS parameter type then the issue appears fixed -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1795

3 2

Errored: lazedo/kamailio#41 (5.1 - 74b8fbf)
by Travis CI 09 Jan '19

09 Jan '19

Build Update for lazedo/kamailio ------------------------------------- Build: #41 Status: Errored Duration: 50 mins and 0 secs Commit: 74b8fbf (5.1) Author: Daniel-Constantin Mierla Message: topos_redis: check the branch value to avoid using uninitialized fields - GH #1784 (cherry picked from commit cfc89db53c087382c29d809dc0bc56f7351af2d1) (cherry picked from commit 7c551812960dd1cfc2901a7a46bbf3010df47cd7) View the changeset: https://github.com/lazedo/kamailio/compare/9d301849a145...74b8fbf0fc82 View the full build log and details: https://travis-ci.org/lazedo/kamailio/builds/477120826?utm_medium=notificat… -- You can unsubscribe from build emails from the lazedo/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=11772075&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

[kamailio/kamailio] tm: Add fixup for PVS in fixup_t_check_status (#1796)
by Hugh Waite 08 Jan '19

08 Jan '19

- Allows PVs including $avp(...) to be passed to t_check_status   #### Pre-Submission Checklist    - [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) - [ ] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1795 #### Description Allows $avp(...) in the parameter to t_check_status You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1796 -- Commit Summary -- * tm: Add fixup for PVS in fixup_t_check_status -- File Changes -- M src/modules/tm/tm.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1796.patch https://github.com/kamailio/kamailio/pull/1796.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1796

2 2

git:master:ae0797ee: Merge pull request #1796 from que273/master
by GitHub 08 Jan '19

08 Jan '19

Module: kamailio Branch: master Commit: ae0797ee8e2519d2bf3399c494642ffd3db2f9f9 URL: https://github.com/kamailio/kamailio/commit/ae0797ee8e2519d2bf3399c494642ff… Author: Hugh Waite <que273(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-08T17:04:05Z Merge pull request #1796 from que273/master tm: Add fixup for PVS in fixup_t_check_status --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/ae0797ee8e2519d2bf3399c494642ff… Patch: https://github.com/kamailio/kamailio/commit/ae0797ee8e2519d2bf3399c494642ff… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 49db7d4507..c8afee9c4c 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -664,6 +664,9 @@ static int fixup_t_check_status(void** param, int param_no) { int ret; + ret = fix_param(FPARAM_PVS, param); + if (ret <= 0) return ret; + ret = fix_param(FPARAM_AVP, param); if (ret <= 0) return ret;

1 0

git:master:c740e2f3: tm: Add fixup for PVS in fixup_t_check_status
by Hugh Waite 08 Jan '19

08 Jan '19

Module: kamailio Branch: master Commit: c740e2f3da746c2f8c6f488fa926dc5d348ea43a URL: https://github.com/kamailio/kamailio/commit/c740e2f3da746c2f8c6f488fa926dc5… Author: Hugh Waite <hugh.waite(a)newvoicemedia.com> Committer: Hugh Waite <hugh.waite(a)newvoicemedia.com> Date: 2019-01-04T16:02:09Z tm: Add fixup for PVS in fixup_t_check_status - Allows PVs including $avp(...) to be passed to t_check_status --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/c740e2f3da746c2f8c6f488fa926dc5… Patch: https://github.com/kamailio/kamailio/commit/c740e2f3da746c2f8c6f488fa926dc5… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 49db7d4507..c8afee9c4c 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -664,6 +664,9 @@ static int fixup_t_check_status(void** param, int param_no) { int ret; + ret = fix_param(FPARAM_PVS, param); + if (ret <= 0) return ret; + ret = fix_param(FPARAM_AVP, param); if (ret <= 0) return ret;

1 0

Re: [sr-dev] [kamailio/kamailio] topos_redis: check the branch value to avoid using uninitialized fields (cfc89db)
by dtryba 08 Jan '19

08 Jan '19

I'll try this patch on the affected machines. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/cfc89db53c087382c29d809dc0bc56f…

1 0

[kamailio/kamailio] 5.1.6 tps_redis_load_branch SIGSEGV (#1784)
by dtryba 08 Jan '19

08 Jan '19

### Description  ### 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  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1784

2 4

git:5.1:74b8fbf0: topos_redis: check the branch value to avoid using uninitialized fields
by Daniel-Constantin Mierla 08 Jan '19

08 Jan '19

Module: kamailio Branch: 5.1 Commit: 74b8fbf0fc820d48a0203b81d2cd41f6e84dc5c5 URL: https://github.com/kamailio/kamailio/commit/74b8fbf0fc820d48a0203b81d2cd41f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-08T15:18:22+01:00 topos_redis: check the branch value to avoid using uninitialized fields - GH #1784 (cherry picked from commit cfc89db53c087382c29d809dc0bc56f7351af2d1) (cherry picked from commit 7c551812960dd1cfc2901a7a46bbf3010df47cd7) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/74b8fbf0fc820d48a0203b81d2cd41f… Patch: https://github.com/kamailio/kamailio/commit/74b8fbf0fc820d48a0203b81d2cd41f… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 22279e0138..a72dd7c266 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -737,8 +737,13 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, LM_ERR("failed to load the INVITE branch value\n"); return -1; } + memset(&id, 0, sizeof(tps_data_t)); xvbranch1 = &id.x_vbranch1; } + if(xvbranch1->len<=0 || xvbranch1->s==NULL) { + LM_DBG("branch value not found (mode: %u)\n", mode); + return 1; + } rp = _tps_redis_cbuf; memcpy(rp, _tps_redis_bprefix.s, _tps_redis_bprefix.len); memcpy(rp + _tps_redis_bprefix.len,

1 0

git:5.2:7c551812: topos_redis: check the branch value to avoid using uninitialized fields
by Daniel-Constantin Mierla 08 Jan '19

08 Jan '19

Module: kamailio Branch: 5.2 Commit: 7c551812960dd1cfc2901a7a46bbf3010df47cd7 URL: https://github.com/kamailio/kamailio/commit/7c551812960dd1cfc2901a7a46bbf30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-08T15:17:28+01:00 topos_redis: check the branch value to avoid using uninitialized fields - GH #1784 (cherry picked from commit cfc89db53c087382c29d809dc0bc56f7351af2d1) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/7c551812960dd1cfc2901a7a46bbf30… Patch: https://github.com/kamailio/kamailio/commit/7c551812960dd1cfc2901a7a46bbf30… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 2f78d21dce..ed8a7616dc 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -737,8 +737,13 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, LM_ERR("failed to load the INVITE branch value\n"); return -1; } + memset(&id, 0, sizeof(tps_data_t)); xvbranch1 = &id.x_vbranch1; } + if(xvbranch1->len<=0 || xvbranch1->s==NULL) { + LM_DBG("branch value not found (mode: %u)\n", mode); + return 1; + } rp = _tps_redis_cbuf; memcpy(rp, _tps_redis_bprefix.s, _tps_redis_bprefix.len); memcpy(rp + _tps_redis_bprefix.len,

1 0

git:master:cfc89db5: topos_redis: check the branch value to avoid using uninitialized fields
by Daniel-Constantin Mierla 08 Jan '19

08 Jan '19

Module: kamailio Branch: master Commit: cfc89db53c087382c29d809dc0bc56f7351af2d1 URL: https://github.com/kamailio/kamailio/commit/cfc89db53c087382c29d809dc0bc56f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-08T12:24:27+01:00 topos_redis: check the branch value to avoid using uninitialized fields - GH #1784 --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/cfc89db53c087382c29d809dc0bc56f… Patch: https://github.com/kamailio/kamailio/commit/cfc89db53c087382c29d809dc0bc56f… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 2f78d21dce..ed8a7616dc 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -737,8 +737,13 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, LM_ERR("failed to load the INVITE branch value\n"); return -1; } + memset(&id, 0, sizeof(tps_data_t)); xvbranch1 = &id.x_vbranch1; } + if(xvbranch1->len<=0 || xvbranch1->s==NULL) { + LM_DBG("branch value not found (mode: %u)\n", mode); + return 1; + } rp = _tps_redis_cbuf; memcpy(rp, _tps_redis_bprefix.s, _tps_redis_bprefix.len); memcpy(rp + _tps_redis_bprefix.len,

1 0

[kamailio/kamailio] Pepelux/cnxcc (#1790)
by Jose Luis Verdeguer 07 Jan '19

07 Jan '19

#### Description  Only a correction in doc file You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1790 -- Commit Summary -- * cnxcc: New improvement for the cnxcc module. With this changes it is possible to account the connect cost for the call. This is useful for calls to premium numbers that have connection charges * Merge branch 'master' of github.com:kamailio/kamailio into pepelux/cnxcc * Merge branch 'master' of github.com:kamailio/kamailio into pepelux/cnxcc * Merge branch 'master' of github.com:kamailio/kamailio into pepelux/cnxcc -- File Changes -- -- Patch Links -- https://github.com/kamailio/kamailio/pull/1790.patch https://github.com/kamailio/kamailio/pull/1790.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1790

1 1

git:5.2:06610073: acc_json: proper check if the mqueue name is set and the module can be loaded
by Daniel-Constantin Mierla 07 Jan '19

07 Jan '19

Module: kamailio Branch: 5.2 Commit: 06610073bb490355d87a774a74716195d3c01192 URL: https://github.com/kamailio/kamailio/commit/06610073bb490355d87a774a7471619… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T15:36:15+01:00 acc_json: proper check if the mqueue name is set and the module can be loaded (cherry picked from commit 7ce278d8accaaaa2b9c4b8fa349672826b5511f7) --- Modified: src/modules/acc_json/acc_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/06610073bb490355d87a774a7471619… Patch: https://github.com/kamailio/kamailio/commit/06610073bb490355d87a774a7471619… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index 908d7d0eb9..55f2bb11f9 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -115,7 +115,8 @@ static int mod_init(void) if(output_mqueue_str && (load_mq_api(&mq_api) != 0)) { LM_ERR("can't load mqueue module API, disabling json acc to mqueue\n"); output_mqueue_str = NULL; - } else { + } + if(output_mqueue_str) { q_name.s = output_mqueue_str; q_name.len = strlen(output_mqueue_str); }

1 0

git:master:7ce278d8: acc_json: proper check if the mqueue name is set and the module can be loaded
by Daniel-Constantin Mierla 07 Jan '19

07 Jan '19

Module: kamailio Branch: master Commit: 7ce278d8accaaaa2b9c4b8fa349672826b5511f7 URL: https://github.com/kamailio/kamailio/commit/7ce278d8accaaaa2b9c4b8fa3496728… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T15:35:34+01:00 acc_json: proper check if the mqueue name is set and the module can be loaded --- Modified: src/modules/acc_json/acc_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7ce278d8accaaaa2b9c4b8fa3496728… Patch: https://github.com/kamailio/kamailio/commit/7ce278d8accaaaa2b9c4b8fa3496728… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index ee3f84bf6b..f1ce4e71f3 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -115,7 +115,8 @@ static int mod_init(void) if(output_mqueue_str && (load_mq_api(&mq_api) != 0)) { LM_ERR("can't load mqueue module API, disabling json acc to mqueue\n"); output_mqueue_str = NULL; - } else { + } + if(output_mqueue_str) { q_name.s = output_mqueue_str; q_name.len = strlen(output_mqueue_str); }

1 0

git:master:d73ce5b7: modules: readme files regenerated - cnxcc ... [skip ci]
by Kamailio Dev 07 Jan '19

07 Jan '19

Module: kamailio Branch: master Commit: d73ce5b79ee89ee2e83559875418b0587057d29e URL: https://github.com/kamailio/kamailio/commit/d73ce5b79ee89ee2e83559875418b05… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-07T14:16:36+01:00 modules: readme files regenerated - cnxcc ... [skip ci] --- Modified: src/modules/cnxcc/README --- Diff: https://github.com/kamailio/kamailio/commit/d73ce5b79ee89ee2e83559875418b05… Patch: https://github.com/kamailio/kamailio/commit/d73ce5b79ee89ee2e83559875418b05… --- diff --git a/src/modules/cnxcc/README b/src/modules/cnxcc/README index b20ee01226..24d73ddaf2 100644 --- a/src/modules/cnxcc/README +++ b/src/modules/cnxcc/README @@ -4,9 +4,18 @@ Carlos Ruiz Díaz ConexionGroup S.A. +Edited by + +Jose Luis Verdeguer + + Zoon Suite + <verdeguer(a)zoonsuite.com> + Copyright © 2013 Carlos Ruiz Díaz, carlos.ruizdiaz(a)gmail.com Copyright © 2014 Carlos Ruiz Díaz, carlos(a)latamvoices.com + + Copyright © 2018 Jose Luis Verdeguer __________________________________________________________________ Table of Contents @@ -26,8 +35,8 @@ Carlos Ruiz Díaz 4. Functions - 4.1. cnxcc_set_max_credit(customer, maxcredit, cps, ipulse, - fpulse) + 4.1. cnxcc_set_max_credit(customer, maxcredit, connect, cps, + ipulse, fpulse) 4.2. cnxcc_set_max_time(customer, maxtime) 4.3. cnxcc_update_max_time(customer, maxtime) @@ -73,8 +82,8 @@ Chapter 1. Admin Guide 4. Functions - 4.1. cnxcc_set_max_credit(customer, maxcredit, cps, ipulse, - fpulse) + 4.1. cnxcc_set_max_credit(customer, maxcredit, connect, cps, + ipulse, fpulse) 4.2. cnxcc_set_max_time(customer, maxtime) 4.3. cnxcc_update_max_time(customer, maxtime) @@ -167,24 +176,27 @@ modparam("cnxcc", "credit_check_period", 1) 4. Functions - 4.1. cnxcc_set_max_credit(customer, maxcredit, cps, ipulse, fpulse) + 4.1. cnxcc_set_max_credit(customer, maxcredit, connect, cps, ipulse, + fpulse) + 4.2. cnxcc_set_max_time(customer, maxtime) 4.3. cnxcc_update_max_time(customer, maxtime) 4.4. cnxcc_set_max_channel(customer, maxchan) 4.5. cnxcc_terminate_all(customer) -4.1. cnxcc_set_max_credit(customer, maxcredit, cps, ipulse, fpulse) +4.1. cnxcc_set_max_credit(customer, maxcredit, connect, cps, ipulse, fpulse) - Associates the call with a customer id and sets the max credit, cost - per second, initial pulse and final pulse. The discount is calculated - in pulses (30/6, 1/1, etc) and subtracted from the pool of credit. + Associates the call with a customer id and sets the max credit, connect + cost, cost per second, initial pulse and final pulse. The discount is + calculated in pulses (30/6, 1/1, etc) and subtracted from the pool of + credit. The customer value can be provided as a string or a variable holding a string. - The maxcredit and cps can be double (float) or integer values, they - have to be provided as static string values of variables holding string - values. + The maxcredit, connect and cps can be double (float) or integer values, + they have to be provided as static string values of variables holding + string values. The ipulse and fpulse values are integer values, they can be also given via variables holding integers. @@ -196,15 +208,16 @@ modparam("cnxcc", "credit_check_period", 1) Example 1.3. cnxcc_set_max_credit() ... -cnxcc_set_max_credit("john-doe", "100.5", "0.5", "20", "10"); +cnxcc_set_max_credit("john-doe", "100", "3.0", "0.5", 60, 1); ... -$var(customer) = "john-doe-premium"; # customer id -$var(credit) = "100"; # max credit -$var(cps) = "2.00"; # cost per second -$var(initial_p) = 30; # initial pulse -$var(final_p) = 6; # final pulse -cnxcc_set_max_credit("$var(customer)", "$var(credit)", "$var(cps)", - "$var(initial_p)", "$var(final_p)"); +$var(customer) = "john-doe-premium"; # customer id +$var(credit) = "100"; # max credit +$var(connect) = "3.0"; # connect const +$var(cps) = "0.5"; # cost per second +$var(initial_p) = 60; # initial pulse +$var(final_p) = 1; # final pulse +cnxcc_set_max_credit("$var(customer)", "$var(credit)", "$var(connect)", + "$var(cps)", "$var(initial_p)", "$var(final_p)"); ... 4.2. cnxcc_set_max_time(customer, maxtime)

1 0

[kamailio/kamailio] cnxcc: New improvement for the cnxcc module (#1785)
by Jose Luis Verdeguer 07 Jan '19

07 Jan '19

#### Pre-Submission Checklist    - [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 - [ ] 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  With this changes it is possible to account the connect cost for the call. This is useful for calls to premium numbers that have connection charges. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1785 -- Commit Summary -- * cnxcc: New improvement for the cnxcc module. With this changes it is possible to account the connect cost for the call. This is useful for calls to premium numbers that have connection charges -- File Changes -- M src/modules/cnxcc/cnxcc_check.c (5) M src/modules/cnxcc/cnxcc_mod.c (149) M src/modules/cnxcc/cnxcc_mod.h (2) M src/modules/cnxcc/cnxcc_rpc.c (3) M src/modules/cnxcc/doc/cnxcc.xml (13) M src/modules/cnxcc/doc/cnxcc_admin.xml (23) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1785.patch https://github.com/kamailio/kamailio/pull/1785.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1785

3 6

git:master:c64518a2: cnxcc: New improvement for the cnxcc module. With this changes it is possible to account the connect cost for the call. This is useful for calls to premium numbers that have connection charges
by Jose Luis Verdeguer 07 Jan '19

07 Jan '19

Module: kamailio Branch: master Commit: c64518a25123de77d6104a5c4522eb52ccd6892d URL: https://github.com/kamailio/kamailio/commit/c64518a25123de77d6104a5c4522eb5… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2019-01-07T14:06:19+01:00 cnxcc: New improvement for the cnxcc module. With this changes it is possible to account the connect cost for the call. This is useful for calls to premium numbers that have connection charges --- Modified: src/modules/cnxcc/cnxcc_check.c Modified: src/modules/cnxcc/cnxcc_mod.c Modified: src/modules/cnxcc/cnxcc_mod.h Modified: src/modules/cnxcc/cnxcc_rpc.c Modified: src/modules/cnxcc/doc/cnxcc.xml Modified: src/modules/cnxcc/doc/cnxcc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c64518a25123de77d6104a5c4522eb5… Patch: https://github.com/kamailio/kamailio/commit/c64518a25123de77d6104a5c4522eb5…

1 0

git:5.2:c5216b56: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 Jan '19

07 Jan '19

Module: kamailio Branch: 5.2 Commit: c5216b56b396b79e4392770bd438e712caca1576 URL: https://github.com/kamailio/kamailio/commit/c5216b56b396b79e4392770bd438e71… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-07T12:46:31+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rtpengine/README Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/c5216b56b396b79e4392770bd438e71… Patch: https://github.com/kamailio/kamailio/commit/c5216b56b396b79e4392770bd438e71…

1 0

git: new commits in branch 5.2
by Daniel-Constantin Mierla 07 Jan '19

07 Jan '19

- URL: https://github.com/kamailio/kamailio/commit/1133f818461cf2ed6c8bd755543f93b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:35+01:00 lib/srdb1: memset db connection structure earlier in db_bind_mod() (cherry picked from commit 1b014d65e26a99f9f5d4aea1b27949776f083c2d) - URL: https://github.com/kamailio/kamailio/commit/cc51d6c7170ad289c8f521a05470a2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:35+01:00 tm: reply_received() - simplify locking for processing sip response - leverage the recursive mutex and skip several zones of unlock/lock, which can lead to races on delayed processing or fast reply retransmissions - related to GH #1613 #1744 (cherry picked from commit 39b89a18a8c357151a173ab02dc95dff1f02715d) - URL: https://github.com/kamailio/kamailio/commit/c9eaace851e91aa75bf979f5092f318… Author: Yasin CANER <caner_yaso(a)hotmail.com> Date: 2019-01-07T12:22:35+01:00 rtpengine : crash is fixed and codec flags added to doc (#1742) * rtpengine : add information to doc about transcode rtpengine : add information to doc about transcode parameter * rtpengine : codec flag crash is fixed codec-transcode , codec-strip , codec-mask , codec-offer gives crash without codec value.It is fixed and some logs are added for help. * rtpengine : codec-transcode and other flags are added to doc codec-transcode , codec-strip , codec-mask , codec-strip are added to doc with example. * rtpengine : str_key_val_prefix is fixed for null values str_key_val_prefix is fixed for null values * rtpengine : b parameter is changed with via-branch in document b parameter is changed with via-branch in document (cherry picked from commit a9a3ec0214227d272338a827ceb4fd12cea94429) - URL: https://github.com/kamailio/kamailio/commit/3a2d9921dc8a3c8133e7e3bacfba944… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:35+01:00 auth_xkeys: clone value before inserting the lump inside auth_xkeys_add() (cherry picked from commit 01f5ecbc45c236daea62d6638a02c168720c8479) - URL: https://github.com/kamailio/kamailio/commit/f1a22ec8fb62277b627398daaa54be6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:35+01:00 misc/examples: kamailio-basic-kemi-python.py - use functions for method and myself checks (cherry picked from commit 52c236e6417581b1f0354cc52f2eb5f762bc3b31) - URL: https://github.com/kamailio/kamailio/commit/8e4a914f3530dc37caec0a70d4b06a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:35+01:00 misc/examples: sample default config with websocket enabled (cherry picked from commit 45cecdef62b43ea19a8be607faddbe9918b67f06) - URL: https://github.com/kamailio/kamailio/commit/2e81abf1262784e390eb31efa95c5f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:35+01:00 dialog: store call-id, r-uri, f-uri and t-uri with 0-ending char - can simplify matching with standard string comparison and regexp (cherry picked from commit f1ab32ee4a0bf64017a0b05f2013b81d37d50208) - URL: https://github.com/kamailio/kamailio/commit/306d1590ad00f7518a7b7284768e52d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:35+01:00 misc/example/kemi: merge condition lines in kamailio-basic-kemi-python.py - fix syntax error (cherry picked from commit beb99b3e4911506246bdd4eaed9aae582232eb84) - URL: https://github.com/kamailio/kamailio/commit/2405ed822068e796caf0ef0f8b04558… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:35+01:00 app_jsdt: updated duktape js engine to v2.3.0 (cherry picked from commit f24487568c76b7e4af70698e246ad67c2cee2f96) - URL: https://github.com/kamailio/kamailio/commit/4b22810de302ef26a7c74cb868c33be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:35+01:00 misc/examples/kemi/kamailio-basic-kemi-jsdt.js: use functions to match methods and myself (cherry picked from commit 3991bcf5541d22d3a7ccaa3f89a9e0d189fd41b8) - URL: https://github.com/kamailio/kamailio/commit/7c8d57dfcfbab6d81ed8cb118cab834… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:35+01:00 misc/examples/kemi/kamailio-basic-kemi-lua.lua: fix condition on user agent (cherry picked from commit c3f3f088cdcff566970c8af0e07e7ae5abb50504) - URL: https://github.com/kamailio/kamailio/commit/97c0391a03313622776133f6696ccda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:35+01:00 misc/examples/kemi/kamailio-basic-kemi-python.py: fix condition on user agent (cherry picked from commit 323e96dbe5f263d66134183de8b2e8cff268431f) - URL: https://github.com/kamailio/kamailio/commit/b5a46dbffd3b9b2f4a61d57fc6aec2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:36+01:00 misc/examples/kemi/kamailio-basic-kemi-jsdt.js: removed extra parenthesis (cherry picked from commit d9c38917ad0fea678449c41a60d52c68b697f8a1) - URL: https://github.com/kamailio/kamailio/commit/cad6b2f034b2eea519be14e04f49795… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:36+01:00 misc/examples/kemi/kamailio-basic-kemi-jsdt.js: match from uri myself with function (cherry picked from commit 856d2e03ea54cab6756dc61c3175df3638af9ce3) - URL: https://github.com/kamailio/kamailio/commit/959b221282cf22036482d650b55fc07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:36+01:00 misc/examples/kemi/kamailio-basic-kemi-sqlang.js: use functions to match methods and myself (cherry picked from commit d196ed8fa1483a1aa7ba24d22b452404ad83ecad) - URL: https://github.com/kamailio/kamailio/commit/cb98198e595c776ccbf2cd8777e178e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:36+01:00 pv: {param.count} accept static string "," as delimiter (cherry picked from commit 80b3c37557d446bfe9ca5a5f469a42af60648280) - URL: https://github.com/kamailio/kamailio/commit/6fff557d5354baea8ad5c52d589f0da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:36+01:00 app_ruby: Makefile - fixed libs for darwin os with no pkg-config - removed -lobj from libs for linux without no pkg-config (cherry picked from commit fb57ccb9d56991ca10714ffaab307cd02c36542b) - URL: https://github.com/kamailio/kamailio/commit/9ccbcc089e70001dd94136eadb68d27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:36+01:00 tm: error log message about new final reply made info - can happen due to races of packets on the network (cherry picked from commit 3d43f546ddff613c50068c9d47521a15b42f1c7b) - URL: https://github.com/kamailio/kamailio/commit/50a60b86d647d6d69f601fe7aa071f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:36+01:00 app_ruby: Makefile - updated how to detect ruby version - GH #1762 (cherry picked from commit 1569f91121a1ec00a0d59becbba587c923a21c63) - URL: https://github.com/kamailio/kamailio/commit/ba1ccab26123e468f7ef4cdee2a74b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:36+01:00 app_ruby: implemented rpc app_ruby.reload command (cherry picked from commit 28b54dc63c62ddef837a3f580ab97161b55f214e) - URL: https://github.com/kamailio/kamailio/commit/d2418ad35ad28cbb8bf875b97886988… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:36+01:00 app_ruby: print new script version in rpc reload info message (cherry picked from commit bbabc77a0ac34fbdc4618161360f27efc12ba1dc) - URL: https://github.com/kamailio/kamailio/commit/d83af7701e3f25f68f01cfd0b0602c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:36+01:00 uac_redirect: docs - added section ids (cherry picked from commit b6e4ebc666877549796e09b721e1234e011b325e) - URL: https://github.com/kamailio/kamailio/commit/a13e067ea162975209f21215ccffd43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:36+01:00 app_ruby: added missing app_ruby.api_list rpc command (cherry picked from commit 37f664c404c5391181fcb61e2ec2955105c47a4d) - URL: https://github.com/kamailio/kamailio/commit/73eef8626c8f2babe55a6e63e00bfb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:36+01:00 uac_redirect: docs - fixed missing space in sectionid (cherry picked from commit 4c44b1e53a135dc234d6c9cdfbddaefbd938f399) - URL: https://github.com/kamailio/kamailio/commit/75aae8055a8acb2f6e3917fa8349894… Author: Anthony Messina <amessina(a)messinet.com> Date: 2019-01-07T12:22:36+01:00 app_python3: fix Python 3.7 deprecation warnings - check for PY_VERSION_HEX >= 0x03070000 (cherry picked from commit 8bb866895c9260fa91143e892a2a77bb1d3fff4b) - URL: https://github.com/kamailio/kamailio/commit/fc6232f7f9d1c65f436e7ca0db505c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:36+01:00 regex: init var to avoid compile warning (cherry picked from commit dfb872b311cd0acd4a40c810f612c8a23e7c9aca) - URL: https://github.com/kamailio/kamailio/commit/2dc84951b8f0e2503ee4c551b8693de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:22:36+01:00 cplc: init var to avoid compile warning (cherry picked from commit 0f1b970ae7f47478649b61a8dc43fe42714b2a95) - URL: https://github.com/kamailio/kamailio/commit/4fe56123b424638a5967832f4ac05d3… Author: Balajee <balajee(a)Balajees-MacBook-Air.local> Date: 2019-01-07T12:23:07+01:00 topoh: fixed unmask route issue, if maksing fails for one of the routes (cherry picked from commit d57f70127c44fd74c459aefc8d2655978b9cb48b) - URL: https://github.com/kamailio/kamailio/commit/3a78d068a3678471efe0a7e7f4ea0e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:23:17+01:00 topoh: aded debug message for knowing the reason of no decoding rr (cherry picked from commit cee4941daf56985d9734263c4b99c33f9ef3a149) - URL: https://github.com/kamailio/kamailio/commit/e25b66962ba51e2749a093f96e0cdaa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:27:36+01:00 websocket: use the list with ids for ws connections to do ping-pong - avoid using pointers to ws connections, they can get closed (cherry picked from commit b5253b62090feb70f08885fb530d894d0bd6ad90) - URL: https://github.com/kamailio/kamailio/commit/049473bce13cc6994cbde1080d75bb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:28:13+01:00 websocket: fetch ws connections based on keepalive process index - get the ones with id that matches the index when doing modulo over the number of keepalive process in order to spread the load of doing the ping-pong (cherry picked from commit 71517152e7de26d6c47fd037c25dc854aa37734f) - URL: https://github.com/kamailio/kamailio/commit/281d6fa15abc3b5f60c9dfc7cab272f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:28:22+01:00 websocket: destroy ws connections in dedicated timer process - avoid races/invalid access when sending data failed and the connection was removed - added parameter to control the timer process: interval or running and delay interval for removing (cherry picked from commit af09e224dba0c57c23fd58a7f83a24d2ffbaa07c) - URL: https://github.com/kamailio/kamailio/commit/bc602ee8662a440d0fec47a5ec6b660… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:28:32+01:00 websocket: docs for timer_interval and rm_delay_interval params (cherry picked from commit 3a20bb1ad27b8a85ec932975e14bcec12237437b) - URL: https://github.com/kamailio/kamailio/commit/6e8a496a5f0cbf29636ef4379c11ffd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-01-07T12:29:05+01:00 ndb_redis: fix compilation warnings > warning: field precision should have type 'int', but argument has type 'size_t' (aka 'unsigned long') [-Wformat] (cherry picked from commit 7d9d9fe21a121a38d4a3861ce252a1a485a35c71) - URL: https://github.com/kamailio/kamailio/commit/3871e87a51290cace879ba61c5e26a9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-01-07T12:29:16+01:00 topos_redis: fix compilation warnings > warning: field precision should have type 'int', but argument has type 'size_t' (aka 'unsigned long') [-Wformat] (cherry picked from commit da18d99e509c86ac21f04cf36184cadfe16fce83) - URL: https://github.com/kamailio/kamailio/commit/92d7bec4b5dddad2d08b6434ab6b561… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-01-07T12:29:39+01:00 cnxcc: fix compilation warnings > warning: field precision should have type 'int', but argument has type 'size_t' (aka 'unsigned long') [-Wformat] (cherry picked from commit 89e89e023d923d2dbec694509b9f958bbed6d3ad) - URL: https://github.com/kamailio/kamailio/commit/5067fe22cc16af943126ea88a9ddd35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:31:02+01:00 dialog: only write debug messages in case cseq or contact fields are empty (cherry picked from commit ae4087ef615c1de5b67c8406eab8316300282d8b) - URL: https://github.com/kamailio/kamailio/commit/42821df5cf64d71b9b837e2e5c55b2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:31:12+01:00 websocket: removed static from declaration of ws_rm_delay_interval - it is used as external in another source file - GH #1771 (cherry picked from commit d5e40d5f05795f3902e5ae51bf4c57345e945a9c) - URL: https://github.com/kamailio/kamailio/commit/dff5c0d68bbae1277f8842fd90b001f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:32:44+01:00 db_redis: use safe clist iteration for db_redis_free_tables() (cherry picked from commit 3ca9765eea980283963a48a9767e93566063057f) - URL: https://github.com/kamailio/kamailio/commit/5bb811d8d7c09c7792206831326c8f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:32:56+01:00 cdp: init pointer to avoid warning on uninitialized use (cherry picked from commit 7873a653a43070f891dc6cde5c188c81bf5de25d) - URL: https://github.com/kamailio/kamailio/commit/e5a25dd7d9c36ae5353cb2f10665930… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:33:13+01:00 rtpengine: lock only when db backend is enabled for build_rtpp_socks() (cherry picked from commit 99250f758e6deb90a5852599f831a53ab394b751) - URL: https://github.com/kamailio/kamailio/commit/f62c3cb67c9c2be10393bdeec684eb3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:33:29+01:00 auth_db: print db table name when version check fails (cherry picked from commit a8de371e90ddc8a6921b5bf7464961865804cc06) - URL: https://github.com/kamailio/kamailio/commit/260aa34a3d1c9df505f69e0a8c57e49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:35:04+01:00 core: function to detect if all processes were forked (cherry picked from commit 4c57d02e53deda909cc93b41d613f62921c99a9c) - URL: https://github.com/kamailio/kamailio/commit/3d9396f0a463e659a94b309e1d2551a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:36:29+01:00 core: added function to detect when processes were initialized - sr_instance_ready() return 1 if all processes finished child_init() (cherry picked from commit 97af78a5c4dd2b99da5d2f7048ac6fa73db94c1d) - URL: https://github.com/kamailio/kamailio/commit/f0fd7b36e8a90067facaadc68a38593… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:36:49+01:00 rtpengine: reworked build of rtpengine sockets to avoid serial initialization - do not lock during startup, change of the list of rtpengines can be done only upon reload, which is now disabled until all child processes did the init - do rtpengine testing (probing) only in one child, the status is stored in shared memory, no need to do it from each process. (cherry picked from commit 3d4813001052497d21804586d643697f7a68aee8) - URL: https://github.com/kamailio/kamailio/commit/018c4328c4b1f55be0920e4350066cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:37:00+01:00 rtpengine: use version number to track building rtpengine sockets on reload - check on list size fails if same list is reloaded with different attributes - reload command has a safe interval of 10 seconds between executions to allow building internal list of sockets (cherry picked from commit 785ede5bacfe55e88381ae8f7d672b24ec4b8cf6) - URL: https://github.com/kamailio/kamailio/commit/83597d2fc2922921e66edeca184b3d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:37:39+01:00 ims_isc: free variable in case of errors (cherry picked from commit e7d684ad22d17f3aca58dd66c555e43877d9320a) - URL: https://github.com/kamailio/kamailio/commit/669aaec3ca09f340be776882ffffe60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:44:31+01:00 core: pt - added missing #endif due to backport conflict

1 0

[kamailio/kamailio] secfilter: changed char* by str in RPC function params (#1787)
by Jose Luis Verdeguer 07 Jan '19

07 Jan '19

#### Description  Changed char* by str in RPC function params to avoid memory problems You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1787 -- Commit Summary -- * secfilter: changed char* by str in RPC function params to avoid memory problems -- File Changes -- M src/modules/secfilter/secfilter_rpc.c (52) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1787.patch https://github.com/kamailio/kamailio/pull/1787.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1787

2 2

git:master:b586e9a0: secfilter: changed char* by str in RPC function params to avoid memory problems
by Jose Luis Verdeguer 07 Jan '19

07 Jan '19

Module: kamailio Branch: master Commit: b586e9a03063197d84d7e173d71b6659901e6def URL: https://github.com/kamailio/kamailio/commit/b586e9a03063197d84d7e173d71b665… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2019-01-07T12:02:54+01:00 secfilter: changed char* by str in RPC function params to avoid memory problems --- Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/b586e9a03063197d84d7e173d71b665… Patch: https://github.com/kamailio/kamailio/commit/b586e9a03063197d84d7e173d71b665…

1 0

git:master:cee4941d: topoh: aded debug message for knowing the reason of no decoding rr
by Daniel-Constantin Mierla 07 Jan '19

07 Jan '19

Module: kamailio Branch: master Commit: cee4941daf56985d9734263c4b99c33f9ef3a149 URL: https://github.com/kamailio/kamailio/commit/cee4941daf56985d9734263c4b99c33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T12:01:21+01:00 topoh: aded debug message for knowing the reason of no decoding rr --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/cee4941daf56985d9734263c4b99c33… Patch: https://github.com/kamailio/kamailio/commit/cee4941daf56985d9734263c4b99c33… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 9cf87aa8c6..142eda1580 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -701,7 +701,7 @@ int th_unmask_route(sip_msg_t *msg) (strncasecmp(rr->nameaddr.uri.s,th_uri_prefix.s, th_uri_prefix.len)!=0))) { - LM_DBG("rr %d is not encoded: [%.*s]", i, + LM_DBG("rr %d is not encoded: [%.*s] - missing prefix\n", i, rr->nameaddr.uri.len, rr->nameaddr.uri.s); rr = rr->next; continue; @@ -710,6 +710,8 @@ int th_unmask_route(sip_msg_t *msg) if(th_get_uri_param_value(&rr->nameaddr.uri, &th_uparam_name, &eval)<0 || eval.len<=0) { + LM_DBG("rr %d is not encoded: [%.*s] - missing param\n", i, + rr->nameaddr.uri.len, rr->nameaddr.uri.s); rr = rr->next; continue; }

1 0

[kamailio/kamailio] topoh: fixed unmask route issue, if maksing fails for one of the routes (#1776)
by balajeesv 07 Jan '19

07 Jan '19

#### 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) - [ ] 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 Kamailio topoh module fails to unmask route headers under following scenario 1. uri_prefix_checks disabled 2. mask_ip configured same as public ip of kamailio host 3. interworking between tcp and udp In this case two record-route headers are added by kamailio for the current host (during tcp to udp conversion). But second record-route is not encoded while sending response to client, but trying to decode second Route on next request from client. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1776 -- Commit Summary -- * topoh: fixed unmask route issue, if maksing fails for one of the routes -- File Changes -- M src/modules/topoh/th_msg.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1776.patch https://github.com/kamailio/kamailio/pull/1776.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1776

2 4

git:master:d57f7012: topoh: fixed unmask route issue, if maksing fails for one of the routes
by Balajee 07 Jan '19

07 Jan '19

Module: kamailio Branch: master Commit: d57f70127c44fd74c459aefc8d2655978b9cb48b URL: https://github.com/kamailio/kamailio/commit/d57f70127c44fd74c459aefc8d26559… Author: Balajee <balajee(a)Balajees-MacBook-Air.local> Committer: Balajee <balajee(a)Balajees-MacBook-Air.local> Date: 2018-12-23T23:27:49+05:30 topoh: fixed unmask route issue, if maksing fails for one of the routes --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/d57f70127c44fd74c459aefc8d26559… Patch: https://github.com/kamailio/kamailio/commit/d57f70127c44fd74c459aefc8d26559… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 2ba5688395..9cf87aa8c6 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -709,7 +709,10 @@ int th_unmask_route(sip_msg_t *msg) if(th_get_uri_param_value(&rr->nameaddr.uri, &th_uparam_name, &eval)<0 || eval.len<=0) - return -1; + { + rr = rr->next; + continue; + } out.s = th_mask_decode(eval.s, eval.len, &th_uparam_prefix, 0, &out.len);

1 0

git:master:5f3e430f: Merge pull request #1776 from balajeesv/routeissue
by GitHub 07 Jan '19

07 Jan '19

Module: kamailio Branch: master Commit: 5f3e430fa7c769aa8b262dbeaec96fd2e556c08a URL: https://github.com/kamailio/kamailio/commit/5f3e430fa7c769aa8b262dbeaec96fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-07T11:58:19+01:00 Merge pull request #1776 from balajeesv/routeissue topoh: fixed unmask route issue, if maksing fails for one of the routes --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/5f3e430fa7c769aa8b262dbeaec96fd… Patch: https://github.com/kamailio/kamailio/commit/5f3e430fa7c769aa8b262dbeaec96fd… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 2ba5688395..9cf87aa8c6 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -709,7 +709,10 @@ int th_unmask_route(sip_msg_t *msg) if(th_get_uri_param_value(&rr->nameaddr.uri, &th_uparam_name, &eval)<0 || eval.len<=0) - return -1; + { + rr = rr->next; + continue; + } out.s = th_mask_decode(eval.s, eval.len, &th_uparam_prefix, 0, &out.len);

1 0

git:master:bbe1e8fa: pkg/kamailio/deb: version set to 5.3.0~dev2
by Victor Seva 07 Jan '19

07 Jan '19

Module: kamailio Branch: master Commit: bbe1e8fa5649182413f12fa931177027f3b75fc8 URL: https://github.com/kamailio/kamailio/commit/bbe1e8fa5649182413f12fa93117702… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-01-07T10:03:03+01:00 pkg/kamailio/deb: version set to 5.3.0~dev2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/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/bbe1e8fa5649182413f12fa93117702… Patch: https://github.com/kamailio/kamailio/commit/bbe1e8fa5649182413f12fa93117702…

1 0

git:master:d03bc22f: Makefile.defs: version set to 5.3.0-dev2
by Daniel-Constantin Mierla 07 Jan '19

07 Jan '19

Module: kamailio Branch: master Commit: d03bc22fdfe657e9408f172989f4d657260017d6 URL: https://github.com/kamailio/kamailio/commit/d03bc22fdfe657e9408f172989f4d65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-07T09:45:25+01:00 Makefile.defs: version set to 5.3.0-dev2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/d03bc22fdfe657e9408f172989f4d65… Patch: https://github.com/kamailio/kamailio/commit/d03bc22fdfe657e9408f172989f4d65… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 62708d93a9..4ea09037d5 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

Re: [sr-dev] kamailio 5.2 : which is the best way to connect to Kamailio and to manage him?
by Henning Westerholt 07 Jan '19

07 Jan '19

Am Montag, 7. Januar 2019, 03:56:34 CET schrieb yboujraf(a)by-research.be: > Thanks for your quick answer. > > MIGRATION : > > Regarding migration 4.2 to 5.2 I will check line by line and try to fix it. > My most issue is the database modules changed and to adapt is taking time. > > DEV : > > Regarding the Dev environment, I am trying to use Go (for cross-platform) > and kafka connector to get all the events through Database and push > notification to my automation then if Kamailio upgrade or change any > structure, I will not be impacted. > > Like this : > > KAMAILIO 5.2 -> DB MONGODB NoSQL -> Connector -> Transforms -> Converter -> > Kafka > > Kafka -> Converter -> Transforms -> Connector -> DB MONGODB NoSQL -> > KAMAILIO 5.2 > > I am not sure but if MongoDB is supported by Kamailio 5.2 and if any script > is available to install it? > > But I have seen into the website at : https://www.kamailio.org/w/features/ > > External Interaction via > - RPC control interface – via XMLRPC, JSONRPC, UDP or TCP > > Extensibility APIs > Java SIP Servlet Application Interface – write Java SIP Servlets to extent > your VoIP services and integrate with web services Lua Programming > Interface > JavaScript Programming Interface > Managed Code (C#) Programming Interface > Python Programming Interface > Java Programming Interface > Generic Event API via TCP connections > > But I can't find any link to API or other. Hello Youssef, have a look to this wiki page on some pointers how to use mongodb with Kamailio: https://www.kamailio.org/wiki/tutorials/kamailio-and-mongodb About the API question - as Kamailio provides a small core and over 200 extension modules there are no huge generic API docs. You start by choosing the appropriate RPC control interface. Your further process then it depends on the modules that you loaded. Have a look to the respective module documentation (README) to find the provided RPC commands from this module. The core provides also some RPC commands, they are documented in our wiki. Best regards, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services Kamailio security assessment - https://skalatan.de/de/assessment

1 0

[kamailio/kamailio] utils/kamctl/kamdbctl: Merged patch from alpine packaging (#1786)
by sergey-safarov 06 Jan '19

06 Jan '19

#### Pre-Submission Checklist - [x] 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) - [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 - [ ] 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 This also fix docker packaging on alpine dist after eb3fd4c2672a18f3851ca255b9c6cb40cb0829ad You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1786 -- Commit Summary -- * utils/kamctl/kamdbctl: Merged patch from alpine packaging -- File Changes -- D pkg/kamailio/alpine/0001-kamdbctl.base.patch (57) M pkg/kamailio/alpine/APKBUILD (2) M utils/kamctl/kamdbctl.base (30) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1786.patch https://github.com/kamailio/kamailio/pull/1786.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1786

2 5

git:5.1:3c343cec: kamdbctl: Merged patch from alpine packaging (#1786)
by Henning Westerholt 06 Jan '19

06 Jan '19

Module: kamailio Branch: 5.1 Commit: 3c343cecbfaaeb8f92c9c026c818c03f95219760 URL: https://github.com/kamailio/kamailio/commit/3c343cecbfaaeb8f92c9c026c818c03… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-06T14:48:04+01:00 kamdbctl: Merged patch from alpine packaging (#1786) - kamdbctl: Merged patch from alpine packaging (#1786) - add proper quoting for DB table and module definitions - manual backport from c6e62f932495af (cherry picked from commit 6e79c6304823301a2dde8a2dd5e169525db6cd9b) --- Modified: pkg/kamailio/alpine/APKBUILD Modified: utils/kamctl/kamdbctl.base Removed: pkg/kamailio/alpine/0001-kamdbctl.base.patch --- Diff: https://github.com/kamailio/kamailio/commit/3c343cecbfaaeb8f92c9c026c818c03… Patch: https://github.com/kamailio/kamailio/commit/3c343cecbfaaeb8f92c9c026c818c03…

1 0

git:5.2:6e79c630: kamdbctl: Merged patch from alpine packaging (#1786)
by Henning Westerholt 06 Jan '19

06 Jan '19

Module: kamailio Branch: 5.2 Commit: 6e79c6304823301a2dde8a2dd5e169525db6cd9b URL: https://github.com/kamailio/kamailio/commit/6e79c6304823301a2dde8a2dd5e1695… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-06T14:46:34+01:00 kamdbctl: Merged patch from alpine packaging (#1786) - kamdbctl: Merged patch from alpine packaging (#1786) - add proper quoting for DB table and module definitions - manual backport from c6e62f932495af --- Modified: pkg/kamailio/alpine/APKBUILD Modified: utils/kamctl/kamdbctl.base Removed: pkg/kamailio/alpine/0001-kamdbctl.base.patch --- Diff: https://github.com/kamailio/kamailio/commit/6e79c6304823301a2dde8a2dd5e1695… Patch: https://github.com/kamailio/kamailio/commit/6e79c6304823301a2dde8a2dd5e1695…

1 0

Cannot Register To SIP Provider
by Prashant Gupta 05 Jan '19

05 Jan '19

Hi, I have the following architecture - SIP provider <-> Kamailio <-> Asterisk servers I currently do not have any issues connecting my asterisk servers to Kamailio server. I am however having issues connecting my Kamailio server to my SIP provider. I am using the uac module for registration and have stored my credentials in the uacreg table. When I sniff on my network, I am able to see Register message being send out and receives an OK from my provider. But I am still unable to get incoming messages to Kamailio. Also these SIP responses from the SIP provider do not make it to kamailio route as I have logged any message that enter the request_route. SIP Messages from Wireshark - 1) 19 563.919267 10.67.XXX.XXX 10.232.XXX.XXX SIP 497 Request: REGISTER sip:ims.airtel.in (1 binding) | 2) 20 564.040917 10.232.XXX.XXX 10.67.XXX.XXX SIP 480 Status: 401 Unauthorized | 3) 21 564.041574 10.67.XXX.XXX 10.232.XXX.XXX SIP 744 Request: REGISTER sip: ims.airtel.in (1 binding) | 4) 22 564.173338 10.232.XXX.XXX 10.67.XXX.XXX SIP 649 Status: 200 OK (1 binding) | Here 10.232.XXX.XXX is my SIP providers proxy address and 10.67.XXX.XXX is my local IP of the lan connected to the SIP line.

2 7

Re: [sr-dev] [kamailio/kamailio] dialog: safety checks for local cseq and contact vars (79946bb)
by Henning Westerholt 04 Jan '19

04 Jan '19

Hello, thank you for the test. The commit 740bc8ce88da6 with the fix for the regression has been committed to branch 5.1 and 5.2 as well. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/79946bbb6d1731f503fc378ae38311b…

1 0

git:5.1:b66ebc65: dialog: check for cseq value only when getting it for caller/request
by Henning Westerholt 04 Jan '19

04 Jan '19

Module: kamailio Branch: 5.1 Commit: b66ebc658b22b992c4b0c6ecad7915b217b344a1 URL: https://github.com/kamailio/kamailio/commit/b66ebc658b22b992c4b0c6ecad7915b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-04T22:56:16+01:00 dialog: check for cseq value only when getting it for caller/request (cherry picked from commit 740bc8ce88da612ac30a73db0145908355cab192) --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/b66ebc658b22b992c4b0c6ecad7915b… Patch: https://github.com/kamailio/kamailio/commit/b66ebc658b22b992c4b0c6ecad7915b… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index a94dd641a4..983e82d7dd 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -208,7 +208,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, /* use the same as in request */ cseq = dlg->cseq[DLG_CALLEE_LEG]; } - if(cseq.s==NULL || cseq.len<=0) { + if ((leg==DLG_CALLER_LEG) && (cseq.s==NULL || cseq.len<=0)) { LM_ERR("empty CSeq number\n"); goto error0; }

1 0

git:5.2:9bfac7d0: dialog: check for cseq value only when getting it for caller/request
by Henning Westerholt 04 Jan '19

04 Jan '19

Module: kamailio Branch: 5.2 Commit: 9bfac7d0fa750c6368d048a1b577009b3ea32481 URL: https://github.com/kamailio/kamailio/commit/9bfac7d0fa750c6368d048a1b577009… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-04T22:56:10+01:00 dialog: check for cseq value only when getting it for caller/request (cherry picked from commit 740bc8ce88da612ac30a73db0145908355cab192) --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/9bfac7d0fa750c6368d048a1b577009… Patch: https://github.com/kamailio/kamailio/commit/9bfac7d0fa750c6368d048a1b577009… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index a94dd641a4..983e82d7dd 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -208,7 +208,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, /* use the same as in request */ cseq = dlg->cseq[DLG_CALLEE_LEG]; } - if(cseq.s==NULL || cseq.len<=0) { + if ((leg==DLG_CALLER_LEG) && (cseq.s==NULL || cseq.len<=0)) { LM_ERR("empty CSeq number\n"); goto error0; }

1 0

git:master:c6e62f93: kamdbctl: Merged patch from alpine packaging (#1786)
by Henning Westerholt 04 Jan '19

04 Jan '19

Module: kamailio Branch: master Commit: c6e62f932495af188c89bf06b468d1bb19579267 URL: https://github.com/kamailio/kamailio/commit/c6e62f932495af188c89bf06b468d1b… Author: sergey-safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-01-04T22:34:47+01:00 kamdbctl: Merged patch from alpine packaging (#1786) - kamdbctl: Merged patch from alpine packaging (#1786) - add proper quoting for DB table and module definitions --- Modified: pkg/kamailio/alpine/APKBUILD Modified: utils/kamctl/kamdbctl.base Removed: pkg/kamailio/alpine/0001-kamdbctl.base.patch --- Diff: https://github.com/kamailio/kamailio/commit/c6e62f932495af188c89bf06b468d1b… Patch: https://github.com/kamailio/kamailio/commit/c6e62f932495af188c89bf06b468d1b…

1 0

[kamailio/kamailio] secfilter: some fixes in check_sqli function and getting from name header value (#1781)
by Jose Luis Verdeguer 02 Jan '19

02 Jan '19

…o NULL. In get values from headers it is checked if From or To name is empty to avoid false positives   #### 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) - [ ] 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  secfilter: in check sql injection function initialize str variables to NULL. In get values from headers it is checked if From or To name is empty to avoid false positives You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1781 -- Commit Summary -- * secfilter: in check sql injection function initialize str variables to NULL. In get values from headers it is checked if From or To name is empty to avoid false positives -- File Changes -- M src/modules/secfilter/secfilter.c (8) M src/modules/secfilter/secfilter_hdr.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1781.patch https://github.com/kamailio/kamailio/pull/1781.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1781

1 1

git:master:d309e27b: secfilter: in check sql injection function initialize str variables to NULL. In get values from headers it is checked if From or To name is empty to avoid false positives
by Jose Luis Verdeguer 02 Jan '19

02 Jan '19

Module: kamailio Branch: master Commit: d309e27b1aa35176e17e24542ffc2507cd17eb3e URL: https://github.com/kamailio/kamailio/commit/d309e27b1aa35176e17e24542ffc250… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2019-01-02T18:51:01+01:00 secfilter: in check sql injection function initialize str variables to NULL. In get values from headers it is checked if From or To name is empty to avoid false positives --- Modified: src/modules/secfilter/secfilter.c Modified: src/modules/secfilter/secfilter_hdr.c --- Diff: https://github.com/kamailio/kamailio/commit/d309e27b1aa35176e17e24542ffc250… Patch: https://github.com/kamailio/kamailio/commit/d309e27b1aa35176e17e24542ffc250… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index 5ec680d1b1..4816c4ad9d 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -131,10 +131,10 @@ PREVENT SQL INJECTION /* External function to search for illegal characters in several headers */ static int w_check_sqli_all(struct sip_msg *msg) { - str ua; - str name; - str user; - str domain; + str ua = STR_NULL; + str name = STR_NULL; + str user = STR_NULL; + str domain = STR_NULL; int res; int retval = 1; diff --git a/src/modules/secfilter/secfilter_hdr.c b/src/modules/secfilter/secfilter_hdr.c index 5375d6ffff..1bb9ba1974 100644 --- a/src/modules/secfilter/secfilter_hdr.c +++ b/src/modules/secfilter/secfilter_hdr.c @@ -74,7 +74,7 @@ int secf_get_from(struct sip_msg *msg, str *name, str *user, str *domain) } hdr = get_from(msg); - if(hdr->display.s != NULL) { + if(hdr->display.s != NULL && hdr->display.len > 0) { name->s = hdr->display.s; name->len = hdr->display.len; @@ -128,7 +128,7 @@ int secf_get_to(struct sip_msg *msg, str *name, str *user, str *domain) } hdr = get_to(msg); - if(hdr->display.s != NULL) { + if(hdr->display.s != NULL && hdr->display.len > 0) { name->s = hdr->display.s; name->len = hdr->display.len;

1 0

git:master:6cb53228: tests: add several presence module to the 34.sh presence load test
by Henning Westerholt 02 Jan '19

02 Jan '19

Module: kamailio Branch: master Commit: 6cb53228ff3c71ca4636a3995ad4ee67894713ca URL: https://github.com/kamailio/kamailio/commit/6cb53228ff3c71ca4636a3995ad4ee6… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-02T12:50:37+01:00 tests: add several presence module to the 34.sh presence load test --- Modified: test/unit/34.cfg Modified: test/unit/34.sh --- Diff: https://github.com/kamailio/kamailio/commit/6cb53228ff3c71ca4636a3995ad4ee6… Patch: https://github.com/kamailio/kamailio/commit/6cb53228ff3c71ca4636a3995ad4ee6… --- diff --git a/test/unit/34.cfg b/test/unit/34.cfg index 473bf10cb5..58b2de3e47 100644 --- a/test/unit/34.cfg +++ b/test/unit/34.cfg @@ -1,4 +1,4 @@ -loadmodule "tm/tm.so" +loadmodule "tm.so" loadmodule "sl.so" loadmodule "usrloc.so" loadmodule "presence.so" @@ -15,6 +15,7 @@ loadmodule "presence_dialoginfo.so" loadmodule "rr.so" loadmodule "dialog.so" loadmodule "pua_dialoginfo.so" +loadmodule "pua_rpc.so" loadmodule "pv.so" modparam("xmpp", "xmpp_host", "example.invalid"); diff --git a/test/unit/34.sh b/test/unit/34.sh index adc821300a..7b318495b8 100755 --- a/test/unit/34.sh +++ b/test/unit/34.sh @@ -34,7 +34,7 @@ if ! (check_kamailio && check_module "db_mysql" && check_module "presence" \ && check_module "pua_usrloc" \ && check_module "pua_xmpp" && check_module "xmpp" \ && check_module "presence_dialoginfo" && check_module "pua_dialoginfo" \ - && check_mysql); then + && check_module "pua_rpc" && check_mysql); then exit 0 fi ;

1 0

git:master:184392b5: tests: add many modules that where introduced in the last years to the 2.sh unit test
by Henning Westerholt 02 Jan '19

02 Jan '19

Module: kamailio Branch: master Commit: 184392b54b1086c2b660668329fb6cb514de970e URL: https://github.com/kamailio/kamailio/commit/184392b54b1086c2b660668329fb6cb… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-02T12:49:53+01:00 tests: add many modules that where introduced in the last years to the 2.sh unit test --- Modified: test/unit/2.cfg --- Diff: https://github.com/kamailio/kamailio/commit/184392b54b1086c2b660668329fb6cb… Patch: https://github.com/kamailio/kamailio/commit/184392b54b1086c2b660668329fb6cb… --- diff --git a/test/unit/2.cfg b/test/unit/2.cfg index 4fd962a1f3..1fbc4e4037 100644 --- a/test/unit/2.cfg +++ b/test/unit/2.cfg @@ -1,54 +1,92 @@ debug=2 -loadmodule "tm/tm.so" + +loadmodule "sl" +loadmodule "tm" loadmodule "tmx" +loadmodule "pv" + loadmodule "acc" loadmodule "alias_db" +loadmodule "app_jsdt" +#loadmodule "app_sqlang" +loadmodule "async" loadmodule "auth" loadmodule "auth_db" -loadmodule "avpops/avpops.so" +loadmodule "auth_xkeys" +loadmodule "avpops.so" loadmodule "benchmark" +loadmodule "blst" +loadmodule "call_control" +loadmodule "call_obj" +loadmodule "cfgt" loadmodule "cfgutils" +loadmodule "corex" +loadmodule "counters" +loadmodule "db_flatstore" loadmodule "dialog" +loadmodule "dialplan" loadmodule "dispatcher" loadmodule "diversion" +##loadmodule "drouting" loadmodule "domain" loadmodule "domainpolicy" -loadmodule "enum/enum.so" +loadmodule "enum" +loadmodule "evrexec" loadmodule "exec" -loadmodule "db_flatstore/db_flatstore.so" loadmodule "group" loadmodule "htable" loadmodule "imc" -loadmodule "maxfwd" loadmodule "jsonrpcs" +loadmodule "keepalive" +loadmodule "kex" +loadmodule "mangler" +loadmodule "maxfwd" +loadmodule "mohqueue" loadmodule "msilo" loadmodule "nathelper" -##loadmodule "nat_traversal" +loadmodule "nat_traversal" +loadmodule "nosip" loadmodule "path" +loadmodule "pdb" +loadmodule "pdt" +loadmodule "permissions" loadmodule "pike" +##loadmodule "prefix_route" loadmodule "ratelimit" + loadmodule "rr" -##loadmodule "seas" -##loadmodule "siptrace" +##loadmodule "rtpengine" +loadmodule "rtpproxy" +loadmodule "sca" +loadmodule "seas" +loadmodule "secfilter" +loadmodule "sdpops" +loadmodule "sipdump" +loadmodule "sipt" +loadmodule "siptrace" loadmodule "siputils" -loadmodule "sl" loadmodule "sms" +loadmodule "smsops" loadmodule "speeddial" -###loadmodule "sst" +loadmodule "ss7ops" +loadmodule "sst" loadmodule "statistics" +loadmodule "statsc" +loadmodule "stun" +loadmodule "tcpops" loadmodule "textops" +loadmodule "timer" +loadmodule "topoh" +loadmodule "topos" +loadmodule "tsilo" loadmodule "uac" -##loadmodule "uac_redirect" +loadmodule "uac_redirect" loadmodule "uri_db" -loadmodule "usrloc" loadmodule "userblacklist" -loadmodule "registrar" -loadmodule "permissions" -loadmodule "pdt" -loadmodule "pv" -loadmodule "rtpproxy/rtpproxy.so" +loadmodule "usrloc" loadmodule "xlog" -loadmodule "pdb/pdb.so" + +loadmodule "registrar" modparam("jsonrpcs", "transport", 2) modparam("jsonrpcs", "fifo_name", "kamailio_rpc.fifo") @@ -58,9 +96,17 @@ modparam("dialog", "db_mode", 2) modparam("sms", "modems", "Nokia [d=/dev/ttyS1;b=9600;m=new;l=30] ") modparam("sms", "networks", "D1 [m=10] ;d2[ m=20]") modparam("sms", "links", "NOKIA[D1;d2]") -###modparam("sst", "sst_flag", 6) +modparam("sst", "sst_flag", 6) modparam("usrloc", "nat_bflag", 15) modparam("uri_db", "use_uri_table", 1) modparam("uri_db", "db_table", "uri") modparam("avpops", "avp_table", "usr_preferences") modparam("pdb", "server", "localhost:10001") +modparam ("mohqueue", "mohdir", "/tmp") +modparam("call_obj", "start", 1) +modparam("call_obj", "end", 99) + +event_route[nosip:msg] { + xlog("non-sip packet received - content [[$mb]] from [$si:$sp]\n"); + exit; +}

1 0

crash if app_jsdt app_sqlang modules loaded together
by Henning Westerholt 02 Jan '19

02 Jan '19

Hello, the app_jsdt and app_sqlang modules crash kamailio git master if they are loaded together. Found by extending the "2.sh" unit test. Can be reproduced by commenting the app_sqlang loadmodule in. Both modules load if only one of them is loaded a time. Core was generated by `../../src/kamailio -L ../../src/modules -Y . -P ./ kamailio.pid -w . -f 2.cfg'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f0917a34351 in _IO_vfprintf_internal (s=s@entry=0x7ffe020da330, format=<optimized out>, format@entry=0x7f09169fc132 "%s", ap=ap@entry=0x7ffe020da498) at vfprintf.c:1631 1631 vfprintf.c: Datei oder Verzeichnis nicht gefunden. (gdb) bt full #0 0x00007f0917a34351 in _IO_vfprintf_internal (s=s@entry=0x7ffe020da330, format=<optimized out>, format@entry=0x7f09169fc132 "%s", ap=ap@entry=0x7ffe020da498) at vfprintf.c:1631 [....] #1 0x00007f0917a5d2f9 in _IO_vsnprintf (string=0x7ffe020da580 "", maxlen=<optimized out>, format=0x7f09169fc132 "%s", args=args@entry=0x7ffe020da498) at vsnprintf.c:119 [......] #2 0x00007f0917a3ac32 in __snprintf (s=<optimized out>, maxlen=<optimized out>, format=<optimized out>) at snprintf.c:33 arg = {{gp_offset = 32, fp_offset = 48, overflow_arg_area = 0x7ffe020da570, reg_save_area = 0x7ffe020da4b0}} done = 0 #3 0x00007f09169a9cf8 in sqlang_open_KSR (J=0x1478e70) at app_sqlang_api.c: 1541 _sr_crt_J_KSRMethods = 0x1485910 emods = 0xad6200 <_sr_kemi_modules> emods_size = 4 i = 2 k = 400070208 n = 58 mname = "\002", '\000' <repeats 11 times>, "\061", '\000' <repeats 11 times>, "@\226\330\027\060", '\000' <repeats 19 times>, "[\000\000\000n", '\000' <repeats 23 times>, "| \000\000\000\004\000\000\000\000\000\000\000\377\377\377\377\377\377\377\377\t \000\000\000\000\000\000\000\340\217G \001\000\000\000\000\002\000\000\000\000\000\000\000\001\000\000\000\062\000\000" malias = "\000H\211\345H\203\354\020H\211}\370H\213E \370\276\001\000\000ss\000\000@\226\330\027\t \177\000\000\020\001\000\000\000\000\000\000\020\022H \001\000\000\000\000\260NH\001\000\000\000\000\360e\246\027\t \177\000\000\004\000\000\000\000\000\000\000\220\021H\001\000\000\000\000@ \226\330\027\t\177\000\000\000\001\000\000\000\000\000\000\200\021H \001\000\000\000\000\020\001\000\000\000\000\000\000\220\000\000\000\000\000\000\000'{\246\027\t \177\000\000\240\020H\001\000\000\000\000\000\220G \001\000\000\000\000\200\246\r\002\376\177\000\000\240ݝ\026\t \177\000\000\002\000\000\005\000\000\000\000\b \000\000\000\000\000\000\000\020\020G\001\000\000\000\000 \016H \001\000\000\000\000\020\220G\001\000\000\000\000\002"... __func__ = "sqlang_open_KSR" #4 0x00007f09169aaf46 in sqlang_sr_kemi_register_libs (J=0x1478e70) at app_sqlang_api.c:1603 ret = 0 __func__ = "sqlang_sr_kemi_register_libs" #5 0x00007f091699f108 in sqlang_sr_init_child () at app_sqlang_api.c:903 __func__ = "sqlang_sr_init_child" Best regards, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services Kamailio security assessment - https://skalatan.de/de/assessment

1 0

git:master:0ccc6d38: secfilter: fix a few errors from previous refactoring in commit #2ebd6a5b8570d6
by Henning Westerholt 02 Jan '19

02 Jan '19

Module: kamailio Branch: master Commit: 0ccc6d380d6a939f1b33d77b853ee80b6332e23b URL: https://github.com/kamailio/kamailio/commit/0ccc6d380d6a939f1b33d77b853ee80… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-02T02:09:53+01:00 secfilter: fix a few errors from previous refactoring in commit #2ebd6a5b8570d6 --- Modified: src/modules/secfilter/secfilter.c Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/0ccc6d380d6a939f1b33d77b853ee80… Patch: https://github.com/kamailio/kamailio/commit/0ccc6d380d6a939f1b33d77b853ee80… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index 7ae1153a62..ef1a7f1fb4 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -38,12 +38,12 @@ secf_data_p secf_data = NULL; /* Static and shared functions */ static int mod_init(void); -int init_data(void); +int secf_init_data(void); static int child_init(int rank); static int rpc_init(void); static void free_str_list(struct str_list *l); static void free_sec_info(secf_info_p info); -void free_data(void); +void secf_free_data(void); static void mod_destroy(void); static int w_check_sqli(str val); static int check_user(struct sip_msg *msg, int type); @@ -621,7 +621,7 @@ static int mod_init(void) { LM_DBG("SECFILTER module init\n"); /* Init data to store database values */ - if(init_data() == -1) + if(secf_init_data() == -1) return -1; /* Init RPC */ if(rpc_init() < 0) @@ -661,7 +661,7 @@ static void mod_destroy(void) if(!secf_data) return; /* Free shared data */ - free_data(); + secf_free_data(); /* Destroy lock */ lock_destroy(&secf_data->lock); shm_free(secf_data); diff --git a/src/modules/secfilter/secfilter_rpc.c b/src/modules/secfilter/secfilter_rpc.c index 002ff9e875..97adf5e633 100644 --- a/src/modules/secfilter/secfilter_rpc.c +++ b/src/modules/secfilter/secfilter_rpc.c @@ -54,7 +54,7 @@ static int get_type(char *ctype) /* Add blacklist destination value */ -void rpc_add_dst(rpc_t *rpc, void *ctx) +void secf_rpc_add_dst(rpc_t *rpc, void *ctx) { int number; str data = STR_NULL; @@ -88,7 +88,7 @@ void rpc_add_dst(rpc_t *rpc, void *ctx) } /* Add blacklist value */ -void rpc_add_bl(rpc_t *rpc, void *ctx) +void secf_rpc_add_bl(rpc_t *rpc, void *ctx) { char *ctype = NULL; str data = STR_NULL; @@ -116,7 +116,7 @@ void rpc_add_bl(rpc_t *rpc, void *ctx) /* Add whitelist value */ -void rpc_add_wl(rpc_t *rpc, void *ctx) +void secf_rpc_add_wl(rpc_t *rpc, void *ctx) { char *ctype = NULL; str data = STR_NULL; @@ -148,7 +148,7 @@ void secf_rpc_reload(rpc_t *rpc, void *ctx) { secf_free_data(); - if(load_db() == -1) { + if(secf_load_db() == -1) { LM_ERR("Error loading data from database\n"); rpc->rpl_printf(ctx, "Error loading data from database"); } else { @@ -171,7 +171,7 @@ static void rpc_print_data(rpc_t *rpc, void *ctx, struct str_list *list) /* Print values */ -void rpc_print(rpc_t *rpc, void *ctx) +void secf_rpc_print(rpc_t *rpc, void *ctx) { char *param = NULL; int showall = 0;

1 0

git:master:689854e5: secfilter: use default read-only DB URL, as the other DB modules (for testing)
by Henning Westerholt 02 Jan '19

02 Jan '19

Module: kamailio Branch: master Commit: 689854e517a9c4c0907eaaab9e76625bc717ed85 URL: https://github.com/kamailio/kamailio/commit/689854e517a9c4c0907eaaab9e76625… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-02T02:26:17+01:00 secfilter: use default read-only DB URL, as the other DB modules (for testing) --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/689854e517a9c4c0907eaaab9e76625… Patch: https://github.com/kamailio/kamailio/commit/689854e517a9c4c0907eaaab9e76625… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index ef1a7f1fb4..5ec680d1b1 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -61,7 +61,7 @@ static int w_check_sqli_hdr(struct sip_msg *msg, char *val); /* Exported module parameters - default values */ int secf_dst_exact_match = 1; -str secf_db_url = {NULL, 0}; +str secf_db_url = str_init(DEFAULT_RODB_URL); str secf_table_name = str_init("secfilter"); str secf_action_col = str_init("action"); str secf_type_col = str_init("type");

1 0

git:master:eb3fd4c2: utils: add secfilter DB to kamdbctl file, for DB creation
by Henning Westerholt 02 Jan '19

02 Jan '19

Module: kamailio Branch: master Commit: eb3fd4c2672a18f3851ca255b9c6cb40cb0829ad URL: https://github.com/kamailio/kamailio/commit/eb3fd4c2672a18f3851ca255b9c6cb4… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-02T02:27:06+01:00 utils: add secfilter DB to kamdbctl file, for DB creation --- Modified: utils/kamctl/kamdbctl.base --- Diff: https://github.com/kamailio/kamailio/commit/eb3fd4c2672a18f3851ca255b9c6cb4… Patch: https://github.com/kamailio/kamailio/commit/eb3fd4c2672a18f3851ca255b9c6cb4… --- diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 587e874757..79b0b12874 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -42,7 +42,7 @@ EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy carrierroute carrier_name domain_name carrierfailureroute userblacklist globalblacklist htable purplemap uacreg pl_pipes mtree mtrees sca_subscriptions mohqcalls mohqueues rtpproxy rtpengine - dr_gateways dr_rules dr_gw_lists dr_groups} + dr_gateways dr_rules dr_gw_lists dr_groups secfilter} PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap pua rls_presentity rls_watchers} DBUID_TABLES=${UID_TABLES:-uid_credentials uid_domain uid_domain_attrs @@ -77,7 +77,7 @@ PRESENCE_MODULES=${PRESENCE_MODULES:-presence rls} EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute drouting userblacklist htable purple uac pipelimit mtree sca mohqueue - rtpproxy rtpengine} + rtpproxy rtpengine secfilter} DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags uid_uri_db}

1 0

git: new commits in branch master
by Henning Westerholt 01 Jan '19

01 Jan '19

- URL: https://github.com/kamailio/kamailio/commit/b14dc38c38a547b252c713e287dbb47… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 core: add DB_TABLE_VERSION_ERROR(table) error helper #define to DB1 API - add DB_TABLE_VERSION_ERROR(table) error helper #define to DB1 API - should used for db table check errors from modules, with table as parameter - example log message: "Error during version check for db table: location, check database structure.\n" - URL: https://github.com/kamailio/kamailio/commit/dcbb63a0900c44adfd27a7975171390… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 auth_db: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/d5dc411c1056d47d22f24133a3fe573… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 carrierroute: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/54842c2ce5d226a4bd2ab0b4e960e3a… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 cplc: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/a41a0c20701818060fa82e9fde8db7c… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 dialog: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/5f90b1f9838fe38aa8cd8c6e1af71db… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 dialplan: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/f53aa8f000d396566a26ae4eff3a1aa… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 domain: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/57865f20449bd60b28aa95647cd46cc… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 group: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/47d9d13256bd0b1478fd5511840c6b0… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 ims_charging: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/0be172beffb7948d60e386b323ef852… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 ims_dialog: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/26b1f71bab4e93ed2391f8062e88395… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 lcr: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/a0db9f5af3a14a380f4a82597de7f33… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 matrix: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/5507edd5d75fbad207d94173c0e9d02… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 mohqueue: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/21e24b16428f23fad03c43794d3c60b… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 msilo: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/db7841aa78ecbbc3bbef6c8b5f3c234… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 permissions: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/ac2aa9a183ba85538094c7f5662867d… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 presence: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/ce1a5256a0096c5ac5a294229a48f89… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 presence_xml: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/e5085c9c085b02eb70f5512fa0849b1… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 pua: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/b1ad4001f46ed6487eea4954d969a97… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 rls: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/9da33cd921dad97f479e80667829c28… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 sca: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/0fd45d23b4c3199e77699409bbb0e64… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 siptrace: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/33dccf230e230ddae410c302c18a259… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 userblacklist: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/3543bbcf5620672323a0603fd0828ce… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 usrloc: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/39fb6bacd9c201aa25507800c5b7176… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 utils: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/8838648d9fed57937569ee580fa9d3a… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 xcap_client: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/be5883332166e972580252081f6f1f9… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 xcap_server: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/5b259f6066ed0eb46c2e73feb3da121… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T20:11:09+01:00 secfilter: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/2ebd6a5b8570d68f833b2b9ca0e25c2… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T21:06:51+01:00 secfilter: add "secf_" prefix to generic RPC and DB functions, use static - add "secf_" prefix to generic RPC and DB functions - add static qualifier to internal check_version and append_str_list functions - URL: https://github.com/kamailio/kamailio/commit/f08bbc99b33f576a1d6ed12c2a2b3c2… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T21:15:15+01:00 pipelimit: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - URL: https://github.com/kamailio/kamailio/commit/3e463dc93f2343858a876c6db6c6e92… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T21:47:33+01:00 secfilter: fix an error in version check, don't use hard-coded secfilter table name - URL: https://github.com/kamailio/kamailio/commit/f31dc9f0087481d99cc371424454713… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T21:51:51+01:00 domainpolicy: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - use abstract db_table_version_error function - URL: https://github.com/kamailio/kamailio/commit/8d9258aba61b8d32c49e2754fa07c55… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T21:55:15+01:00 uri_db: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - use abstract db_table_version_error function - URL: https://github.com/kamailio/kamailio/commit/9708499869d60ae3f8ed06233d270d4… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T22:02:36+01:00 rtpproxy: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - use abstract db_table_version_error function - URL: https://github.com/kamailio/kamailio/commit/d210ba8319b3534e2fcee6978284e49… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T22:05:31+01:00 rtpengine: convert module to use DB_TABLE_VERSION_ERROR helper - convert module to use DB_TABLE_VERSION_ERROR helper - unify error handling (properly close database on errors, null db handle) - use abstract db_table_version_error function - URL: https://github.com/kamailio/kamailio/commit/ba4176860e464ce54eaa86ea3f01d9a… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-01T22:12:06+01:00 lib: extend (doxygen) comments for db_table_version and db_check_table_version

1 0

git:5.2:ddc0073c: cdp: fix two errors from coverty scan (missing check, var initialization)
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.2 Commit: ddc0073c64df5ea1817ce2f727ea7c5e0b46b5ed URL: https://github.com/kamailio/kamailio/commit/ddc0073c64df5ea1817ce2f727ea7c5… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:42:45+01:00 cdp: fix two errors from coverty scan (missing check, var initialization) - remove library call can fail, test for the error and log it - initialize the msghdr variable with a memset (cherry picked from commit 7d52bf6ce7188eaa57690766c231e55b5509db4f) --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/ddc0073c64df5ea1817ce2f727ea7c5… Patch: https://github.com/kamailio/kamailio/commit/ddc0073c64df5ea1817ce2f727ea7c5… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 4278bde951..c33554457a 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -157,10 +157,14 @@ static int make_send_pipe(serviced_peer_t *sp) */ static void close_send_pipe(serviced_peer_t *sp) { + int tmp; if (sp->send_pipe_name.s) { close(sp->send_pipe_fd); close(sp->send_pipe_fd_out); - remove(sp->send_pipe_name.s); + tmp = remove(sp->send_pipe_name.s); + if (tmp == -1) { + LM_ERR("could not remove send pipe\n"); + } shm_free(sp->send_pipe_name.s); sp->send_pipe_name.s=0; sp->send_pipe_name.len=0; @@ -269,6 +273,7 @@ static int send_fd(int pipe_fd,int fd, peer *p) struct iovec iov[1]; int ret; int *tmp = NULL; + memset(&msg, 0, sizeof(struct msghdr)); #ifdef HAVE_MSGHDR_MSG_CONTROL struct cmsghdr* cmsg;

1 0

git:5.2:eed2a7f8: core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.2 Commit: eed2a7f86129950e5f20a4b4010a7e67ea04eac5 URL: https://github.com/kamailio/kamailio/commit/eed2a7f86129950e5f20a4b4010a7e6… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:41:44+01:00 core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com - fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com - use the same logic for IPv4 string comparison as for IPv6 - the old comparison could return true for e.g. via="192.168.1.1", src="192.1.1.100" - the new logic is also faster for the trivial case with different string length (cherry picked from commit 98ee014a88ca951d82a0389f0be119078ba525f7) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/eed2a7f86129950e5f20a4b4010a7e6… Patch: https://github.com/kamailio/kamailio/commit/eed2a7f86129950e5f20a4b4010a7e6… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 08e518a9d8..038b02f461 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -179,7 +179,7 @@ static int check_via_address(struct ip_addr* ip, str *name, LM_CRIT("invalid Via host name\n"); return -1; } - if (strncmp(name->s, s, name->len)==0) + if (len==name->len&&(strncmp(name->s, s, name->len)==0)) return 0; } }else{

1 0

git:5.2:aeaf35ce: core: check for optarg before passing it to external library (coverity report)
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.2 Commit: aeaf35ce1f19dc46436102a2763a8e9a4d1db1b7 URL: https://github.com/kamailio/kamailio/commit/aeaf35ce1f19dc46436102a2763a8e9… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:42:05+01:00 core: check for optarg before passing it to external library (coverity report) (cherry picked from commit 7eb1eae615a4c3ef710e9931b101ddc4db07aff2) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/aeaf35ce1f19dc46436102a2763a8e9… Patch: https://github.com/kamailio/kamailio/commit/aeaf35ce1f19dc46436102a2763a8e9… --- diff --git a/src/main.c b/src/main.c index b7e9fdb58a..13c47a0852 100644 --- a/src/main.c +++ b/src/main.c @@ -1889,6 +1889,10 @@ int main(int argc, char** argv) log_color=1; break; case 'M': + if (optarg == NULL) { + fprintf(stderr, "bad private mem size\n"); + goto error; + } pkg_mem_size=strtol(optarg, &tmp, 10) * 1024 * 1024; if (tmp &&(*tmp)){ fprintf(stderr, "bad private mem size number: -M %s\n",

1 0

git:5.2:fb989491: cdp: fix three coverity errors (ressource leaks and error checks)
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.2 Commit: fb9894915bba17927ef6edd69a0b8606ac109a53 URL: https://github.com/kamailio/kamailio/commit/fb9894915bba17927ef6edd69a0b860… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:42:28+01:00 cdp: fix three coverity errors (ressource leaks and error checks) - fix an ressource leak related to library call getaddrinfo - add missing error checks for setsockopts and fcntl calls (cherry picked from commit 967a71687aa63a253d495ba49351ae916713a452) --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/fb9894915bba17927ef6edd69a0b860… Patch: https://github.com/kamailio/kamailio/commit/fb9894915bba17927ef6edd69a0b860… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 2b4da266e3..4278bde951 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -839,6 +839,7 @@ int receive_loop(peer *original_peer) int peer_connect(peer *p) { int sock; + int tmp = 0; unsigned int option = 1; struct addrinfo *ainfo=0,*res=0,*sainfo=0,hints; @@ -930,10 +931,21 @@ int peer_connect(peer *p) } x=fcntl(sock,F_GETFL,0); - fcntl(sock,F_SETFL,x & (~O_NONBLOCK)); + if (x == -1) { + LM_ERR("error during first fcntl operation\n"); + goto error; + } + tmp = fcntl(sock,F_SETFL,x & (~O_NONBLOCK)); + if (tmp == -1) { + LM_ERR("error during second fcntl operation\n"); + goto error; + } + } + tmp = setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&option,sizeof(option)); + if (tmp == -1) { + LM_ERR("could not set socket options\n"); + goto error; } - setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&option,sizeof(option)); - LM_INFO("peer_connect(): Peer %.*s:%d connected\n",p->fqdn.len,p->fqdn.s,p->port); if (!send_fd(p->fd_exchange_pipe,sock,p)){ @@ -943,10 +955,12 @@ int peer_connect(peer *p) } if (res) freeaddrinfo(res); + if (sainfo) freeaddrinfo(sainfo); return sock; } error: if (res) freeaddrinfo(res); + if (sainfo) freeaddrinfo(sainfo); return -1; }

1 0

git:5.1:977057fb: cdp: fix three coverity errors (ressource leaks and error checks)
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.1 Commit: 977057fb98ecd72844a0441e1f890378369e4862 URL: https://github.com/kamailio/kamailio/commit/977057fb98ecd72844a0441e1f89037… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:42:24+01:00 cdp: fix three coverity errors (ressource leaks and error checks) - fix an ressource leak related to library call getaddrinfo - add missing error checks for setsockopts and fcntl calls (cherry picked from commit 967a71687aa63a253d495ba49351ae916713a452) --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/977057fb98ecd72844a0441e1f89037… Patch: https://github.com/kamailio/kamailio/commit/977057fb98ecd72844a0441e1f89037… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 0ff2fe15ae..46a16be650 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -839,6 +839,7 @@ int receive_loop(peer *original_peer) int peer_connect(peer *p) { int sock; + int tmp = 0; unsigned int option = 1; struct addrinfo *ainfo=0,*res=0,*sainfo=0,hints; @@ -930,10 +931,21 @@ int peer_connect(peer *p) } x=fcntl(sock,F_GETFL,0); - fcntl(sock,F_SETFL,x & (~O_NONBLOCK)); + if (x == -1) { + LM_ERR("error during first fcntl operation\n"); + goto error; + } + tmp = fcntl(sock,F_SETFL,x & (~O_NONBLOCK)); + if (tmp == -1) { + LM_ERR("error during second fcntl operation\n"); + goto error; + } + } + tmp = setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&option,sizeof(option)); + if (tmp == -1) { + LM_ERR("could not set socket options\n"); + goto error; } - setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&option,sizeof(option)); - LM_INFO("peer_connect(): Peer %.*s:%d connected\n",p->fqdn.len,p->fqdn.s,p->port); if (!send_fd(p->fd_exchange_pipe,sock,p)){ @@ -943,10 +955,12 @@ int peer_connect(peer *p) } if (res) freeaddrinfo(res); + if (sainfo) freeaddrinfo(sainfo); return sock; } error: if (res) freeaddrinfo(res); + if (sainfo) freeaddrinfo(sainfo); return -1; }

1 0

git:5.1:b5f12075: cdp: fix two errors from coverty scan (missing check, var initialization)
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.1 Commit: b5f12075497cf2ab6bcfc71ab2550198065e7e87 URL: https://github.com/kamailio/kamailio/commit/b5f12075497cf2ab6bcfc71ab255019… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:42:41+01:00 cdp: fix two errors from coverty scan (missing check, var initialization) - remove library call can fail, test for the error and log it - initialize the msghdr variable with a memset (cherry picked from commit 7d52bf6ce7188eaa57690766c231e55b5509db4f) --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/b5f12075497cf2ab6bcfc71ab255019… Patch: https://github.com/kamailio/kamailio/commit/b5f12075497cf2ab6bcfc71ab255019… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 46a16be650..2710387d29 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -157,10 +157,14 @@ static int make_send_pipe(serviced_peer_t *sp) */ static void close_send_pipe(serviced_peer_t *sp) { + int tmp; if (sp->send_pipe_name.s) { close(sp->send_pipe_fd); close(sp->send_pipe_fd_out); - remove(sp->send_pipe_name.s); + tmp = remove(sp->send_pipe_name.s); + if (tmp == -1) { + LM_ERR("could not remove send pipe\n"); + } shm_free(sp->send_pipe_name.s); sp->send_pipe_name.s=0; sp->send_pipe_name.len=0; @@ -269,6 +273,7 @@ static int send_fd(int pipe_fd,int fd, peer *p) struct iovec iov[1]; int ret; int *tmp = NULL; + memset(&msg, 0, sizeof(struct msghdr)); #ifdef HAVE_MSGHDR_MSG_CONTROL struct cmsghdr* cmsg;

1 0

git:5.1:b075e6fc: core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.1 Commit: b075e6fcb7435d168241bc9bc83e87b70b4d08d4 URL: https://github.com/kamailio/kamailio/commit/b075e6fcb7435d168241bc9bc83e87b… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:41:39+01:00 core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com - fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com - use the same logic for IPv4 string comparison as for IPv6 - the old comparison could return true for e.g. via="192.168.1.1", src="192.1.1.100" - the new logic is also faster for the trivial case with different string length (cherry picked from commit 98ee014a88ca951d82a0389f0be119078ba525f7) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/b075e6fcb7435d168241bc9bc83e87b… Patch: https://github.com/kamailio/kamailio/commit/b075e6fcb7435d168241bc9bc83e87b… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 5b0c726378..f34637b6f1 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -176,7 +176,7 @@ static int check_via_address(struct ip_addr* ip, str *name, LM_CRIT("invalid Via host name\n"); return -1; } - if (strncmp(name->s, s, name->len)==0) + if (len==name->len&&(strncmp(name->s, s, name->len)==0)) return 0; } }else{

1 0

git:5.1:5d738714: core: check for optarg before passing it to external library (coverity report)
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.1 Commit: 5d738714cb95edbf119462553d16be547117355e URL: https://github.com/kamailio/kamailio/commit/5d738714cb95edbf119462553d16be5… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:41:57+01:00 core: check for optarg before passing it to external library (coverity report) (cherry picked from commit 7eb1eae615a4c3ef710e9931b101ddc4db07aff2) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/5d738714cb95edbf119462553d16be5… Patch: https://github.com/kamailio/kamailio/commit/5d738714cb95edbf119462553d16be5… --- diff --git a/src/main.c b/src/main.c index dd33b89a75..f26aea8561 100644 --- a/src/main.c +++ b/src/main.c @@ -1887,6 +1887,10 @@ int main(int argc, char** argv) log_color=1; break; case 'M': + if (optarg == NULL) { + fprintf(stderr, "bad private mem size\n"); + goto error; + } pkg_mem_size=strtol(optarg, &tmp, 10) * 1024 * 1024; if (tmp &&(*tmp)){ fprintf(stderr, "bad private mem size number: -M %s\n",

1 0

git:master:e7d684ad: ims_isc: free variable in case of errors
by Daniel-Constantin Mierla 30 Dec '18

30 Dec '18

Module: kamailio Branch: master Commit: e7d684ad22d17f3aca58dd66c555e43877d9320a URL: https://github.com/kamailio/kamailio/commit/e7d684ad22d17f3aca58dd66c555e43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-30T17:44:14+01:00 ims_isc: free variable in case of errors --- Modified: src/modules/ims_isc/checker.c --- Diff: https://github.com/kamailio/kamailio/commit/e7d684ad22d17f3aca58dd66c555e43… Patch: https://github.com/kamailio/kamailio/commit/e7d684ad22d17f3aca58dd66c555e43… --- diff --git a/src/modules/ims_isc/checker.c b/src/modules/ims_isc/checker.c index 44611822ad..f02cf98bab 100644 --- a/src/modules/ims_isc/checker.c +++ b/src/modules/ims_isc/checker.c @@ -369,6 +369,7 @@ static inline isc_match* isc_new_match(ims_filter_criteria *fc, int index) { if (!r->server_name.s) { LM_ERR("isc_new_match(): error allocating %d bytes\n", fc->application_server.server_name.len); + pkg_free(r); return 0; } r->server_name.len = fc->application_server.server_name.len; @@ -381,6 +382,10 @@ static inline isc_match* isc_new_match(ims_filter_criteria *fc, int index) { if (!r->service_info.s) { LM_ERR("isc_new_match(): error allocating %d bytes\n", fc->application_server.service_info.len); + if (r->server_name.s) { + pkg_free(r->server_name.s); + } + pkg_free(r); return 0; } r->service_info.len = fc->application_server.service_info.len;

1 0

git:master:ddaebe5c: secfilter: init vars to avoid unitialized usage
by Daniel-Constantin Mierla 30 Dec '18

30 Dec '18

Module: kamailio Branch: master Commit: ddaebe5ce4e903a28ab97339a4f9bcf14ca3cbf4 URL: https://github.com/kamailio/kamailio/commit/ddaebe5ce4e903a28ab97339a4f9bcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-30T18:03:07+01:00 secfilter: init vars to avoid unitialized usage --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/ddaebe5ce4e903a28ab97339a4f9bcf… Patch: https://github.com/kamailio/kamailio/commit/ddaebe5ce4e903a28ab97339a4f9bcf… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index 37b1ededfd..0111792214 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -401,12 +401,12 @@ Return codes: */ static int check_user(struct sip_msg *msg, int type) { - str name; - str user; - str domain; + str name = STR_NULL; + str user = STR_NULL; + str domain = STR_NULL; int res = 0; int nlen, ulen, dlen; - struct str_list *list; + struct str_list *list = NULL; switch(type) { case 1:

1 0

Re: [sr-dev] [SR-Users] An error in msg_translator.c source file
by Henning Westerholt 30 Dec '18

30 Dec '18

Am Samstag, 29. Dezember 2018, 19:34:42 CET schrieb Mojtaba: > In msg_translator.c source file, goes to check_via_address function in line > 147, > In that function, the length of both ip in host(name) and host(ip) is just > checked in ipv6 (if condition section). the code are here: > > /* check if name->s is an ipv6 address or an ipv6 address ref. */ > if ((ip->af==AF_INET6) && > ( ((len==name->len)&&(strncasecmp(name->s, s, name->len)==0)) > > ((len==(name->len-2))&&(name->s[0]=='[')&& > (name->s[name->len-1]==']')&& > (strncasecmp(name->s+1, s, len)==0)) > ) > ) { > return 0; > } > else { > if (unlikely(name->s==NULL)) { > LM_CRIT("invalid Via host name\n"); > return -1; > } > > if (strncmp(name->s, s, name->len)==0) //I think the length > would be checked > return 0; > } Hello Mojtaba, thank you for the report. This looks indeed not correct. I fixed this today in git master (commit 98ee014a) and will also backport it. I wonder why this was not found earlier, this is a really old function. But most people probably use DNS names in their VIAs. Best regards, Henning > But in else section, the length does not check. I think it would be nice to > check . like this: > > if (len == name->len && strncmp(name->s, s, name->len)==0) > > Not actually, i am not referring to git master yet. I just want to know do > it would be nice or not? > With Regards.Mojtaba Esfandiari.S > > > > Does anybody know why the lenght of both ip-address (s and name) in > > > check_via_address function in msg_translator.c source file dose not > > > check first? > > > Actually i think it's better do. > > > For example if via:192.168.122.1 and src:192.168.122.100, the result > > > returned true, as they are not the same! > > > With.Regards. Mojtaba > > > > Hello Mojtaba, > > > > can you give more details, which line in e.g. git master are you referring > > to? -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services Kamailio security assessment - https://skalatan.de/de/assessment

1 0

git:master:7eb1eae6: core: check for optarg before passing it to external library (coverity report)
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: master Commit: 7eb1eae615a4c3ef710e9931b101ddc4db07aff2 URL: https://github.com/kamailio/kamailio/commit/7eb1eae615a4c3ef710e9931b101ddc… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T00:52:18+01:00 core: check for optarg before passing it to external library (coverity report) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/7eb1eae615a4c3ef710e9931b101ddc… Patch: https://github.com/kamailio/kamailio/commit/7eb1eae615a4c3ef710e9931b101ddc… --- diff --git a/src/main.c b/src/main.c index ac58b760ba..be1405eeec 100644 --- a/src/main.c +++ b/src/main.c @@ -1908,6 +1908,10 @@ int main(int argc, char** argv) log_color=1; break; case 'M': + if (optarg == NULL) { + fprintf(stderr, "bad private mem size\n"); + goto error; + } pkg_mem_size=strtol(optarg, &tmp, 10) * 1024 * 1024; if (tmp &&(*tmp)){ fprintf(stderr, "bad private mem size number: -M %s\n",

1 0

git:master:98ee014a: core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: master Commit: 98ee014a88ca951d82a0389f0be119078ba525f7 URL: https://github.com/kamailio/kamailio/commit/98ee014a88ca951d82a0389f0be1190… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T01:17:15+01:00 core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com - fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com - use the same logic for IPv4 string comparison as for IPv6 - the old comparison could return true for e.g. via="192.168.1.1", src="192.1.1.100" - the new logic is also faster for the trivial case with different string length --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/98ee014a88ca951d82a0389f0be1190… Patch: https://github.com/kamailio/kamailio/commit/98ee014a88ca951d82a0389f0be1190… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 3bb0dd7bba..c7851904c7 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -179,7 +179,7 @@ static int check_via_address(struct ip_addr* ip, str *name, LM_CRIT("invalid Via host name\n"); return -1; } - if (strncmp(name->s, s, name->len)==0) + if (len==name->len&&(strncmp(name->s, s, name->len)==0)) return 0; } }else{

1 0

git:master:14975b6e: cdp: fix a coverity scan error, duplicated code for logical statement
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: master Commit: 14975b6e7e028aea9db198c64b65526fb9bd20b7 URL: https://github.com/kamailio/kamailio/commit/14975b6e7e028aea9db198c64b65526… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T00:41:58+01:00 cdp: fix a coverity scan error, duplicated code for logical statement --- Modified: src/modules/cdp/session.c --- Diff: https://github.com/kamailio/kamailio/commit/14975b6e7e028aea9db198c64b65526… Patch: https://github.com/kamailio/kamailio/commit/14975b6e7e028aea9db198c64b65526… --- diff --git a/src/modules/cdp/session.c b/src/modules/cdp/session.c index dd5c026e3e..60e97becae 100644 --- a/src/modules/cdp/session.c +++ b/src/modules/cdp/session.c @@ -607,8 +607,8 @@ AAASession* cdp_new_cc_acc_session(str id, int is_statefull) AAASession *s; cdp_session_type_t type; - if (is_statefull) type = ACCT_CC_CLIENT; - else type = ACCT_CC_CLIENT; //for now everything will be supported through this SM (until we add IEC) + //for now everything will be supported through this SM (until we add IEC) + type = ACCT_CC_CLIENT; s = cdp_new_session(id,type); if (s) {

1 0

git:master:967a7168: cdp: fix three coverity errors (ressource leaks and error checks)
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: master Commit: 967a71687aa63a253d495ba49351ae916713a452 URL: https://github.com/kamailio/kamailio/commit/967a71687aa63a253d495ba49351ae9… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T00:42:31+01:00 cdp: fix three coverity errors (ressource leaks and error checks) - fix an ressource leak related to library call getaddrinfo - add missing error checks for setsockopts and fcntl calls --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/967a71687aa63a253d495ba49351ae9… Patch: https://github.com/kamailio/kamailio/commit/967a71687aa63a253d495ba49351ae9… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 6257d15362..c33554457a 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -844,6 +844,7 @@ int receive_loop(peer *original_peer) int peer_connect(peer *p) { int sock; + int tmp = 0; unsigned int option = 1; struct addrinfo *ainfo=0,*res=0,*sainfo=0,hints; @@ -935,10 +936,21 @@ int peer_connect(peer *p) } x=fcntl(sock,F_GETFL,0); - fcntl(sock,F_SETFL,x & (~O_NONBLOCK)); + if (x == -1) { + LM_ERR("error during first fcntl operation\n"); + goto error; + } + tmp = fcntl(sock,F_SETFL,x & (~O_NONBLOCK)); + if (tmp == -1) { + LM_ERR("error during second fcntl operation\n"); + goto error; + } + } + tmp = setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&option,sizeof(option)); + if (tmp == -1) { + LM_ERR("could not set socket options\n"); + goto error; } - setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&option,sizeof(option)); - LM_INFO("peer_connect(): Peer %.*s:%d connected\n",p->fqdn.len,p->fqdn.s,p->port); if (!send_fd(p->fd_exchange_pipe,sock,p)){ @@ -948,10 +960,12 @@ int peer_connect(peer *p) } if (res) freeaddrinfo(res); + if (sainfo) freeaddrinfo(sainfo); return sock; } error: if (res) freeaddrinfo(res); + if (sainfo) freeaddrinfo(sainfo); return -1; }

1 0

git:master:7d52bf6c: cdp: fix two errors from coverty scan (missing check, var initialization)
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: master Commit: 7d52bf6ce7188eaa57690766c231e55b5509db4f URL: https://github.com/kamailio/kamailio/commit/7d52bf6ce7188eaa57690766c231e55… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T00:15:46+01:00 cdp: fix two errors from coverty scan (missing check, var initialization) - remove library call can fail, test for the error and log it - initialize the msghdr variable with a memset --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/7d52bf6ce7188eaa57690766c231e55… Patch: https://github.com/kamailio/kamailio/commit/7d52bf6ce7188eaa57690766c231e55… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 2b4da266e3..6257d15362 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -157,10 +157,14 @@ static int make_send_pipe(serviced_peer_t *sp) */ static void close_send_pipe(serviced_peer_t *sp) { + int tmp; if (sp->send_pipe_name.s) { close(sp->send_pipe_fd); close(sp->send_pipe_fd_out); - remove(sp->send_pipe_name.s); + tmp = remove(sp->send_pipe_name.s); + if (tmp == -1) { + LM_ERR("could not remove send pipe\n"); + } shm_free(sp->send_pipe_name.s); sp->send_pipe_name.s=0; sp->send_pipe_name.len=0; @@ -269,6 +273,7 @@ static int send_fd(int pipe_fd,int fd, peer *p) struct iovec iov[1]; int ret; int *tmp = NULL; + memset(&msg, 0, sizeof(struct msghdr)); #ifdef HAVE_MSGHDR_MSG_CONTROL struct cmsghdr* cmsg;

1 0

A bit trick in msg_translator.c source file
by Mojtaba 29 Dec '18

29 Dec '18

Hello , Does anybody know why the lenght of both ip-address (s and name) in check_via_address function in msg_translator.c source file dose not check first? Actually i think it's better do. For example if via:192.168.122.1 and src:192.168.122.100, the result returned true, as they are not the same! With.Regards. Mojtaba Happy new year --Mojtaba Esfandiari.S

2 1

PKG/SHM allocation failure log macros
by Daniel-Constantin Mierla 29 Dec '18

29 Dec '18

Hello, I noticed many commits replacing the log messages in case of allocation failure with some macros. That is good, bringing consistency, but I think that we should offer couple of them. The current one is rather dry (meaning that it offers very few context details), which matches most of the existing log messages used in such cases. But there are also other log messages for such cases which give more details, like for what the allocation fails, some also giving the requested size of allocation. So besides the current two macros (one for shm and one for pkg), we should add few more. Like: #define PKG_MEM_ERROR_MSG(m) LM_ERR("could not allocate private memory from pkg pool - %s\n", m); So one can do: PKG_MEM_ERROR_MSG("needed for htable struct"); And one to include also the size: #define PKG_MEM_ERROR_SZ(s, m) LM_ERR("could not allocate private memory from pkg pool - size: %u - %s\n", (unsigned int)s, m); No need to revert what was done, but I think for the future we would preserve better information for troubleshooting in some cases, instead of replacing those messages that now have more details with the bare error log message. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com

3 5

git:master:ccb77f2d: core: remove wrongly commited out-commented statement from pkg.h
by Henning Westerholt 29 Dec '18

29 Dec '18

Module: kamailio Branch: master Commit: ccb77f2d7f69d6a2f309ea7c4f16ba6892a4785a URL: https://github.com/kamailio/kamailio/commit/ccb77f2d7f69d6a2f309ea7c4f16ba6… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-29T01:58:25+01:00 core: remove wrongly commited out-commented statement from pkg.h --- Modified: src/core/mem/pkg.h --- Diff: https://github.com/kamailio/kamailio/commit/ccb77f2d7f69d6a2f309ea7c4f16ba6… Patch: https://github.com/kamailio/kamailio/commit/ccb77f2d7f69d6a2f309ea7c4f16ba6… --- diff --git a/src/core/mem/pkg.h b/src/core/mem/pkg.h index 147208698f..6dad39f360 100644 --- a/src/core/mem/pkg.h +++ b/src/core/mem/pkg.h @@ -134,7 +134,6 @@ void pkg_print_manager(void); #define PKG_MEM_CRITICAL LM_CRIT("could not allocate private memory from pkg pool\n") #ifdef __SUNPRO_C -//#define PKG_MEM_ERROR_FMT(...) LM_ERR("could not allocate private memory from pkg pool", __VA_ARGS__) #define PKG_MEM_ERROR_FMT(...) LM_ERR("could not allocate private memory from pkg pool" __VA_ARGS__) #define PKG_MEM_CRITICAL_FMT(...) LM_CRIT("could not allocate private memory from pkg pool" __VA_ARGS__) #else

1 0

git:master:d3b3e87a: core: refactor PKG, SHM, and SYS* memory allocation error logging helper #defines
by Henning Westerholt 29 Dec '18

29 Dec '18

Module: kamailio Branch: master Commit: d3b3e87a2d39992d1da291f552869f14375425de URL: https://github.com/kamailio/kamailio/commit/d3b3e87a2d39992d1da291f552869f1… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-29T01:50:19+01:00 core: refactor PKG, SHM, and SYS* memory allocation error logging helper #defines - refactor PKG, SHM, and SYS* memory allocation error logging helper #defines - replace *_SZ and *_MSG by *_FTM #defines, which accept variable parameters - usage example: PKG_MEM_ERROR_FMT("for the record index %d\n", i); - output: "could not allocate private memory from pkg pool - for the record index 2" - because of the variable parameters you need to add a '\n' at the end --- Modified: src/core/mem/pkg.h Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/d3b3e87a2d39992d1da291f552869f1… Patch: https://github.com/kamailio/kamailio/commit/d3b3e87a2d39992d1da291f552869f1…

1 0

git:master:427e47b5: core: add PKG*, SYS* and SHM* macro error helper for message and size and message
by Henning Westerholt 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 427e47b500ee92cee096162b3419ef63f893cfa5 URL: https://github.com/kamailio/kamailio/commit/427e47b500ee92cee096162b3419ef6… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-28T17:55:36+01:00 core: add PKG*, SYS* and SHM* macro error helper for message and size and message - add more PKG_MEM_ERROR, PKG_MEM_CRITICAL, SHM_MEM_ERROR, SHM_MEM_CRITICAL, SYS_MEM_ERROR and SYS_MEM_CRITICAL error logging helper - *_MSG(m) to add an additional error string - *_SZ(s,m) to add the size of the failed allocation, additional error string --- Modified: src/core/mem/pkg.h Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/427e47b500ee92cee096162b3419ef6… Patch: https://github.com/kamailio/kamailio/commit/427e47b500ee92cee096162b3419ef6… --- diff --git a/src/core/mem/pkg.h b/src/core/mem/pkg.h index 0222baffe0..f5544f5818 100644 --- a/src/core/mem/pkg.h +++ b/src/core/mem/pkg.h @@ -111,17 +111,36 @@ void pkg_print_manager(void); # define pkg_mod_free_stats(x) do{}while(0) #endif /*PKG_MALLOC*/ + /** generic logging helper for allocation errors in private memory pool/ system */ #ifdef SYS_MALLOC #define PKG_MEM_ERROR LM_ERR("could not allocate private memory from sys pool\n") +#define PKG_MEM_ERROR_MSG(m) LM_ERR("could not allocate private memory from sys pool - %s\n", m); +#define PKG_MEM_ERROR_SZ(s, m) LM_ERR("could not allocate private memory from sys pool, size: %u - %s\n", (unsigned int)s, m); + #define PKG_MEM_CRITICAL LM_CRIT("could not allocate private memory from sys pool\n") +#define PKG_MEM_CRITICAL_MSG(m) LM_CRIT("could not allocate private memory from sys pool - %s\n", m); +#define PKG_MEM_CRITICAL_SZ(s, m) LM_CRIT("could not allocate private memory from sys pool, size: %u - %s\n", (unsigned int)s, m); + + #else #define PKG_MEM_ERROR LM_ERR("could not allocate private memory from pkg pool\n") +#define PKG_MEM_ERROR_MSG(m) LM_ERR("could not allocate private memory from pkg pool - %s\n", m); +#define PKG_MEM_ERROR_SZ(s, m) LM_ERR("could not allocate private memory from pkg pool, size: %u - %s\n", (unsigned int)s, m); + #define PKG_MEM_CRITICAL LM_CRIT("could not allocate private memory from pkg pool\n") +#define PKG_MEM_CRITICAL_MSG(m) LM_CRIT("could not allocate private memory from pkg pool - %s\n", m); +#define PKG_MEM_CRITICAL_SZ(s, m) LM_CRIT("could not allocate private memory from pkg pool, size: %u - %s\n", (unsigned int)s, m); #endif + /** generic logging helper for allocation errors in system memory */ #define SYS_MEM_ERROR LM_ERR("could not allocate memory from system\n") +#define SYS_MEM_ERROR_MSG(m) LM_ERR("could not allocate memory from system - %s\n", m); +#define SYS_MEM_ERROR_SZ(s, m) LM_ERR("could not allocate memory from system, size: %u - %s\n", (unsigned int)s, m); + #define SYS_MEM_CRITICAL LM_CRIT("could not allocate memory from system\n") +#define SYS_MEM_CRITICAL_MSG(m) LM_CRIT("could not allocate memory from system - %s\n", m); +#define SYS_MEM_CRITICAL_SZ(s, m) LM_CRIT("could not allocate memory from system, size: %u - %s\n", (unsigned int)s, m); #endif diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index a726eefdb0..5da3e27664 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -98,6 +98,11 @@ int shm_address_in(void *p); /** generic logging helper for allocation errors in shared memory pool */ #define SHM_MEM_ERROR LM_ERR("could not allocate shared memory from shm pool\n") +#define SHM_MEM_ERROR_MSG(m) LM_ERR("could not allocate shared memory from shm pool - %s\n", m); +#define SHM_MEM_ERROR_SZ(s, m) LM_ERR("could not allocate shared memory from shm pool, size: %u - %s\n", (unsigned int)s, m); + #define SHM_MEM_CRITICAL LM_CRIT("could not allocate shared memory from shm pool\n") +#define SHM_MEM_CRITICAL_MSG(m) LM_CRIT("could not allocate shared memory from shm pool - %s\n", m); +#define SHM_MEM_CRITICAL_SZ(s, m) LM_CRIT("could not allocate shared memory from shm pool, size: %u - %s\n", (unsigned int)s, m); #endif

1 0

git:master:304b4924: core: move includes, dprint.h from mem.h to new pkg.h, remove obselete config.h
by Henning Westerholt 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 304b492425a755ab524f814d1f9e03be8f7d407a URL: https://github.com/kamailio/kamailio/commit/304b492425a755ab524f814d1f9e03b… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-28T18:12:58+01:00 core: move includes, dprint.h from mem.h to new pkg.h, remove obselete config.h --- Modified: src/core/mem/mem.h Modified: src/core/mem/pkg.h --- Diff: https://github.com/kamailio/kamailio/commit/304b492425a755ab524f814d1f9e03b… Patch: https://github.com/kamailio/kamailio/commit/304b492425a755ab524f814d1f9e03b… --- diff --git a/src/core/mem/mem.h b/src/core/mem/mem.h index 23aa981483..64a5a229e1 100644 --- a/src/core/mem/mem.h +++ b/src/core/mem/mem.h @@ -37,8 +37,6 @@ #ifndef mem_h #define mem_h -#include "../config.h" -#include "../dprint.h" #include "pkg.h" diff --git a/src/core/mem/pkg.h b/src/core/mem/pkg.h index f5544f5818..e231692d30 100644 --- a/src/core/mem/pkg.h +++ b/src/core/mem/pkg.h @@ -29,6 +29,8 @@ #include "memapi.h" +#include "../dprint.h" + extern sr_pkg_api_t _pkg_root; int pkg_init_api(sr_pkg_api_t *ap);

1 0

git:master:6a36cc88: core: move PKG*, SYS* and SHM* macros to the new memory manager headers
by Henning Westerholt 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 6a36cc88ce63d8a3eedd4a9e5a4bbf1e75f57934 URL: https://github.com/kamailio/kamailio/commit/6a36cc88ce63d8a3eedd4a9e5a4bbf1… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-28T17:37:37+01:00 core: move PKG*, SYS* and SHM* macros to the new memory manager headers --- Modified: src/core/mem/mem.h Modified: src/core/mem/pkg.h Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/6a36cc88ce63d8a3eedd4a9e5a4bbf1… Patch: https://github.com/kamailio/kamailio/commit/6a36cc88ce63d8a3eedd4a9e5a4bbf1… --- diff --git a/src/core/mem/mem.h b/src/core/mem/mem.h index c11f891118..23aa981483 100644 --- a/src/core/mem/mem.h +++ b/src/core/mem/mem.h @@ -42,22 +42,5 @@ #include "pkg.h" - -/** generic logging helper for allocation errors in private memory pool/ system */ -#ifdef SYS_MALLOC -#define PKG_MEM_ERROR LM_ERR("could not allocate private memory from sys pool\n") -#define PKG_MEM_CRITICAL LM_CRIT("could not allocate private memory from sys pool\n") -#else -#define PKG_MEM_ERROR LM_ERR("could not allocate private memory from pkg pool\n") -#define PKG_MEM_CRITICAL LM_CRIT("could not allocate private memory from pkg pool\n") #endif -/** generic logging helper for allocation errors in system memory */ -#define SYS_MEM_ERROR LM_ERR("could not allocate memory from system\n") -#define SYS_MEM_CRITICAL LM_CRIT("could not allocate memory from system\n") - -/** generic logging helper for allocation errors in shared memory pool */ -#define SHM_MEM_ERROR LM_ERR("could not allocate shared memory from shm pool\n") -#define SHM_MEM_CRITICAL LM_CRIT("could not allocate shared memory from shm pool\n") - -#endif diff --git a/src/core/mem/pkg.h b/src/core/mem/pkg.h index 7b57719e46..0222baffe0 100644 --- a/src/core/mem/pkg.h +++ b/src/core/mem/pkg.h @@ -111,4 +111,17 @@ void pkg_print_manager(void); # define pkg_mod_free_stats(x) do{}while(0) #endif /*PKG_MALLOC*/ +/** generic logging helper for allocation errors in private memory pool/ system */ +#ifdef SYS_MALLOC +#define PKG_MEM_ERROR LM_ERR("could not allocate private memory from sys pool\n") +#define PKG_MEM_CRITICAL LM_CRIT("could not allocate private memory from sys pool\n") +#else +#define PKG_MEM_ERROR LM_ERR("could not allocate private memory from pkg pool\n") +#define PKG_MEM_CRITICAL LM_CRIT("could not allocate private memory from pkg pool\n") +#endif + +/** generic logging helper for allocation errors in system memory */ +#define SYS_MEM_ERROR LM_ERR("could not allocate memory from system\n") +#define SYS_MEM_CRITICAL LM_CRIT("could not allocate memory from system\n") + #endif diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index 4143462617..a726eefdb0 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -96,4 +96,8 @@ int shm_address_in(void *p); #define shm_available_safe() shm_available() #define shm_malloc_on_fork() do{}while(0) +/** generic logging helper for allocation errors in shared memory pool */ +#define SHM_MEM_ERROR LM_ERR("could not allocate shared memory from shm pool\n") +#define SHM_MEM_CRITICAL LM_CRIT("could not allocate shared memory from shm pool\n") + #endif

1 0

git:master:a8de371e: auth_db: print db table name when version check fails
by Daniel-Constantin Mierla 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: a8de371e90ddc8a6921b5bf7464961865804cc06 URL: https://github.com/kamailio/kamailio/commit/a8de371e90ddc8a6921b5bf74649618… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-26T12:04:59+01:00 auth_db: print db table name when version check fails --- Modified: src/modules/auth_db/auth_db_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a8de371e90ddc8a6921b5bf74649618… Patch: https://github.com/kamailio/kamailio/commit/a8de371e90ddc8a6921b5bf74649618… --- diff --git a/src/modules/auth_db/auth_db_mod.c b/src/modules/auth_db/auth_db_mod.c index 13fa154804..cd1ebaf8ba 100644 --- a/src/modules/auth_db/auth_db_mod.c +++ b/src/modules/auth_db/auth_db_mod.c @@ -303,7 +303,8 @@ static int auth_fixup(void** param, int param_no) if(version_table_check!=0 && db_check_table_version(&auth_dbf, dbh, &name, TABLE_VERSION) < 0) { - LM_ERR("error during table version check.\n"); + LM_ERR("error during version check for db table: %.*s.\n", + name.len, name.s); auth_dbf.close(dbh); return -1; }

2 3

git:master:bfe9fedf: app_perl: use mem error macros
by Victor Seva 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: bfe9fedfbf705ea6d37c5fa116f35bce6d9dfa67 URL: https://github.com/kamailio/kamailio/commit/bfe9fedfbf705ea6d37c5fa116f35bc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-28T15:57:27+01:00 app_perl: use mem error macros --- Modified: src/modules/app_perl/app_perl_mod.c Modified: src/modules/app_perl/kamailioxs.xs --- Diff: https://github.com/kamailio/kamailio/commit/bfe9fedfbf705ea6d37c5fa116f35bc… Patch: https://github.com/kamailio/kamailio/commit/bfe9fedfbf705ea6d37c5fa116f35bc… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index d8789f919d..3852fa118c 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -217,7 +217,7 @@ PerlInterpreter *parser_init(void) { LM_INFO("setting lib path: '%s'\n", entry); argv[argc] = pkg_malloc(strlen(entry)+20); if (!argv[argc]) { - LM_ERR("not enough pkg mem\n"); + PKG_MEM_ERROR; return NULL; } sprintf(argv[argc], "-I%s", entry); @@ -329,7 +329,7 @@ static int mod_init(void) { _ap_reset_cycles = shm_malloc(sizeof(int)); if(_ap_reset_cycles == NULL) { - LM_ERR("no more shared memory\n"); + SHM_MEM_ERROR; return -1; } *_ap_reset_cycles = _ap_reset_cycles_init; diff --git a/src/modules/app_perl/kamailioxs.xs b/src/modules/app_perl/kamailioxs.xs index faaa5b1fae..8feec95b2c 100644 --- a/src/modules/app_perl/kamailioxs.xs +++ b/src/modules/app_perl/kamailioxs.xs @@ -236,7 +236,7 @@ int moduleFunc(struct sip_msg *m, char *func, if (param1) { argv[0] = (char *)pkg_malloc(strlen(param1)+1); if (!argv[0]) { - LM_ERR("not enough pkg mem\n"); + PKG_MEM_ERROR; return -1; } strcpy(argv[0], param1); @@ -248,7 +248,7 @@ int moduleFunc(struct sip_msg *m, char *func, if (param2) { argv[1] = (char *)pkg_malloc(strlen(param2)+1); if (!argv[1]) { - LM_ERR("not enough pkg mem\n"); + PKG_MEM_ERROR; if (argv[0]) pkg_free(argv[0]); return -1; }

1 0

git:master:66ed074c: app_python: use mem error macros
by Victor Seva 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 66ed074cc4e85dbd76483f09e6fec4ae3dc0eccb URL: https://github.com/kamailio/kamailio/commit/66ed074cc4e85dbd76483f09e6fec4a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-28T15:59:58+01:00 app_python: use mem error macros --- Modified: src/modules/app_python/apy_kemi.c Modified: src/modules/app_python/python_support.c --- Diff: https://github.com/kamailio/kamailio/commit/66ed074cc4e85dbd76483f09e6fec4a… Patch: https://github.com/kamailio/kamailio/commit/66ed074cc4e85dbd76483f09e6fec4a… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index bcccbaa261..87e2ccce07 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -1342,7 +1342,7 @@ int apy_sr_init_mod(void) if(_sr_python_reload_version == NULL) { _sr_python_reload_version = (int*)shm_malloc(sizeof(int)); if(_sr_python_reload_version == NULL) { - LM_ERR("failed to allocated reload version\n"); + SHM_MEM_ERROR; return -1; } *_sr_python_reload_version = 0; diff --git a/src/modules/app_python/python_support.c b/src/modules/app_python/python_support.c index 7b1a93017e..7c4522eba6 100644 --- a/src/modules/app_python/python_support.c +++ b/src/modules/app_python/python_support.c @@ -94,8 +94,7 @@ void python_handle_exception(const char *fmt, ...) buf = (char *)pkg_realloc(NULL, buflen * sizeof(char)); if (!buf) { - LM_ERR("Can't allocate memory (%lu bytes), pkg_realloc() has failed." - " Not enough memory.\n", (unsigned long)(buflen * sizeof(char *))); + PKG_MEM_ERROR; if (srcbuf) pkg_free(srcbuf); return; } @@ -130,8 +129,7 @@ void python_handle_exception(const char *fmt, ...) buf = (char *)pkg_reallocxf(buf, buflen * sizeof(char)); if (!buf) { - LM_ERR("Can't allocate memory (%lu bytes), pkg_realloc() has failed." - " Not enough memory.\n", (unsigned long)(buflen * sizeof(char *))); + PKG_MEM_ERROR; Py_DECREF(line); Py_DECREF(pResult); if (srcbuf) pkg_free(srcbuf); @@ -200,8 +198,7 @@ static char *make_message(const char *fmt, va_list ap) p = (char *)pkg_realloc(NULL, size * sizeof(char)); if (!p) { - LM_ERR("Can't allocate memory (%lu bytes), pkg_malloc() has failed:" - " Not enough memory.\n", (unsigned long)(size * sizeof(char))); + PKG_MEM_ERROR; return NULL; } memset(p, 0, size * sizeof(char)); @@ -221,8 +218,7 @@ static char *make_message(const char *fmt, va_list ap) np = (char *)pkg_realloc(p, size * sizeof(char)); if (!np) { - LM_ERR("Can't allocate memory (%lu bytes), pkg_realloc() has failed:" - " Not enough memory.\n", (unsigned long)size * sizeof(char)); + PKG_MEM_ERROR; if (p) pkg_free(p); return NULL;

1 0

git:master:529a3416: app_mono: use mem error macros
by Victor Seva 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 529a341609e00f55e05ec090ff99c54e5ac70a17 URL: https://github.com/kamailio/kamailio/commit/529a341609e00f55e05ec090ff99c54… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-28T15:54:49+01:00 app_mono: use mem error macros --- Modified: src/modules/app_mono/app_mono_api.c --- Diff: https://github.com/kamailio/kamailio/commit/529a341609e00f55e05ec090ff99c54… Patch: https://github.com/kamailio/kamailio/commit/529a341609e00f55e05ec090ff99c54… --- diff --git a/src/modules/app_mono/app_mono_api.c b/src/modules/app_mono/app_mono_api.c index 05b9d151a3..efd17e8226 100644 --- a/src/modules/app_mono/app_mono_api.c +++ b/src/modules/app_mono/app_mono_api.c @@ -83,7 +83,7 @@ int sr_mono_load_script(char *script) mi = (sr_mono_load_t*)pkg_malloc(sizeof(sr_mono_load_t)); if(mi==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return -1; } memset(mi, 0, sizeof(sr_mono_load_t)); @@ -771,7 +771,7 @@ static int sr_mono_hdr_append (MonoString *hv) hdr = (char*)pkg_malloc(txt.len+1); if(hdr==NULL) { - LM_ERR("no pkg memory left\n"); + PKG_MEM_ERROR; goto error; } memcpy(hdr, txt.s, txt.len); @@ -866,7 +866,7 @@ static int sr_mono_hdr_insert (MonoString *hv) hdr = (char*)pkg_malloc(txt.len+1); if(hdr==NULL) { - LM_ERR("no pkg memory left\n"); + PKG_MEM_ERROR; goto error; } memcpy(hdr, txt.s, txt.len);

1 0

git:master:37c95cb4: app_lua: use mem error macros
by Victor Seva 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 37c95cb4acf09daa4258003e8ddb0e0dc83c3937 URL: https://github.com/kamailio/kamailio/commit/37c95cb4acf09daa4258003e8ddb0e0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-28T15:50:27+01:00 app_lua: use mem error macros --- Modified: src/modules/app_lua/app_lua_api.c Modified: src/modules/app_lua/app_lua_exp.c Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/37c95cb4acf09daa4258003e8ddb0e0… Patch: https://github.com/kamailio/kamailio/commit/37c95cb4acf09daa4258003e8ddb0e0… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 8fe8a22569..68e079d648 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -81,14 +81,14 @@ int lua_sr_alloc_script_ver(void) sr_lua_script_ver = (sr_lua_script_ver_t *) shm_malloc(sizeof(sr_lua_script_ver_t)); if(sr_lua_script_ver==NULL) { - LM_ERR("cannot allocate shm memory\n"); + SHM_MEM_ERROR; return -1; } sr_lua_script_ver->version = (unsigned int *) shm_malloc(sizeof(unsigned int)*size); if(sr_lua_script_ver->version==NULL) { - LM_ERR("cannot allocate shm memory\n"); + SHM_MEM_ERROR; goto error; } memset(sr_lua_script_ver->version, 0, sizeof(unsigned int)*size); @@ -136,7 +136,7 @@ int sr_lua_load_script(char *script) li = (sr_lua_load_t*)pkg_malloc(sizeof(sr_lua_load_t)); if(li==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return -1; } memset(li, 0, sizeof(sr_lua_load_t)); @@ -451,7 +451,7 @@ int sr_lua_reload_script(void) _app_lua_sv = (int *) pkg_malloc(sizeof(int)*sv_len); if(_app_lua_sv==NULL) { - LM_ERR("no more pkg memory\n"); + PKG_MEM_ERROR; return -1; } } diff --git a/src/modules/app_lua/app_lua_exp.c b/src/modules/app_lua/app_lua_exp.c index 7889a4eff1..1e512ec533 100644 --- a/src/modules/app_lua/app_lua_exp.c +++ b/src/modules/app_lua/app_lua_exp.c @@ -646,7 +646,7 @@ static int lua_sr_tm_t_on_branch_failure(lua_State *L) { if ((rt_name.s = pkg_reallocxf(rt_name.s, rt_name_len+1)) == NULL) { - LM_ERR("No memory left in branch_failure fixup\n"); + PKG_MEM_ERROR; return -1; } rt_name.len = rt_name_len; diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 8009f2970a..6119aefa46 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -171,7 +171,7 @@ static int lua_sr_modf (lua_State *L) argv[i] = (char*)pkg_malloc(strlen(luav[i])+1); if(argv[i]==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; goto error; } strcpy(argv[i], luav[i]); @@ -743,7 +743,7 @@ static int lua_sr_hdr_append (lua_State *L) hdr = (char*)pkg_malloc(len+1); if(hdr==NULL) { - LM_ERR("no pkg memory left\n"); + PKG_MEM_ERROR; return 0; } memcpy(hdr, txt, len); @@ -829,7 +829,7 @@ static int lua_sr_hdr_insert (lua_State *L) hdr = (char*)pkg_malloc(len+1); if(hdr==NULL) { - LM_ERR("no pkg memory left\n"); + PKG_MEM_ERROR; return 0; } memcpy(hdr, txt, len);

1 0

git:master:1fdc4be9: app_jsdt: use mem error macros
by Victor Seva 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 1fdc4be9541b1363081fd769ab9d863afe27a961 URL: https://github.com/kamailio/kamailio/commit/1fdc4be9541b1363081fd769ab9d863… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-28T15:47:19+01:00 app_jsdt: use mem error macros --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/1fdc4be9541b1363081fd769ab9d863… Patch: https://github.com/kamailio/kamailio/commit/1fdc4be9541b1363081fd769ab9d863… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 907433573b..ee25fd5379 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -604,7 +604,7 @@ static int jsdt_sr_modf (duk_context *J) if(jsdtv[i]!=NULL) { argv[i] = (char*)pkg_malloc(strlen(jsdtv[i])+1); if(argv[i]==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; goto error; } strcpy(argv[i], jsdtv[i]); @@ -758,7 +758,7 @@ int jsdt_sr_init_mod(void) if(_sr_jsdt_reload_version == NULL) { _sr_jsdt_reload_version = (int*)shm_malloc(sizeof(int)); if(_sr_jsdt_reload_version == NULL) { - LM_ERR("failed to allocated reload version\n"); + SHM_MEM_ERROR; return -1; } *_sr_jsdt_reload_version = 0;

1 0

git:master:508db5a6: app_java: use mem error macros
by Victor Seva 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 508db5a6cda890c5df7c093e644f9659a1eff188 URL: https://github.com/kamailio/kamailio/commit/508db5a6cda890c5df7c093e644f965… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-28T15:44:16+01:00 app_java: use mem error macros --- Modified: src/modules/app_java/app_java_mod.c Modified: src/modules/app_java/java_iface.c Modified: src/modules/app_java/java_msgobj.c Modified: src/modules/app_java/java_native_methods.c Modified: src/modules/app_java/java_sig_parser.c Modified: src/modules/app_java/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/508db5a6cda890c5df7c093e644f965… Patch: https://github.com/kamailio/kamailio/commit/508db5a6cda890c5df7c093e644f965… --- diff --git a/src/modules/app_java/app_java_mod.c b/src/modules/app_java/app_java_mod.c index 393e4aa349..b789f77cf4 100644 --- a/src/modules/app_java/app_java_mod.c +++ b/src/modules/app_java/app_java_mod.c @@ -123,8 +123,7 @@ static int mod_init(void) options = (JavaVMOption *)pkg_malloc(sizeof(JavaVMOption)); if(!options) { - LM_ERR("pkg_malloc() failed: Couldn't initialize Java VM: Not enough " - "memory\n"); + PKG_MEM_ERROR; return -1; } memset(options, 0, sizeof(JavaVMOption)); diff --git a/src/modules/app_java/java_iface.c b/src/modules/app_java/java_iface.c index 0535591055..74059331ac 100644 --- a/src/modules/app_java/java_iface.c +++ b/src/modules/app_java/java_iface.c @@ -152,9 +152,7 @@ int java_exec(struct sip_msg *msgp, int is_static, int is_synchronized, + 1; // '(' + 'signature' + ')' + 'return signature' + null terminator cs = (char *)pkg_malloc((cslen+1) * sizeof(char)); if(!cs) { - LM_ERR("%s: pkg_malloc() has failed. Can't allocate %lu bytes. Not " - "enough memory!\n", - APP_NAME, (unsigned long)cslen); + PKG_MEM_ERROR; return -1; } r = snprintf(cs, cslen, "(%s)%s", signature, retval_sig); diff --git a/src/modules/app_java/java_msgobj.c b/src/modules/app_java/java_msgobj.c index cc5e1b4cce..940670f420 100644 --- a/src/modules/app_java/java_msgobj.c +++ b/src/modules/app_java/java_msgobj.c @@ -47,7 +47,7 @@ jobject *fill_sipmsg_object(JNIEnv *env, struct sip_msg *msg) SipMsgInstance = (jobject *)pkg_malloc(sizeof(jobject)); if(!SipMsgInstance) { - LM_ERR("%s: pkg_malloc() has failed. Not enough memory!\n", APP_NAME); + PKG_MEM_ERROR; return NULL; } memset(SipMsgInstance, 0, sizeof(jobject)); diff --git a/src/modules/app_java/java_native_methods.c b/src/modules/app_java/java_native_methods.c index 5d12e844cf..bb2ebe6be7 100644 --- a/src/modules/app_java/java_native_methods.c +++ b/src/modules/app_java/java_native_methods.c @@ -995,17 +995,13 @@ JNIEXPORT jint JNICALL Java_org_siprouter_CoreMethods_force_1send_1socket( nl = (struct name_lst *)pkg_malloc(sizeof(struct name_lst)); if(!nl) { - LM_ERR("%s: force_send_socket: pkg_malloc() has failed. Not enough " - "memory!\n", - APP_NAME); + PKG_MEM_ERROR; return -1; } si = (struct socket_id *)pkg_malloc(sizeof(struct socket_id)); if(!si) { - LM_ERR("%s: force_send_socket: pkg_malloc() has failed. Not enough " - "memory!\n", - APP_NAME); + PKG_MEM_ERROR; return -1; } diff --git a/src/modules/app_java/java_sig_parser.c b/src/modules/app_java/java_sig_parser.c index a1512fe85f..87b73b6288 100644 --- a/src/modules/app_java/java_sig_parser.c +++ b/src/modules/app_java/java_sig_parser.c @@ -188,7 +188,7 @@ jvalue *get_value_by_sig_type(char *sig, char *pval) ret = (jvalue *)pkg_malloc(sizeof(jvalue)); if(!ret) { - LM_ERR("%s: pkg_malloc() has failed. Not enouph memory!\n", APP_NAME); + PKG_MEM_ERROR; return NULL; } diff --git a/src/modules/app_java/utils.c b/src/modules/app_java/utils.c index 611665831e..5ec7cc17fe 100644 --- a/src/modules/app_java/utils.c +++ b/src/modules/app_java/utils.c @@ -46,7 +46,7 @@ char **split(char *str, char *sep) buf = (char **)pkg_malloc(sizeof(char *)); if(!buf) { - LM_ERR("%s: pkg_malloc() has failed. Not enough memory!\n", APP_NAME); + PKG_MEM_ERROR; return NULL; } memset(&buf, 0, sizeof(char *)); @@ -69,8 +69,7 @@ char **split(char *str, char *sep) buf = (char **)pkg_reallocxf(buf, (i + 2) * sizeof(char *)); if(!buf) { - LM_ERR("%s: pkg_realloc() has failed. Not enough memory!\n", - APP_NAME); + PKG_MEM_ERROR; return NULL; } buf[i] = strdup(token);

1 0

git:master:0d843f5f: acc_radius: use mem error macros
by Victor Seva 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 0d843f5f51750d51b66a5f0501320cb461072c26 URL: https://github.com/kamailio/kamailio/commit/0d843f5f51750d51b66a5f0501320cb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-28T15:38:09+01:00 acc_radius: use mem error macros --- Modified: src/modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0d843f5f51750d51b66a5f0501320cb… Patch: https://github.com/kamailio/kamailio/commit/0d843f5f51750d51b66a5f0501320cb… --- diff --git a/src/modules/acc_radius/acc_radius_mod.c b/src/modules/acc_radius/acc_radius_mod.c index adbfe18b00..b4e74c6656 100644 --- a/src/modules/acc_radius/acc_radius_mod.c +++ b/src/modules/acc_radius/acc_radius_mod.c @@ -184,7 +184,7 @@ static int acc_api_fixup(void **param, int param_no) if(param_no == 1) { accp = (struct acc_param *)pkg_malloc(sizeof(struct acc_param)); if(!accp) { - LM_ERR("no more pkg mem\n"); + PKG_MEM_ERROR; return E_OUT_OF_MEM; } memset(accp, 0, sizeof(struct acc_param));

1 0

git:master:8e2ae178: acc_diameter: use mem error macros
by Victor Seva 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 8e2ae17802e03153b23fbc4d30fd10ae1717aa4d URL: https://github.com/kamailio/kamailio/commit/8e2ae17802e03153b23fbc4d30fd10a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-28T15:35:52+01:00 acc_diameter: use mem error macros --- Modified: src/modules/acc_diameter/acc_diameter_mod.c Modified: src/modules/acc_diameter/diam_avp.c Modified: src/modules/acc_diameter/diam_message.c Modified: src/modules/acc_diameter/diam_tcp.c --- Diff: https://github.com/kamailio/kamailio/commit/8e2ae17802e03153b23fbc4d30fd10a… Patch: https://github.com/kamailio/kamailio/commit/8e2ae17802e03153b23fbc4d30fd10a…

1 0

git:master:b5c40df3: acc: use mem error macros
by Victor Seva 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: b5c40df3d75fc664505f80ea2fefd8bc3cb47868 URL: https://github.com/kamailio/kamailio/commit/b5c40df3d75fc664505f80ea2fefd8b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-28T13:52:56+01:00 acc: use mem error macros --- Modified: src/modules/acc/acc_extra.c Modified: src/modules/acc/acc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b5c40df3d75fc664505f80ea2fefd8b… Patch: https://github.com/kamailio/kamailio/commit/b5c40df3d75fc664505f80ea2fefd8b… --- diff --git a/src/modules/acc/acc_extra.c b/src/modules/acc/acc_extra.c index c92995beaf..5e8568535e 100644 --- a/src/modules/acc/acc_extra.c +++ b/src/modules/acc/acc_extra.c @@ -115,7 +115,7 @@ struct acc_extra *parse_acc_extra(char *extra_str) } extra = (struct acc_extra*)pkg_malloc(sizeof(struct acc_extra)); if (extra==0) { - LM_ERR("no more pkg mem 1\n"); + PKG_MEM_ERROR; goto error; } memset( extra, 0, sizeof(struct acc_extra)); @@ -237,7 +237,7 @@ int extra2strar(struct acc_extra *extra, struct sip_msg *rq, str *val_arr, } else { val_arr[n].s = (char *)pkg_malloc(value.rs.len); if (val_arr[n].s == NULL ) { - LM_ERR("out of memory.\n"); + PKG_MEM_ERROR; /* Cleanup already allocated memory and * return that we didn't do anything */ for (i = 0; i < n ; i++) { diff --git a/src/modules/acc/acc_mod.c b/src/modules/acc/acc_mod.c index cde32146b9..a4f9a64265 100644 --- a/src/modules/acc/acc_mod.c +++ b/src/modules/acc/acc_mod.c @@ -165,7 +165,7 @@ static int _acc_module_initialized = 0; static int acc_fixup(void** param, int param_no); static int free_acc_fixup(void** param, int param_no); - +/* clang-format off */ static cmd_export_t cmds[] = { {"acc_log_request", (cmd_function)w_acc_log_request, 1, acc_fixup, free_acc_fixup, @@ -242,14 +242,14 @@ struct module_exports exports= { DEFAULT_DLFLAGS, /* dlopen flags */ cmds, /* exported functions */ params, /* exported params */ - 0, /* RPC method exports */ + 0, /* RPC method exports */ 0, /* exported pseudo-variables */ 0, /* response function */ mod_init, /* initialization module */ child_init, /* per-child init function */ destroy /* destroy function */ }; - +/* clang-format on */ /************************** FIXUP functions ****************************/ @@ -268,7 +268,7 @@ static int acc_fixup(void** param, int param_no) if (param_no == 1) { accp = (struct acc_param*)pkg_malloc(sizeof(struct acc_param)); if (!accp) { - LM_ERR("no more pkg mem\n"); + PKG_MEM_ERROR; return E_OUT_OF_MEM; } memset( accp, 0, sizeof(struct acc_param)); @@ -664,7 +664,7 @@ static int acc_register_engine(acc_engine_t *eng) e = (acc_engine_t*)pkg_malloc(sizeof(acc_engine_t)); if(e ==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return -1; } memcpy(e, eng, sizeof(acc_engine_t));

1 0

git:master:dc03199e: core: rename sdp parser USE_PKG_MEM and USE_SHM_MEM #define, prevent core mix-up
by Henning Westerholt 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: dc03199eaa7368003f3d2c188322e23d9c8512eb URL: https://github.com/kamailio/kamailio/commit/dc03199eaa7368003f3d2c188322e23… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-28T12:11:31+01:00 core: rename sdp parser USE_PKG_MEM and USE_SHM_MEM #define, prevent core mix-up --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/dc03199eaa7368003f3d2c188322e23… Patch: https://github.com/kamailio/kamailio/commit/dc03199eaa7368003f3d2c188322e23… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index b4c9ffcaa3..7dbf259379 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -35,8 +35,8 @@ #include "sdp.h" #include "sdp_helpr_funcs.h" -#define USE_PKG_MEM 0 -#define USE_SHM_MEM 1 +#define SDP_USE_PKG_MEM 0 +#define SDP_USE_SHM_MEM 1 #define HOLD_IP_STR "0.0.0.0" #define HOLD_IP_LEN 7 @@ -179,18 +179,18 @@ static inline sdp_payload_attr_t** init_p_payload_attr(sdp_stream_cell_t* _strea LM_ERR("Invalid number of payloads\n"); return NULL; } - if (pkg == USE_PKG_MEM) { + if (pkg == SDP_USE_PKG_MEM) { _stream->p_payload_attr = (sdp_payload_attr_t**)pkg_malloc(payloads_num * sizeof(sdp_payload_attr_t*)); - } else if (pkg == USE_SHM_MEM) { + } else if (pkg == SDP_USE_SHM_MEM) { _stream->p_payload_attr = (sdp_payload_attr_t**)shm_malloc(payloads_num * sizeof(sdp_payload_attr_t*)); } else { LM_ERR("undefined memory type\n"); return NULL; } if (_stream->p_payload_attr == NULL) { - if (pkg == USE_PKG_MEM) { + if (pkg == SDP_USE_PKG_MEM) { PKG_MEM_ERROR; - } else if (pkg == USE_SHM_MEM) { + } else if (pkg == SDP_USE_SHM_MEM) { SHM_MEM_ERROR; } return NULL; @@ -531,7 +531,7 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ } /* Initialize fast access pointers */ - if (NULL == init_p_payload_attr(stream, USE_PKG_MEM)) { + if (NULL == init_p_payload_attr(stream, SDP_USE_PKG_MEM)) { return -1; } parse_payload_attr = 1; @@ -1082,7 +1082,7 @@ sdp_stream_cell_t * clone_sdp_stream_cell(sdp_stream_cell_t *stream) clone_stream->payloads_num = stream->payloads_num; if (clone_stream->payloads_num) { - if (NULL == init_p_payload_attr(clone_stream, USE_SHM_MEM)) { + if (NULL == init_p_payload_attr(clone_stream, SDP_USE_SHM_MEM)) { goto error; } } @@ -1319,3 +1319,5 @@ sdp_info_t * clone_sdp_info(struct sip_msg* _m) return NULL; } +#undef SDP_USE_PKG_MEM +#undef SDP_USE_SHM_MEM

1 0

git:master:851fe7f7: core: use SHM_MEM_ERROR helper define after commit 4c57d02e
by Henning Westerholt 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 851fe7f7de78a41c9e0e1b67d437201bb49b7941 URL: https://github.com/kamailio/kamailio/commit/851fe7f7de78a41c9e0e1b67d437201… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-28T12:14:26+01:00 core: use SHM_MEM_ERROR helper define after commit 4c57d02e --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/851fe7f7de78a41c9e0e1b67d437201… Patch: https://github.com/kamailio/kamailio/commit/851fe7f7de78a41c9e0e1b67d437201… --- diff --git a/src/main.c b/src/main.c index ad992a56be..ac58b760ba 100644 --- a/src/main.c +++ b/src/main.c @@ -1271,7 +1271,7 @@ int main_loop(void) if(_sr_instance_started == NULL) { _sr_instance_started = shm_malloc(sizeof(int)); if(_sr_instance_started == NULL) { - LM_ERR("no shared memory\n"); + SHM_MEM_ERROR; goto error; } *_sr_instance_started = 0;

1 0

git:master:29b569f4: core: consistently set "ser_error" internal state for all lump operations
by Henning Westerholt 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 29b569f499bfe810d4e4aef7259c91dcc8c26e0b URL: https://github.com/kamailio/kamailio/commit/29b569f499bfe810d4e4aef7259c91d… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-28T12:11:31+01:00 core: consistently set "ser_error" internal state for all lump operations --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/29b569f499bfe810d4e4aef7259c91d… Patch: https://github.com/kamailio/kamailio/commit/29b569f499bfe810d4e4aef7259c91d… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index 5a1acb14d5..007c5de2cc 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -57,6 +57,7 @@ struct lump* append_new_lump(struct lump** list, char* new_hdr, tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ + ser_error=E_OUT_OF_MEM; PKG_MEM_ERROR; return 0; } @@ -83,6 +84,7 @@ struct lump* add_new_lump(struct lump** list, char* new_hdr, tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ + ser_error=E_OUT_OF_MEM; PKG_MEM_ERROR; return 0; } @@ -108,6 +110,7 @@ struct lump* insert_new_lump(struct lump** list, char* new_hdr, tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ + ser_error=E_OUT_OF_MEM; PKG_MEM_ERROR; return 0; } @@ -303,6 +306,7 @@ struct lump* del_lump(struct sip_msg* msg, int offset, int len, enum _hdr_types_ tmp=pkg_malloc(sizeof(struct lump)); if (tmp==0){ + ser_error=E_OUT_OF_MEM; PKG_MEM_ERROR; return 0; } @@ -536,6 +540,7 @@ static struct lump *dup_lump_list_r( struct lump *l, /* otherwise duplicate current element */ new_lump=pkg_malloc(sizeof(struct lump)); if (!new_lump) { + ser_error=E_OUT_OF_MEM; PKG_MEM_ERROR; *error=1; return 0; @@ -754,6 +759,7 @@ int sr_hdr_add(sip_msg_t *msg, str *sname, str *sbody) h.len = sname->len + 2 + sbody->len + CRLF_LEN; h.s = (char*)pkg_malloc(h.len+1); if(h.s == 0) { + ser_error=E_OUT_OF_MEM; PKG_MEM_ERROR; return -1; }

1 0

git:master:785ede5b: rtpengine: use version number to track building rtpengine sockets on reload
by Daniel-Constantin Mierla 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 785ede5bacfe55e88381ae8f7d672b24ec4b8cf6 URL: https://github.com/kamailio/kamailio/commit/785ede5bacfe55e88381ae8f7d672b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-28T09:56:26+01:00 rtpengine: use version number to track building rtpengine sockets on reload - check on list size fails if same list is reloaded with different attributes - reload command has a safe interval of 10 seconds between executions to allow building internal list of sockets --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/785ede5bacfe55e88381ae8f7d672b2… Patch: https://github.com/kamailio/kamailio/commit/785ede5bacfe55e88381ae8f7d672b2… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 46a55e6669..484ce05f35 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -169,6 +169,16 @@ struct minmax_stats_vals { long long avg_samples; /* our own running count to average the averages */ }; +#define RTPE_LIST_VERSION_DELAY 10 + +typedef struct rtpe_list_version { + int vernum; + time_t vertime; +} rtpe_list_version_t; + +static rtpe_list_version_t *_rtpe_list_version = NULL; +static int _rtpe_list_vernum_local = 0; + static char *gencookie(); static int rtpp_test(struct rtpp_node*, int, int); static int start_recording_f(struct sip_msg *, char *, char *); @@ -283,7 +293,6 @@ static struct minmax_mos_label_stats global_mos_stats, int got_any_mos_pvs; - static cmd_export_t cmds[] = { {"set_rtpengine_set", (cmd_function)set_rtpengine_set_f, 1, fixup_set_id, 0, @@ -1169,16 +1178,26 @@ static int rtpp_test_ping(struct rtpp_node *node) static void rtpengine_rpc_reload(rpc_t* rpc, void* ctx) { + time_t tnow; + if (rtpp_db_url.s == NULL) { // no database rpc->fault(ctx, 500, "No Database URL"); return; } + if(!sr_instance_ready()) { rpc->fault(ctx, 500, "Initializing - try later"); return; } + tnow = time(NULL); + if(tnow - _rtpe_list_version->vertime < RTPE_LIST_VERSION_DELAY) { + rpc->fault(ctx, 500, "Too short reload interval - try later"); + return; + } + _rtpe_list_version->vertime = tnow; + if (init_rtpproxy_db() < 0) { // fail reloading from database rpc->fault(ctx, 500, "Failed reloading db"); @@ -1186,9 +1205,15 @@ static void rtpengine_rpc_reload(rpc_t* rpc, void* ctx) } if (build_rtpp_socks(1, 1)) { - rpc->fault(ctx, 500, "Out of memory"); + rpc->fault(ctx, 500, "Failed to build rtpengine sockets"); return; } + + _rtpe_list_version->vernum += 1; + _rtpe_list_version->vertime = time(NULL); + LM_DBG("current rtpengines list version: %d (%u)\n", + _rtpe_list_version->vernum, + (unsigned int)_rtpe_list_version->vertime); } static int rtpengine_rpc_iterate(rpc_t* rpc, void* ctx, const str *rtpp_url, @@ -1473,6 +1498,14 @@ mod_init(void) unsigned short avp_flags; str s; + _rtpe_list_version = (rtpe_list_version_t*)shm_mallocxz(sizeof(rtpe_list_version_t)); + if(_rtpe_list_version==NULL) { + LM_ERR("no more shm memory for rtpe list version\n"); + return -1; + } + _rtpe_list_version->vernum = 1; + _rtpe_list_version->vertime = time(NULL); + if(rtpengine_rpc_init()<0) { LM_ERR("failed to register RPC commands\n"); @@ -1666,13 +1699,15 @@ static int build_rtpp_socks(int lmode, int rtest) { int ip_mtu_discover = IP_PMTUDISC_DONT; #endif + if(_rtpe_list_vernum_local == _rtpe_list_version->vernum) { + /* same version for the list of rtpengines */ + return 0; + } + rtpe_reload_lock_get(rtpp_no_lock); current_rtpp_no = *rtpp_no; rtpe_reload_lock_release(rtpp_no_lock); - if (current_rtpp_no == rtpp_socks_size) - return 0; - // close current sockets for (i = 0; i < rtpp_socks_size; i++) { if (rtpp_socks[i] >= 0) { @@ -1690,6 +1725,7 @@ static int build_rtpp_socks(int lmode, int rtest) { memset(rtpp_socks, -1, sizeof(int)*(rtpp_socks_size)); rtpe_reload_lock_get(rtpp_set_list->rset_head_lock); + _rtpe_list_vernum_local = _rtpe_list_version->vernum; for (rtpp_list = rtpp_set_list->rset_first; rtpp_list != 0; rtpp_list = rtpp_list->rset_next) { @@ -1948,6 +1984,10 @@ static void mod_destroy(void) } else { LM_DBG("rtpengine_hash_table_destroy() success!\n"); } + if(_rtpe_list_version!=NULL) { + shm_free(_rtpe_list_version); + _rtpe_list_version = NULL; + } }

1 0

git:master:3d481300: rtpengine: reworked build of rtpengine sockets to avoid serial initialization
by Daniel-Constantin Mierla 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 3d4813001052497d21804586d643697f7a68aee8 URL: https://github.com/kamailio/kamailio/commit/3d4813001052497d21804586d643697… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-28T09:56:26+01:00 rtpengine: reworked build of rtpengine sockets to avoid serial initialization - do not lock during startup, change of the list of rtpengines can be done only upon reload, which is now disabled until all child processes did the init - do rtpengine testing (probing) only in one child, the status is stored in shared memory, no need to do it from each process. --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/3d4813001052497d21804586d643697… Patch: https://github.com/kamailio/kamailio/commit/3d4813001052497d21804586d643697… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index f18a35b33d..46a55e6669 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -193,7 +193,7 @@ static struct rtpp_node *select_rtpp_node_new(str, str, int, struct rtpp_node ** static struct rtpp_node *select_rtpp_node_old(str, str, int, enum rtpe_operation); static struct rtpp_node *select_rtpp_node(str, str, int, struct rtpp_node **, int, enum rtpe_operation); static int is_queried_node(struct rtpp_node *, struct rtpp_node **, int); -static int build_rtpp_socks(); +static int build_rtpp_socks(int lmode, int rtest); static char *send_rtpp_command(struct rtpp_node *, bencode_item_t *, int *); static int get_extra_id(struct sip_msg* msg, str *id_str); @@ -1174,6 +1174,10 @@ static void rtpengine_rpc_reload(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "No Database URL"); return; } + if(!sr_instance_ready()) { + rpc->fault(ctx, 500, "Initializing - try later"); + return; + } if (init_rtpproxy_db() < 0) { // fail reloading from database @@ -1181,7 +1185,7 @@ static void rtpengine_rpc_reload(rpc_t* rpc, void* ctx) return; } - if (build_rtpp_socks()) { + if (build_rtpp_socks(1, 1)) { rpc->fault(ctx, 500, "Out of memory"); return; } @@ -1195,7 +1199,12 @@ static int rtpengine_rpc_iterate(rpc_t* rpc, void* ctx, const str *rtpp_url, int found = RPC_FOUND_NONE, err = 0; int ret; - if (build_rtpp_socks()) { + if(!sr_instance_ready()) { + rpc->fault(ctx, 500, "Initializing - try later"); + return -1; + } + + if (build_rtpp_socks(1, 1)) { rpc->fault(ctx, 500, "Out of memory"); return -1; } @@ -1634,14 +1643,19 @@ mod_init(void) } #define rtpe_reload_lock_get(plock) do { \ - if (rtpp_db_url.s != NULL) lock_get(plock); \ + if (rtpp_db_url.s != NULL && lmode != 0) lock_get(plock); \ } while(0) #define rtpe_reload_lock_release(plock) do { \ - if (rtpp_db_url.s != NULL) lock_release(plock); \ + if (rtpp_db_url.s != NULL && lmode != 0) lock_release(plock); \ } while(0) -static int build_rtpp_socks() { +/** + * build rtp enigne sockets + * - lmode: locking mode (1 - lock if needed; 0 - no locking) + * - rtest: rtpengine testing (1 - test if active; 0 - no test done) + */ +static int build_rtpp_socks(int lmode, int rtest) { int n, i; char *cp; struct addrinfo hints, *res; @@ -1768,7 +1782,7 @@ static int build_rtpp_socks() { freeaddrinfo(res); rptest: - pnode->rn_disabled = rtpp_test(pnode, 0, 1); + if(rtest) pnode->rn_disabled = rtpp_test(pnode, 0, 1); } rtpe_reload_lock_release(rtpp_list->rset_lock); } @@ -1848,8 +1862,14 @@ child_init(int rank) memset(queried_nodes_ptr, 0, MAX_RTPP_TRIED_NODES * sizeof(struct rtpp_node*)); /* Iterate known RTP proxies - create sockets */ - if (build_rtpp_socks()) - return -1; + if(rank==PROC_SIPINIT) { + /* probe rtpengines only in first worker */ + if (build_rtpp_socks(0, 1)) + return -1; + } else { + if (build_rtpp_socks(0, 0)) + return -1; + } return 0; } @@ -2865,7 +2885,7 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer { struct rtpp_node *node = NULL; - if (build_rtpp_socks()) { + if (build_rtpp_socks(1, 0)) { LM_ERR("out of memory\n"); return NULL; }

1 0

git:master:97af78a5: core: added function to detect when processes were initialized
by Daniel-Constantin Mierla 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 97af78a5c4dd2b99da5d2f7048ac6fa73db94c1d URL: https://github.com/kamailio/kamailio/commit/97af78a5c4dd2b99da5d2f7048ac6fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-28T09:56:26+01:00 core: added function to detect when processes were initialized - sr_instance_ready() return 1 if all processes finished child_init() --- Modified: src/core/pt.c Modified: src/core/pt.h Modified: src/core/sr_module.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/97af78a5c4dd2b99da5d2f7048ac6fa… Patch: https://github.com/kamailio/kamailio/commit/97af78a5c4dd2b99da5d2f7048ac6fa…

1 0

git:master:61c368b4: core: new rpc command - core.psa
by Daniel-Constantin Mierla 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 61c368b406f9fd3bf40f548b2866fc254ca11670 URL: https://github.com/kamailio/kamailio/commit/61c368b406f9fd3bf40f548b2866fc2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-28T09:56:26+01:00 core: new rpc command - core.psa - print attributes stored in process table, similar to core.psx, but also prints the rank and status fields --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/61c368b406f9fd3bf40f548b2866fc2… Patch: https://github.com/kamailio/kamailio/commit/61c368b406f9fd3bf40f548b2866fc2… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index bfa962b567..ea38e60bae 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -438,6 +438,28 @@ static void core_psx(rpc_t* rpc, void* c) } } +static const char* core_psa_doc[] = { + "Return all the attributes of running.", + /* Documentation string */ + 0 /* Method signature(s) */ +}; + + +static void core_psa(rpc_t* rpc, void* c) +{ + int p; + void *handle; + + for (p=0; p<*process_count;p++) { + rpc->add(c, "{", &handle); + rpc->struct_add(handle, "dddds", + "index", p, + "pid", pt[p].pid, + "status", pt[p].status, + "rank", pt[p].rank, + "description", pt[p].desc); + } +} static const char* core_pwd_doc[] = { "Returns the working directory of server.", /* Documentation string */ @@ -1058,6 +1080,7 @@ static rpc_export_t core_rpc_methods[] = { {"core.uptime", core_uptime, core_uptime_doc, 0 }, {"core.ps", core_ps, core_ps_doc, RET_ARRAY}, {"core.psx", core_psx, core_psx_doc, RET_ARRAY}, + {"core.psa", core_psa, core_psa_doc, RET_ARRAY}, {"core.pwd", core_pwd, core_pwd_doc, RET_ARRAY}, {"core.arg", core_arg, core_arg_doc, RET_ARRAY}, {"core.kill", core_kill, core_kill_doc, 0 },

1 0

git:master:4c57d02e: core: function to detect if all processes were forked
by Daniel-Constantin Mierla 28 Dec '18

28 Dec '18

Module: kamailio Branch: master Commit: 4c57d02e53deda909cc93b41d613f62921c99a9c URL: https://github.com/kamailio/kamailio/commit/4c57d02e53deda909cc93b41d613f62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-28T09:56:26+01:00 core: function to detect if all processes were forked --- Modified: src/core/pt.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/4c57d02e53deda909cc93b41d613f62… Patch: https://github.com/kamailio/kamailio/commit/4c57d02e53deda909cc93b41d613f62… --- diff --git a/src/core/pt.h b/src/core/pt.h index b6d4dc86fc..5c8ed49d99 100644 --- a/src/core/pt.h +++ b/src/core/pt.h @@ -96,4 +96,6 @@ int mem_dump_shm_fixup(void *handle, str *gname, str *name, void **val); unsigned int set_fork_delay(unsigned int v); +int sr_instance_started(void); + #endif diff --git a/src/main.c b/src/main.c index aaf5637e53..08b6909278 100644 --- a/src/main.c +++ b/src/main.c @@ -499,6 +499,16 @@ char* pgid_file = 0; char *sr_memmng_pkg = NULL; char *sr_memmng_shm = NULL; +static int *_sr_instance_started = NULL; + +int sr_instance_initialized(void) +{ + if(_sr_instance_started!=NULL && *_sr_instance_started==1) { + return 1; + } + return 0; +} + /* call it before exiting; if show_status==1, mem status is displayed */ void cleanup(int show_status) { @@ -1253,6 +1263,14 @@ int main_loop(void) int nrprocs; int woneinit; + if(_sr_instance_started == NULL) { + _sr_instance_started = shm_malloc(sizeof(int)); + if(_sr_instance_started == NULL) { + LM_ERR("no shared memory\n"); + goto error; + } + *_sr_instance_started = 0; + } /* one "main" process and n children handling i/o */ if (dont_fork){ #ifdef STATS @@ -1415,6 +1433,7 @@ int main_loop(void) LM_ERR("init_child failed\n"); goto error; } + *_sr_instance_started = 1; return udp_rcv_loop(); }else{ /* fork: */ @@ -1729,6 +1748,8 @@ int main_loop(void) cfg_child_no_cb_init(); cfg_ok=1; + *_sr_instance_started = 1; + #ifdef EXTRA_DEBUG for (r=0; r<*process_count; r++){ fprintf(stderr, "% 3d % 5d - %s\n", r, pt[r].pid, pt[r].desc);

1 0

[kamailio/kamailio] db_mysql: remove build warning, unneeded include (#1777)
by Victor Seva 27 Dec '18

27 Dec '18

mysql_version.h is already included at mysql.h > In file included from km_dbase.c:38: > /usr/include/mariadb/mysql_version.h:3:2: warning: This file should not be included by clients, include only <mysql.h> [-W#warnings] > #warning This file should not be included by clients, include only <mysql.h> > ^ > 1 warning generated. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1777 -- Commit Summary -- * db_mysql: remove build warning, unneeded include -- File Changes -- M src/modules/db_mysql/km_dbase.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1777.patch https://github.com/kamailio/kamailio/pull/1777.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1777

2 2

[kamailio/kamailio] tls: detection of kerberos support for openssl at runtime (#1050)
by Victor Seva 27 Dec '18

27 Dec '18

It was reported https://github.com/kamailio/kamailio/issues/662#issuecomment-261920382 but I think is not related to that issue, so opening another one. >From https://buildd.debian.org/status/fetch.php?pkg=openssl&arch=amd64&ver=1.1.0… ``` Configuring OpenSSL version 1.1.0e (0x1010005fL) no-asan [default] OPENSSL_NO_ASAN no-crypto-mdebug [default] OPENSSL_NO_CRYPTO_MDEBUG no-crypto-mdebug-backtrace [default] OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE no-dynamic-engine [forced] no-egd [default] OPENSSL_NO_EGD no-fuzz-afl [default] OPENSSL_NO_FUZZ_AFL no-fuzz-libfuzzer [default] OPENSSL_NO_FUZZ_LIBFUZZER no-heartbeats [default] OPENSSL_NO_HEARTBEATS no-idea [option] OPENSSL_NO_IDEA (skip dir) no-md2 [default] OPENSSL_NO_MD2 (skip dir) no-mdc2 [option] OPENSSL_NO_MDC2 (skip dir) no-msan [default] OPENSSL_NO_MSAN no-rc5 [option] OPENSSL_NO_RC5 (skip dir) no-sctp [default] OPENSSL_NO_SCTP no-shared [option] no-ssl-trace [default] OPENSSL_NO_SSL_TRACE no-ssl3 [option(ssl3-method)] OPENSSL_NO_SSL3 no-ssl3-method [option] OPENSSL_NO_SSL3_METHOD no-ubsan [default] OPENSSL_NO_UBSAN no-weak-ssl-ciphers [default] OPENSSL_NO_WEAK_SSL_CIPHERS no-zlib [option] no-zlib-dynamic [default] Configuring for debian-amd64 ``` so openssl 1.1.0e has kerberos support but trying to start kamailio 4.4.4-2 (from Debian stretch) with TLS enabled ``` Mar 31 09:05:14 router /usr/sbin/kamailio[4375]: INFO: tls [tls_mod.c:368]: mod_init(): With Diffie Hellman Mar 31 09:05:14 router /usr/sbin/kamailio[4375]: INFO: tls [tls_init.c:633]: init_tls_h(): tls: _init_tls_h: compiled with openssl version "OpenSSL 1.1.0d 26 Jan 2017" (0x10100 04f), kerberos support: on, compression: on Mar 31 09:05:14 router /usr/sbin/kamailio[4375]: INFO: tls [tls_init.c:641]: init_tls_h(): tls: init_tls_h: installed openssl library version "OpenSSL 1.1.0e 16 Feb 2017" (0x101000 5f), kerberos support: off, zlib compression: off compiler: gcc -DDSO_DLFCN -DHAVE_DLFCN_H -DNDEBUG -DOPENSSL_THREADS -DOPENSSL_NO_STATIC_ENGINE -DOPENSSL_PIC -DOPENSSL_IA32_SSE2 -D OPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DRC4_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DGHASH_ASM -DECP_NISTZ25 6_ASM -DPADLOCK_ASM -DPOLY1305_ASM -DOPENSSLDIR="\"/usr/lib/ssl\"" -DENGINESDIR="\"/usr/lib/x86_64-linux-gnu/engines-1.1\"" Mar 31 09:05:14 router /usr/sbin/kamailio[4375]: : tls [tls_init.c:651]: init_tls_h(): ERROR: tls: init_tls_h: openssl compile options mismatch: library has kerberos support disabled and Kamailio tls enabled (unstable configuration) (tls_force_run in kamailio.cfg will override this check) Mar 31 09:05:14 router /usr/sbin/kamailio[4375]: CRITICAL: <core> [main.c:2592]: main(): could not initialize tls, exiting... ``` A rebuild version with the same openssl version doesn't help ``` Mar 31 11:20:41 spce lb[17194]: INFO: tls [tls_init.c:633]: init_tls_h(): tls: _init_tls_h: compiled with openssl version "OpenSSL 1.1.0e 16 Feb 2017" (0x1010005f), kerberos support: on, compression: on Mar 31 11:20:41 spce lb[17194]: INFO: tls [tls_init.c:641]: init_tls_h(): tls: init_tls_h: installed openssl library version "OpenSSL 1.1.0e 16 Feb 2017" (0x1010005f), kerberos support: off, zlib compression: off#012 compiler: gcc -DDSO_DLFCN -DHAVE_DLFCN_H -DNDEBUG -DOPENSSL_THREADS -DOPENSSL_NO_STATIC_ENGINE -DOPENSSL_PIC -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DRC4_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DGHASH_ASM -DECP_NISTZ256_ASM -DPADLOCK_ASM -DPOLY1305_ASM -DOPENSSLDIR="\"/usr/lib/ssl\"" -DENGINESDIR="\"/usr/lib/x86_64-linux-gnu/engines-1.1\"" Mar 31 11:20:41 spce lb[17194]: : tls [tls_init.c:651]: init_tls_h(): ERROR: tls: init_tls_h: openssl compile options mismatch: library has kerberos support disabled and Kamailio tls enabled (unstable configuration)#012 (tls_force_run in kamailio.cfg will override this check) Mar 31 11:20:41 spce lb[17194]: CRITICAL: <core> [main.c:2592]: main(): could not initialize tls, exiting... ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1050

2 11

git:master:cfe9edd1: cfgt: use mem error macros
by Victor Seva 27 Dec '18

27 Dec '18

Module: kamailio Branch: master Commit: cfe9edd1cd01d48aee23d03b63550ca9cafaa760 URL: https://github.com/kamailio/kamailio/commit/cfe9edd1cd01d48aee23d03b63550ca… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-27T10:10:40+01:00 cfgt: use mem error macros --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/cfe9edd1cd01d48aee23d03b63550ca… Patch: https://github.com/kamailio/kamailio/commit/cfe9edd1cd01d48aee23d03b63550ca… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 1c5b938e9c..97ebe0b11d 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -44,9 +44,10 @@ int cfgt_mask = CFGT_DP_ALL; static int shm_str_hash_alloc(struct str_hash_table *ht, int size) { ht->table = shm_malloc(sizeof(struct str_hash_head) * size); - - if(!ht->table) + if(!ht->table) { + SHM_MEM_ERROR; return -1; + } ht->size = size; return 0; @@ -54,10 +55,8 @@ static int shm_str_hash_alloc(struct str_hash_table *ht, int size) static int _cfgt_init_hashtable(struct str_hash_table *ht) { - if(shm_str_hash_alloc(ht, CFGT_HASH_SIZE) != 0) { - LM_ERR("Error allocating shared memory hashtable\n"); + if(shm_str_hash_alloc(ht, CFGT_HASH_SIZE) != 0) return -1; - } str_hash_init(ht); @@ -128,13 +127,12 @@ int _cfgt_get_uuid_id(cfgt_node_p node) entry = shm_malloc(sizeof(struct str_hash_entry)); if(entry == NULL) { lock_release(&_cfgt_uuid->lock); - LM_ERR("No shared memory left\n"); + SHM_MEM_ERROR; return -1; } if(shm_str_dup(&entry->key, &node->uuid) != 0) { lock_release(&_cfgt_uuid->lock); shm_free(entry); - LM_ERR("No shared memory left\n"); return -1; } entry->u.n = 1; @@ -206,7 +204,7 @@ cfgt_node_p cfgt_create_node(struct sip_msg *msg) node = (cfgt_node_p)pkg_malloc(sizeof(cfgt_node_t)); if(node == NULL) { - LM_ERR("cannot allocate cfgtest msgnode\n"); + PKG_MEM_ERROR; return node; } memset(node, 0, sizeof(cfgt_node_t)); @@ -287,7 +285,7 @@ int _cfgt_get_filename(int msgid, str uuid, str *dest, int *dir) dest->len += lid + 6; dest->s = (char *)pkg_malloc((dest->len * sizeof(char) + 1)); if(dest->s == NULL) { - LM_ERR("no more memory.\n"); + PKG_MEM_ERROR; return -1; } snprintf(dest->s, dest->len + 1, format, cfgt_basedir.len, cfgt_basedir.s, @@ -454,7 +452,7 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) { node->route = pkg_malloc(sizeof(cfgt_str_list_t)); if(!node->route) { - LM_ERR("No more pkg mem\n"); + PKG_MEM_ERROR; return -1; } memset(node->route, 0, sizeof(cfgt_str_list_t)); @@ -483,7 +481,7 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) } route = pkg_malloc(sizeof(cfgt_str_list_t)); if(!route) { - LM_ERR("No more pkg mem\n"); + PKG_MEM_ERROR; return -1; } memset(route, 0, sizeof(cfgt_str_list_t)); @@ -718,7 +716,7 @@ int cfgt_init(void) } _cfgt_uuid = shm_malloc(sizeof(cfgt_hash_t)); if(_cfgt_uuid == NULL) { - LM_ERR("Cannot allocate shared memory\n"); + SHM_MEM_ERROR; return -1; } if(!lock_init(&_cfgt_uuid->lock)) {

1 0

git:master:3b157cd3: cfgt: clang-format changes
by Victor Seva 27 Dec '18

27 Dec '18

Module: kamailio Branch: master Commit: 3b157cd3c59fa8beb9a2e2d91af8147c4114bfba URL: https://github.com/kamailio/kamailio/commit/3b157cd3c59fa8beb9a2e2d91af8147… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-27T10:10:49+01:00 cfgt: clang-format changes --- Modified: src/modules/cfgt/cfgt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3b157cd3c59fa8beb9a2e2d91af8147… Patch: https://github.com/kamailio/kamailio/commit/3b157cd3c59fa8beb9a2e2d91af8147… --- diff --git a/src/modules/cfgt/cfgt_mod.c b/src/modules/cfgt/cfgt_mod.c index aedd2e4e94..8806d0c8b8 100644 --- a/src/modules/cfgt/cfgt_mod.c +++ b/src/modules/cfgt/cfgt_mod.c @@ -42,20 +42,24 @@ unsigned int init_flag = 0; extern int cfgt_mask; extern str cfgt_basedir; extern str cfgt_hdr_prefix; - +/* clang-format off */ /*! \brief * Exported functions */ static cmd_export_t cmds[] = { - {"cfgt_bind_cfgt", (cmd_function)bind_cfgt, 1, 0, 0, 0}, - {0, 0, 0, 0, 0, 0}}; + {"cfgt_bind_cfgt", (cmd_function)bind_cfgt, 1, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; /*! \brief * Exported parameters */ -static param_export_t params[] = {{"basedir", PARAM_STR, &cfgt_basedir}, - {"mask", INT_PARAM, &cfgt_mask}, - {"callid_prefix", PARAM_STR, &cfgt_hdr_prefix}, {0, 0, 0}}; +static param_export_t params[] = { + {"basedir", PARAM_STR, &cfgt_basedir}, + {"mask", INT_PARAM, &cfgt_mask}, + {"callid_prefix", PARAM_STR, &cfgt_hdr_prefix}, + {0, 0, 0} +}; struct module_exports exports = { "cfgt", /* module name */ @@ -69,7 +73,7 @@ struct module_exports exports = { child_init, /* per-child init function */ destroy /* module destroy function */ }; - +/* clang-format on */ /*! \brief * Module initialization function */ @@ -102,5 +106,4 @@ static int child_init(int _rank) * Module destroy function */ static void destroy(void) -{ -} +{}

1 0

git:master:87c6a855: core: remove USE_SHM_MEM from core ver_defs (related to commit ec97e6f9f39c7)
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: 87c6a85586a6c85eb31bdd91d5a09bf42905339d URL: https://github.com/kamailio/kamailio/commit/87c6a85586a6c85eb31bdd91d5a09bf… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-27T00:04:10+01:00 core: remove USE_SHM_MEM from core ver_defs (related to commit ec97e6f9f39c7) --- Modified: src/core/ver_defs.h --- Diff: https://github.com/kamailio/kamailio/commit/87c6a85586a6c85eb31bdd91d5a09bf… Patch: https://github.com/kamailio/kamailio/commit/87c6a85586a6c85eb31bdd91d5a09bf… --- diff --git a/src/core/ver_defs.h b/src/core/ver_defs.h index dff10bca6a..af9332e1b2 100644 --- a/src/core/ver_defs.h +++ b/src/core/ver_defs.h @@ -159,12 +159,6 @@ #define TLSF_MALLOC_STR "" #endif -#ifdef USE_SHM_MEM -#define USE_SHM_MEM_STR ", USE_SHM_MEM" -#else -#define USE_SHM_MEM_STR "" -#endif - #ifdef DBG_SR_MEMORY #define DBG_SR_MEMORY_STR ", DBG_SR_MEMORY" #else @@ -335,7 +329,7 @@ USE_SCTP_STR CORE_TLS_STR TLS_HOOKS_STR USE_RAW_SOCKS_STR \ DISABLE_NAGLE_STR USE_MCAST_STR NO_DEBUG_STR NO_LOG_STR \ NO_SIG_DEBUG_STR DNS_IP_HACK_STR \ - USE_SHM_MEM_STR SHM_MMAP_STR PKG_MALLOC_STR \ + SHM_MMAP_STR PKG_MALLOC_STR \ Q_MALLOC_STR F_MALLOC_STR DL_MALLOC_STR SF_MALLOC_STR LL_MALLOC_STR TLSF_MALLOC_STR \ DBG_SR_MEMORY_STR DBG_QM_MALLOC_STR DBG_F_MALLOC_STR \ DBG_SF_MALLOC_STR DBG_LL_MALLOC_STR DBG_TLSF_MALLOC_STR \

1 0

git:master:2260808c: presence: replaced removed macro SHM_MEM_STR
by Daniel-Constantin Mierla 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: 2260808c09cb2f9f9b17c97bf3ac22d80e83b0a7 URL: https://github.com/kamailio/kamailio/commit/2260808c09cb2f9f9b17c97bf3ac22d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-26T22:07:59+01:00 presence: replaced removed macro SHM_MEM_STR --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/2260808c09cb2f9f9b17c97bf3ac22d… Patch: https://github.com/kamailio/kamailio/commit/2260808c09cb2f9f9b17c97bf3ac22d… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index e5d8c62d30..c2f155f74e 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -2694,14 +2694,14 @@ int restore_db_subs(void) if(event== NULL) { free_event_params(parsed_event.params.list, PKG_MEM_TYPE); - ERR_MEM(SHM_MEM_STR); + ERR_MEM("shm"); } memset(event, 0, sizeof(pres_ev_t)); event->name.s= (char*)shm_malloc(ev_sname.len* sizeof(char)); if(event->name.s== NULL) { free_event_params(parsed_event.params.list, PKG_MEM_TYPE); - ERR_MEM(SHM_MEM_STR); + ERR_MEM("shm"); } memcpy(event->name.s,ev_sname.s, ev_sname.len); event->name.len= ev_sname.len;

1 0

Broken: kamailio/kamailio#6834 (master - ec97e6f)
by Travis CI 26 Dec '18

26 Dec '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6834 Status: Broken Duration: 4 mins and 22 secs Commit: ec97e6f (master) Author: Henning Westerholt Message: Makefile: remove obselete USE_SHM_MEM #define from Makefile - remove obselete USE_SHM_MEM #define from Makefile, no code uses this anymore - this could be used a long time ago to map all PKG memory to SHM memory View the changeset: https://github.com/kamailio/kamailio/compare/d272dafbfa2e...ec97e6f9f39c View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/472443311?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:ec97e6f9: Makefile: remove obselete USE_SHM_MEM #define from Makefile
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: ec97e6f9f39c707530551d1ea27a3e17439c2e6c URL: https://github.com/kamailio/kamailio/commit/ec97e6f9f39c707530551d1ea27a3e1… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T21:33:37+01:00 Makefile: remove obselete USE_SHM_MEM #define from Makefile - remove obselete USE_SHM_MEM #define from Makefile, no code uses this anymore - this could be used a long time ago to map all PKG memory to SHM memory --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/ec97e6f9f39c707530551d1ea27a3e1… Patch: https://github.com/kamailio/kamailio/commit/ec97e6f9f39c707530551d1ea27a3e1… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 09260d1cbd..62708d93a9 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -518,10 +518,7 @@ data_target = $(prefix)/$(data_dir) # -DSHM_MMAP # use mmap instead of SYSV shared memory # -DPKG_MALLOC -# uses a faster malloc (exclusive w/ USE_SHM_MEM) -# -DUSE_SHM_MEM -# all pkg_malloc => shm_malloc (most mallocs use a common sh. -# mem. segment); don't define PKG_MALLOC if you want this! +# uses a faster malloc # -DDBG_QM_MALLOC # qm_malloc debug code, will cause pkg_malloc and shm_malloc # to keep and display lot of debuging information: file name, @@ -681,7 +678,6 @@ C_DEFS+= -DSHM_MMAP \ #-DVQ_MALLOC \ #-DDBG_LOCK \ #-DNOSMP \ - #-DUSE_SHM_MEM \ #-DSTATS \ #-DNO_LOG \ #-DPROFILING \

1 0

git:master:cabd13a6: core: additional change to commit 63cc0c1df10138 - also remove #ifndef SHM_MEM
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: cabd13a69a81cc2b7bdb7e9ce5f23288694be78e URL: https://github.com/kamailio/kamailio/commit/cabd13a69a81cc2b7bdb7e9ce5f2328… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T21:24:23+01:00 core: additional change to commit 63cc0c1df10138 - also remove #ifndef SHM_MEM --- Modified: src/core/tcp_main.c Modified: src/core/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/cabd13a69a81cc2b7bdb7e9ce5f2328… Patch: https://github.com/kamailio/kamailio/commit/cabd13a69a81cc2b7bdb7e9ce5f2328… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 3ac1289779..7266c63cea 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -28,10 +28,6 @@ #ifdef USE_TCP -#ifndef SHM_MEM -#error "shared memory support needed (add -DSHM_MEM to Makefile.defs)" -#endif - #define HANDLE_IO_INLINE #include "io_wait.h" /* include first to make sure the needed features are turned on (e.g. _GNU_SOURCE for POLLRDHUP) */ diff --git a/src/core/timer.c b/src/core/timer.c index fc6f49872c..92e26ba5f1 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -1017,11 +1017,6 @@ int register_timer(timer_function f, void* param, unsigned int interval) ticks_t get_ticks_raw() { -#ifndef SHM_MEM - LM_CRIT("no shared memory support compiled in" - ", returning 0 (probably wrong)"); - return 0; -#endif return *ticks; } @@ -1030,11 +1025,6 @@ ticks_t get_ticks_raw() /* returns tick in s (for compatibility with the old code) */ ticks_t get_ticks() { -#ifndef SHM_MEM - LM_CRIT("no shared memory support compiled in" - ", returning 0 (probably wrong)"); - return 0; -#endif return TICKS_TO_S(*ticks); }

1 0

git:master:135ce2b5: Makefile: remove SHM_MEM #define after change in commit 63cc0c1df10138
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: 135ce2b5b28bc033a282565c683e1d9c7fa2d636 URL: https://github.com/kamailio/kamailio/commit/135ce2b5b28bc033a282565c683e1d9… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T21:26:21+01:00 Makefile: remove SHM_MEM #define after change in commit 63cc0c1df10138 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/135ce2b5b28bc033a282565c683e1d9… Patch: https://github.com/kamailio/kamailio/commit/135ce2b5b28bc033a282565c683e1d9… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 221a67002e..3512666e0e 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -515,9 +515,6 @@ data_target = $(prefix)/$(data_dir) # compiles in some extra debugging code # -DDNS_IP_HACK # faster ip address resolver for ip strings (e.g "127.0.0.1") -# -DSHM_MEM -# compiles in shared mem. support, needed by some modules and -# by USE_SHM_MEM # -DSHM_MMAP # use mmap instead of SYSV shared memory # -DPKG_MALLOC @@ -665,7 +662,7 @@ ifneq ($(MEMPKG), sys) C_DEFS+= -DPKG_MALLOC endif -C_DEFS+= -DSHM_MEM -DSHM_MMAP \ +C_DEFS+= -DSHM_MMAP \ -DDNS_IP_HACK \ -DUSE_MCAST \ -DUSE_TCP \

1 0

git:master:b6e8422b: Makefile: remove "pingtel hack" #define from 2002 in Makefile
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: b6e8422b8969daabb1259f00edc17f580a96e90f URL: https://github.com/kamailio/kamailio/commit/b6e8422b8969daabb1259f00edc17f5… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T21:29:33+01:00 Makefile: remove "pingtel hack" #define from 2002 in Makefile --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b6e8422b8969daabb1259f00edc17f5… Patch: https://github.com/kamailio/kamailio/commit/b6e8422b8969daabb1259f00edc17f5… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 3512666e0e..09260d1cbd 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -575,10 +575,6 @@ data_target = $(prefix)/$(data_dir) # -DNOSMP # don't use smp compliant locking (faster but won't work on SMP machines) # (not yet enabled) (FAST_LOCK) -# -DNO_PINGTEL_TAG_HACK -# if enabled, To-header-field will be less liberal and will not accept -# 'tag=' (tag parameter with equal sign and without value); it is called -# this way because such message was sighted from a Pingtel phone # -DUSE_TCP # compiles in tcp support # -DDISABLE_NAGLE

1 0

git:master:47b9c44f: core: remove the empty mem.c and shm_mem.c files, after change in 63cc0c1df1013
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: 47b9c44f06102b6dc26eb3ac06e49c63bfe6849b URL: https://github.com/kamailio/kamailio/commit/47b9c44f06102b6dc26eb3ac06e49c6… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T21:13:46+01:00 core: remove the empty mem.c and shm_mem.c files, after change in 63cc0c1df1013 --- Removed: src/core/mem/mem.c Removed: src/core/mem/shm_mem.c --- Diff: https://github.com/kamailio/kamailio/commit/47b9c44f06102b6dc26eb3ac06e49c6… Patch: https://github.com/kamailio/kamailio/commit/47b9c44f06102b6dc26eb3ac06e49c6… --- diff --git a/src/core/mem/mem.c b/src/core/mem/mem.c deleted file mode 100644 index 9af7e5052a..0000000000 --- a/src/core/mem/mem.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of Kamailio, a free SIP server. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * - */ - -/** - * \file - * \brief Main definitions for memory manager - * - * Main definitions for memory manager, like malloc, free and realloc - * \ingroup mem - */ - - -#include <stdio.h> -#include <stdlib.h> -#include "../config.h" -#include "../dprint.h" -#include "../globals.h" -#include "mem.h" - -#ifdef PKG_MALLOC -#include "q_malloc.h" -#endif - -#include "shm_mem.h" diff --git a/src/core/mem/shm_mem.c b/src/core/mem/shm_mem.c deleted file mode 100644 index a94b79889e..0000000000 --- a/src/core/mem/shm_mem.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of Kamailio, a free SIP server. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/** - * \file - * \brief Shared memory functions - * \ingroup mem - */ - -

1 0

git:master:42d9b351: rtpengine: remove the SHM_MEM #define, after core change
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: 42d9b351f9b7fa4140ccd9cf7fc368483d74535a URL: https://github.com/kamailio/kamailio/commit/42d9b351f9b7fa4140ccd9cf7fc3684… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T20:47:49+01:00 rtpengine: remove the SHM_MEM #define, after core change --- Modified: src/modules/rtpengine/bencode.h --- Diff: https://github.com/kamailio/kamailio/commit/42d9b351f9b7fa4140ccd9cf7fc3684… Patch: https://github.com/kamailio/kamailio/commit/42d9b351f9b7fa4140ccd9cf7fc3684… --- diff --git a/src/modules/rtpengine/bencode.h b/src/modules/rtpengine/bencode.h index f5f775538f..272e8125c7 100644 --- a/src/modules/rtpengine/bencode.h +++ b/src/modules/rtpengine/bencode.h @@ -4,7 +4,7 @@ #include <sys/uio.h> #include <string.h> -#if defined(SHM_MEM) || defined(PKG_MALLOC) || defined(pkg_malloc) +#if defined(PKG_MALLOC) || defined(pkg_malloc) /* kamailio */ # include "../../core/mem/mem.h" # include "../../core/str.h"

1 0

git:master:63cc0c1d: core: remove old memory managers, deactivated in 2015
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: 63cc0c1df10138428473f17726c8b5ee336755ce URL: https://github.com/kamailio/kamailio/commit/63cc0c1df10138428473f17726c8b5e… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T21:04:02+01:00 core: remove old memory managers, deactivated in 2015 - remove old memory PKG and SHM manager from core, it was deactivated in 2015 in commit 50df0feecc34e and bf3e80bdf711 from Daniel with an #ifdef 0 - modules should include for SHM memory the header "shm.h" instead of the old header "shm_mem.h", this is kept for compatibility reasons - no functional changes --- Modified: src/core/mem/mem.c Modified: src/core/mem/mem.h Modified: src/core/mem/shm_mem.c Modified: src/core/mem/shm_mem.h --- Diff: https://github.com/kamailio/kamailio/commit/63cc0c1df10138428473f17726c8b5e… Patch: https://github.com/kamailio/kamailio/commit/63cc0c1df10138428473f17726c8b5e…

1 0

git:master:0999f108: core: add doxygen file header to current memory manager
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: 0999f108c91bdcfed91878241345fb24da3fc2a7 URL: https://github.com/kamailio/kamailio/commit/0999f108c91bdcfed91878241345fb2… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T21:12:42+01:00 core: add doxygen file header to current memory manager --- Modified: src/core/mem/pkg.c Modified: src/core/mem/pkg.h Modified: src/core/mem/shm.c Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/0999f108c91bdcfed91878241345fb2… Patch: https://github.com/kamailio/kamailio/commit/0999f108c91bdcfed91878241345fb2… --- diff --git a/src/core/mem/pkg.c b/src/core/mem/pkg.c index f1e616eca6..57d7ea051d 100644 --- a/src/core/mem/pkg.c +++ b/src/core/mem/pkg.c @@ -16,6 +16,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/** + * \file + * \brief Main definitions for memory manager + * + * Main definitions for PKG memory manager, like malloc, free and realloc + * \ingroup mem + */ #include <string.h> #include <stdlib.h> diff --git a/src/core/mem/pkg.h b/src/core/mem/pkg.h index 0fe7f8942c..7b57719e46 100644 --- a/src/core/mem/pkg.h +++ b/src/core/mem/pkg.h @@ -16,6 +16,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/** + * \file + * \brief Main definitions for memory manager + * + * Main definitions for PKG memory manager, like malloc, free and realloc + * \ingroup mem + */ #ifndef _sr_pkg_h_ #define _sr_pkg_h_ diff --git a/src/core/mem/shm.c b/src/core/mem/shm.c index 2cecb1110e..b25fef1a51 100644 --- a/src/core/mem/shm.c +++ b/src/core/mem/shm.c @@ -16,6 +16,12 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/** + * \file + * \brief Shared memory functions + * \ingroup mem + */ + #include <stdlib.h> #include "../config.h" diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index e36a94accc..4143462617 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -16,6 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/** + * \file + * \brief Shared memory functions + * \ingroup mem + */ #ifndef _sr_shm_h_ #define _sr_shm_h_

1 0

git:master:4f655313: main: small formatting fixes in "kamailio -v" output
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: 4f65531306e14758335867d69f74841c78ec8292 URL: https://github.com/kamailio/kamailio/commit/4f65531306e14758335867d69f74841… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T20:39:00+01:00 main: small formatting fixes in "kamailio -v" output --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/4f65531306e14758335867d69f74841… Patch: https://github.com/kamailio/kamailio/commit/4f65531306e14758335867d69f74841… --- diff --git a/src/main.c b/src/main.c index e22282b9ce..aaf5637e53 100644 --- a/src/main.c +++ b/src/main.c @@ -219,12 +219,12 @@ Options:\n\ void print_ct_constants(void) { #ifdef ADAPTIVE_WAIT - printf("ADAPTIVE_WAIT_LOOPS=%d, ", ADAPTIVE_WAIT_LOOPS); + printf("ADAPTIVE_WAIT_LOOPS %d, ", ADAPTIVE_WAIT_LOOPS); #endif /* - printf("SHM_MEM_SIZE=%d, ", SHM_MEM_SIZE); + printf("SHM_MEM_SIZE %dMB, ", SHM_MEM_SIZE); */ - printf("MAX_RECV_BUFFER_SIZE %d" + printf("MAX_RECV_BUFFER_SIZE %d," " MAX_URI_SIZE %d, BUF_SIZE %d, DEFAULT PKG_SIZE %uMB\n", MAX_RECV_BUFFER_SIZE, MAX_URI_SIZE, BUF_SIZE, PKG_MEM_SIZE);

1 0

git:master:f864b8c2: cdp: remove the SHM_MEM #define, after core change
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: f864b8c26aaadb862b3b25ab3a5cacd89e7868fe URL: https://github.com/kamailio/kamailio/commit/f864b8c26aaadb862b3b25ab3a5cacd… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T20:26:30+01:00 cdp: remove the SHM_MEM #define, after core change --- Modified: src/modules/cdp/globals.c Modified: src/modules/cdp/sem.h --- Diff: https://github.com/kamailio/kamailio/commit/f864b8c26aaadb862b3b25ab3a5cacd… Patch: https://github.com/kamailio/kamailio/commit/f864b8c26aaadb862b3b25ab3a5cacd… --- diff --git a/src/modules/cdp/globals.c b/src/modules/cdp/globals.c index 5eaf4c2a77..56062e84fa 100644 --- a/src/modules/cdp/globals.c +++ b/src/modules/cdp/globals.c @@ -61,7 +61,6 @@ // } //#endif // -//#ifdef SHM_MEM // // if (init_shm_mallocs()==-1) // goto error; @@ -69,7 +68,6 @@ // LM_DBG( "Memory status (shm):\n"); // shm_status(); // } -//#endif // return 1; //error: // return 0; diff --git a/src/modules/cdp/sem.h b/src/modules/cdp/sem.h index 71c7e41686..26057d9232 100644 --- a/src/modules/cdp/sem.h +++ b/src/modules/cdp/sem.h @@ -44,8 +44,6 @@ #ifndef __SEM_H #define __SEM_H -#ifdef SHM_MEM - // #include "../../core/mem/mem.h" // #include "../../core/mem/shm_mem.h" @@ -89,8 +87,4 @@ typedef sem_t gen_sem_t; #define sem_release(sem) sem_post(sem) -#else -//#error "locking requires shared memory support" -#endif - #endif

1 0

git:master:a2f74c4e: erlang: remove the SHM_MEM #define, after core change
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: a2f74c4ea76d570f4c8493664ebb94f3a1276276 URL: https://github.com/kamailio/kamailio/commit/a2f74c4ea76d570f4c8493664ebb94f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T20:27:09+01:00 erlang: remove the SHM_MEM #define, after core change --- Modified: src/modules/erlang/erlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a2f74c4ea76d570f4c8493664ebb94f… Patch: https://github.com/kamailio/kamailio/commit/a2f74c4ea76d570f4c8493664ebb94f… --- diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 15c05ce729..e4060698f9 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -283,7 +283,6 @@ static int child_init(int rank) if (rank == PROC_INIT) { -#ifdef SHM_MEM usocks[KSOCKET]=(int*)shm_malloc(sizeof(int)*no_cnodes); if (!usocks[KSOCKET]) { LM_ERR("Not enough memory\n"); @@ -295,19 +294,6 @@ static int child_init(int rank) LM_ERR("Not enough memory\n"); return -1; } -#else - usocks[KSOCKET]=(int*)pkg_malloc(sizeof(int)*no_cnodes); - if (!usocks[KSOCKET]) { - LM_ERR("Not enough memory\n"); - return -1; - } - - usocks[CSOCKET]=(int*)pkg_malloc(sizeof(int)*no_cnodes); - if (!usocks[CSOCKET]) { - LM_ERR("Not enough memory\n"); - return -1; - } -#endif for(i=0;i<no_cnodes;i++) { if (socketpair(AF_UNIX, SOCK_STREAM, 0, pair)) { @@ -397,13 +383,8 @@ static int child_init(int rank) */ static void mod_destroy(void) { -#ifdef SHM_MEM shm_free(usocks[0]); shm_free(usocks[1]); -#else - pkg_free(usocks[0]); - pkg_free(usocks[1]); -#endif free_tuple_fmt_buff(); free_atom_fmt_buff(); free_list_fmt_buff();

1 0

git:master:970fc2ac: core: remove the SHM_MEM #define, the core will not even compile without it
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: 970fc2ac73fb38b22d5a5acd3e326fb97b97f6af URL: https://github.com/kamailio/kamailio/commit/970fc2ac73fb38b22d5a5acd3e326fb… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T20:22:51+01:00 core: remove the SHM_MEM #define, the core will not even compile without it - remove the SHM_MEM #define, the purpose of this was to allow the compilation without SHM memory pool support - this did not worked for a long time, the core will not even compile without it (no locking, broken timer etc..). Additionally many modules need it. - remove 50 ifdef/endif blocks, no functional changes done --- Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: src/core/lock_alloc.h Modified: src/core/mem/mem.c Modified: src/core/mem/shm_mem.c Modified: src/core/mem/shm_mem.h Modified: src/core/pt.c Modified: src/core/pt.h Modified: src/core/shm_init.c Modified: src/core/timer.c Modified: src/core/ut.h Modified: src/core/ver_defs.h --- Diff: https://github.com/kamailio/kamailio/commit/970fc2ac73fb38b22d5a5acd3e326fb… Patch: https://github.com/kamailio/kamailio/commit/970fc2ac73fb38b22d5a5acd3e326fb…

1 0

git:master:127e1c4c: maim: remove the SHM_MEM #define, the core will not even comile without it
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: 127e1c4c6df088c15c10bc488eeaecc22a9e2ae1 URL: https://github.com/kamailio/kamailio/commit/127e1c4c6df088c15c10bc488eeaecc… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T20:25:58+01:00 maim: remove the SHM_MEM #define, the core will not even comile without it - remove the SHM_MEM #define, the purpose of this was to allow the compilation without SHM memory pool support - this did not worked for a long time, the core will not even compile without it (no locking, broken timer etc..). Additionally many modules need it. - remove 50 ifdef/endif blocks, no functional changes done --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/127e1c4c6df088c15c10bc488eeaecc… Patch: https://github.com/kamailio/kamailio/commit/127e1c4c6df088c15c10bc488eeaecc… --- diff --git a/src/main.c b/src/main.c index 4c31bdf13f..e22282b9ce 100644 --- a/src/main.c +++ b/src/main.c @@ -68,10 +68,8 @@ #include "core/udp_server.h" #include "core/globals.h" #include "core/mem/mem.h" -#ifdef SHM_MEM #include "core/mem/shm_mem.h" #include "core/shm_init.h" -#endif /* SHM_MEM */ #include "core/sr_module.h" #include "core/timer.h" #include "core/parser/msg_parser.h" @@ -224,9 +222,7 @@ void print_ct_constants(void) printf("ADAPTIVE_WAIT_LOOPS=%d, ", ADAPTIVE_WAIT_LOOPS); #endif /* -#ifdef SHM_MEM printf("SHM_MEM_SIZE=%d, ", SHM_MEM_SIZE); -#endif */ printf("MAX_RECV_BUFFER_SIZE %d" " MAX_URI_SIZE %d, BUF_SIZE %d, DEFAULT PKG_SIZE %uMB\n", @@ -249,9 +245,7 @@ void print_internals(void) printf(" MAX_URI_SIZE=%d\n", MAX_URI_SIZE); printf(" BUF_SIZE=%d\n", BUF_SIZE); printf(" DEFAULT PKG_SIZE=%uMB\n", PKG_MEM_SIZE); -#ifdef SHM_MEM printf(" DEFAULT SHM_SIZE=%uMB\n", SHM_MEM_SIZE); -#endif #ifdef ADAPTIVE_WAIT printf(" ADAPTIVE_WAIT_LOOPS=%d\n", ADAPTIVE_WAIT_LOOPS); #endif @@ -567,7 +561,6 @@ void cleanup(int show_status) } } #endif -#ifdef SHM_MEM if (pt) shm_free(pt); pt=0; if (show_status && memlog <= cfg_get(core, core_cfg, debug)){ @@ -582,7 +575,6 @@ void cleanup(int show_status) } /* zero all shmem alloc vars that we still use */ shm_destroy_manager(); -#endif destroy_lock_ops(); if (pid_file) unlink(pid_file); if (pgid_file) unlink(pgid_file); @@ -714,7 +706,6 @@ void handle_sigs(void) } } #endif -#ifdef SHM_MEM if (memlog <= cfg_get(core, core_cfg, debug)){ if (cfg_get(core, core_cfg, mem_summary) & 2) { LOG(memlog, "Memory status (shm):\n"); @@ -725,7 +716,6 @@ void handle_sigs(void) shm_sums(); } } -#endif break; case SIGCHLD: @@ -2461,10 +2451,8 @@ int main(int argc, char** argv) * Note: shm can now be initialized when parsing the config script, that's * why checking for a prior initialization is needed. * --andrei */ -#ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) goto error; -#endif /* SHM_MEM */ pkg_print_manager(); shm_print_manager(); if (init_atomic_ops()==-1)

1 0

[kamailio/kamailio] unquoted value in global vars got segafult or error at cfg files (#1779)
by PICCORO Lenz McKAY 26 Dec '18

26 Dec '18

### Description due the behaviour of the variable "alias" the other that use dots inside are misinterpreted: seems ambiguity in the grammar with alias and listen respect other vars that have "dots" in values. Both alias and listen can have an unquoted host list as value. An unquoted host is a list of IDs separated by ‘.’. Since EOL is not taken into account, then `alias=foo.bar` followed by `myvar.msg=2.3.4.5` is interpreted as: `alias=foo.bar myvar.msg` bug of course in issue #1773 nobody check that right? ### Troubleshooting kamailio seems does not reconoce it the global variable in kamailio.cfg file **if no double quoted the value itselft! but if are not global variables, alias variable can be unquoted!** prevousli done in isues: * #1773 closed by a comment that does not make sense due i configured in right way * after furter investigation seems due the alias variable that implies a "dot" inside the value seems the "dots" are misinterperted due the presence of the aliases variable that already are present! and that generated a very very older problem! #### Reproduction download, configure and make build of kamailio use the main config file in that file put only one change, presicelly and adition: `kamailio.bindip=10.101.10.10` **bur using doble coutes seems there no problem** this are not documented and seems its and ancient bug #### Log Messages ``` 0(1542) DEBUG: <core> [core/modparam.c:83]: set_mod_param_regex(): 'debugger' matches module 'debugger' 0(1542) DEBUG: <core> [core/sr_module.c:811]: find_param_export(): found <log_level_name> in module debugger [/usr/lib/x86_64-linux-gnu/kamailio/modules/debugger.so] 0(1542) DEBUG: <core> [core/modparam.c:99]: set_mod_param_regex(): found <log_level_name> in module debugger [/usr/lib/x86_64-linux-gnu/kamailio/modules/debugger.so] 0(1542) CRITICAL: <core> [core/cfg.y:3450]: yyerror_at(): parse error in config file kamailio.cfg, line 9, column 6: syntax error 0(1542) CRITICAL: <core> [core/cfg.y:3450]: yyerror_at(): parse error in config file kamailio.cfg, line 9, column 6: unknown config variable 0(1542) CRITICAL: <core> [core/cfg.y:3447]: yyerror_at(): parse error in config file kamailio.cfg, line 9, column 7-8: ERROR: bad config file (3 errors) 0(1542) WARNING: <core> [core/ppcfg.c:221]: pp_ifdef_level_check(): different number of preprocessor directives: N(#!IF[N]DEF) - N(#!ENDIF) = 1 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST, HAVE_RESOLV_RES 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: unknown compiled with gcc 4.9.2 ``` * **Operating System**: ``` Linux ip-10-101-2-78 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1 (2016-12-30) x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1779

4 6

[kamailio/kamailio] table check error when upgrade kamailio 4 to 5 (#1780)
by PICCORO Lenz McKAY 26 Dec '18

26 Dec '18

### Description i upgrade kamailio 4 to 5 following all the respective guides carefully: https://www.kamailio.org/wiki/install/upgrade/4.4.x-to-5.0.0 and then from 5.0 to 5.1 and kamailio does not start ### Troubleshooting kamailio does not run and got error: `db_check_table_version(): invalid version 6 for table sipusers found, expected 7 (check table structure and table "version")` the message are very ambigous #### Reproduction * install log time ago kamailio 4.4 * apply all steps to upgrade as https://www.kamailio.org/wiki/install/upgrade/4.4.x-to-5.0.0 * apply again aditional steps as https://www.kamailio.org/wiki/install/upgrade/5.0.x-to-5.1.0 * restar kamailio and does not start due error on table check #### Log Messages ``` Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: db_mysql [km_my_con.c:148]: db_mysql_new_connection(): server version is 5.5.5-10.0.32-MariaDB-0+deb8u1 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:120]: db_new_result(): allocate 56 bytes for result set at 0x7f395b036b30 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: db_mysql [km_res.c:66]: db_mysql_get_columns(): 1 columns returned from the query Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:158]: db_allocate_columns(): allocate 8 bytes for result names at 0x7f395b044128 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:169]: db_allocate_columns(): allocate 4 bytes for result types at 0x7f395b044198 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: db_mysql [km_res.c:84]: db_mysql_get_columns(): allocate 16 bytes for RES_NAMES[0] at 0x7f395b0b91c8 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: db_mysql [km_res.c:91]: db_mysql_get_columns(): RES_NAMES(0x7f395b0b91c8)[0]=[table_version] Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: db_mysql [km_res.c:99]: db_mysql_get_columns(): use DB1_INT result type Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:188]: db_allocate_rows(): allocate 16 bytes for rows at 0x7f395b0b9240 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_row.c:117]: db_allocate_row(): allocate 32 bytes for row values at 0x7f395b0b92b8 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_val.c:74]: db_str2val(): converting INT [6] Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:79]: db_free_columns(): freeing 1 columns Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:83]: db_free_columns(): freeing RES_NAMES[0] at 0x7f395b0b91c8 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:96]: db_free_columns(): freeing result names at 0x7f395b044128 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:101]: db_free_columns(): freeing result types at 0x7f395b044198 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:52]: db_free_rows(): freeing 1 rows Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_row.c:95]: db_free_row(): freeing row values at 0x7f395b0b92b8 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:60]: db_free_rows(): freeing rows at 0x7f395b0b9240 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_res.c:138]: db_free_result(): freeing result set at 0x7f395b036b30 Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) ERROR: <core> [db.c:450]: db_check_table_version(): invalid version 6 for table sipusers found, expected 7 (check table structure and table "version") Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) ERROR: auth_db [auth_db_mod.c:308]: auth_fixup(): error during table version check. Dec 21 16:34:31 ip-10-101-2-78 kamailio[8501]: 0(8503) DEBUG: <core> [db_pool.c:100]: pool_remove(): removing connection from the pool ``` ### Possible Solutions could the changelog provide the missing tables? or wiki doesn ot point all the respective changes? ### Additional Information ``` version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST, HAVE_RESOLV_RES 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: unknown compiled with gcc 4.9.2 ``` ### Operating System: ``` Linux ip-10-101-2-78 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1 (2016-12-30) x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1780

6 12

git:master:d272dafb: lib: lib: refactor ims library to use common pkg and shm memory helper logging #define
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: d272dafbfa2e57a6a0ee444890a83afe0984ca6b URL: https://github.com/kamailio/kamailio/commit/d272dafbfa2e57a6a0ee444890a83af… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T14:47:39+01:00 lib: lib: refactor ims library to use common pkg and shm memory helper logging #define --- Modified: src/lib/ims/ims_getters.c --- Diff: https://github.com/kamailio/kamailio/commit/d272dafbfa2e57a6a0ee444890a83af… Patch: https://github.com/kamailio/kamailio/commit/d272dafbfa2e57a6a0ee444890a83af… --- diff --git a/src/lib/ims/ims_getters.c b/src/lib/ims/ims_getters.c index 0929bdf4e6..26fdbb8c41 100644 --- a/src/lib/ims/ims_getters.c +++ b/src/lib/ims/ims_getters.c @@ -301,6 +301,10 @@ str cscf_get_public_identity(struct sip_msg *msg) if(get_to(msg) == NULL) { to = (struct to_body *)pkg_malloc(sizeof(struct to_body)); + if (to == NULL) { + PKG_MEM_ERROR; + return pu; + } parse_to(msg->to->body.s, msg->to->body.s + msg->to->body.len, to); msg->to->parsed = to; } else @@ -334,6 +338,10 @@ str cscf_get_public_identity_from(struct sip_msg *msg) if(get_from(msg) == NULL) { from = (struct to_body *)pkg_malloc(sizeof(struct to_body)); + if (from == NULL) { + PKG_MEM_ERROR; + return pu; + } parse_to(msg->from->body.s, msg->from->body.s + msg->from->body.len, from); msg->from->parsed = from; @@ -454,9 +462,7 @@ str cscf_get_public_identity_from_requri(struct sip_msg *msg) pu.len = 4 + msg->parsed_uri.user.len; pu.s = shm_malloc(pu.len + 1); if(!pu.s) { - LM_ERR("cscf_get_public_identity_from_requri: Error allocating %d " - "bytes\n", - pu.len + 1); + SHM_MEM_ERROR; pu.len = 0; goto done; } @@ -466,9 +472,7 @@ str cscf_get_public_identity_from_requri(struct sip_msg *msg) pu.len = 4 + msg->parsed_uri.user.len + 1 + msg->parsed_uri.host.len; pu.s = shm_malloc(pu.len + 1); if(!pu.s) { - LM_ERR("cscf_get_public_identity_from_requri: Error allocating %d " - "bytes\n", - pu.len + 1); + SHM_MEM_ERROR; pu.len = 0; goto done; } @@ -508,9 +512,7 @@ str cscf_get_contact_from_requri(struct sip_msg *msg) + 1 /*for colon before port*/; pu.s = shm_malloc(pu.len + 1); if(!pu.s) { - LM_ERR("cscf_get_public_identity_from_requri: Error allocating %d " - "bytes\n", - pu.len + 1); + SHM_MEM_ERROR; pu.len = 0; goto done; } @@ -523,9 +525,7 @@ str cscf_get_contact_from_requri(struct sip_msg *msg) + msg->parsed_uri.port.len + 1 /*for colon before port*/; pu.s = shm_malloc(pu.len + 1); if(!pu.s) { - LM_ERR("cscf_get_public_identity_from_requri: Error allocating %d " - "bytes\n", - pu.len + 1); + SHM_MEM_ERROR; pu.len = 0; goto done; } @@ -642,7 +642,7 @@ str cscf_get_asserted_identity(struct sip_msg *msg, int is_shm) { len = pai->uri.len + 1; uri.s = (char*) pkg_malloc(pai->uri.len + 1); if (!uri.s) { - LM_ERR("no more pkg mem\n"); + PKG_MEM_ERROR; return uri; } memset(uri.s, 0, len); @@ -986,7 +986,7 @@ struct via_body* cscf_get_last_via(struct sip_msg *msg) if (!h->parsed){ vb = pkg_malloc(sizeof(struct via_body)); if (!vb){ - LM_ERR("cscf_get_last_via: Error allocating %lx bytes\n",sizeof(struct via_body)); + PKG_MEM_ERROR; return 0; } parse_via(h->body.s,h->body.s+h->body.len,vb); @@ -1315,7 +1315,7 @@ int cscf_get_p_charging_vector(struct sip_msg *msg, str * icid, str * orig_ioi, str_free(header_body, pkg); return 1; out_of_memory: - LM_ERR("cscf_get_p_charging_vector:out of pkg memory\n"); + PKG_MEM_ERROR; return 0; } @@ -1466,7 +1466,7 @@ int cscf_get_p_associated_uri(struct sip_msg *msg, str **public_id, } *public_id = pkg_malloc(sizeof(str)*(*public_id_cnt)); if (*public_id==NULL) { - LM_ERR("Error out of pkg memory"); + PKG_MEM_ERROR; return 0; } r2 = r; @@ -1718,7 +1718,7 @@ int cscf_get_cseq(struct sip_msg *msg,struct hdr_field **hr) if (!h->parsed){ cseq = pkg_malloc(sizeof(struct cseq_body)); if (!cseq){ - LM_ERR("ERR:cscf_get_cseq: Header CSeq not found\n"); + PKG_MEM_ERROR; return 0; } parse_cseq(h->body.s,h->body.s+h->body.len,cseq);

1 0

git:master:3b0c06ef: lib: refactor srdb1 DB1 API to use common pkg memory helper logging #define
by Henning Westerholt 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: 3b0c06ef76f3bb651395951d90ad83d11eb8db65 URL: https://github.com/kamailio/kamailio/commit/3b0c06ef76f3bb651395951d90ad83d… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-26T14:26:41+01:00 lib: refactor srdb1 DB1 API to use common pkg memory helper logging #define --- Modified: src/lib/srdb1/db.c Modified: src/lib/srdb1/db_id.c Modified: src/lib/srdb1/db_query.c Modified: src/lib/srdb1/db_res.c Modified: src/lib/srdb1/db_row.c Modified: src/lib/srdb1/db_val.c --- Diff: https://github.com/kamailio/kamailio/commit/3b0c06ef76f3bb651395951d90ad83d… Patch: https://github.com/kamailio/kamailio/commit/3b0c06ef76f3bb651395951d90ad83d…

1 0

git:master:99250f75: rtpengine: lock only when db backend is enabled for build_rtpp_socks()
by Daniel-Constantin Mierla 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: 99250f758e6deb90a5852599f831a53ab394b751 URL: https://github.com/kamailio/kamailio/commit/99250f758e6deb90a5852599f831a53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-26T11:50:50+01:00 rtpengine: lock only when db backend is enabled for build_rtpp_socks() --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/99250f758e6deb90a5852599f831a53… Patch: https://github.com/kamailio/kamailio/commit/99250f758e6deb90a5852599f831a53… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 6f91e607bd..f18a35b33d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1633,6 +1633,14 @@ mod_init(void) return 0; } +#define rtpe_reload_lock_get(plock) do { \ + if (rtpp_db_url.s != NULL) lock_get(plock); \ +} while(0) + +#define rtpe_reload_lock_release(plock) do { \ + if (rtpp_db_url.s != NULL) lock_release(plock); \ +} while(0) + static int build_rtpp_socks() { int n, i; char *cp; @@ -1644,9 +1652,9 @@ static int build_rtpp_socks() { int ip_mtu_discover = IP_PMTUDISC_DONT; #endif - lock_get(rtpp_no_lock); + rtpe_reload_lock_get(rtpp_no_lock); current_rtpp_no = *rtpp_no; - lock_release(rtpp_no_lock); + rtpe_reload_lock_release(rtpp_no_lock); if (current_rtpp_no == rtpp_socks_size) return 0; @@ -1667,11 +1675,11 @@ static int build_rtpp_socks() { } memset(rtpp_socks, -1, sizeof(int)*(rtpp_socks_size)); - lock_get(rtpp_set_list->rset_head_lock); + rtpe_reload_lock_get(rtpp_set_list->rset_head_lock); for (rtpp_list = rtpp_set_list->rset_first; rtpp_list != 0; rtpp_list = rtpp_list->rset_next) { - lock_get(rtpp_list->rset_lock); + rtpe_reload_lock_get(rtpp_list->rset_lock); for (pnode=rtpp_list->rn_first; pnode!=0; pnode = pnode->rn_next) { char *hostname; @@ -1762,9 +1770,9 @@ static int build_rtpp_socks() { rptest: pnode->rn_disabled = rtpp_test(pnode, 0, 1); } - lock_release(rtpp_list->rset_lock); + rtpe_reload_lock_release(rtpp_list->rset_lock); } - lock_release(rtpp_set_list->rset_head_lock); + rtpe_reload_lock_release(rtpp_set_list->rset_head_lock); return 0; }

1 0

git:master:3ca9765e: db_redis: use safe clist iteration for db_redis_free_tables()
by Daniel-Constantin Mierla 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: 3ca9765eea980283963a48a9767e93566063057f URL: https://github.com/kamailio/kamailio/commit/3ca9765eea980283963a48a9767e935… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-26T09:59:44+01:00 db_redis: use safe clist iteration for db_redis_free_tables() --- Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/3ca9765eea980283963a48a9767e935… Patch: https://github.com/kamailio/kamailio/commit/3ca9765eea980283963a48a9767e935… --- diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c index e9db44458e..fe63490174 100644 --- a/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c @@ -294,7 +294,9 @@ void db_redis_free_tables(km_redis_con_t *con) { struct str_hash_table *ht; struct str_hash_table *col_ht; struct str_hash_entry *he; + struct str_hash_entry *he_b; struct str_hash_entry *col_he; + struct str_hash_entry *col_he_b; struct str_hash_entry *last; struct str_hash_entry *col_last; redis_table_t *table; @@ -305,13 +307,13 @@ void db_redis_free_tables(km_redis_con_t *con) { ht = &con->tables; for (i = 0; i < ht->size; ++i) { last = (&ht->table[i])->prev; - clist_foreach(&ht->table[i], he, next) { + clist_foreach_safe(&ht->table[i], he, he_b, next) { table = (redis_table_t*) he->u.p; col_ht = &table->columns; for (j = 0; j < col_ht->size; ++j) { col_last = (&col_ht->table[j])->prev; - clist_foreach(&col_ht->table[j], col_he, next) { + clist_foreach_safe(&col_ht->table[j], col_he, col_he_b, next) { pkg_free(col_he->key.s); if (col_he == col_last) { pkg_free(col_he);

1 0

git:master:7873a653: cdp: init pointer to avoid warning on uninitialized use
by Daniel-Constantin Mierla 26 Dec '18

26 Dec '18

Module: kamailio Branch: master Commit: 7873a653a43070f891dc6cde5c188c81bf5de25d URL: https://github.com/kamailio/kamailio/commit/7873a653a43070f891dc6cde5c188c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-26T09:59:44+01:00 cdp: init pointer to avoid warning on uninitialized use --- Modified: src/modules/cdp/diameter_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/7873a653a43070f891dc6cde5c188c8… Patch: https://github.com/kamailio/kamailio/commit/7873a653a43070f891dc6cde5c188c8… --- diff --git a/src/modules/cdp/diameter_msg.c b/src/modules/cdp/diameter_msg.c index fb4257f52a..464a3504e1 100644 --- a/src/modules/cdp/diameter_msg.c +++ b/src/modules/cdp/diameter_msg.c @@ -459,7 +459,7 @@ AAAMessage* AAATranslateMessage( unsigned char* source, unsigned int sourceLen, int attach_buf) { unsigned char *ptr; - AAAMessage *msg; + AAAMessage *msg = 0; unsigned char version; unsigned int msg_len; AAA_AVP *avp;

1 0

git:master:de48be80: core: fix a resource leak in the case for memory allocation error
by Henning Westerholt 25 Dec '18

25 Dec '18

Module: kamailio Branch: master Commit: de48be80ae5a6380434913bd177e17c7d8cb42c5 URL: https://github.com/kamailio/kamailio/commit/de48be80ae5a6380434913bd177e17c… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-25T23:41:57+01:00 core: fix a resource leak in the case for memory allocation error --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/de48be80ae5a6380434913bd177e17c… Patch: https://github.com/kamailio/kamailio/commit/de48be80ae5a6380434913bd177e17c… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 16704a6f29..0ba1be5fe3 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -215,7 +215,8 @@ static int new_addr_info2list(char* name, enum si_flags f, -/* another helper function, it just creates a socket_info struct */ +/* another helper function, it just creates a socket_info struct + * allocates a si and a si->name in new pkg memory */ static inline struct socket_info* new_sock_info( char* name, struct name_lst* addr_l, unsigned short port, unsigned short proto, @@ -702,7 +703,7 @@ static struct socket_info* new_sock2list(char* name, struct name_lst* addr_l, struct socket_info** list) { struct socket_info* si; - + /* allocates si and si->name in new pkg memory */ si=new_sock_info(name, addr_l, port, proto, usename, useport, flags); if (si==0){ LM_ERR("new_sock_info failed\n"); @@ -718,6 +719,8 @@ static struct socket_info* new_sock2list(char* name, struct name_lst* addr_l, si->mcast.s=(char*)pkg_malloc(si->mcast.len+1); if (si->mcast.s==0) { PKG_MEM_ERROR; + pkg_free(si->name.s); + pkg_free(si); return 0; } strcpy(si->mcast.s, mcast);

1 0

git:master:9d38aa06: core: fix two errors introduced in commit #e3ecad34bb13e
by Henning Westerholt 25 Dec '18

25 Dec '18

Module: kamailio Branch: master Commit: 9d38aa06d645bc44e37052d9b315474a99503359 URL: https://github.com/kamailio/kamailio/commit/9d38aa06d645bc44e37052d9b315474… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-25T23:26:15+01:00 core: fix two errors introduced in commit #e3ecad34bb13e --- Modified: src/core/str_hash.h Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/9d38aa06d645bc44e37052d9b315474… Patch: https://github.com/kamailio/kamailio/commit/9d38aa06d645bc44e37052d9b315474… --- diff --git a/src/core/str_hash.h b/src/core/str_hash.h index 8c6589f449..8755a6272c 100644 --- a/src/core/str_hash.h +++ b/src/core/str_hash.h @@ -57,9 +57,10 @@ struct str_hash_table{ inline static int str_hash_alloc(struct str_hash_table* ht, int size) { ht->table=(struct str_hash_head*)pkg_malloc(sizeof(struct str_hash_head)*size); - if (ht->table==0) + if (ht->table==0) { PKG_MEM_ERROR; return -1; + } ht->size=size; return 0; } diff --git a/src/core/xavp.c b/src/core/xavp.c index 2680cf71fa..2c725e92ee 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -92,9 +92,10 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) if(val->type == SR_XTYPE_STR) size += val->v.s.len + 1; avp = (sr_xavp_t*)shm_malloc(size); - if(avp==NULL) + if(avp==NULL) { SHM_MEM_ERROR; return NULL; + } memset(avp, 0, size); avp->id = id; avp->name.s = (char*)avp + sizeof(sr_xavp_t);

1 0

Merry Christmas and Happy Holidays!
by Daniel-Constantin Mierla 24 Dec '18

24 Dec '18

With the season holiday just starting, it's again a good time to express my thanks and greetings to all the friends, developers and community members that made 2018 another great year for Kamailio project. Enjoy the holidays! Merry Christmas! Daniel * Santa is flying Kamailio! * -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 - www.kamailioworld.com

2 1

[kamailio/kamailio] jsonrpcs_exec for the rtpengine cache gives memory leak (#1778)
by ovoshlook 24 Dec '18

24 Dec '18

### Description  We are buidling some kind of our own rtpengine dispatcher based on our own algorithm using kemi Lua. In one of the functions we are calling: `local reqBody = function(command, params) return json.encode({ jsonrpc = "2.0", method = "rtpengine." .. command, params = params }) end KSR.jsonrpcs.exec(reqBody("show", { "all" })) local data = json.decode(KSR.pv.get("$jsonrpl(body)")) ` And watching **free_mem** decrasing in case of every call of this function If we are commenting this - nothing happens P.S. We are doing the same for the dispatcher module but did not find memory leak for it: `local reqBody = function (command,params) return json.encode( { jsonrpc = "2.0", method = "dispatcher." ..command, params = params } ) end KSR.jsonrpcs.exec(reqBody( "list" ) ) local data = json.decode( KSR.pv.get("$jsonrpl(body)") ) ` ### Troubleshooting #### Reproduction To reproduce this issue suppose will be enough to call code above #### Debugging Data test results for 10000 calls total/300 per second (sipp based) memory stats on the start shmem:fragments = 2 | shmem:free_size = 63131408 shmem:max_used_size = 3994704 shmem:real_used_size = 3977456 shmem:total_size = 67108864 shmem:used_size = 3205144 memory stats on the end shmem:fragments = 5 | shmem:free_size = 60106232 shmem:max_used_size = 7019952 shmem:real_used_size = 7002632 shmem:total_size = 67108864 shmem:used_size = 4150008 ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.6 (x86_64/linux) 7d1964 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST, HAVE_RESOLV_RES 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: 7d1964 compiled on 03:23:23 Oct 5 2018 with gcc 6.3.0 ``` * **Operating System**:  ``` 1 machine: SMP Debian 4.9.110-3+deb9u6 (2018-10-08) x86_64 GNU/Linux 2 machine: SMP Debian 4.9.110-3+deb9u2 (2018-08-13) x86_64 GNU/Linux ``` If will need any additional info just let me know P.S. We also tried to find what can give this behavior on the rtpengine.c but didn't figured out yet -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1778

1 2

git:master:73842a6f: textops: proper parameter no for fixup_regex_substring()
by Daniel-Constantin Mierla 24 Dec '18

24 Dec '18

Module: kamailio Branch: master Commit: 73842a6fc548ae79751f98bdaa717e95e46850e4 URL: https://github.com/kamailio/kamailio/commit/73842a6fc548ae79751f98bdaa717e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-24T14:01:15+01:00 textops: proper parameter no for fixup_regex_substring() --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/73842a6fc548ae79751f98bdaa717e9… Patch: https://github.com/kamailio/kamailio/commit/73842a6fc548ae79751f98bdaa717e9… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 3db4626232..abf8e3e785 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -923,7 +923,7 @@ static int fixup_regex_substring(void** param, int param_no) return fixup_spve_all(param, param_no); } - if (param_no == 3 || param_no == 3) { + if (param_no == 3 || param_no == 4) { return fixup_igp_all(param, param_no); }

1 0

git:master:8afbefda: textops: pkg free pmatch for regex_substring()
by Daniel-Constantin Mierla 24 Dec '18

24 Dec '18

Module: kamailio Branch: master Commit: 8afbefda8b77db19f38c7f8984fe683c30ffc95d URL: https://github.com/kamailio/kamailio/commit/8afbefda8b77db19f38c7f8984fe683… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-24T14:04:16+01:00 textops: pkg free pmatch for regex_substring() --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/8afbefda8b77db19f38c7f8984fe683… Patch: https://github.com/kamailio/kamailio/commit/8afbefda8b77db19f38c7f8984fe683… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index abf8e3e785..ab7d894bdd 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -833,6 +833,7 @@ static int ki_regex_substring(sip_msg_t* msg, str *input, str *regex, if (0 != rc) { LM_ERR("regular experession coudnt be compiled, Error code: (%d)\n", rc); + pkg_free(pmatch); regfree(&preg); return -1; } @@ -841,12 +842,14 @@ static int ki_regex_substring(sip_msg_t* msg, str *input, str *regex, regfree(&preg); if(rc!=0) { LM_DBG("no matches\n"); + pkg_free(pmatch); return -2; } /* matched */ if (pmatch[mindex].rm_so==-1) { LM_WARN("invalid offset for regular expression result\n"); + pkg_free(pmatch); return -1; } @@ -855,6 +858,7 @@ static int ki_regex_substring(sip_msg_t* msg, str *input, str *regex, if (pmatch[mindex].rm_so==pmatch[mindex].rm_eo) { LM_WARN("Matched string is empty\n"); + pkg_free(pmatch); return -1; } @@ -863,6 +867,7 @@ static int ki_regex_substring(sip_msg_t* msg, str *input, str *regex, if(tempstr.s== NULL || tempstr.len<=0) { LM_WARN("matched token is null\n"); + pkg_free(pmatch); return -1; } @@ -871,6 +876,7 @@ static int ki_regex_substring(sip_msg_t* msg, str *input, str *regex, valx.rs.len=tempstr.len; LM_DBG("result: %.*s\n", valx.rs.len, valx.rs.s); pvresult->setf(msg, &pvresult->pvp, (int)EQ_T, &valx); + pkg_free(pmatch); return 1; }

1 0

git:5.2:1a3a485a: pkg/kamailio/deb: add kamailio-python3-modules
by Victor Seva 24 Dec '18

24 Dec '18

Module: kamailio Branch: 5.2 Commit: 1a3a485ac13218b4b34366b452428a34d1e2191d URL: https://github.com/kamailio/kamailio/commit/1a3a485ac13218b4b34366b452428a3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-24T09:46:23+01:00 pkg/kamailio/deb: add kamailio-python3-modules (cherry picked from commit c78a53004777f498fcef63ae74a11723da950625) --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/1a3a485ac13218b4b34366b452428a3… Patch: https://github.com/kamailio/kamailio/commit/1a3a485ac13218b4b34366b452428a3…

1 0

[kamailio/kamailio] Broken Kamailio repository for CentOS 7 (#1604)
by pwakano 24 Dec '18

24 Dec '18

### Description Centos RPM repo is generating Kamailio 5.0.7 packages that can't be installed ### Troubleshooting #### Reproduction By using the repo https://download.opensuse.org/repositories/home:/kamailio:/v5.0.x-rpms/Cent… when trying to install Kamailio 5.0.7, yum returns this error: ``` Downloading packages: Delta RPMs disabled because /usr/bin/applydeltarpm not installed. kamailio-5.0.7-3.el7.centos.x8 FAILED http://download.opensuse.org/repositories/home%3A/kamailio%3A/v5.0.x-rpms/C…: [Errno 14] HTTP Error 416 - Requested Range Not Satisfiable Trying other mirror. ``` #### Debugging Data #### Log Messages #### SIP Traffic ### Possible Solutions  ### Additional Information * **Operating System**: ``` $ cat /etc/redhat-release CentOS Linux release 7.4.1708 (Core) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1604

6 14

Broken: kamailio/kamailio#6824 (master - c78a530)
by Travis CI 24 Dec '18

24 Dec '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6824 Status: Broken Duration: 6 mins and 6 secs Commit: c78a530 (master) Author: Victor Seva Message: pkg/kamailio/deb: add kamailio-python3-modules View the changeset: https://github.com/kamailio/kamailio/compare/5ba65fcb0b7b...c78a53004777 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/471785053?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:c78a5300: pkg/kamailio/deb: add kamailio-python3-modules
by Victor Seva 24 Dec '18

24 Dec '18

Module: kamailio Branch: master Commit: c78a53004777f498fcef63ae74a11723da950625 URL: https://github.com/kamailio/kamailio/commit/c78a53004777f498fcef63ae74a1172… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-24T08:50:11+01:00 pkg/kamailio/deb: add kamailio-python3-modules --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/c78a53004777f498fcef63ae74a1172… Patch: https://github.com/kamailio/kamailio/commit/c78a53004777f498fcef63ae74a1172…

1 0

git:master:5ba65fcb: core: cleanup, remove local_malloc/local_free #define in core
by Henning Westerholt 23 Dec '18

23 Dec '18

Module: kamailio Branch: master Commit: 5ba65fcb0b7bea9c79d83fdbc24239e7351e543d URL: https://github.com/kamailio/kamailio/commit/5ba65fcb0b7bea9c79d83fdbc24239e… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-23T22:50:43+01:00 core: cleanup, remove local_malloc/local_free #define in core - remove the unused local_malloc and local_free #define in the core - they were introduced in 2002 and not touched in the repository since this time - they pointed to pkg_malloc and pkg_free --- Modified: src/core/io_wait.c Modified: src/core/io_wait.h Modified: src/core/resolve.c Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/5ba65fcb0b7bea9c79d83fdbc24239e… Patch: https://github.com/kamailio/kamailio/commit/5ba65fcb0b7bea9c79d83fdbc24239e…

1 0

git:master:e3ecad34: core: use generic PKG_MEM_ERROR, SHM_ERROR and _CRITICAL helper defines in core
by Henning Westerholt 23 Dec '18

23 Dec '18

Module: kamailio Branch: master Commit: e3ecad34bb13e72b16a4213e7ce785194e88c534 URL: https://github.com/kamailio/kamailio/commit/e3ecad34bb13e72b16a4213e7ce7851… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-23T22:37:22+01:00 core: use generic PKG_MEM_ERROR, SHM_ERROR and _CRITICAL helper defines in core - refactoring of the core to use generic PKG_MEM_ERROR, SHM_ERROR, PKG_MEM_CRITICAL, SHM_MEM_CRITICAL and SYS_MEM_ERROR helper defines - unify many different error messages in different spellings - add a few missing error handler for allocation errors after (found with a complete review of all memory allocation functions in core) - no other functional changes, change has been reviewed two times --- Modified: src/core/action.c Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/cfg/cfg.c Modified: src/core/cfg/cfg_ctx.c Modified: src/core/cfg/cfg_script.c Modified: src/core/cfg/cfg_select.c Modified: src/core/cfg/cfg_struct.c Modified: src/core/cfg_parser.c Modified: src/core/core_cmd.c Modified: src/core/counters.c Modified: src/core/data_lump.c Modified: src/core/data_lump_rpl.c Modified: src/core/dns_cache.c Modified: src/core/dset.c Modified: src/core/dst_blacklist.c Modified: src/core/error.c Modified: src/core/flags.c Modified: src/core/forward.c Modified: src/core/io_wait.c Modified: src/core/ip_addr.c Modified: src/core/kemi.c Modified: src/core/lock_alloc.h Modified: src/core/locking.c Modified: src/core/mod_fix.c Modified: src/core/modparam.c Modified: src/core/msg_translator.c Modified: src/core/name_alias.h Modified: src/core/nonsip_hooks.c Modified: src/core/parser/contact/contact.c Modified: src/core/parser/contact/parse_contact.c Modified: src/core/parser/digest/digest.c Modified: src/core/parser/msg_parser.c Modified: src/core/parser/parse_addr_spec.c Modified: src/core/parser/parse_allow.c Modified: src/core/parser/parse_content.c Modified: src/core/parser/parse_date.c Modified: src/core/parser/parse_disposition.c Modified: src/core/parser/parse_diversion.c Modified: src/core/parser/parse_event.c Modified: src/core/parser/parse_expires.c Modified: src/core/parser/parse_fline.c Modified: src/core/parser/parse_from.c Modified: src/core/parser/parse_identity.c Modified: src/core/parser/parse_identityinfo.c Modified: src/core/parser/parse_param.c Modified: src/core/parser/parse_ppi_pai.c Modified: src/core/parser/parse_refer_to.c Modified: src/core/parser/parse_require.c Modified: src/core/parser/parse_rpid.c Modified: src/core/parser/parse_rr.c Modified: src/core/parser/parse_sipifmatch.c Modified: src/core/parser/parse_subscription_state.c Modified: src/core/parser/parse_supported.c Modified: src/core/parser/parse_via.c Modified: src/core/parser/sdp/sdp.c Modified: src/core/parser/sdp/sdp_helpr_funcs.c Modified: src/core/ppcfg.c Modified: src/core/proxy.c Modified: src/core/pt.c Modified: src/core/pvapi.c Modified: src/core/re.c Modified: src/core/receive.c Modified: src/core/resolve.c Modified: src/core/route.c Modified: src/core/route_struct.c Modified: src/core/rpc_lookup.c Modified: src/core/rvalue.c Modified: src/core/script_cb.c Modified: src/core/select.c Modified: src/core/select_buf.c Modified: src/core/sip_msg_clone.c Modified: src/core/socket_info.c Modified: src/core/sr_module.c Modified: src/core/stats.c Modified: src/core/str.c Modified: src/core/str_hash.h Modified: src/core/switch.c Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c Modified: src/core/timer.c Modified: src/core/timer_proc.c Modified: src/core/udp_server.c Modified: src/core/usr_avp.c Modified: src/core/ut.c Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/e3ecad34bb13e72b16a4213e7ce7851… Patch: https://github.com/kamailio/kamailio/commit/e3ecad34bb13e72b16a4213e7ce7851…

1 0

git:master:5667377c: core: log an error in mk_name_lst_elem if memory allocation failed
by Henning Westerholt 23 Dec '18

23 Dec '18

Module: kamailio Branch: master Commit: 5667377c95cfc23cfac24ae67f0af54d959ba636 URL: https://github.com/kamailio/kamailio/commit/5667377c95cfc23cfac24ae67f0af54… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-23T22:37:22+01:00 core: log an error in mk_name_lst_elem if memory allocation failed --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/5667377c95cfc23cfac24ae67f0af54… Patch: https://github.com/kamailio/kamailio/commit/5667377c95cfc23cfac24ae67f0af54… --- diff --git a/src/main.c b/src/main.c index b7e9fdb58a..4c31bdf13f 100644 --- a/src/main.c +++ b/src/main.c @@ -978,8 +978,11 @@ static struct name_lst* mk_name_lst_elem(char* name, int name_len, int flags) l->name[name_len]=0; l->flags=flags; l->next=0; + return l; + } else { + PKG_MEM_ERROR; + return 0; } - return l; }

1 0

git:master:753bc81c: core: add some more memory logging helper defines to mem.h
by Henning Westerholt 23 Dec '18

23 Dec '18

Module: kamailio Branch: master Commit: 753bc81c80e9d523e7032a318c95d4168e8834e4 URL: https://github.com/kamailio/kamailio/commit/753bc81c80e9d523e7032a318c95d41… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-23T22:37:22+01:00 core: add some more memory logging helper defines to mem.h - add some more memory logging helper defines to mem.h - PKG_MEM_CRITICAL: output a generic pkg error message with log level critical - SHM_MEM_CRITICAL: output a generic shm error message with log level critical - SYS_MEM_ERROR/SYS_MEM_CRITICAL: generic error message for system allocation --- Modified: src/core/mem/mem.h --- Diff: https://github.com/kamailio/kamailio/commit/753bc81c80e9d523e7032a318c95d41… Patch: https://github.com/kamailio/kamailio/commit/753bc81c80e9d523e7032a318c95d41… --- diff --git a/src/core/mem/mem.h b/src/core/mem/mem.h index 2a06020f82..83c03b8d98 100644 --- a/src/core/mem/mem.h +++ b/src/core/mem/mem.h @@ -195,10 +195,18 @@ int init_shm_mallocs(int force_alloc); /** generic logging helper for allocation errors in private memory pool/ system */ #ifdef SYS_MALLOC #define PKG_MEM_ERROR LM_ERR("could not allocate private memory from sys pool\n") +#define PKG_MEM_CRITICAL LM_CRIT("could not allocate private memory from sys pool\n") #else #define PKG_MEM_ERROR LM_ERR("could not allocate private memory from pkg pool\n") +#define PKG_MEM_CRITICAL LM_CRIT("could not allocate private memory from pkg pool\n") #endif + +/** generic logging helper for allocation errors in system memory */ +#define SYS_MEM_ERROR LM_ERR("could not allocate memory from system\n") +#define SYS_MEM_CRITICAL LM_CRIT("could not allocate memory from system\n") + /** generic logging helper for allocation errors in shared memory pool */ #define SHM_MEM_ERROR LM_ERR("could not allocate shared memory from shm pool\n") +#define SHM_MEM_CRITICAL LM_CRIT("could not allocate shared memory from shm pool\n") #endif

1 0

git:master:de195e06: modules: readme files regenerated - secfilter ... [skip ci]
by Kamailio Dev 21 Dec '18

21 Dec '18

Module: kamailio Branch: master Commit: de195e0655edec0c5b3b0f2c7a9dcc28f6e0da89 URL: https://github.com/kamailio/kamailio/commit/de195e0655edec0c5b3b0f2c7a9dcc2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-12-21T12:31:47+01:00 modules: readme files regenerated - secfilter ... [skip ci] --- Modified: src/modules/secfilter/README --- Diff: https://github.com/kamailio/kamailio/commit/de195e0655edec0c5b3b0f2c7a9dcc2… Patch: https://github.com/kamailio/kamailio/commit/de195e0655edec0c5b3b0f2c7a9dcc2… --- diff --git a/src/modules/secfilter/README b/src/modules/secfilter/README index f2656581ab..0680756dfc 100644 --- a/src/modules/secfilter/README +++ b/src/modules/secfilter/README @@ -2,6 +2,9 @@ Secfilter Module Jose Luis Verdeguer + Zoon Suite + <verdeguer(a)zoonsuite.com> + Copyright © 2018 __________________________________________________________________

1 0

[kamailio/kamailio] secfilter: Added information about the author in the README file (#1774)
by Jose Luis Verdeguer 21 Dec '18

21 Dec '18

#### 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) - [ ] 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  secfilter: Added information about the author in the README file You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1774 -- Commit Summary -- * secfilter: Added information about the author in the README file -- File Changes -- M src/modules/secfilter/README (3) M src/modules/secfilter/doc/secfilter.xml (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1774.patch https://github.com/kamailio/kamailio/pull/1774.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1774

2 1

git:master:80112ddf: secfilter: Added information about the author in the README file [skip ci]
by Victor Seva 21 Dec '18

21 Dec '18

Module: kamailio Branch: master Commit: 80112ddf35ca91fafdb52a2e6442ba8c810af865 URL: https://github.com/kamailio/kamailio/commit/80112ddf35ca91fafdb52a2e6442ba8… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-21T12:25:20+01:00 secfilter: Added information about the author in the README file [skip ci] --- Modified: src/modules/secfilter/doc/secfilter.xml --- Diff: https://github.com/kamailio/kamailio/commit/80112ddf35ca91fafdb52a2e6442ba8… Patch: https://github.com/kamailio/kamailio/commit/80112ddf35ca91fafdb52a2e6442ba8… --- diff --git a/src/modules/secfilter/doc/secfilter.xml b/src/modules/secfilter/doc/secfilter.xml index 9ee0304ae7..f6f8767bbc 100644 --- a/src/modules/secfilter/doc/secfilter.xml +++ b/src/modules/secfilter/doc/secfilter.xml @@ -16,7 +16,8 @@ <author> <firstname>Jose Luis</firstname> <surname>Verdeguer</surname> - <affiliation><orgname></orgname></affiliation> + <email>verdeguer(a)zoonsuite.com</email> + <affiliation><orgname>Zoon Suite</orgname></affiliation> <address> <email>verdeguer(a)zoonsuite.com</email> </address>

1 0

[kamailio/kamailio] kamailio refuses custom global variable (#1773)
by PICCORO Lenz McKAY 21 Dec '18

21 Dec '18

### Description triying to config kamailio using default config file with proper parameters, and also aparte few other in kamailio-local.cfg.. en that second file i put a variable (for global) as `kamailioip=10.10.10.10 ` but refuses to reconoce it ### Troubleshooting kamailio seems does not reconoce it the global variable in kamailio-local.cfg file that are sourcered by the kamailio.cfg main file #### Reproduction download, configure and make build of kamailio use the main config file `touch kamilio-local.cfg` that will be sourcered by kamailio.cfg in that file put only `kamailioip=10.10.10.10` i tri also with "101.10.10.10" and same problem #### Log Messages ``` 0(1542) DEBUG: <core> [core/modparam.c:83]: set_mod_param_regex(): 'debugger' matches module 'debugger' 0(1542) DEBUG: <core> [core/sr_module.c:811]: find_param_export(): found <log_level_name> in module debugger [/usr/lib/x86_64-linux-gnu/kamailio/modules/debugger.so] 0(1542) DEBUG: <core> [core/modparam.c:99]: set_mod_param_regex(): found <log_level_name> in module debugger [/usr/lib/x86_64-linux-gnu/kamailio/modules/debugger.so] 0(1542) CRITICAL: <core> [core/cfg.y:3450]: yyerror_at(): parse error in config file kamailio-localmods.cfg, line 9, column 6: syntax error 0(1542) CRITICAL: <core> [core/cfg.y:3450]: yyerror_at(): parse error in config file kamailio-localmods.cfg, line 9, column 6: unknown config variable 0(1542) CRITICAL: <core> [core/cfg.y:3447]: yyerror_at(): parse error in config file kamailio-localmods.cfg, line 9, column 7-8: ERROR: bad config file (3 errors) 0(1542) WARNING: <core> [core/ppcfg.c:221]: pp_ifdef_level_check(): different number of preprocessor directives: N(#!IF[N]DEF) - N(#!ENDIF) = 1 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST, HAVE_RESOLV_RES 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: unknown compiled with gcc 4.9.2 ``` * **Operating System**: ``` Linux ip-10-101-2-78 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1 (2016-12-30) x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1773

3 5

[kamailio/kamailio] assign CSeq header for REGISTER generation (#1768)
by maryamb99 21 Dec '18

21 Dec '18

Hello everyone, I use from uac_req_send()‌function from UAC‌ module for generation of REGISTER request in onreply_route , I assign new values for all headers of my packet before sending my new generated request but I can't assign value for CSeq header. It doesn't define and when I try to assign it, I got an error . I analysed packet flow through Wireshark and recognized always value of CSeq header for my new register request is 10. I want to assign new value for my REGISTER packet in configuration file.. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1768

4 8

[kamailio/kamailio] Segfault when calling $sel(cfg_get...) (#1159)
by Sebastian Damm 20 Dec '18

20 Dec '18

### Description I set some configuration parameters in the global section of kamailio.cfg and wanted to read them later in request_route and reply_route. But when accessing them, Kamailio segfaults. However, I can read them via kamcmd after startup. ### Troubleshooting #### Reproduction Set the following config parameter in your kamailio.cfg in the global section: ``` config.foo = "hello Daniel" ``` later, put your request and reply route in the configuration file: ``` request_route { xlog("L_INFO", "Reading config.foo into variable"); $var(configfoo) = $sel(cfg_get.config.foo); } onreply_route { xlog("L_INFO", "Reading config.foo into variable"); $var(configfoo) = $sel(cfg_get.config.foo); } ``` #### Debugging Data gdb output is the following: ``` GNU gdb (Debian 7.7.1+dfsg-5) 7.7.1 Copyright (C) 2014 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /usr/sbin/kamailio...Reading symbols from /usr/lib/debug/.build-id/94/dfffd4a243602bbd4d977202f533c3e9e613f7.debug...done. done. [New LWP 7999] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio_li_sniffer.pid -f /etc/kamaili'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f19e418e20d in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #0 0x00007f19e418e20d in ?? () from /lib/x86_64-linux-gnu/libc.so.6 No symbol table info available. #1 0x00000000006f4813 in select_cfg_var (res=0x7ffc998181d0, s=0x7f19e3965f60, msg=0x7f19e3985dd0) at core/cfg/cfg_select.c:227 group = 0x7f19e394e600 var = 0x7f19e3985958 p = 0x40 i = 32537 buf = '\000' <repeats 21 times> __FUNCTION__ = "select_cfg_var" #2 0x000000000050a6f0 in run_select (res=0x7ffc998181d0, s=0x7f19e3965f60, msg=0x7f19e3985dd0) at core/select.c:425 ret = 0 orig_level = 0 __FUNCTION__ = "run_select" #3 0x00007f19e133f089 in pv_get_select (msg=0x7f19e3985dd0, param=0x7f19e39667b8, res=0x7ffc998182d0) at pv_select.c:61 s = {s = 0x0, len = 0} sel = 0x7f19e3965f60 #4 0x00000000005b38a3 in pv_get_spec_value (msg=0x7f19e3985dd0, sp=0x7f19e39667a0, value=0x7ffc998182d0) at core/pvapi.c:1307 ret = 0 __FUNCTION__ = "pv_get_spec_value" #5 0x000000000057b007 in lval_pvar_assign (h=0x7ffc99818a80, msg=0x7f19e3985dd0, lv=0x7f19e3966690, rv=0x7f19e3966798) at core/lvalue.c:335 pvar = 0x7f19e39658d8 pval = {rs = {s = 0x0, len = 0}, ri = 0, flags = 0} r_avp = 0x417590 <syslog@plt> avp_val = {n = 7876360, s = {s = 0x782f08 "DEBUG", len = 7}, re = 0x782f08} ret = 0 v = 18987664 destroy_pval = 0 __FUNCTION__ = "lval_pvar_assign" #6 0x000000000057bd36 in lval_assign (h=0x7ffc99818a80, msg=0x7f19e3985dd0, lv=0x7f19e3966690, rve=0x7f19e3966790) at core/lvalue.c:400 rv = 0x7f19e3966798 ret = 0 __FUNCTION__ = "lval_assign" #7 0x0000000000467f60 in do_action (h=0x7ffc99818a80, a=0x7f19e3966ec0, msg=0x7f19e3985dd0) at core/action.c:1430 ret = -5 v = 6 dst = {send_sock = 0x7f19e449f300, to = {s = {sa_family = 34783, sa_data = "\201\231\374\177\000\000\220\025\031\001\000\000\000"}, sin = { sin_family = 34783, sin_port = 39297, sin_addr = {s_addr = 32764}, sin_zero = "\220\025\031\001\000\000\000"}, sin6 = {sin6_family = 34783, sin6_port = 39297, sin6_flowinfo = 32764, sin6_addr = {__in6_u = { __u6_addr8 = "\220\025\031\001\000\000\000\000@\206\201\231\374\177\000", __u6_addr16 = {5520, 281, 0, 0, 34368, 39297, 32764, 0}, __u6_addr32 = {18421136, 0, 2575402560, 32764}}}, sin6_scope_id = 8172960}}, id = 0, proto = -32 '\340', send_flags = {f = 188 '\274', blst_imask = 33 '!'}} tmp = 0x7ffc99818a90 "\220uA" new_uri = 0x2010 <error: Cannot access memory at address 0x2010> end = 0x7f19e44a1620 "" crt = 0x3939393700000015 <error: Cannot access memory at address 0x3939393700000015> cmd = 0x7f19e395d060 len = -467267128 user = 32537 uri = {user = {s = 0x7f19e44a1620 "", len = 18988272}, passwd = {s = 0x121bce0 "`\002", len = -467267135}, host = { s = 0x121bcfc "10:34:39 /usr/sbin/kamailio[7999]: DEBUG: <core> [core/select.c:412]: run_select(): Calling SELECT 0x7f19e3965f60\n", len = -464913696}, port = { s = 0x8 <error: Cannot access memory at address 0x8>, len = -467275366}, params = { s = 0x1 <error: Cannot access memory at address 0x1>, len = -468002654}, sip_params = { s = 0x3939393700000008 <error: Cannot access memory at address 0x3939393700000008>, len = 8187}, headers = {s = 0x0, len = 18987664}, port_no = 5336, proto = 125, type = ERROR_URI_T, flags = (unknown: 18988256), transport = { s = 0x2010 <error: Cannot access memory at address 0x2010>, len = -464906720}, ttl = { s = 0x121dcf0 "", len = -460542388}, user_param = { s = 0x2010 <error: Cannot access memory at address 0x2010>, len = -1472036457}, maddr = { s = 0x3 <error: Cannot access memory at address 0x3>, len = 5}, method = { s = 0x7f19e4ad7578 "\260A\256\344\031\177", len = -460539970}, lr = {s = 0x121bce0 "`\002", len = -1719564448}, r2 = {s = 0x7f19e40ffd28 "", len = -468690656}, gr = { s = 0x7ffc99818870 " Y\020\344\031\177", len = 44108294}, transport_val = { s = 0x7ffc99818860 "\377\377\377\377", len = 8180}, ttl_val = {s = 0x0, len = -458394160}, user_param_val = {s = 0x7f19e4ad7000 "", len = 4253282}, maddr_val = {s = 0x7f19e410cd78 "", len = 4209664}, method_val = { s = 0x500000000 <error: Cannot access memory at address 0x500000000>, len = 981}, lr_val = { s = 0x7f19e449f300 "\033\t&\344\031\177", len = -458394160}, r2_val = { s = 0x7ffc99818900 "@\212\201\231\374\177", len = -458341112}, gr_val = { s = 0x7ffc99818928 " Y\020\344\031\177", len = -458341968}} next_hop = {user = {s = 0x1 <error: Cannot access memory at address 0x1>, len = -460539539}, passwd = {s = 0x0, len = -458394160}, host = { s = 0x393300000005 <error: Cannot access memory at address 0x393300000005>, len = 0}, port = {s = 0x1 <error: Cannot access memory at address 0x1>, len = -458341968}, params = { s = 0x121bcf0 "<191>Jun 21 10:34:39 /usr/sbin/kamailio[7999]: DEBUG: <core> [core/select.c:412]: run_select(): Calling SELECT 0x7f19e3965f60\n", len = 0}, sip_params = { s = 0x121bcf0 "<191>Jun 21 10:34:39 /usr/sbin/kamailio[7999]: DEBUG: <core> [core/select.c:412]: run_select(): Calling SELECT 0x7f19e3965f60\n", len = -467267135}, headers = {s = 0x0, len = -458341112}, port_no = 34928, proto = 39297, type = 32764, flags = (unknown: 2575403104), transport = { s = 0xa8428197 <error: Cannot access memory at address 0xa8428197>, len = 4253282}, ttl = { s = 0xffffffff <error: Cannot access memory at address 0xffffffff>, len = -467275366}, user_param = {s = 0x7f19e4105920 "\203I", len = -458395648}, maddr = { s = 0x3939393700781a68 <error: Cannot access memory at address 0x3939393700781a68>, len = 8187}, method = {s = 0x0, len = 18987664}, lr = { s = 0x781d20 "%s: %s%s(): preparing to run routing scripts...\n", len = 18988256}, r2 = { s = 0x2010 <error: Cannot access memory at address 0x2010>, len = -464906720}, gr = { s = 0x121dcf0 "", len = 135}, transport_val = { s = 0x2010 <error: Cannot access memory at address 0x2010>, len = 10658448}, ttl_val = { s = 0x0, len = 7}, user_param_val = { s = 0xa3557a <buf+506> "13296 REGISTER\r\nMax-Forwards: 69\r\nUser-Agent: snom820/8.7.5.17\r\nContact: <sip:1016908e0@82.116.119.72:53401;line=hqwwdi0u>;reg-id=1;q=1.0;audio;mobility=\"fixed\";duplex=\"full\";description=\"snomD765\";ac"..., len = 4289936}, maddr_val = { s = 0x7ffc99818a40 "`\213\201\231\374\177", len = -460521481}, method_val = { s = 0x5 <error: Cannot access memory at address 0x5>, len = 0}, lr_val = { s = 0x100000000 <error: Cannot access memory at address 0x100000000>, len = -468690656}, r2_val = {s = 0x417590 <syslog@plt> "\377%\022.a", len = -1719563712}, gr_val = { s = 0x782f08 "DEBUG", len = -460495595}} u = 0x3000000010 port = 39297 dst_host = 0x121bce0 i = 13 flags = 2 avp = 0x7ffc99818b70 st = {flags = 3830051584, id = 32537, name = {n = -1719564353, s = {s = 0x7ffc998187bf "", len = 18421136}, re = 0x7ffc998187bf}, avp = 0x7ffc99818620} sct = 0x7f19e41aeb51 sjt = 0x2010 rve = 0x7ce8d0 mct = 0x1ff4 rv = 0x7ffc99818b50 rv1 = 0x7ffc99818ab0 c1 = {cache_type = 8208, val_type = 14643, c = {avp_val = {n = -464906720, s = { s = 0x7f19e44a1620 "", len = 18996464}, re = 0x7f19e44a1620}, pval = {rs = { s = 0x7f19e44a1620 "", len = 18996464}, ri = 150, flags = 0}}, i2s = "\020 \000\000\063\071\000\000\254u\027\344\031\177\000\000\020\207\201\231\374\177"} s = {s = 0x6 <error: Cannot access memory at address 0x6>, len = -467997871} srevp = {0x7ffc99818830, 0x7ffc99818600} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = { number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = { s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = { number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #8 0x00000000004699fa in run_actions (h=0x7ffc99818a80, a=0x7f19e3965510, msg=0x7f19e3985dd0) at core/action.c:1552 t = 0x7f19e3966ec0 ret = 1 mod = 0xab00000003 ms = 0 __FUNCTION__ = "run_actions" #9 0x000000000046a1bd in run_top_route (a=0x7f19e3965510, msg=0x7f19e3985dd0, c=0x0) at core/action.c:1641 ctx = {rec_lev = 1, run_flags = 0, last_retcode = 1, jmp_env = {{__jmpbuf = {4289936, -8039283903424375778, 7876360, 7, 10704250, 4289936, -8039283903554399202, 8041047856258208798}, __mask_was_saved = 0, __saved_mask = {__val = {139749141390273, 4294967416, 20, 20, 18446744073709551615, 140722883889968, 139749141390764, 7876360, 0, 4611686022733059450, 139749169323472, 140722883890016, 5295428, 4302843656, 139749169323472, 4611686022733059450}}}}} p = 0x7ffc99818a80 ret = 0 sfbk = 0 #10 0x000000000057f2fc in receive_msg ( buf=0xa353f7 <buf+119> "REGISTER sip:sipgate.de SIP/2.0\r\nVia: SIP/2.0/UDP 217.116.120.247;branch=z9hG4bK0333.dae22993f9315bf8290cb153c6c2a81a.0\r\nVia: SIP/2.0/UDP 82.116.119.72:53401;received=82.116.119.72;branch=z9hG4bK-5hxr"..., len=1051, rcv_info=0x7ffc99818e80) at core/receive.c:264 msg = 0x7f19e3985dd0 ctx = {rec_lev = 248976, run_flags = 0, last_retcode = 568056, jmp_env = {{__jmpbuf = {568056, 8, 25, -8487096721362804224, 170079128784, 139749117125472, 139749169323120, 21482915456}, __mask_was_saved = 11, __saved_mask = {__val = {139749169100840, 7876360, 7, 140722883890512, 139749114876551, 139749114945152, 171331424705, 140722883890600, 98307693672, 11401280, 0, 8834747727873, 139745350909968, 7876360, 139749169100840, 7876360}}}}} bctx = 0x661d2b <qm_info+46> ret = 103 stats_on = 0 tvb = {tv_sec = 1498034079, tv_usec = 444700} tve = {tv_sec = 139749169323416, tv_usec = 139749168754704} tz = {tz_minuteswest = 0, tz_dsttime = 0} diff = 0 inb = { s = 0xa353f7 <buf+119> "REGISTER sip:sipgate.de SIP/2.0\r\nVia: SIP/2.0/UDP 217.116.120.247;branch=z9hG4bK0333.dae22993f9315bf8290cb153c6c2a81a.0\r\nVia: SIP/2.0/UDP 82.116.119.72:53401;received=82.116.119.72;branch=z9hG4bK-5hxr"..., len = 1051} netinfo = {data = {s = 0x7f19e3933440 "", len = 0}, dst = 0x800000 <yytable+6400>, rcv = 0x775508} keng = 0x0 __FUNCTION__ = "receive_msg" #11 0x00007f19e059ccdf in parsing_hepv3_message (buf=0xa35380 <buf> "HEP3\004\222", len=1170) at hep.c:499 from = {s = {sa_family = 2, sa_data = "\023\304\331tx\367\000\000\000\000\000\000\000"}, sin = { sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 4151866585}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 4151866585, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}} to = {s = {sa_family = 2, sa_data = "\023\304\254\024\025\004\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 68490412}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 68490412, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}} ri = {src_ip = {af = 2, len = 4, u = {addrl = {139749502776537, 1}, addr32 = {4151866585, 32537, 1, 0}, addr16 = {29913, 63352, 32537, 0, 1, 0, 0, 0}, addr = "\331tx\367\031\177\000\000\001\000\000\000\000\000\000"}}, dst_ip = {af = 2, len = 4, u = {addrl = {68490412, 139749187483088}, addr32 = {68490412, 0, 3836573136, 32537}, addr16 = {5292, 1045, 0, 0, 30160, 58541, 32537, 0}, addr = "\254\024\025\004\000\000\000\000\320u\255\344\031\177\000"}}, src_port = 5060, dst_port = 5060, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 2, sa_data = "\023\304\331tx\367\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 4151866585}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 4151866585, sin6_addr = {__in6_u = { __u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x7f19e3985c50, proto = 1 '\001'} tmp = 0xa353f1 <buf+113> "" dst_ip = {af = 2, len = 4, u = {addrl = {68490412, 140722883890976}, addr32 = {68490412, 0, 2575404832, 32764}, addr16 = {5292, 1045, 0, 0, 36640, 39297, 32764, 0}, addr = "\254\024\025\004\000\000\000\000 \217\201\231\374\177\000"}} src_ip = {af = 2, len = 4, u = {addrl = {139749502776537, 139749187481600}, addr32 = { 4151866585, 32537, 3836571648, 32537}, addr16 = {29913, 63352, 32537, 0, 28672, 58541, 32537, 0}, addr = "\331tx\367\031\177\000\000\000p\255\344\031\177\000"}} si = 0x7f19e3985c50 tmp_len = 4 i = 1170 payload = 0xa353f7 <buf+119> "REGISTER sip:sipgate.de SIP/2.0\r\nVia: SIP/2.0/UDP 217.116.120.247;branch=z9hG4bK0333.dae22993f9315bf8290cb153c6c2a81a.0\r\nVia: SIP/2.0/UDP 82.116.119.72:53401;received=82.116.119.72;branch=z9hG4bK-5hxr"... payload_len = 1051 chunk = 0xa353f1 <buf+113> hg = 0x7f19e3985b60 totelem = 11 chunk_vendor = 0 chunk_type = 15 chunk_length = 1057 total_length = 1170 __FUNCTION__ = "parsing_hepv3_message" #12 0x00007f19e059b264 in hepv3_received (buf=0xa35380 <buf> "HEP3\004\222", len=1170, ri=0x7ffc998190c0) at hep.c:231 __FUNCTION__ = "hepv3_received" #13 0x00007f19e05999cb in hep_msg_received (data=0x7ffc998190a0) at hep.c:85 srevp = 0x7ffc998190a0 buf = 0xa35380 <buf> "HEP3\004\222" len = 0x7ffc99819074 ri = 0x7ffc998190c0 __FUNCTION__ = "hep_msg_received" heph = 0xa35380 <buf> #14 0x000000000049e3e1 in sr_event_exec (type=7, data=0x7ffc998190a0) at core/events.c:263 ret = 0 i = 7 #15 0x000000000048721a in udp_rcv_loop () at core/udp_server.c:466 sredp = {0xa35380 <buf>, 0x7ffc99819074, 0x7ffc998190c0} len = 1170 buf = "HEP3\004\222\000\000\000\001\000\a\002\000\000\000\002\000\a\021\000\000\000\a\000\b\023\304\000\000\000\b\000\b\023\304\000\000\000\t\000\n\237/JY\000\000\000\n\000\n}\354\005\000\000\000\000\v\000\a\001\000\000\000\f\000\n\000\000\000\000\000\000\000\003\000\n\331tx\367\000\000\000\004\000\n\254\024\025\004\000\000\000\016\000\024buschMyHep2001\000\000\000\017\004!REGISTER sip:sipgate.de SIP/2.0\r\nVia: SIP/2.0/UDP 217.116.120.247;branch=z9hG4bK0"... tmp = 0x52f3ea <init_child+52> "\311\303UH\211\345AWAVAUATSH\203\354\070H\211}\270H\203}\270" from = 0x7f19e3968030 fromlen = 16 ri = {src_ip = {af = 2, len = 4, u = {addrl = {16777343, 139749169093632}, addr32 = {16777343, 0, 3818183680, 32537}, addr16 = {127, 256, 0, 0, 56320, 58260, 32537, 0}, addr = "\177\000\000\001\000\000\000\000\000\334\224\343\031\177\000"}}, dst_ip = { af = 2, len = 4, u = {addrl = {0, 0}, addr32 = {0, 0, 0, 0}, addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, addr = '\000' <repeats 15 times>}}, src_port = 42940, dst_port = 9060, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 2, sa_data = "\247\274\177\000\000\001\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 48295, sin_addr = {s_addr = 16777343}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 48295, sin6_flowinfo = 16777343, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x7f19e394da80, proto = 1 '\001'} __FUNCTION__ = "udp_rcv_loop" #16 0x0000000000422c08 in main_loop () at main.c:1625 i = 1 pid = 0 si = 0x7f19e394da80 si_desc = "udp receiver child=1 sock=0.0.0.0:9060\000\000\276\250s\000\000\000\000\000Z\261s\000\000\000\000\000\000\242\311\234\177\306\067\212\004\000\000\000\000\000\000\000\220uA\000\000\000\000\000\b/x\000\000\000\000\000\a\000\000\000\000\000\000\000\017", '\000' <repeats 15 times>, "\220\222\201\231\374\177\000\000i$_\000\000\000\000" nrprocs = 4 woneinit = 1 __FUNCTION__ = "main_loop" #17 0x000000000042a308 in main (argc=13, argv=0x7ffc99819568) at main.c:2646 cfg_stream = 0x118b010 c = -1 r = 0 tmp = 0x7ffc99819f00 "" tmp_len = -468663896 port = 32537 proto = -1719561184 options = 0x738938 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 2544599327 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x1 <error: Cannot access memory at address 0x1> st = {st_dev = 15, st_ino = 11439, st_nlink = 2, st_mode = 16832, st_uid = 118, st_gid = 301, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = { tv_sec = 1495618022, tv_nsec = 508564058}, st_mtim = {tv_sec = 1498034038, tv_nsec = 560355778}, st_ctim = {tv_sec = 1498034038, tv_nsec = 560355778}, __glibc_reserved = {0, 0, 0}} __FUNCTION__ = "main" No symbol table info available. 1829 main.c: No such file or directory. ``` #### Log Messages This is what debug log says (trimmed down to the essential lines): ``` root@busch:/var/cores# systemctl restart kamailio_li_sniffer.service && kamcmd cfg.get config foo && tail -f /var/log/kamailio/proxy.log hello Daniel [..] Jun 21 10:34:39 busch /usr/sbin/kamailio[7998]: DEBUG: <core> [core/parser/msg_parser.c:600]: parse_msg(): SIP Request: Jun 21 10:34:39 busch /usr/sbin/kamailio[7998]: DEBUG: <core> [core/parser/msg_parser.c:602]: parse_msg(): method: <REGISTER> Jun 21 10:34:39 busch /usr/sbin/kamailio[7998]: DEBUG: <core> [core/parser/msg_parser.c:604]: parse_msg(): uri: <sip:sipgate.de> Jun 21 10:34:39 busch /usr/sbin/kamailio[7998]: DEBUG: <core> [core/parser/msg_parser.c:606]: parse_msg(): version: <SIP/2.0> [..] Jun 21 10:34:39 busch /usr/sbin/kamailio[7999]: DEBUG: <core> [core/receive.c:234]: receive_msg(): preparing to run routing scripts... Jun 21 10:34:39 busch /usr/sbin/kamailio[8001]: INFO: <script>: Reading config.foo into variable Jun 21 10:34:39 busch /usr/sbin/kamailio[8000]: INFO: <script>: Reading config.foo into variable Jun 21 10:34:39 busch /usr/sbin/kamailio[7999]: INFO: <script>: Reading config.foo into variable Jun 21 10:34:39 busch /usr/sbin/kamailio[8001]: DEBUG: <core> [core/select.c:412]: run_select(): Calling SELECT 0x7f19e3965f60 Jun 21 10:34:39 busch /usr/sbin/kamailio[7999]: DEBUG: <core> [core/select.c:412]: run_select(): Calling SELECT 0x7f19e3965f60 Jun 21 10:34:39 busch /usr/sbin/kamailio[8000]: DEBUG: <core> [core/select.c:412]: run_select(): Calling SELECT 0x7f19e3965f60 Jun 21 10:34:39 busch /usr/sbin/kamailio[8010]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 11 Jun 21 10:34:39 busch /usr/sbin/kamailio[8010]: DEBUG: <core> [core/tcp_main.c:3456]: handle_ser_child(): dead child 1, pid 7998 (shutting down?) Jun 21 10:34:39 busch /usr/sbin/kamailio[8010]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0xa4c100, 11, -1, 0x0) fd_no=18 called Jun 21 10:34:39 busch /usr/sbin/kamailio[8010]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 14 Jun 21 10:34:39 busch /usr/sbin/kamailio[8010]: DEBUG: <core> [core/tcp_main.c:3456]: handle_ser_child(): dead child 4, pid 8001 (shutting down?) Jun 21 10:34:39 busch /usr/sbin/kamailio[8010]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0xa4c100, 14, -1, 0x0) fd_no=17 called Jun 21 10:34:39 busch /usr/sbin/kamailio[7996]: ALERT: <core> [main.c:743]: handle_sigs(): child process 7998 exited by a signal 11 Jun 21 10:34:39 busch /usr/sbin/kamailio[7996]: ALERT: <core> [main.c:746]: handle_sigs(): core was generated Jun 21 10:34:39 busch /usr/sbin/kamailio[7996]: INFO: <core> [main.c:768]: handle_sigs(): terminating due to SIGCHLD Jun 21 10:34:39 busch /usr/sbin/kamailio[7996]: DEBUG: <core> [main.c:770]: handle_sigs(): terminating due to SIGCHLD Jun 21 10:34:39 busch /usr/sbin/kamailio[8010]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8009]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8008]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8007]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8006]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8005]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8002]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8003]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 21 10:34:39 busch /usr/sbin/kamailio[8004]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received [..] ``` #### SIP Traffic The SIP traffic doesn't matter. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.9.2 ``` * **Operating System**: ``` Debian Jessie Linux busch.dev.sipgate.net 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1+deb8u1 (2017-02-22) x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1159

4 9

git:master:fab17d89: modules: readme files regenerated - secfilter ... [skip ci]
by Kamailio Dev 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: fab17d89305610ed0c8188e45bfd79ea66eec77e URL: https://github.com/kamailio/kamailio/commit/fab17d89305610ed0c8188e45bfd79e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-12-20T19:16:34+01:00 modules: readme files regenerated - secfilter ... [skip ci] --- Modified: src/modules/secfilter/README --- Diff: https://github.com/kamailio/kamailio/commit/fab17d89305610ed0c8188e45bfd79e… Patch: https://github.com/kamailio/kamailio/commit/fab17d89305610ed0c8188e45bfd79e… --- diff --git a/src/modules/secfilter/README b/src/modules/secfilter/README index be9813463b..f2656581ab 100644 --- a/src/modules/secfilter/README +++ b/src/modules/secfilter/README @@ -135,9 +135,9 @@ Chapter 1. Admin Guide value is not found, then the blacklist will be searched. All data will be loaded into memory when the module is started. There - is an RPC reload command to update the data in database and memory. It - is also possible to add new data to the blacklist or whitelist using - other RPC commands. + is an RPC reload command to update all the data from database. It is + also possible to add new data to the blacklist or whitelist using other + RPC commands. 2. Dependencies

1 0

[kamailio/kamailio] Pepelux/secfilter (#1772)
by Jose Luis Verdeguer 20 Dec '18

20 Dec '18

#### 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) - [ ] 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  Some fixes in secfilter module. - Fixed w_check_sqli(). Character '#' could be used in URI header. Its use should not be considered as an SQL injection attack - Added some debug messages and sorted the code You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1772 -- Commit Summary -- * fix w_check_sqli(). Character '#' could be used in URI header. Its use should not be considered as an SQL injection attack * Added some debug messages and sorted the code -- File Changes -- M src/modules/secfilter/secfilter.c (2) M src/modules/secfilter/secfilter_hdr.c (117) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1772.patch https://github.com/kamailio/kamailio/pull/1772.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1772

3 2

git:master:7c078c79: modules: readme files regenerated - acc_json ... [skip ci]
by Kamailio Dev 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: 7c078c7947ccfc53d8ce037761e0b2ddf6036b3f URL: https://github.com/kamailio/kamailio/commit/7c078c7947ccfc53d8ce037761e0b2d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-12-20T18:46:38+01:00 modules: readme files regenerated - acc_json ... [skip ci] --- Modified: src/modules/acc_json/README --- Diff: https://github.com/kamailio/kamailio/commit/7c078c7947ccfc53d8ce037761e0b2d… Patch: https://github.com/kamailio/kamailio/commit/7c078c7947ccfc53d8ce037761e0b2d…

1 0

git:master:0eaed4af: acc_json: docs correction and updated example
by Julien Chavanton 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: 0eaed4afe6c7150c6714470cdec324d005895def URL: https://github.com/kamailio/kamailio/commit/0eaed4afe6c7150c6714470cdec324d… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2018-12-20T09:44:21-08:00 acc_json: docs correction and updated example --- Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0eaed4afe6c7150c6714470cdec324d… Patch: https://github.com/kamailio/kamailio/commit/0eaed4afe6c7150c6714470cdec324d… --- diff --git a/src/modules/acc_json/doc/acc_json_admin.xml b/src/modules/acc_json/doc/acc_json_admin.xml index 8c05713aef..ea1fbc446c 100644 --- a/src/modules/acc_json/doc/acc_json_admin.xml +++ b/src/modules/acc_json/doc/acc_json_admin.xml @@ -104,7 +104,7 @@ modparam("acc_json", "acc_missed_flag", 3) </section> <section id="acc_json.p.acc_extra"> - <title><varname>acc_extra</varname> (integer)</title> + <title><varname>acc_extra</varname> (string)</title> <para> Extra values to be added to the json dictionary. </para> @@ -189,7 +189,10 @@ modparam("acc_json", "acc_time_format", "%Y/%m/%d %H:%M:%S") Using a rtimer module exec you can access the queue and process them. </para> <para> - Default value is not-set mqueue will not be required + You can also fetch the acc events using mqueue.fetch over JSON-RPC. + </para> + <para> + Default value is not-set mqueue will not be required. </para> <example> <title>output_mqueue usage example</title> @@ -206,15 +209,19 @@ modparam("rtimer", "exec", "timer=nsqt;route=RUN_CDR_PUBLISH") modparam("http_client", "keep_connections", 1) modparam("http_client", "httpcon", "nsqd=>http://localhost:4151/pub?topic=acc") -route[RUN_CDR_PUBLISH] { +route[RUN_ACC_PUBLISH] { $var(count) = 0; while (mq_fetch("acc_events")) { $var(q_size) = mq_size("acc_events"); $var(count) = $var(count) + 1; - xinfo("[RUN_CDR_PUBLISH][$var(q_size)][$var(count)][$mqk(acc_events)][$mqv(acc_events)]\n"); - $var(res) = http_connect("nsqd", "", "application/json", $mqv(acc_events), "$var(nsq_res)"); - if ($var(res) != "200") { + xinfo("[RUN_ACC_PUBLISH][$var(q_size)][$var(count)][$mqk(acc_events)][$mqv(acc_events)]\n"); + $var(res) = http_connect_raw("nsqd", "", "application/json", $mqv(acc_events), "$var(nsq_res)"); + if ($var(res) < 0) { + xerr("[RUN_ACC_PUBLISH][$var(res)] http_connect_raw: timeout or error !\n"); mq_add("acc_events", "acc_key", "$mqv(acc_events)"); + } else if ($var(res) < 200 || $var(res) > 299) { + xerr("[RUN_ACC_PUBLISH][$var(res)] http unexpected response code !\n"); + mq_add("acc_dead_letter_queue", "acc_key", "$mqv(acc_events)"); return; } }

1 0

[kamailio/kamailio] websocket.so: undefined symbol: ws_rm_delay_interval (#1771)
by Jose Luis Verdeguer 20 Dec '18

20 Dec '18

### Description Error loading module websocket.so  Since the last update of the websocket.so module gives an error when starting Kamailio ### Troubleshooting #### Reproduction ``` # service kamailio restart Job for kamailio.service failed. See 'systemctl status kamailio.service' and 'journalctl -xn' for details. # systemctl status kamailio.service ● kamailio.service - LSB: Start the Kamailio SIP proxy server Loaded: loaded (/etc/init.d/kamailio) Active: failed (Result: exit-code) since Thu 2018-12-20 11:51:30 CET; 5s ago Process: 24396 ExecStop=/etc/init.d/kamailio stop (code=exited, status=0/SUCCESS) Process: 24442 ExecStart=/etc/init.d/kamailio start (code=exited, status=1/FAILURE) Dec 20 11:51:30 debian kamailio[24442]: Not starting Kamailio SIP Server: invalid configuration file! ... failed! Dec 20 11:51:30 debian kamailio[24442]: failed! Dec 20 11:51:30 debian kamailio[24442]: 0(24451) INFO: tls [tls_init.c:503]: init_tls_compression(): disabling compression... 0(24451) ERROR: <core> [core/sr_module.c:498]: load_module():...l: ws_rm_delay Dec 20 11:51:30 debian kamailio[24442]: failed! Dec 20 11:51:30 debian systemd[1]: kamailio.service: control process exited, code=exited status=1 Dec 20 11:51:30 debian systemd[1]: Failed to start LSB: Start the Kamailio SIP proxy server. Dec 20 11:51:30 debian systemd[1]: Unit kamailio.service entered failed state. Hint: Some lines were ellipsized, use -l to show in full. # journalctl -xn -- Logs begin at Wed 2018-12-12 02:36:41 CET, end at Thu 2018-12-20 11:51:35 CET. -- Dec 20 11:51:23 debian kernel: iptables denied: IN=eth0 OUT= MAC=00:50:56:a4:88:be:00:1c:73:8e:f6:8f:08:00 SRC=94.102.56.235 DST=5.57.231.245 LEN=40 TOS=0x00 PREC=0x00 TTL=252 ID=55056 PROTO=TCP SPT=58501 Dec 20 11:51:30 debian systemd[1]: Starting LSB: Start the Kamailio SIP proxy server... -- Subject: Unit kamailio.service has begun with start-up -- Defined-By: systemd -- Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel -- -- Unit kamailio.service has begun starting up. Dec 20 11:51:30 debian kamailio[24442]: Not starting Kamailio SIP Server: invalid configuration file! ... failed! Dec 20 11:51:30 debian kamailio[24442]: failed! Dec 20 11:51:30 debian kamailio[24442]: 0(24451) INFO: tls [tls_init.c:503]: init_tls_compression(): disabling compression... 0(24451) ERROR: <core> [core/sr_module.c:498]: load_module(): could not open m Dec 20 11:51:30 debian kamailio[24442]: failed! Dec 20 11:51:30 debian systemd[1]: kamailio.service: control process exited, code=exited status=1 Dec 20 11:51:30 debian systemd[1]: Failed to start LSB: Start the Kamailio SIP proxy server. -- Subject: Unit kamailio.service has failed -- Defined-By: systemd -- Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel -- -- Unit kamailio.service has failed. -- -- The result is failed. Dec 20 11:51:30 debian systemd[1]: Unit kamailio.service entered failed state. Dec 20 11:51:35 debian kernel: iptables denied: IN=eth0 OUT= MAC=00:50:56:a4:88:be:00:1c:73:8f:13:f3:08:00 SRC=89.248.168.107 DST=5.57.231.245 LEN=40 TOS=0x00 PREC=0x00 TTL=252 ID=28132 PROTO=TCP SPT=5834 r ```  #### 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` ``` version: kamailio 5.3.0-dev1 (i386/linux) baa542 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST, HAVE_RESOLV_RES 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: baa542 compiled on 11:42:31 Dec 20 2018 with gcc 4.9.2 ``` * **Operating System**:  ``` Linux debian 3.16.0-4-686-pae #1 SMP Debian 3.16.43-2+deb8u2 (2017-06-26) i686 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1771

2 2

git:master:ae4087ef: dialog: only write debug messages in case cseq or contact fields are empty
by Daniel-Constantin Mierla 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: ae4087ef615c1de5b67c8406eab8316300282d8b URL: https://github.com/kamailio/kamailio/commit/ae4087ef615c1de5b67c8406eab8316… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-20T13:14:33+01:00 dialog: only write debug messages in case cseq or contact fields are empty --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/ae4087ef615c1de5b67c8406eab8316… Patch: https://github.com/kamailio/kamailio/commit/ae4087ef615c1de5b67c8406eab8316… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 983e82d7dd..96406bde35 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -209,8 +209,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, cseq = dlg->cseq[DLG_CALLEE_LEG]; } if ((leg==DLG_CALLER_LEG) && (cseq.s==NULL || cseq.len<=0)) { - LM_ERR("empty CSeq number\n"); - goto error0; + LM_DBG("empty CSeq number (leg: %d)\n", leg); } /* extract the contact address */ @@ -226,8 +225,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, } contact = ((contact_body_t *)msg->contact->parsed)->contacts->uri; if(contact.s==NULL || contact.len<=0) { - LM_ERR("empty contact uri\n"); - goto error0; + LM_DBG("empty contact uri (leg: %d)\n", leg); } /* extract the record-route addresses */

1 0

git:master:d5e40d5f: websocket: removed static from declaration of ws_rm_delay_interval
by Daniel-Constantin Mierla 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: d5e40d5f05795f3902e5ae51bf4c57345e945a9c URL: https://github.com/kamailio/kamailio/commit/d5e40d5f05795f3902e5ae51bf4c573… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-20T13:14:33+01:00 websocket: removed static from declaration of ws_rm_delay_interval - it is used as external in another source file - GH #1771 --- Modified: src/modules/websocket/websocket.c --- Diff: https://github.com/kamailio/kamailio/commit/d5e40d5f05795f3902e5ae51bf4c573… Patch: https://github.com/kamailio/kamailio/commit/d5e40d5f05795f3902e5ae51bf4c573… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index 4f23177ac7..87cf4e3a5f 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -61,7 +61,7 @@ static int ws_init_rpc(void); sl_api_t ws_slb; #define WS_DEFAULT_RM_DELAY_INTERVAL 5 -static int ws_rm_delay_interval = WS_DEFAULT_RM_DELAY_INTERVAL; +int ws_rm_delay_interval = WS_DEFAULT_RM_DELAY_INTERVAL; #define DEFAULT_TIMER_INTERVAL 1 static int ws_timer_interval = DEFAULT_TIMER_INTERVAL;

1 0

git:master:baa54215: secfilter: fix segmentation fault on mod_destroy
by Victor Seva 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: baa542151de2af11752116b69db5d343a2c65159 URL: https://github.com/kamailio/kamailio/commit/baa542151de2af11752116b69db5d34… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-20T11:40:17+01:00 secfilter: fix segmentation fault on mod_destroy --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/baa542151de2af11752116b69db5d34… Patch: https://github.com/kamailio/kamailio/commit/baa542151de2af11752116b69db5d34… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index 2b5b91d84e..1a32b1274d 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -34,7 +34,7 @@ MODULE_VERSION -secf_data_p secf_data; +secf_data_p secf_data = NULL; /* Static and shared functions */ static int mod_init(void); @@ -658,6 +658,8 @@ static int child_init(int rank) static void mod_destroy(void) { LM_DBG("SECFILTER module destroy\n"); + if(!secf_data) + return; /* Free shared data */ free_data(); /* Destroy lock */

1 0

[kamailio/kamailio] secfilter: some improvements and fixes (#1770)
by Victor Seva 20 Dec '18

20 Dec '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1770 -- Commit Summary -- * secfilter: reduce code copy&paste * secfilter: simplify secf_get_contact() * secfilter: fix memmory leak on error * secfilter: simplify RPC code -- File Changes -- M src/modules/secfilter/secfilter_db.c (22) M src/modules/secfilter/secfilter_hdr.c (44) M src/modules/secfilter/secfilter_rpc.c (88) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1770.patch https://github.com/kamailio/kamailio/pull/1770.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1770

2 2

git:master:6e6d82bc: secfilter: fix compilation warning
by Jose Luis Verdeguer 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: 6e6d82bc04a3f6a4744751b70dde8810a48838c5 URL: https://github.com/kamailio/kamailio/commit/6e6d82bc04a3f6a4744751b70dde881… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2018-12-20T10:51:03+01:00 secfilter: fix compilation warning > secfilter.c:516:15: warning: comparison of address of 'msg->rcv.src_ip' equal to a null pointer is always false [-Wtautological-pointer-compare] > if(&msg->rcv.src_ip == NULL) > ~~~~~~~~~^~~~~~ ~~~~ > 1 warning generated. --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/6e6d82bc04a3f6a4744751b70dde881… Patch: https://github.com/kamailio/kamailio/commit/6e6d82bc04a3f6a4744751b70dde881… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index 94d592e434..2b5b91d84e 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -513,8 +513,6 @@ static int w_check_ip(struct sip_msg *msg) if(msg == NULL) return -1; - if(&msg->rcv.src_ip == NULL) - return -1; ip.s = ip_addr2a(&msg->rcv.src_ip); ip.len = strlen(ip.s);

1 0

git:master:1b610f18: secfilter: fix memmory leak on error
by Jose Luis Verdeguer 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: 1b610f186f2cab65453f74f58fa0cce9cf944b8b URL: https://github.com/kamailio/kamailio/commit/1b610f186f2cab65453f74f58fa0cce… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2018-12-20T10:51:03+01:00 secfilter: fix memmory leak on error --- Modified: src/modules/secfilter/secfilter_db.c --- Diff: https://github.com/kamailio/kamailio/commit/1b610f186f2cab65453f74f58fa0cce… Patch: https://github.com/kamailio/kamailio/commit/1b610f186f2cab65453f74f58fa0cce… --- diff --git a/src/modules/secfilter/secfilter_db.c b/src/modules/secfilter/secfilter_db.c index f6f4665640..274a45757b 100644 --- a/src/modules/secfilter/secfilter_db.c +++ b/src/modules/secfilter/secfilter_db.c @@ -211,6 +211,7 @@ int append_rule(int action, int type, str *value) new = shm_append_str_list(v, value->len, last_node, &total); if(!new) { LM_ERR("can't append new node\n"); + shm_free(v); return -1; } LM_DBG("new node[%p] str:'%.*s'[%d]\n", new, new->s.len, new->s.s,

1 0

git:master:40468c0f: secfilter: simplify RPC code
by Jose Luis Verdeguer 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: 40468c0fb437545cd7ee211ee71183f99f413b9e URL: https://github.com/kamailio/kamailio/commit/40468c0fb437545cd7ee211ee71183f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2018-12-20T10:51:03+01:00 secfilter: simplify RPC code --- Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/40468c0fb437545cd7ee211ee71183f… Patch: https://github.com/kamailio/kamailio/commit/40468c0fb437545cd7ee211ee71183f… --- diff --git a/src/modules/secfilter/secfilter_rpc.c b/src/modules/secfilter/secfilter_rpc.c index 2e5a33288a..e437524336 100644 --- a/src/modules/secfilter/secfilter_rpc.c +++ b/src/modules/secfilter/secfilter_rpc.c @@ -65,81 +65,81 @@ void rpc_add_dst(rpc_t *rpc, void *ctx) "Invalid Parameters. Usage: secfilter.add_dst " "number\n Example: secfilter.add_dst " "555123123"); + return; + } + text = int2str(number, &data.len); + data.s = pkg_malloc(data.len * sizeof(char)); + if(!data.s) { + PKG_MEM_ERROR; + rpc->rpl_printf(ctx, "Error insert values in the blacklist"); + return; + } + memcpy(data.s, text, data.len); + lock_get(&secf_data->lock); + if(append_rule(2, 0, &data) == 0) { + rpc->rpl_printf(ctx, + "Values (%s) inserted into blacklist destinations", data); } else { - text = int2str(number, &data.len); - data.s = pkg_malloc(data.len * sizeof(char)); - if(!data.s) { - PKG_MEM_ERROR; - rpc->rpl_printf(ctx, "Error insert values in the blacklist"); - return; - } - memcpy(data.s, text, data.len); - lock_get(&secf_data->lock); - if(append_rule(2, 0, &data) == 0) { - rpc->rpl_printf(ctx, - "Values (%s) inserted into blacklist destinations", data); - } else { - rpc->rpl_printf(ctx, "Error insert values in the blacklist"); - } - lock_release(&secf_data->lock); - if(data.s) - pkg_free(data.s); + rpc->rpl_printf(ctx, "Error insert values in the blacklist"); } + lock_release(&secf_data->lock); + if(data.s) + pkg_free(data.s); } /* Add blacklist value */ void rpc_add_bl(rpc_t *rpc, void *ctx) { - char *ctype; + char *ctype = NULL; str data = STR_NULL; int type; - if(rpc->scan(ctx, "ss", (char *)(&ctype), (char *)(&data.s)) < 2) { + if(rpc->scan(ctx, "ss", ctype, &data.s) < 2) { rpc->fault(ctx, 0, "Invalid Parameters. Usage: secfilter.add_bl type " "value\n Example: secfilter.add_bl user " "sipvicious"); + return; + } + data.len = strlen(data.s); + type = get_type(ctype); + + lock_get(&secf_data->lock); + if(append_rule(0, type, &data) == 0) { + rpc->rpl_printf(ctx, "Values (%s, %s) inserted into blacklist", + ctype, data); } else { - data.len = strlen(data.s); - type = get_type(ctype); - - lock_get(&secf_data->lock); - if(append_rule(0, type, &data) == 0) { - rpc->rpl_printf(ctx, "Values (%s, %s) inserted into blacklist", - ctype, data); - } else { - rpc->rpl_printf(ctx, "Error insert values in the blacklist"); - } - lock_release(&secf_data->lock); + rpc->rpl_printf(ctx, "Error insert values in the blacklist"); } + lock_release(&secf_data->lock); } /* Add whitelist value */ void rpc_add_wl(rpc_t *rpc, void *ctx) { - char *ctype; + char *ctype = NULL; str data = STR_NULL; int type; - if(rpc->scan(ctx, "ss", (char *)(&ctype), (char *)(&data.s)) < 2) { + if(rpc->scan(ctx, "ss", ctype, &data.s) < 2) { rpc->fault(ctx, 0, "Invalid Parameters. Usage: secfilter.add_wl type " "value\n Example: secfilter.add_wl user " "trusted_user"); + return; + } + data.len = strlen(data.s); + type = get_type(ctype); + + lock_get(&secf_data->lock); + if(append_rule(1, type, &data) == 0) { + rpc->rpl_printf( + ctx, "Values (%s, %s) inserted into whitelist", type, data); } else { - data.len = strlen(data.s); - type = get_type(ctype); - - lock_get(&secf_data->lock); - if(append_rule(1, type, &data) == 0) { - rpc->rpl_printf( - ctx, "Values (%s, %s) inserted into whitelist", type, data); - } else { - rpc->rpl_printf(ctx, "Error insert values in the whitelist"); - } - lock_release(&secf_data->lock); + rpc->rpl_printf(ctx, "Error insert values in the whitelist"); } + lock_release(&secf_data->lock); }

1 0

git:master:6180cf1b: secfilter: reduce code copy&paste
by Jose Luis Verdeguer 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: 6180cf1b9ee1c5655c8915e7dfaca8e3b785eb90 URL: https://github.com/kamailio/kamailio/commit/6180cf1b9ee1c5655c8915e7dfaca8e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2018-12-20T10:51:03+01:00 secfilter: reduce code copy&paste --- Modified: src/modules/secfilter/secfilter_db.c --- Diff: https://github.com/kamailio/kamailio/commit/6180cf1b9ee1c5655c8915e7dfaca8e… Patch: https://github.com/kamailio/kamailio/commit/6180cf1b9ee1c5655c8915e7dfaca8e… --- diff --git a/src/modules/secfilter/secfilter_db.c b/src/modules/secfilter/secfilter_db.c index 31bb0cc0fa..f6f4665640 100644 --- a/src/modules/secfilter/secfilter_db.c +++ b/src/modules/secfilter/secfilter_db.c @@ -40,7 +40,7 @@ static str table_version_col = str_init("table_version"); /* Check module version */ int check_version(void) { - int version = 0; + int version = 0, res = 0; db_key_t db_keys[1]; db_val_t db_vals[1]; db_key_t db_cols[1]; @@ -71,17 +71,15 @@ int check_version(void) db_handle, db_keys, NULL, db_vals, db_cols, 1, 1, NULL, &db_res) < 0) { LM_ERR("Failed to query database\n"); - db_funcs.close(db_handle); - return -1; + res = -1; + goto done; } if(RES_ROW_N(db_res) == 0) { LM_ERR("No version value found in database. It must be %d\n", mod_version); - if(db_res != NULL && db_funcs.free_result(db_handle, db_res) < 0) - LM_DBG("Failed to free the result\n"); - db_funcs.close(db_handle); - return -1; + res = -1; + goto done; } /* Get the version value */ @@ -90,17 +88,16 @@ int check_version(void) if(version != mod_version) { LM_ERR("Wrong version value. Correct version is %d but found %d\n", mod_version, version); - if(db_res != NULL && db_funcs.free_result(db_handle, db_res) < 0) - LM_DBG("Failed to free the result\n"); - db_funcs.close(db_handle); - return -1; + res = -1; + goto done; } +done: if(db_res != NULL && db_funcs.free_result(db_handle, db_res) < 0) LM_DBG("Failed to free the result\n"); db_funcs.close(db_handle); - return 0; + return res; }

1 0

git:master:7b2175dd: secfilter: simplify secf_get_contact()
by Jose Luis Verdeguer 20 Dec '18

20 Dec '18

Module: kamailio Branch: master Commit: 7b2175dde6335926934e88b21533f8fa4cc5e7e3 URL: https://github.com/kamailio/kamailio/commit/7b2175dde6335926934e88b21533f8f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2018-12-20T10:51:03+01:00 secfilter: simplify secf_get_contact() --- Modified: src/modules/secfilter/secfilter_hdr.c --- Diff: https://github.com/kamailio/kamailio/commit/7b2175dde6335926934e88b21533f8f… Patch: https://github.com/kamailio/kamailio/commit/7b2175dde6335926934e88b21533f8f… --- diff --git a/src/modules/secfilter/secfilter_hdr.c b/src/modules/secfilter/secfilter_hdr.c index 4880b6a534..7e3a4feeb4 100644 --- a/src/modules/secfilter/secfilter_hdr.c +++ b/src/modules/secfilter/secfilter_hdr.c @@ -141,40 +141,32 @@ int secf_get_to(struct sip_msg *msg, str *name, str *user, str *domain) /* get 'contact' header */ int secf_get_contact(struct sip_msg *msg, str *user, str *domain) { - str contact = {NULL, 0}; - struct sip_uri parsed_uri; + struct sip_uri uri; + contact_t *contact; - if(msg == NULL) - return -1; - if(msg->contact == NULL) + if((parse_headers(msg, HDR_CONTACT_F, 0) == -1) || !msg->contact) + return 1; + + if(!msg->contact->parsed && parse_contact(msg->contact) < 0) { + LM_ERR("cannot parse the Contact header\n"); return 1; - if(!msg->contact->parsed && (parse_contact(msg->contact) < 0)) { - LM_ERR("Error parsing contact header (%.*s)\n", msg->contact->body.len, - msg->contact->body.s); - return -1; - } - if(((contact_body_t *)msg->contact->parsed)->contacts - && ((contact_body_t *)msg->contact->parsed)->contacts->uri.s != NULL - && ((contact_body_t *)msg->contact->parsed)->contacts->uri.len - > 0) { - contact.s = ((contact_body_t *)msg->contact->parsed)->contacts->uri.s; - contact.len = - ((contact_body_t *)msg->contact->parsed)->contacts->uri.len; } - if(contact.s == NULL) + + contact = ((contact_body_t *)msg->contact->parsed)->contacts; + if(!contact) { return 1; + } - if(parse_uri(contact.s, contact.len, &parsed_uri) < 0) { - LM_ERR("Error parsing contact uri header (%.*s)\n", contact.len, - contact.s); - return -1; + if(parse_uri(contact->uri.s, contact->uri.len, &uri) < 0) { + LM_ERR("cannot parse the Contact URI\n"); + return 1; } - user->s = parsed_uri.user.s; - user->len = parsed_uri.user.len; + user->s = uri.user.s; + user->len = uri.user.len; - domain->s = parsed_uri.host.s; - domain->len = parsed_uri.host.len; + domain->s = uri.host.s; + domain->len = uri.host.len; return 0; }

1 0

git:master:d8f595fe: core: fix compilation warnings
by Victor Seva 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: d8f595fe4bb4cec6049e86202b95e40ae849b165 URL: https://github.com/kamailio/kamailio/commit/d8f595fe4bb4cec6049e86202b95e40… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-20T00:26:20+01:00 core: fix compilation warnings > core/tcp_main.c:1135:13: warning: result of comparison of constant 18446744073709551615 with expression of type 'uint32_t' (aka 'unsigned int') is always false [-Wtautological-constant-out-of-range-compare] > if (port == ULONG_MAX || port == 0 || port >= (1 << 16)) { > ~~~~ ^ ~~~~~~~~~ > core/tcp_main.c:1147:13: warning: result of comparison of constant 18446744073709551615 with expression of type 'uint32_t' (aka 'unsigned int') is always false [-Wtautological-constant-out-of-range-compare] > if (port == ULONG_MAX || port == 0 || port >= (1 << 16)) { > ~~~~ ^ ~~~~~~~~~ > 2 warnings generated. --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/d8f595fe4bb4cec6049e86202b95e40… Patch: https://github.com/kamailio/kamailio/commit/d8f595fe4bb4cec6049e86202b95e40… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 2ab169ab6b..212a3aad19 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1132,7 +1132,7 @@ int tcpconn_read_haproxy(struct tcp_connection *c) { /* Parse the source port */ port = strtoul(p, &end, 10); - if (port == ULONG_MAX || port == 0 || port >= (1 << 16)) { + if (port == UINT32_MAX || port == 0 || port >= (1 << 16)) { return -1; /* invalid port number */ } c->rcv.src_port = port; @@ -1144,7 +1144,7 @@ int tcpconn_read_haproxy(struct tcp_connection *c) { /* Parse the destination port */ port = strtoul(p, NULL, 10); - if (port == ULONG_MAX || port == 0 || port >= (1 << 16)) { + if (port == UINT32_MAX || port == 0 || port >= (1 << 16)) { return -1; /* invalid port number */ } c->rcv.dst_port = port;

1 0

git:master:da18d99e: topos_redis: fix compilation warnings
by Victor Seva 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: da18d99e509c86ac21f04cf36184cadfe16fce83 URL: https://github.com/kamailio/kamailio/commit/da18d99e509c86ac21f04cf36184cad… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-20T00:09:39+01:00 topos_redis: fix compilation warnings > warning: field precision should have type 'int', but argument has type 'size_t' (aka 'unsigned long') [-Wformat] --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/da18d99e509c86ac21f04cf36184cad… Patch: https://github.com/kamailio/kamailio/commit/da18d99e509c86ac21f04cf36184cad… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 4ba31f404a..2f78d21dce 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -654,7 +654,7 @@ int tps_redis_load_invite_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) sval.s = NULL; switch(rrpl->element[i]->type) { case REDIS_REPLY_STRING: - LM_DBG("r[%d]: s[%.*s]\n", i, rrpl->element[i]->len, + LM_DBG("r[%d]: s[%.*s]\n", i, (int)rrpl->element[i]->len, rrpl->element[i]->str); sval.s = rrpl->element[i]->str; sval.len = rrpl->element[i]->len; @@ -802,7 +802,7 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, sval.s = NULL; switch(rrpl->element[i]->type) { case REDIS_REPLY_STRING: - LM_DBG("r[%d]: s[%.*s]\n", i, rrpl->element[i]->len, + LM_DBG("r[%d]: s[%.*s]\n", i, (int)rrpl->element[i]->len, rrpl->element[i]->str); sval.s = rrpl->element[i]->str; sval.len = rrpl->element[i]->len; @@ -1005,7 +1005,7 @@ int tps_redis_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) sval.s = NULL; switch(rrpl->element[i]->type) { case REDIS_REPLY_STRING: - LM_DBG("r[%d]: s[%.*s]\n", i, rrpl->element[i]->len, + LM_DBG("r[%d]: s[%.*s]\n", i, (int)rrpl->element[i]->len, rrpl->element[i]->str); sval.s = rrpl->element[i]->str; sval.len = rrpl->element[i]->len;

1 0

git:master:7d9d9fe2: ndb_redis: fix compilation warnings
by Victor Seva 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: 7d9d9fe21a121a38d4a3861ce252a1a485a35c71 URL: https://github.com/kamailio/kamailio/commit/7d9d9fe21a121a38d4a3861ce252a1a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-20T00:06:45+01:00 ndb_redis: fix compilation warnings > warning: field precision should have type 'int', but argument has type 'size_t' (aka 'unsigned long') [-Wformat] --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/7d9d9fe21a121a38d4a3861ce252a1a… Patch: https://github.com/kamailio/kamailio/commit/7d9d9fe21a121a38d4a3861ce252a1a… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index f923878284..7e3ddb0d8c 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -758,7 +758,7 @@ int check_cluster_reply(redisReply *reply, redisc_server_t **rsrv) char spec_new[100]; if(redis_cluster_param) { - LM_DBG("Redis replied: \"%.*s\"\n", reply->len, reply->str); + LM_DBG("Redis replied: \"%.*s\"\n", (int)reply->len, reply->str); if((reply->len > 7) && (strncmp(reply->str, "MOVED", 5) == 0)) { port = 6379; if(strchr(reply->str, ':') > 0) { @@ -769,7 +769,7 @@ int check_cluster_reply(redisReply *reply, redisc_server_t **rsrv) LM_DBG("Port \"%.*s\" [%i] => %i\n", tmpstr.len, tmpstr.s, tmpstr.len, port); } else { - LM_ERR("No Port in REDIS MOVED Reply (%.*s)\n", reply->len, + LM_ERR("No Port in REDIS MOVED Reply (%.*s)\n", (int)reply->len, reply->str); return 0; } @@ -778,7 +778,7 @@ int check_cluster_reply(redisReply *reply, redisc_server_t **rsrv) addr.s = strchr(reply->str + 6, ' ') + 1; LM_DBG("Host \"%.*s\" [%i]\n", addr.len, addr.s, addr.len); } else { - LM_ERR("No Host in REDIS MOVED Reply (%.*s)\n", reply->len, + LM_ERR("No Host in REDIS MOVED Reply (%.*s)\n", (int)reply->len, reply->str); return 0; }

1 0

git:master:89e89e02: cnxcc: fix compilation warnings
by Victor Seva 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: 89e89e023d923d2dbec694509b9f958bbed6d3ad URL: https://github.com/kamailio/kamailio/commit/89e89e023d923d2dbec694509b9f958… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-20T00:16:25+01:00 cnxcc: fix compilation warnings > warning: field precision should have type 'int', but argument has type 'size_t' (aka 'unsigned long') [-Wformat] --- Modified: src/modules/cnxcc/cnxcc_redis.c --- Diff: https://github.com/kamailio/kamailio/commit/89e89e023d923d2dbec694509b9f958… Patch: https://github.com/kamailio/kamailio/commit/89e89e023d923d2dbec694509b9f958… --- diff --git a/src/modules/cnxcc/cnxcc_redis.c b/src/modules/cnxcc/cnxcc_redis.c index 4aad3b48a8..2b9d803ad6 100644 --- a/src/modules/cnxcc/cnxcc_redis.c +++ b/src/modules/cnxcc/cnxcc_redis.c @@ -233,7 +233,7 @@ static int __redis_select_db(redisContext *ctxt, int db) if(!rpl) LM_ERR("%s\n", ctxt->errstr); else { - LM_ERR("%.*s\n", rpl->len, rpl->str); + LM_ERR("%.*s\n", (int)rpl->len, rpl->str); freeReplyObject(rpl); } return -1; @@ -254,7 +254,7 @@ static int __redis_exec( if(!*rpl) LM_ERR("%s\n", _data.redis->ctxt->errstr); else { - LM_ERR("%.*s\n", (*rpl)->len, (*rpl)->str); + LM_ERR("%.*s\n", (int)(*rpl)->len, (*rpl)->str); freeReplyObject(*rpl); } @@ -384,7 +384,7 @@ int redis_get_str(credit_data_t *credit_data, const char *instruction, } if(rpl->len <= 0) { - LM_ERR("RPL len is equal to %d\n", rpl->len); + LM_ERR("RPL len is equal to %d\n", (int)rpl->len); goto done; }

1 0

[kamailio/kamailio] secfilter: free initial struct of shared memory on mod_destroy (#1769)
by Victor Seva 19 Dec '18

19 Dec '18

seems that ``secf_data`` was never freed You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1769 -- Commit Summary -- * secfilter: free initial struct of shared memory on mod_destroy -- File Changes -- M src/modules/secfilter/secfilter.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1769.patch https://github.com/kamailio/kamailio/pull/1769.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1769

2 1

git:master:eb374d71: secfilter: free initial struct of shared memory on mod_destroy
by Jose Luis Verdeguer 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: eb374d7167e9be15dca0a30a402418fb5993bf69 URL: https://github.com/kamailio/kamailio/commit/eb374d7167e9be15dca0a30a402418f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2018-12-19T18:43:28+01:00 secfilter: free initial struct of shared memory on mod_destroy --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/eb374d7167e9be15dca0a30a402418f… Patch: https://github.com/kamailio/kamailio/commit/eb374d7167e9be15dca0a30a402418f… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index 4719513556..94d592e434 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -664,6 +664,8 @@ static void mod_destroy(void) free_data(); /* Destroy lock */ lock_destroy(&secf_data->lock); + shm_free(secf_data); + secf_data = NULL; }

1 0

git:master:bfbbc231: secfilter: clang-format
by Victor Seva 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: bfbbc2311530a5d9ef0d2cde0aef01f652acbc93 URL: https://github.com/kamailio/kamailio/commit/bfbbc2311530a5d9ef0d2cde0aef01f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-19T18:18:54+01:00 secfilter: clang-format --- Modified: src/modules/secfilter/secfilter.c Modified: src/modules/secfilter/secfilter_db.c Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/bfbbc2311530a5d9ef0d2cde0aef01f… Patch: https://github.com/kamailio/kamailio/commit/bfbbc2311530a5d9ef0d2cde0aef01f…

1 0

Re: [sr-dev] [kamailio/kamailio] dialog: safety checks for local cseq and contact vars (79946bb)
by Cui Gang 19 Dec '18

19 Dec '18

I found your commit in branch master, "dialog: check for cseq value only when getting it for caller/request". And I tested, It works well ! Could you commit that patch to branch 5.2? -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/79946bbb6d1731f503fc378ae38311b…

1 0

git:master:fbfca70e: modules: readme files regenerated - websocket ... [skip ci]
by Kamailio Dev 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: fbfca70ec60c41f3fa4050c8d022e75f7b1e1bba URL: https://github.com/kamailio/kamailio/commit/fbfca70ec60c41f3fa4050c8d022e75… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-12-19T14:16:41+01:00 modules: readme files regenerated - websocket ... [skip ci] --- Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/fbfca70ec60c41f3fa4050c8d022e75… Patch: https://github.com/kamailio/kamailio/commit/fbfca70ec60c41f3fa4050c8d022e75… --- diff --git a/src/modules/websocket/README b/src/modules/websocket/README index 6421646e09..c8241be6e6 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -34,6 +34,8 @@ Peter Dunkley 4.7. cors_mode (integer) 4.8. verbose_list (int) 4.9. event_callback (str) + 4.10. timer_interval (integer) + 4.11. rm_delay_interval (integer) 5. Functions @@ -70,10 +72,12 @@ Peter Dunkley 1.9. Set cors_mode parameter 1.10. Set verbose_list parameter 1.11. Set event_callback parameter - 1.12. ws_handle_handshake usage - 1.13. ws_close usage - 1.14. event_route[websocket:closed] usage - 1.15. $ws_conid usage + 1.12. Set timer_intervalparameter + 1.13. Set rm_timer_intervalparameter + 1.14. ws_handle_handshake usage + 1.15. ws_close usage + 1.16. event_route[websocket:closed] usage + 1.17. $ws_conid usage Chapter 1. Admin Guide @@ -102,6 +106,8 @@ Chapter 1. Admin Guide 4.7. cors_mode (integer) 4.8. verbose_list (int) 4.9. event_callback (str) + 4.10. timer_interval (integer) + 4.11. rm_delay_interval (integer) 5. Functions @@ -345,6 +351,8 @@ onreply_route[WS_REPLY] { 4.7. cors_mode (integer) 4.8. verbose_list (int) 4.9. event_callback (str) + 4.10. timer_interval (integer) + 4.11. rm_delay_interval (integer) 4.1. keepalive_mechanism (integer) @@ -483,6 +491,29 @@ function ksr_websocket_event(evname) end ... +4.10. timer_interval (integer) + + The number of seconds between each timer process run + + Default value is 1. + + Example 1.12. Set timer_intervalparameter +... +modparam("websocket", "timer_interval", 5) +... + +4.11. rm_delay_interval (integer) + + The number of seconds to wait before destroying the websocket + connection once put in remove state. + + Default value is 5. + + Example 1.13. Set rm_timer_intervalparameter +... +modparam("websocket", "rm_delay_interval", 2) +... + 5. Functions 5.1. ws_handle_handshake() @@ -503,7 +534,7 @@ Note request, when there is a problem. Otherwise, it returns 1 (or positive number) in case of success. - Example 1.12. ws_handle_handshake usage + Example 1.14. ws_handle_handshake usage ... ws_handle_handshake(); ... @@ -528,7 +559,7 @@ Note This function can be used from ANY_ROUTE. - Example 1.13. ws_close usage + Example 1.15. ws_close usage ... ws_close(4000, "Because I say so"); ... @@ -642,7 +673,7 @@ kamcmd ws.enable connection closes. The connection may be identified using the the $si and $sp pseudo-variables. - Example 1.14. event_route[websocket:closed] usage + Example 1.16. event_route[websocket:closed] usage ... event_route[websocket:closed] { xlog("L_INFO", "WebSocket connection from $si:$sp has closed\n"); @@ -658,7 +689,7 @@ event_route[websocket:closed] { Connection id of closed websocket connection. Can only be used in websocket:closed event route. - Example 1.15. $ws_conid usage + Example 1.17. $ws_conid usage ... event_route[websocket:closed] { xlog("L_INFO", "WebSocket connection with id $ws_conid has closed\n");

1 0

git:master:3a20bb1a: websocket: docs for timer_interval and rm_delay_interval params
by Daniel-Constantin Mierla 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: 3a20bb1ad27b8a85ec932975e14bcec12237437b URL: https://github.com/kamailio/kamailio/commit/3a20bb1ad27b8a85ec932975e14bcec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-19T14:11:51+01:00 websocket: docs for timer_interval and rm_delay_interval params --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3a20bb1ad27b8a85ec932975e14bcec… Patch: https://github.com/kamailio/kamailio/commit/3a20bb1ad27b8a85ec932975e14bcec… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index 338d37ef22..6b6483d73f 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -477,6 +477,37 @@ end </example> </section> + <section id="websocket.p.timer_interval"> + <title><varname>timer_interval</varname> (integer)</title> + <para>The number of seconds between each timer process run + </para> + <para><emphasis>Default value is 1.</emphasis></para> + <example> + <title>Set <varname>timer_interval</varname>parameter</title> + <programlisting format="linespecific"> +... +modparam("websocket", "timer_interval", 5) +... +</programlisting> + </example> + </section> + + <section id="websocket.p.rm_delay_interval"> + <title><varname>rm_delay_interval</varname> (integer)</title> + <para>The number of seconds to wait before destroying the websocket + connection once put in remove state. + </para> + <para><emphasis>Default value is 5.</emphasis></para> + <example> + <title>Set <varname>rm_timer_interval</varname>parameter</title> + <programlisting format="linespecific"> +... +modparam("websocket", "rm_delay_interval", 2) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:71517152: websocket: fetch ws connections based on keepalive process index
by Daniel-Constantin Mierla 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: 71517152e7de26d6c47fd037c25dc854aa37734f URL: https://github.com/kamailio/kamailio/commit/71517152e7de26d6c47fd037c25dc85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-19T13:15:36+01:00 websocket: fetch ws connections based on keepalive process index - get the ones with id that matches the index when doing modulo over the number of keepalive process in order to spread the load of doing the ping-pong --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_conn.h Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/71517152e7de26d6c47fd037c25dc85… Patch: https://github.com/kamailio/kamailio/commit/71517152e7de26d6c47fd037c25dc85…

1 0

git:master:af09e224: websocket: destroy ws connections in dedicated timer process
by Daniel-Constantin Mierla 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: af09e224dba0c57c23fd58a7f83a24d2ffbaa07c URL: https://github.com/kamailio/kamailio/commit/af09e224dba0c57c23fd58a7f83a24d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-19T14:06:56+01:00 websocket: destroy ws connections in dedicated timer process - avoid races/invalid access when sending data failed and the connection was removed - added parameter to control the timer process: interval or running and delay interval for removing --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_conn.h --- Diff: https://github.com/kamailio/kamailio/commit/af09e224dba0c57c23fd58a7f83a24d… Patch: https://github.com/kamailio/kamailio/commit/af09e224dba0c57c23fd58a7f83a24d…

1 0

RFC: updates to some core functions
by Daniel-Constantin Mierla 19 Dec '18

19 Dec '18

Hello, it was brought into discussions several times in the past about core functions not accepting variables in the parameters. I think it is time to update them during the 5.3 release development. For few of them, I added in the past some alternative function in the corex module (e.g., force_send_socket() in core and set_send_socket() in corex module). So, I see two options: 1) add a function with similar name in corex module and same behaviour like the one from core 2) remove the function export from the core and export one with the same name from the corex module First one will ensure that configs using the functions right now keep working without any update. The second one will be better in long term from the point of documentation (no duplicated docs), but there might be few cases that would require updates in the config -- iirc, there are some functions that can get special tokens in the parameters (like forward(uri:host, uri:port)), they will get an equivalent with variables, but old config will not be compatible. Obviously the reason for this email is to ask the developers and users what would be the preferred way from own point of view. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com

8 12

Re: [sr-dev] [kamailio/kamailio] dialog: safety checks for local cseq and contact vars (79946bb)
by Daniel-Constantin Mierla 19 Dec '18

19 Dec '18

Looks like a regression introduced with a patch that tried to avoid a crash -- I pushed another commit to skip the test on cseq when not taken from sip request. It is already in branch 5.2, can you test and see if all ok now? -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/79946bbb6d1731f503fc378ae38311b…

1 0

git:master:740bc8ce: dialog: check for cseq value only when getting it for caller/request
by Daniel-Constantin Mierla 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: 740bc8ce88da612ac30a73db0145908355cab192 URL: https://github.com/kamailio/kamailio/commit/740bc8ce88da612ac30a73db0145908… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-19T11:56:41+01:00 dialog: check for cseq value only when getting it for caller/request --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/740bc8ce88da612ac30a73db0145908… Patch: https://github.com/kamailio/kamailio/commit/740bc8ce88da612ac30a73db0145908… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index a94dd641a4..983e82d7dd 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -208,7 +208,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, /* use the same as in request */ cseq = dlg->cseq[DLG_CALLEE_LEG]; } - if(cseq.s==NULL || cseq.len<=0) { + if ((leg==DLG_CALLER_LEG) && (cseq.s==NULL || cseq.len<=0)) { LM_ERR("empty CSeq number\n"); goto error0; }

1 0

Re: [sr-dev] [kamailio/kamailio] dialog: safety checks for local cseq and contact vars (79946bb)
by Cui Gang 19 Dec '18

19 Dec '18

Hi, My kamailio configuration file works well on the first release 5.2.0(535e13b). When I update kamailio server to the 5.2.0 branch last version, include this commit, dialog always ERROR like: ERROR: {...} dialog [dlg_handlers.c:212]: populate_leg_info(): empty CSeq number Why? And how can I fix it? Thanks! -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/79946bbb6d1731f503fc378ae38311b…

1 0

[kamailio/kamailio] core: Add PROXY protocol implementation (#1765)
by Sebastian Lauwers 19 Dec '18

19 Dec '18

#### Pre-Submission Checklist    - [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 - [ ] 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 - [x] Related to issue #1757 #### Description  Note: This PR follows the discussion in #1757. - introduce new global variable `ksr_tcp_accept_proxy`. - this variable can be modified by using the `tcp_accept_proxy=yes` configuration parameter. - when active, inbound TCP connections are expected to behave according to the PROXY protocol[1]. - Both the v1 (human-readable) and v2 (binary) versions of the protocol are supported. [1]: https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1765 -- Commit Summary -- * core: Add PROXY protocol implementation -- File Changes -- M src/core/cfg.lex (3) M src/core/cfg.y (9) M src/core/globals.h (1) M src/core/tcp_main.c (244) M src/core/tcp_read.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1765.patch https://github.com/kamailio/kamailio/pull/1765.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1765

4 11

[kamailio/kamailio] Proxy Protocol support (#1757)
by Sebastian Lauwers 19 Dec '18

19 Dec '18

### Description I would like to implement support for the Proxy Protocol as implemented by HAProxy and AWS ELBs. The main advantage this brings is better connection information, even behind multiple layers of NAT or LBs. This feature was already discussed a couple of years ago, and it appears the project was not against receiving a patch that adds support for this protocol: https://lists.kamailio.org/pipermail/sr-users/2016-June/093497.html For example, at the moment, my Kamailio deployment is "blind" when it comes to the origin of inbound TCP connections, because it is only able to report the internal IP address of our ELBs, rather than the actual IP address of the client, and IP address of the LB the connection was received on. Dixa is offering to sponsor work (my own hours) to implement this, and we would also be a production user of this feature. The Proxy Protocol is fairly well documented here: https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt As far as I know, AWS ELBs only implement version 1 of the protocol, but I believe there is value in implementing both (while we're at it), and the second version of the protocol is a lot easier to parse, anyway. I'm opening this feature request to a/ track progress, b/ discuss implementation details. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1757

3 11

git:master:10be01a4: core: Add PROXY protocol implementation (#1765)
by Henning Westerholt 19 Dec '18

19 Dec '18

Module: kamailio Branch: master Commit: 10be01a41430335f27a557a58a8f0e72bbd5d2c7 URL: https://github.com/kamailio/kamailio/commit/10be01a41430335f27a557a58a8f0e7… Author: Sebastian Lauwers <sebastian.lauwers(a)gmail.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-12-19T09:05:14+01:00 core: Add PROXY protocol implementation (#1765) - introduce new global variable `ksr_tcp_accept_haproxy`. - this variable can be modified by using the `tcp_accept_haproxy=yes` core configuration parameter. - when active, inbound TCP connections are expected to behave according to the PROXY protocol[1]. - Both the v1 (human-readable) and v2 (binary) versions of the protocol are supported. - [1]: https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/10be01a41430335f27a557a58a8f0e7… Patch: https://github.com/kamailio/kamailio/commit/10be01a41430335f27a557a58a8f0e7…

1 0

git:master:b5253b62: websocket: use the list with ids for ws connections to do ping-pong
by Daniel-Constantin Mierla 18 Dec '18

18 Dec '18

Module: kamailio Branch: master Commit: b5253b62090feb70f08885fb530d894d0bd6ad90 URL: https://github.com/kamailio/kamailio/commit/b5253b62090feb70f08885fb530d894… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-18T13:20:51+01:00 websocket: use the list with ids for ws connections to do ping-pong - avoid using pointers to ws connections, they can get closed --- Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_conn.h Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/b5253b62090feb70f08885fb530d894… Patch: https://github.com/kamailio/kamailio/commit/b5253b62090feb70f08885fb530d894…

1 0

[kamailio/kamailio] Module: security to prevent different types of attacks (#1755)
by Pepelux 18 Dec '18

18 Dec '18

#### Pre-Submission Checklist    - [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 - [ ] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This module has been designed to offer an additional layer of security over our communications. To achieve this, the following features are available: Blacklist to filter user agents, IP addresses, countries, domains and users. Whitelist to filter user agents, IP addresses, countries, domains and users. Blacklist of destinations where calling is not allowed. SQL injection attacks prevention. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1755 -- Commit Summary -- * Module security: create database SQL * Module security: database schema * Module security: new module * Change dst_exact_match from string to integer * fix Makefile description * update descriptions * Now it is possible to define the names of the columns in as parameters of the module * Update description * Update description * Fix sqli checks for some headers -- File Changes -- A src/lib/srdb1/schema/security.xml (65) A src/modules/security/Makefile (14) A src/modules/security/README (461) A src/modules/security/doc/Makefile (3) A src/modules/security/doc/security.xml (33) A src/modules/security/doc/security_admin.xml (601) A src/modules/security/security.c (376) A src/modules/security/security.h (64) A src/modules/security/security_db.c (408) A src/modules/security/security_hdr.c (294) A src/modules/security/security_rpc.c (212) A utils/kamctl/db_sqlite/security-create.sql (11) A utils/kamctl/mysql/security-create.sql (11) A utils/kamctl/oracle/security-create.sql (19) A utils/kamctl/postgres/security-create.sql (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1755.patch https://github.com/kamailio/kamailio/pull/1755.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1755

3 16

git:master:8467ef01: src/Makefile.groups: added secfilter module
by Daniel-Constantin Mierla 18 Dec '18

18 Dec '18

Module: kamailio Branch: master Commit: 8467ef01181e43d3664501862bb698f4963c6e3e URL: https://github.com/kamailio/kamailio/commit/8467ef01181e43d3664501862bb698f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-18T10:27:26+01:00 src/Makefile.groups: added secfilter module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/8467ef01181e43d3664501862bb698f… Patch: https://github.com/kamailio/kamailio/commit/8467ef01181e43d3664501862bb698f… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 9729cdd1b5..90f62e0127 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -29,7 +29,7 @@ mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \ db_cluster dialog dispatcher domain drouting group \ htable imc matrix mohqueue msilo mtree p_usrloc pdt permissions \ pipelimit prefix_route registrar sipcapture siptrace speeddial \ - sqlops uac uri_db userblacklist usrloc + sqlops uac uri_db userblacklist usrloc secfilter # - common modules depending on database, using UID db schema

1 0

git:master:ff943c68: lib/srdb1: added db schema for secfilter module
by Daniel-Constantin Mierla 18 Dec '18

18 Dec '18

Module: kamailio Branch: master Commit: ff943c681f1888bb106e85a170df371136410341 URL: https://github.com/kamailio/kamailio/commit/ff943c681f1888bb106e85a170df371… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-18T10:22:18+01:00 lib/srdb1: added db schema for secfilter module --- Added: src/lib/srdb1/schema/secfilter.xml --- Diff: https://github.com/kamailio/kamailio/commit/ff943c681f1888bb106e85a170df371… Patch: https://github.com/kamailio/kamailio/commit/ff943c681f1888bb106e85a170df371… --- diff --git a/src/lib/srdb1/schema/secfilter.xml b/src/lib/srdb1/schema/secfilter.xml new file mode 100644 index 0000000000..3e0037da5a --- /dev/null +++ b/src/lib/srdb1/schema/secfilter.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE table PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + +<!ENTITY % entities SYSTEM "entities.xml"> +%entities; + +]> + +<table id="secfilter" xmlns:db="http://docbook.org/ns/docbook"> + <name>secfilter</name> + <version>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para> + This table is used by the secfilter module. It contains the sets of + values used to block or allow messages. More information about the + secfilter module can be found at: + <itemizedlist> + <listitem> + <ulink url="&KAMAILIO_MOD_DOC;secfilter.html">&KAMAILIO_MOD_DOC;secfilter.html</ulink>. + </listitem> + </itemizedlist> + </db:para> + </description> + + <column id="id"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>unique ID</description> + </column> + + <column id="action"> + <name>action</name> + <type>tinyint</type> + <default/> + <description>Action to do (0=blacklisted data, 1=whitelisted data, 2=blacklisted destination).</description> + </column> + + <column id="type"> + <name>type</name> + <type>tinyint</type> + <default/> + <description>Type of data (0=user-agent, 1=country, 2=domain, 3=IP address, 4=user).</description> + </column> + + <column id="data"> + <name>data</name> + <type>string</type> + <size>64</size> + <default/> + <description>Data value.</description> + </column> + + <index> + <name>secfilter_idx</name> + <colref linkend="action"/> + <colref linkend="type"/> + <colref linkend="data"/> + </index> +</table>

1 0

git:master:e5067d45: kamctl: generated sql creation scripts for secfilter module
by Daniel-Constantin Mierla 18 Dec '18

18 Dec '18

Module: kamailio Branch: master Commit: e5067d45614abbc89710493f7f0916aa4f33432a URL: https://github.com/kamailio/kamailio/commit/e5067d45614abbc89710493f7f0916a… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-18T10:23:10+01:00 kamctl: generated sql creation scripts for secfilter module --- Added: utils/kamctl/db_sqlite/secfilter-create.sql Added: utils/kamctl/mysql/secfilter-create.sql Added: utils/kamctl/oracle/secfilter-create.sql Added: utils/kamctl/postgres/secfilter-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/e5067d45614abbc89710493f7f0916a… Patch: https://github.com/kamailio/kamailio/commit/e5067d45614abbc89710493f7f0916a… --- diff --git a/utils/kamctl/db_sqlite/secfilter-create.sql b/utils/kamctl/db_sqlite/secfilter-create.sql new file mode 100644 index 0000000000..6f8af6d5a9 --- /dev/null +++ b/utils/kamctl/db_sqlite/secfilter-create.sql @@ -0,0 +1,11 @@ +CREATE TABLE secfilter ( + id INTEGER PRIMARY KEY NOT NULL, + action SMALLINT DEFAULT 0 NOT NULL, + type SMALLINT DEFAULT 0 NOT NULL, + data VARCHAR(64) DEFAULT '' NOT NULL +); + +CREATE INDEX secfilter_idx ON secfilter (action, type, data); + +INSERT INTO version (table_name, table_version) values ('secfilter', '1'); + diff --git a/utils/kamctl/mysql/secfilter-create.sql b/utils/kamctl/mysql/secfilter-create.sql new file mode 100644 index 0000000000..9e6eab745f --- /dev/null +++ b/utils/kamctl/mysql/secfilter-create.sql @@ -0,0 +1,11 @@ +CREATE TABLE `secfilter` ( + `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + `action` TINYINT(1) DEFAULT 0 NOT NULL, + `type` TINYINT(1) DEFAULT 0 NOT NULL, + `data` VARCHAR(64) DEFAULT '' NOT NULL +); + +CREATE INDEX secfilter_idx ON secfilter (`action`, `type`, `data`); + +INSERT INTO version (`table_name`, `table_version`) values ('secfilter', '1'); + diff --git a/utils/kamctl/oracle/secfilter-create.sql b/utils/kamctl/oracle/secfilter-create.sql new file mode 100644 index 0000000000..539be00a5d --- /dev/null +++ b/utils/kamctl/oracle/secfilter-create.sql @@ -0,0 +1,19 @@ +CREATE TABLE secfilter ( + id NUMBER(10) PRIMARY KEY, + action NUMBER(1) DEFAULT 0 NOT NULL, + type NUMBER(1) DEFAULT 0 NOT NULL, + data VARCHAR2(64) DEFAULT '' NOT NULL +); + +CREATE OR REPLACE TRIGGER secfilter_tr +before insert on secfilter FOR EACH ROW +BEGIN + auto_id(:NEW.id); +END secfilter_tr; +/ +BEGIN map2users('secfilter'); END; +/ +CREATE INDEX ORA_secfilter_idx ON secfilter (action, type, data); + +INSERT INTO version (table_name, table_version) values ('secfilter', '1'); + diff --git a/utils/kamctl/postgres/secfilter-create.sql b/utils/kamctl/postgres/secfilter-create.sql new file mode 100644 index 0000000000..fc44a806a9 --- /dev/null +++ b/utils/kamctl/postgres/secfilter-create.sql @@ -0,0 +1,11 @@ +CREATE TABLE secfilter ( + id SERIAL PRIMARY KEY NOT NULL, + action SMALLINT DEFAULT 0 NOT NULL, + type SMALLINT DEFAULT 0 NOT NULL, + data VARCHAR(64) DEFAULT '' NOT NULL +); + +CREATE INDEX secfilter_idx ON secfilter (action, type, data); + +INSERT INTO version (table_name, table_version) values ('secfilter', '1'); +

1 0

git:master:4e9558e1: secfilter: new module for defining security filters
by Daniel-Constantin Mierla 18 Dec '18

18 Dec '18

Module: kamailio Branch: master Commit: 4e9558e1cb142612fa6053a790d29814a8b1e623 URL: https://github.com/kamailio/kamailio/commit/4e9558e1cb142612fa6053a790d2981… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-18T10:18:07+01:00 secfilter: new module for defining security filters - the following features are available: * blacklist to filter user agents, IP addresses, countries, domains and users * whitelist to filter user agents, IP addresses, countries, domains and users * blacklist of destinations where calling is not allowed * SQL injection attacks prevention --- Added: src/modules/secfilter/Makefile Added: src/modules/secfilter/README Added: src/modules/secfilter/doc/Makefile Added: src/modules/secfilter/doc/secfilter.xml Added: src/modules/secfilter/doc/secfilter_admin.xml Added: src/modules/secfilter/secfilter.c Added: src/modules/secfilter/secfilter.h Added: src/modules/secfilter/secfilter_db.c Added: src/modules/secfilter/secfilter_hdr.c Added: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/4e9558e1cb142612fa6053a790d2981… Patch: https://github.com/kamailio/kamailio/commit/4e9558e1cb142612fa6053a790d2981…

1 0

[kamailio/kamailio] pipelimit module documentation error? (#1671)
by Rogelio Perez 17 Dec '18

17 Dec '18

As reported by Juan Priotti [here](https://lists.kamailio.org/pipermail/sr-users/2017-December/099727.ht… the way pipelimit actually works is: > limit * timer_interval = max req/sec However the [module documentation](https://www.kamailio.org/docs/modules/5.1.x/modules/pipelimi… can be interpreted as: > limit / timer_interval = max req/sec Is this just a documentation error or are we doing something wrong? Thanks. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1671

3 12

[kamailio/kamailio] Same warnings durring build (#1712)
by sergey-safarov 17 Dec '18

17 Dec '18

### Description This in not important and may be closed at any time. Some info about build warnings on Alpine dist ### Troubleshooting #### Reproduction start a build process on Alpine dist #### Debugging Data NA #### Log Messages ``` CC (gcc) [M regex.so] regex_mod.o regex_mod.c: In function 'w_pcre_match_group': regex_mod.c:663:9: warning: 'num_pcre' may be used uninitialized in this function [-Wmaybe-uninitialized] return ki_pcre_match_group(_msg, &string, (int)num_pcre); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ LD (gcc) [M regex.so] regex.so CC (gcc) [M db_berkeley.so] bdb_fld.o ``` Next ``` CC (gcc) [M cplc.so] cpl_parser.o In file included from ../../core/mem/mem.h:41:0, from cpl_run.c:37: cpl_run.c: In function 'run_remove_location': ../../core/mem/../dprint.h:302:8: warning: 'url.len' may be used uninitialized in this function [-Wmaybe-uninitialized] fprintf(stderr, "%2d(%d) %s: %.*s%s" fmt, \ ^~~~~~~ cpl_run.c:416:6: note: 'url.len' was declared here str url; ^~~ CC (gcc) [M cplc.so] sub_list.o make[3]: 'libsrdb1.so.1.0' is up to date. ``` Next ``` CC (gcc) [M db2_ldap.so] ld_fld.o ld_fld.c: In function 'ldap_gentime2db_datetime': ld_fld.c:273:10: warning: implicit declaration of function 'timelocal' [-Wimplicit-function-declaration] *dst = timelocal(&time); ^~~~~~~~~ CC (gcc) [M db2_ldap.so] ld_cmd.o ``` Next ``` CC (gcc) [M auth_identity.so] auth_dynstr.o CC (gcc) [M auth_identity.so] auth_crypt.o auth_crypt.c:29:0: warning: "_GNU_SOURCE" redefined #define _GNU_SOURCE <command-line>:0:0: note: this is the location of the previous definition ``` Next ``` CC (gcc) [M tls.so] tls_init.o tls_init.c:320:13: warning: 'ser_free' defined but not used [-Wunused-function] static void ser_free(void *ptr, const char *fname, int fline) ^~~~~~~~ CC (gcc) [M tls.so] tls_dump_vf.o CC (gcc) [M tls.so] tls_select.o CC (gcc) [M tls.so] tls_cfg.o CC (gcc) [M tls.so] tls_map.o CC (gcc) [M tls.so] tls_server.o CC (gcc) [M tls.so] tls_locking.o tls_locking.c:85:13: warning: 'dyn_destroy_f' defined but not used [-Wunused-function] static void dyn_destroy_f(struct CRYPTO_dynlock_value *l, ^~~~~~~~~~~~~ tls_locking.c:67:13: warning: 'dyn_lock_f' defined but not used [-Wunused-function] static void dyn_lock_f(int mode, struct CRYPTO_dynlock_value* l, ^~~~~~~~~~ tls_locking.c:45:37: warning: 'dyn_create_f' defined but not used [-Wunused-function] static struct CRYPTO_dynlock_value* dyn_create_f(const char* file, int line) ^~~~~~~~~~~~ CC (gcc) [M tls.so] tls_domain.o tls_domain.c:872:12: warning: 'tls_ssl_ctx_set_freelist' defined but not used [-Wunused-function] static int tls_ssl_ctx_set_freelist(SSL_CTX* ctx, long val, void* unused) ^~~~~~~~~~~~~~~~~~~~~~~~ In file included from tls_domain.c:33:0: tls_domain.c: In function 'load_engine_private_key': tls_map.h:46:14: warning: 'pkey' may be used uninitialized in this function [-Wmaybe-uninitialized] ( (m)->tmp = (value),\ ^ tls_domain.c:1183:12: note: 'pkey' was declared here EVP_PKEY *pkey; ^~~~ CC (gcc) [M tls.so] tls_util.o ``` Next ``` CC (gcc) [M ims_usrloc_pcscf.so] dlist.o In file included from usrloc_db.c:10:0: usrloc_db.c: In function 'db_update_pcontact': usrloc_db.h:46:25: warning: 'service_routes.len' may be used uninitialized in this function [-Wmaybe-uninitialized] VAL_STR((_val)).len = (_str).len;\ ^ usrloc_db.c:122:13: note: 'service_routes.len' was declared here str impus, service_routes; ^~~~~~~~~~~~~~ In file included from usrloc_db.c:10:0: usrloc_db.h:45:24: warning: 'service_routes.s' may be used uninitialized in this function [-Wmaybe-uninitialized] VAL_STR((_val)).s = (_str).s;\ ^ usrloc_db.c:122:13: note: 'service_routes.s' was declared here str impus, service_routes; ^~~~~~~~~~~~~~ CC (gcc) [M ims_usrloc_pcscf.so] pcontact.o ``` Next ``` CC (gcc) [M evapi.so] evapi_mod.o evapi_dispatch.c: In function 'evapi_run_dispatcher': evapi_dispatch.c:699:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] ev_io_init(&io_server, evapi_accept_client, evapi_srv_sock, EV_READ); ^~~~~~~~~~ evapi_dispatch.c:699:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] evapi_dispatch.c:699:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] evapi_dispatch.c:699:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] evapi_dispatch.c:701:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] ev_io_init(&io_notify, evapi_recv_notify, _evapi_notify_sockets[0], EV_READ); ^~~~~~~~~~ evapi_dispatch.c:701:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] evapi_dispatch.c:701:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] evapi_dispatch.c:701:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] make[3]: 'libsrutils.so.1.0' is up to date. LD (gcc) [M evapi.so] evapi.so ``` #### SIP Traffic NA ### Possible Solutions ### Additional Information Compiled master on Alpine 3.8 dist If this is fixed, then i can provide more warnings. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1712

4 5

git:master:dfb872b3: regex: init var to avoid compile warning
by Daniel-Constantin Mierla 17 Dec '18

17 Dec '18

Module: kamailio Branch: master Commit: dfb872b311cd0acd4a40c810f612c8a23e7c9aca URL: https://github.com/kamailio/kamailio/commit/dfb872b311cd0acd4a40c810f612c8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-17T20:31:59+01:00 regex: init var to avoid compile warning --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dfb872b311cd0acd4a40c810f612c8a… Patch: https://github.com/kamailio/kamailio/commit/dfb872b311cd0acd4a40c810f612c8a… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 67e6b667ad..880e1924fd 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -636,7 +636,7 @@ static int ki_pcre_match_group(sip_msg_t* _msg, str* string, int num_pcre) static int w_pcre_match_group(struct sip_msg* _msg, char* _s1, char* _s2) { str string, group; - unsigned int num_pcre; + unsigned int num_pcre = 0; if (_s1 == NULL) { LM_ERR("bad parameters\n");

1 0

git:master:0f1b970a: cplc: init var to avoid compile warning
by Daniel-Constantin Mierla 17 Dec '18

17 Dec '18

Module: kamailio Branch: master Commit: 0f1b970ae7f47478649b61a8dc43fe42714b2a95 URL: https://github.com/kamailio/kamailio/commit/0f1b970ae7f47478649b61a8dc43fe4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-17T20:34:35+01:00 cplc: init var to avoid compile warning --- Modified: src/modules/cplc/cpl_run.c --- Diff: https://github.com/kamailio/kamailio/commit/0f1b970ae7f47478649b61a8dc43fe4… Patch: https://github.com/kamailio/kamailio/commit/0f1b970ae7f47478649b61a8dc43fe4… --- diff --git a/src/modules/cplc/cpl_run.c b/src/modules/cplc/cpl_run.c index dd82d9868b..768f6b3d4a 100644 --- a/src/modules/cplc/cpl_run.c +++ b/src/modules/cplc/cpl_run.c @@ -413,7 +413,7 @@ static inline char *run_remove_location( struct cpl_interpreter *intr ) unsigned short attr_name; unsigned short n; char *p; - str url; + str url = STR_NULL; int i; url.s = (char*)UNDEF_CHAR;

1 0

[kamailio/kamailio] Crashing Kamailio: store_reply. replacing stored reply (#1744)
by Luis Martin Gil 17 Dec '18

17 Dec '18

### Description Did a parallel fork (added two destinations using `append_branch` with the same qvalue). Looks like something is wrong with "store_reply" function: ``` "store_reply(): ERROR: replacing stored reply; aborting" ``` ### Troubleshooting #### Reproduction Randomly happening when executing the SIP flow attached. #### Debugging Data ``` (gdb) bt #0 0x00007f700eb4c4f5 in raise (sig=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64 #1 0x00007f700eb4dcd5 in abort () at abort.c:92 #2 0x00007f6ffad16087 in store_reply (trans=0x7f6fb44b3d38, branch=0, rpl=0x7f6ffeca4118) at t_reply.c:1601 #3 0x00007f6ffad17275 in relay_reply (t=0x7f6fb44b3d38, p_msg=0x7f6ffeca4118, branch=0, msg_status=500, cancel_data=0x7ffde2759230, do_put_on_wait=1) at t_reply.c:1757 #4 0x00007f6ffad1bec4 in reply_received (p_msg=0x7f6ffeca4118) at t_reply.c:2466 #5 0x000000000049828f in do_forward_reply (msg=0x7f6ffeca4118, mode=0) at forward.c:747 #6 0x00000000004999fe in forward_reply (msg=0x7f6ffeca4118) at forward.c:849 #7 0x0000000000515d8a in receive_msg ( buf=0xab0080 "SIP/2.0 500 I'm terribly sorry, server error occurred (6/SL)\r\nVia: SIP/2.0/UDP 192.168.178.35;branch=z9hG4bKecc7.4b5f187ecb5db7bceee392c8c43c0509.0\r\nVia: SIP/2.0/UDP 192.168.178.36:5060;received=192.1"..., len=518, rcv_info=0x7ffde27596f0) at receive.c:299 #8 0x0000000000628f95 in udp_rcv_loop () at udp_server.c:495 #9 0x00000000004b2dd6 in main_loop () at main.c:1614 #10 0x00000000004ba1eb in main (argc=14, argv=0x7ffde2759c68) at main.c:2631 ``` ``` (gdb) bt full #0 0x00007f700eb4c4f5 in raise (sig=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64 resultvar = 0 pid = <value optimized out> selftid = <value optimized out> #1 0x00007f700eb4dcd5 in abort () at abort.c:92 save_stage = 2 act = {__sigaction_handler = {sa_handler = 0x8, sa_sigaction = 0x8}, sa_mask = {__val = {0, 7582136, 140118926563523, 140118926577440, 180, 206158430248, 140728402808320, 140728402808112, 522715890832, 140118815048117, 17092387201, 137438953472000, 5000, 7582110, 140118926567681, 140118926577360}}, sa_flags = 1030059617, sa_restorer = 0x1f4} sigs = {__val = {32, 0 <repeats 15 times>}} #2 0x00007f6ffad16087 in store_reply (trans=0x7f6fb44b3d38, branch=0, rpl=0x7f6ffeca4118) at t_reply.c:1601 __FUNCTION__ = "store_reply" #3 0x00007f6ffad17275 in relay_reply (t=0x7f6fb44b3d38, p_msg=0x7f6ffeca4118, branch=0, msg_status=500, cancel_data=0x7ffde2759230, do_put_on_wait=1) at t_reply.c:1757 relay = -1 save_clone = 1 buf = 0x0 res_len = 0 relayed_code = 0 relayed_msg = 0x0 reply_bak = 0xb411e4c0 bm = {to_tag_val = {s = 0x7ffde2758ff0 "\020\220u\342\375\177", len = -87011592}} totag_retr = 0 reply_status = RPS_STORE uas_rb = 0x7f6fb4116000 to_tag = 0x7ffde2759010 reason = {s = 0xe2759040 <Address 0xe2759040 out of bounds>, len = -1270137096} onsend_params = {req = 0x7f6f00000003, rpl = 0x7ffde2759070, param = 0x7f6ffad7e6f0, code = -1270136928, flags = 2216, branch = 0, t_rbuf = 0x7f6ffad84de2, dst = 0x1, send_buf = { s = 0x7f6fb44b3ef8 "\002", len = -1273929728}} ip = {af = 0, len = 0, u = {addrl = {140728402809056, 140118992765208}, addr32 = {3799355616, 32765, 4274667800, 32623}, addr16 = {37088, 57973, 32765, 0, 16664, 65226, 32623, 0}, addr = "\340\220u\342\375\177\000\000\030A\312\376o\177\000"}} __FUNCTION__ = "relay_reply" #4 0x00007f6ffad1bec4 in reply_received (p_msg=0x7f6ffeca4118) at t_reply.c:2466 msg_status = 500 last_uac_status = 0 ack = 0x7f6fb44b7980 "SIP/2.0 180 Ringing\r\nRecord-Route: <sip:192.168.178.53:8080;transport=ws;r2=on;lr=on;ftag=56e.2c8>\r\nRecord-Route: <sip:192.168.178.53;r2=on;lr=on;ftag=56e.2c8>\r\nRecord-Route: <sip:192.168.178.35;lr=on"... ---Type <return> to continue, or q <return> to quit--- ack_len = 363 branch = 0 reply_status = -198019613 onreply_route = 1 cancel_data = {cancel_bitmap = 0, reason = {cause = 0, u = {text = {s = 0x0, len = 257199189}, e2e_cancel = 0x0, packed_hdrs = {s = 0x0, len = 257199189}}}} uac = 0x7f6fb44b3f40 t = 0x7f6fb44b3d38 lack_dst = {send_sock = 0xe00000001, to = {s = {sa_family = 0, sa_data = "\000\000\000\000\000\000\000\000\000\000\006\000\000"}, sin = {sin_family = 0, sin_port = 0, sin_addr = { s_addr = 0}, sin_zero = "\000\000\000\000\006\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = { __u6_addr8 = "\000\000\000\000\006\000\000\000\000\066\262\016p\177\000", __u6_addr16 = {0, 0, 6, 0, 13824, 3762, 32624, 0}, __u6_addr32 = {0, 6, 246560256, 32624}}}, sin6_scope_id = 7582136}}, id = 0, proto = -29 '\343', send_flags = {f = 117 'u', blst_imask = 50 '2'}} backup_user_from = 0xac00b0 backup_user_to = 0xac00b8 backup_domain_from = 0xac00c0 backup_domain_to = 0xac00c8 backup_uri_from = 0xac00a0 backup_uri_to = 0xac00a8 backup_xavps = 0xac01e0 replies_locked = 1 branch_ret = 3 prev_branch = 7582136 blst_503_timeout = 0 hf = 0x7004885c2 onsend_params = {req = 0x77cdae, rpl = 0x1, param = 0xa17cb0, code = 0, flags = 0, branch = 0, t_rbuf = 0x7, dst = 0x0, send_buf = {s = 0x0, len = 257172512}} ctx = {rec_lev = 0, run_flags = 0, last_retcode = 128, jmp_env = {{__jmpbuf = {140117739134976, 2350401339451012324, 7582136, 0, 0, 0, 2350401339480372452, -2349319903025662748}, __mask_was_saved = 0, __saved_mask = {__val = {4251813, 140118992648344, 140114718097411, 11206855, 3, 11206859, 140114718097422, 11206863, 140114718097408, 8035905, 459561500672, 140114718097427, 33089526208, 140119259624960, 140119272375504, 7582136}}}}} __FUNCTION__ = "reply_received" #5 0x000000000049828f in do_forward_reply (msg=0x7f6ffeca4118, mode=0) at forward.c:747 new_buf = 0x0 dst = {send_sock = 0x0, to = {s = {sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, id = 0, proto = 0 '\000', send_flags = {f = 0 '\000', blst_imask = 0 '\000'}} new_len = 0 r = 1 ---Type <return> to continue, or q <return> to quit--- ip = {af = 3799356400, len = 32765, u = {addrl = {140118935378591, 8391916088}, addr32 = {4217281183, 32623, 4096948792, 1}, addr16 = {39583, 64350, 32623, 0, 31288, 62514, 1, 0}, addr = "\237\232^\373o\177\000\000\070z2\364\001\000\000"}} s = 0x7ffde27594a0 "\200\226u\342\375\177" len = 0 __FUNCTION__ = "do_forward_reply" #6 0x00000000004999fe in forward_reply (msg=0x7f6ffeca4118) at forward.c:849 No locals. #7 0x0000000000515d8a in receive_msg ( buf=0xab0080 "SIP/2.0 500 I'm terribly sorry, server error occurred (6/SL)\r\nVia: SIP/2.0/UDP 192.168.178.35;branch=z9hG4bKecc7.4b5f187ecb5db7bceee392c8c43c0509.0\r\nVia: SIP/2.0/UDP 192.168.178.36:5060;received=192.1"..., len=518, rcv_info=0x7ffde27596f0) at receive.c:299 msg = 0x7f6ffeca4118 ctx = {rec_lev = 0, run_flags = 0, last_retcode = 1, jmp_env = {{__jmpbuf = {140118815045091, 2350401338767340772, 7582136, 7, 7, 0, 2350401338796700900, -2349319903025662748}, __mask_was_saved = 0, __saved_mask = {__val = {140118991147024, 140728402810496, 7582136, 20, 1, 140117739169952, 917678272, 0, 1024, 8094324272, 140117739169952, 140728402810416, 6429261, 85, 140117739169952, 32}}}}} ret = 1 inb = { s = 0xab0080 "SIP/2.0 500 I'm terribly sorry, server error occurred (6/SL)\r\nVia: SIP/2.0/UDP 192.168.178.35;branch=z9hG4bKecc7.4b5f187ecb5db7bceee392c8c43c0509.0\r\nVia: SIP/2.0/UDP 192.168.178.36:5060;received=192.1"..., len = 518} netinfo = {data = {s = 0x7f700eb2a2f0 "\\<", len = 259310800}, dst = 0x0, rcv = 0xffffffff} __FUNCTION__ = "receive_msg" #8 0x0000000000628f95 in udp_rcv_loop () at udp_server.c:495 len = 518 buf = "SIP/2.0 500 I'm terribly sorry, server error occurred (6/SL)\r\nVia: SIP/2.0/UDP 192.168.178.35;branch=z9hG4bKecc7.4b5f187ecb5db7bceee392c8c43c0509.0\r\nVia: SIP/2.0/UDP 192.168.178.36:5060;received=192.1"... tmp = 0x600000000 <Address 0x600000000 out of bounds> from = 0x7f6ffec584f8 fromlen = 16 ri = {src_ip = {af = 2, len = 4, u = {addrl = {140725521131712, 140728402810640}, addr32 = {917678272, 32765, 3799357200, 32765}, addr16 = {43200, 14002, 32765, 0, 38672, 57973, 32765, 0}, addr = "\300\250\262\066\375\177\000\000\020\227u\342\375\177\000"}}, dst_ip = {af = 2, len = 4, u = {addrl = {598911168, 0}, addr32 = {598911168, 0, 0, 0}, addr16 = {43200, 9138, 0, 0, 0, 0, 0, 0}, addr = "\300\250\262#", '\000' <repeats 11 times>}}, src_port = 5060, dst_port = 5060, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = { sa_family = 2, sa_data = "\023\304\300\250\262\066\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 917678272}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 917678272, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x7f6ffeb3fe80, proto = 1 '\001'} __FUNCTION__ = "udp_rcv_loop" #9 0x00000000004b2dd6 in main_loop () at main.c:1614 ---Type <return> to continue, or q <return> to quit--- i = 5 pid = 0 si = 0x7f6ffeb3fe80 si_desc = "udp receiver child=5 sock=192.168.178.35:5060\000\000\000\024\000\000\000\000\000\000\000\a", '\000' <repeats 15 times>, "\003\000\000\000p\177\000\000\060\000\000\000\060\000\000\000P\231u\342\375\177\000\000\220\230u\342\375\177\000\000E;u\000\000\000\000\000\004\000\000\000\000\000\000\000\000`\021\264o\177\000" r = 0 nrprocs = 8 woneinit = 1 __FUNCTION__ = "main_loop" #10 0x00000000004ba1eb in main (argc=14, argv=0x7ffde2759c68) at main.c:2631 cfg_stream = 0x198a010 c = -1 r = 0 tmp = 0x7ffde275be25 "" tmp_len = 32624 port = 259350928 proto = 0 options = 0x7493c8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:" ret = -1 seed = 2637875816 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x7f700ebaa457 p = 0x7ffde2759b68 "`\234u\342\375\177" st = {st_dev = 64768, st_ino = 263284, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 4096, st_blksize = 4096, st_blocks = 8, st_atim = { tv_sec = 1543247591, tv_nsec = 708943540}, st_mtim = {tv_sec = 1539696832, tv_nsec = 509518950}, st_ctim = {tv_sec = 1539696832, tv_nsec = 509518950}, __unused = {0, 0, 0}} __FUNCTION__ = "main" ``` ``` (gdb) list 59 if (__builtin_expect (pid <= 0, 0)) 60 pid = (pid & INT_MAX) == 0 ? selftid : -pid; 61 #endif 62 63 #if __ASSUME_TGKILL 64 return INLINE_SYSCALL (tgkill, 3, pid, selftid, sig); 65 #else 66 # ifdef __NR_tgkill 67 int res = INLINE_SYSCALL (tgkill, 3, pid, selftid, sig); 68 if (res != -1 || errno != ENOSYS) ``` #### Log Messages ``` 2018-11-28T21:03:44Z DEBUG DEBUG: tm [t_reply.c:1233]: t_should_relay_response(): ->>>>>>>>> T_code=0, new_code=180 2018-11-28T21:03:44Z DEBUG DEBUG: tm [t_reply.c:1752]: relay_reply(): DEBUG: relay_reply: branch=1, save=0, relay=1 icode=0 2018-11-28T21:03:44Z DEBUG DEBUG: tm [t_hooks.c:266]: run_trans_callbacks_internal(): DBG: trans=0x7f6fb44b3d38, callback type 32, id 0 entered 2018-11-28T21:03:44Z DEBUG DEBUG: dialog [dlg_hash.c:690]: dlg_lookup(): ref dlg 0x7f6fb44b2f58 with 1 -> 2 2018-11-28T21:03:44Z DEBUG DEBUG: dialog [dlg_hash.c:692]: dlg_lookup(): dialog id=6583 found on entry 3685 2018-11-28T21:03:44Z DEBUG DEBUG: dialog [dlg_hash.c:922]: dlg_unref_helper(): unref op on 0x7f6fb44b2f58 with 1 from dlg_hash.c:940 2018-11-28T21:03:44Z DEBUG DEBUG: dialog [dlg_hash.c:926]: dlg_unref_helper(): unref dlg 0x7f6fb44b2f58 with 1 -> 1 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [msg_translator.c:2261]: generate_res_buf_from_sip_res(): old size: 813, new size: 725 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [msg_translator.c:2279]: generate_res_buf_from_sip_res(): copied size: orig:811, new: 723, rest: 2 msg= kamailio.log-SIP/2.0 180 Ringing kamailio.log-Record-Route: <sip:192.168.178.53:8080;transport=ws;r2=on;lr=on;ftag=56e.2c8> kamailio.log-Record-Route: <sip:192.168.178.53;r2=on;lr=on;ftag=56e.2c8> kamailio.log-Record-Route: <sip:192.168.178.35;lr=on;ftag=56e.7b91> kamailio.log-Via: SIP/2.0/UDP 192.168.178.36:5060;received=192.168.178.36;branch=z9hG4bKd237e465abb1c1bee01727d790654f65;rport=5060 kamailio.log-To: <sip:911@192.168.178.35>;tag=njbalhm9t3 kamailio.log-From: <sip:2609184641@192.168.178.36>;tag=b6344cba503381b36bdc2b52f4ae77e2 kamailio.log-Call-ID: ed3095um65kdm8h2rlle kamailio.log-CSeq: 200 INVITE kamailio.log-Contact: <sip:kfp5hkj9@icb3p4n1vfqk.in;alias=192.168.178.33~50982~5;transport=ws;reguser=118-085-5011;regrealm=indigitaldev.net> kamailio.log-User-Agent: MyID SIP/MSRP v1.0 kamailio.log-Content-Length: 0 kamailio.log-Server: MyID-kamailio- kamailio.log- kamailio.log- 2018-11-28T21:03:44Z DEBUG DEBUG: tm [t_hooks.c:266]: run_trans_callbacks_internal(): DBG: trans=0x7f6fb44b3d38, callback type 1048576, id 0 entered 2018-11-28T21:03:44Z DEBUG DEBUG: dialog [dlg_hash.c:690]: dlg_lookup(): ref dlg 0x7f6fb44b2f58 with 1 -> 2 2018-11-28T21:03:44Z DEBUG DEBUG: dialog [dlg_hash.c:692]: dlg_lookup(): dialog id=6583 found on entry 3685 2018-11-28T21:03:44Z DEBUG DEBUG: dialog [dlg_hash.c:1122]: next_state_dlg(): dialog 0x7f6fb44b2f58 changed from state 1 to state 2, due event 2 (ref 2) 2018-11-28T21:03:44Z DEBUG DEBUG: dialog [dlg_hash.c:922]: dlg_unref_helper(): unref op on 0x7f6fb44b2f58 with 1 from dlg_hash.c:940 2018-11-28T21:03:44Z DEBUG DEBUG: dialog [dlg_hash.c:926]: dlg_unref_helper(): unref dlg 0x7f6fb44b2f58 with 1 -> 1 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:321]: pv_cache_lookup(): pvar [$mt] found in cache 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:321]: pv_cache_lookup(): pvar [$cs] found in cache 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:321]: pv_cache_lookup(): pvar [$si] found in cache 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:321]: pv_cache_lookup(): pvar [$rm] found in cache 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:321]: pv_cache_lookup(): pvar [$ci] found in cache 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:1393]: pv_printf(): final buffer length 54 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:1393]: pv_printf(): final buffer length 39 kamailio.log:kamailio 2018-11-28T21:03:44Z INFO {2 200 192.168.178.54 INVITE ed3095um65kdm8h2rlle} In MANAGE_REPLY, incoming reply 500 [0] 2018-11-28T21:03:44Z DEBUG DEBUG: tm [t_reply.c:1233]: t_should_relay_response(): ->>>>>>>>> T_code=180, new_code=500 2018-11-28T21:03:44Z DEBUG DEBUG: tm [t_reply.c:1752]: relay_reply(): DEBUG: relay_reply: branch=0, save=1, relay=-1 icode=0 2018-11-28T21:03:44Z DEBUG DEBUG: dialog [dlg_var.c:86]: cb_dlg_locals_reset(): resetting the local dialog shortcuts on script callback: 2147483652 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [xavp.c:446]: xavp_destroy_list(): destroying xavp list (nil) 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [receive.c:322]: receive_msg(): cleaning up 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:321]: pv_cache_lookup(): pvar [$mt] found in cache 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:321]: pv_cache_lookup(): pvar [$cs] found in cache 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:321]: pv_cache_lookup(): pvar [$si] found in cache 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:321]: pv_cache_lookup(): pvar [$rm] found in cache 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:321]: pv_cache_lookup(): pvar [$ci] found in cache 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:1393]: pv_printf(): final buffer length 54 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:1393]: pv_printf(): final buffer length 39 -- 2018-11-28T21:03:44Z DEBUG DEBUG: tm [t_reply.c:1233]: t_should_relay_response(): ->>>>>>>>> T_code=180, new_code=500 2018-11-28T21:03:44Z DEBUG DEBUG: tm [t_reply.c:1752]: relay_reply(): DEBUG: relay_reply: branch=0, save=1, relay=-1 icode=0 2018-11-28T21:03:44Z DEBUG DEBUG: dialog [dlg_var.c:86]: cb_dlg_locals_reset(): resetting the local dialog shortcuts on script callback: 2147483652 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [xavp.c:446]: xavp_destroy_list(): destroying xavp list (nil) 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [receive.c:322]: receive_msg(): cleaning up 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:321]: pv_cache_lookup(): pvar [$mt] found in cache 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:321]: pv_cache_lookup(): pvar [$cs] found in cache 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:321]: pv_cache_lookup(): pvar [$si] found in cache 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:321]: pv_cache_lookup(): pvar [$rm] found in cache 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:321]: pv_cache_lookup(): pvar [$ci] found in cache 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:1393]: pv_printf(): final buffer length 54 2018-11-28T21:03:44Z DEBUG DEBUG: <core> [pvapi.c:1393]: pv_printf(): final buffer length 39 kamailio.log:kamailio 2018-11-28T21:03:44Z INFO {2 200 192.168.178.54 INVITE ed3095um65kdm8h2rlle} In MANAGE_REPLY, incoming reply 500 [0] 2018-11-28T21:03:44Z DEBUG DEBUG: tm [t_reply.c:1233]: t_should_relay_response(): ->>>>>>>>> T_code=180, new_code=500 2018-11-28T21:03:44Z DEBUG DEBUG: tm [t_reply.c:1752]: relay_reply(): DEBUG: relay_reply: branch=0, save=1, relay=-1 icode=0 2018-11-28T21:03:44Z ERROR ERROR: tm [t_reply.c:1600]: store_reply(): ERROR: replacing stored reply; aborting 2018-11-28T21:03:47Z ALERT ALERT: <core> [main.c:740]: handle_sigs(): child process 7554 exited by a signal 6 2018-11-28T21:03:47Z ALERT ALERT: <core> [main.c:743]: handle_sigs(): core was generated 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:755]: handle_sigs(): terminating due to SIGCHLD 2018-11-28T21:03:47Z DEBUG DEBUG: <core> [main.c:757]: handle_sigs(): terminating due to SIGCHLD 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:47Z INFO INFO: <core> [main.c:810]: sig_usr(): signal 15 received 2018-11-28T21:03:48Z DEBUG DEBUG: dialog [dlg_hash.c:327]: destroy_dlg(): destroying dialog 0x7f6fb44b2f58 (ref 1) 2018-11-28T21:03:48Z DEBUG DEBUG: dialog [dlg_hash.c:343]: destroy_dlg(): removed timer for dlg 0x7f6fb44b2f58 [3685:6583] with clid 'ed3095um65kdm8h2rlle' and tags 'b6344cba503381b36bdc2b52f4ae77e2' '' 2018-11-28T21:03:48Z DEBUG DEBUG: <core> [db_pool.c:100]: pool_remove(): removing connection from the pool 2018-11-28T21:03:48Z DEBUG DEBUG: tm [t_funcs.c:86]: tm_shutdown(): DEBUG: tm_shutdown : start 2018-11-28T21:03:48Z DEBUG DEBUG: tm [t_funcs.c:89]: tm_shutdown(): DEBUG: tm_shutdown : emptying hash table 2018-11-28T21:03:48Z DEBUG DEBUG: tm [h_table.c:127]: free_cell_helper(): freeing transaction 0x7f6fb44b3d38 from h_table.c:449 2018-11-28T21:03:48Z DEBUG DEBUG: dialog [dlg_handlers.c:303]: dlg_iuid_sfree(): freeing dlg iuid [3685:6583] (0x7f6fb44b3950) 2018-11-28T21:03:48Z DEBUG DEBUG: tm [t_funcs.c:91]: tm_shutdown(): DEBUG: tm_shutdown : removing semaphores 2018-11-28T21:03:48Z DEBUG DEBUG: tm [t_funcs.c:93]: tm_shutdown(): DEBUG: tm_shutdown : destroying tmcb lists 2018-11-28T21:03:48Z DEBUG DEBUG: tm [t_funcs.c:96]: tm_shutdown(): DEBUG: tm_shutdown : done 2018-11-28T21:03:48Z INFO INFO: <core> [sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized 2018-11-28T21:03:48Z DEBUG DEBUG: <core> [mem/shm.c:174]: shm_core_lock_destroy(): destroying the shared memory lock 2018-11-28T21:03:48Z DEBUG DEBUG: <core> [mem/shm.c:266]: shm_destroy_manager(): destroying memory manager: f_malloc 2018-11-28T21:03:48Z DEBUG DEBUG: <core> [mem/pkg.c:89]: pkg_destroy_manager(): destroying memory manager: f_malloc ``` #### SIP Traffic ![kamailio-store_reply-crash](https://user-images.githubusercontent.com/1906859/49220087-79b09780-f3d5-11e8-827a-f78b0a2f1470.png) ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio-4.4.5 ``` * **Operating System**: ``` CentOS release 6.10 Linux mybox 2.6.32-754.6.3.el6.x86_64 #1 SMP Tue Oct 9 17:27:49 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1744

2 7

[kamailio/kamailio] app_python3: fix Python 3.7 deprecation warnings (#1767)
by Anthony Messina 17 Dec '18

17 Dec '18

#### Pre-Submission Checklist    - [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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1748 (replace XXXX with an open issue number) #### Description  Add compile-time checks for `PY_VERSION_HEX >= 0x03070000` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1767 -- Commit Summary -- * app_python3: fix Python 3.7 deprecation warnings -- File Changes -- M src/modules/app_python3/app_python3_mod.c (8) M src/modules/app_python3/python_support.c (16) M src/modules/app_python3/python_support.h (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1767.patch https://github.com/kamailio/kamailio/pull/1767.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1767

2 3

git:5.2:45cdd659: pkg/kamailio/obs: Added ruby package #1761 [skip ci]
by Sergey Safarov 17 Dec '18

17 Dec '18

Module: kamailio Branch: 5.2 Commit: 45cdd6591177ccfa4a810b1f66eb00f024059b96 URL: https://github.com/kamailio/kamailio/commit/45cdd6591177ccfa4a810b1f66eb00f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-12-17T11:30:11Z pkg/kamailio/obs: Added ruby package #1761 [skip ci] (cherry picked from commit c249cfdf38ba98f4494557cf2b25b87ba6f63e21) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/45cdd6591177ccfa4a810b1f66eb00f… Patch: https://github.com/kamailio/kamailio/commit/45cdd6591177ccfa4a810b1f66eb00f… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 83877d3fec..bd174fa0c6 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -19,6 +19,7 @@ %bcond_without perl %bcond_without rabbitmq %bcond_without redis +%bcond_without ruby %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc @@ -41,6 +42,7 @@ %bcond_without perl %bcond_without rabbitmq %bcond_without redis +%bcond_without ruby %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc @@ -63,6 +65,7 @@ %bcond_without perl %bcond_without rabbitmq %bcond_without redis +%bcond_without ruby %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc @@ -85,6 +88,7 @@ %bcond_without perl %bcond_with rabbitmq %bcond_with redis +%bcond_with ruby %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc @@ -108,6 +112,7 @@ %bcond_without perl %bcond_without rabbitmq %bcond_without redis +%bcond_without ruby %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc @@ -130,6 +135,7 @@ %bcond_without perl %bcond_with rabbitmq %bcond_without redis +%bcond_without ruby %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc @@ -152,6 +158,7 @@ %bcond_with perl %bcond_with rabbitmq %bcond_with redis +%bcond_with ruby %bcond_with sctp %bcond_with websocket %bcond_without xmlrpc @@ -174,6 +181,7 @@ %bcond_without perl %bcond_with rabbitmq %bcond_without redis +%bcond_with ruby %bcond_with sctp %bcond_with websocket %bcond_without xmlrpc @@ -225,7 +233,7 @@ Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver Conflicts: kamailio-python < %ver Conflicts: kamailio-radius < %ver, kamailio-redis < %ver -Conflicts: kamailio-regex < %ver, kamailio-sctp < %ver +Conflicts: kamailio-regex < %ver, kamailio-ruby < %ver, kamailio-sctp < %ver Conflicts: kamailio-sipdump < %ver Conflicts: kamailio-snmpstats < %ver, kamailio-sqlang < %ver, kamailio-sqlite < %ver Conflicts: kamailio-tls < %ver, kamailio-unixodbc < %ver @@ -739,6 +747,18 @@ Requires: kamailio = %ver SIP routing based on JSON specifications. +%if %{with ruby} +%package ruby +Summary: Ruby extensions for Kamailio +Group: %{PKGGROUP} +Requires: kamailio = %ver +BuildRequires: ruby-devel + +%description ruby +Ruby extensions for Kamailio. +%endif + + %if %{with sctp} %package sctp Summary: SCTP transport for Kamailio @@ -1057,6 +1077,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with redis} kredis \ %endif +%if %{with ruby} + kruby \ +%endif %if %{with sctp} ksctp \ %endif @@ -1131,6 +1154,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with redis} kredis \ %endif +%if %{with ruby} + kruby \ +%endif %if %{with sctp} ksctp \ %endif @@ -1913,6 +1939,14 @@ fi %endif +%if %{with ruby} +%files ruby +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.app_ruby +%{_libdir}/kamailio/modules/app_ruby.so +%endif + + %if %{with sctp} %files sctp %defattr(-,root,root) @@ -2035,6 +2069,8 @@ fi %changelog +* Tue Dec 11 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-1 + - Added Ruby package * Sun Nov 04 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-0 - removed packaging for Fedora 25, 26 as End Of Life * Sat Sep 02 2017 Sergey Safarov <s.safarov(a)gmail.com>

1 0

[kamailio/kamailio] pkg/kamailio/obs: Added ruby package #1761 (#1762)
by sergey-safarov 17 Dec '18

17 Dec '18

#### Pre-Submission Checklist - [x] 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) - [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 - [ ] 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1761 #### Description Ruby module is disabled on CentOS6 and RHEL6 dist You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1762 -- Commit Summary -- * pkg/kamailio/obs: Added ruby package #1761 -- File Changes -- M pkg/kamailio/obs/kamailio.spec (38) M src/modules/app_ruby/Makefile (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1762.patch https://github.com/kamailio/kamailio/pull/1762.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1762

3 25

git:master:c249cfdf: pkg/kamailio/obs: Added ruby package #1761 [skip ci]
by sergey-safarov 17 Dec '18

17 Dec '18

Module: kamailio Branch: master Commit: c249cfdf38ba98f4494557cf2b25b87ba6f63e21 URL: https://github.com/kamailio/kamailio/commit/c249cfdf38ba98f4494557cf2b25b87… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: sergey-safarov <s.safarov(a)gmail.com> Date: 2018-12-17T14:24:19+03:00 pkg/kamailio/obs: Added ruby package #1761 [skip ci] --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/c249cfdf38ba98f4494557cf2b25b87… Patch: https://github.com/kamailio/kamailio/commit/c249cfdf38ba98f4494557cf2b25b87… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 83877d3fec..bd174fa0c6 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -19,6 +19,7 @@ %bcond_without perl %bcond_without rabbitmq %bcond_without redis +%bcond_without ruby %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc @@ -41,6 +42,7 @@ %bcond_without perl %bcond_without rabbitmq %bcond_without redis +%bcond_without ruby %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc @@ -63,6 +65,7 @@ %bcond_without perl %bcond_without rabbitmq %bcond_without redis +%bcond_without ruby %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc @@ -85,6 +88,7 @@ %bcond_without perl %bcond_with rabbitmq %bcond_with redis +%bcond_with ruby %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc @@ -108,6 +112,7 @@ %bcond_without perl %bcond_without rabbitmq %bcond_without redis +%bcond_without ruby %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc @@ -130,6 +135,7 @@ %bcond_without perl %bcond_with rabbitmq %bcond_without redis +%bcond_without ruby %bcond_without sctp %bcond_without websocket %bcond_without xmlrpc @@ -152,6 +158,7 @@ %bcond_with perl %bcond_with rabbitmq %bcond_with redis +%bcond_with ruby %bcond_with sctp %bcond_with websocket %bcond_without xmlrpc @@ -174,6 +181,7 @@ %bcond_without perl %bcond_with rabbitmq %bcond_without redis +%bcond_with ruby %bcond_with sctp %bcond_with websocket %bcond_without xmlrpc @@ -225,7 +233,7 @@ Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver Conflicts: kamailio-python < %ver Conflicts: kamailio-radius < %ver, kamailio-redis < %ver -Conflicts: kamailio-regex < %ver, kamailio-sctp < %ver +Conflicts: kamailio-regex < %ver, kamailio-ruby < %ver, kamailio-sctp < %ver Conflicts: kamailio-sipdump < %ver Conflicts: kamailio-snmpstats < %ver, kamailio-sqlang < %ver, kamailio-sqlite < %ver Conflicts: kamailio-tls < %ver, kamailio-unixodbc < %ver @@ -739,6 +747,18 @@ Requires: kamailio = %ver SIP routing based on JSON specifications. +%if %{with ruby} +%package ruby +Summary: Ruby extensions for Kamailio +Group: %{PKGGROUP} +Requires: kamailio = %ver +BuildRequires: ruby-devel + +%description ruby +Ruby extensions for Kamailio. +%endif + + %if %{with sctp} %package sctp Summary: SCTP transport for Kamailio @@ -1057,6 +1077,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with redis} kredis \ %endif +%if %{with ruby} + kruby \ +%endif %if %{with sctp} ksctp \ %endif @@ -1131,6 +1154,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with redis} kredis \ %endif +%if %{with ruby} + kruby \ +%endif %if %{with sctp} ksctp \ %endif @@ -1913,6 +1939,14 @@ fi %endif +%if %{with ruby} +%files ruby +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.app_ruby +%{_libdir}/kamailio/modules/app_ruby.so +%endif + + %if %{with sctp} %files sctp %defattr(-,root,root) @@ -2035,6 +2069,8 @@ fi %changelog +* Tue Dec 11 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-1 + - Added Ruby package * Sun Nov 04 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-0 - removed packaging for Fedora 25, 26 as End Of Life * Sat Sep 02 2017 Sergey Safarov <s.safarov(a)gmail.com>

1 0

git:master:975cd058: Merge pull request #1767 from amessina/master
by GitHub 17 Dec '18

17 Dec '18

Module: kamailio Branch: master Commit: 975cd058bb116becbfa5e42ebd5e7e3ce73a9222 URL: https://github.com/kamailio/kamailio/commit/975cd058bb116becbfa5e42ebd5e7e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-12-17T10:28:53+01:00 Merge pull request #1767 from amessina/master app_python3: fix Python 3.7 deprecation warnings --- Modified: src/modules/app_python3/app_python3_mod.c Modified: src/modules/app_python3/python_support.c Modified: src/modules/app_python3/python_support.h --- Diff: https://github.com/kamailio/kamailio/commit/975cd058bb116becbfa5e42ebd5e7e3… Patch: https://github.com/kamailio/kamailio/commit/975cd058bb116becbfa5e42ebd5e7e3… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index fcc42fa899..464caadb35 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -177,7 +177,11 @@ static int child_init(int rank) return 0; } _apy_process_rank = rank; +#if PY_VERSION_HEX >= 0x03070000 + PyOS_AfterFork_Child(); +#else PyOS_AfterFork(); +#endif if (cfg_child_init()) { return -1; } @@ -431,7 +435,11 @@ int apy_init_script(int rank) { PyObject *pFunc, *pArgs, *pValue, *pResult; int rval = -1; +#if PY_VERSION_HEX >= 0x03070000 + const char *classname; +#else char *classname; +#endif PyGILState_STATE gstate; diff --git a/src/modules/app_python3/python_support.c b/src/modules/app_python3/python_support.c index e7dc47d526..0a8216f133 100644 --- a/src/modules/app_python3/python_support.c +++ b/src/modules/app_python3/python_support.c @@ -234,10 +234,18 @@ static char *make_message(const char *fmt, va_list ap) return NULL; // shall not happened, but who knows ;) } +#if PY_VERSION_HEX >= 0x03070000 +const char *get_class_name(PyObject *y) +#else char *get_class_name(PyObject *y) +#endif { PyObject *p; +#if PY_VERSION_HEX >= 0x03070000 + const char *name; +#else char *name; +#endif p = PyObject_GetAttrString(y, "__name__"); if (p == NULL || p == Py_None) @@ -253,10 +261,18 @@ char *get_class_name(PyObject *y) } +#if PY_VERSION_HEX >= 0x03070000 +const char *get_instance_class_name(PyObject *y) +#else char *get_instance_class_name(PyObject *y) +#endif { PyObject *p, *n; +#if PY_VERSION_HEX >= 0x03070000 + const char *name; +#else char *name; +#endif n = PyObject_GetAttrString(y, "__class__"); if (n == NULL || n == Py_None) diff --git a/src/modules/app_python3/python_support.h b/src/modules/app_python3/python_support.h index 4d25564119..97c4e72e3e 100644 --- a/src/modules/app_python3/python_support.h +++ b/src/modules/app_python3/python_support.h @@ -30,7 +30,12 @@ PyObject *format_exc_obj; void python_handle_exception(const char *, ...); PyObject *InitTracebackModule(void); +#if PY_VERSION_HEX >= 0x03070000 +const char *get_class_name(PyObject *); +const char *get_instance_class_name(PyObject *); +#else char *get_class_name(PyObject *); char *get_instance_class_name(PyObject *); +#endif #endif

1 0

git:master:8bb86689: app_python3: fix Python 3.7 deprecation warnings
by Anthony Messina 17 Dec '18

17 Dec '18

Module: kamailio Branch: master Commit: 8bb866895c9260fa91143e892a2a77bb1d3fff4b URL: https://github.com/kamailio/kamailio/commit/8bb866895c9260fa91143e892a2a77b… Author: Anthony Messina <amessina(a)messinet.com> Committer: Anthony Messina <amessina(a)messinet.com> Date: 2018-12-14T16:32:04-06:00 app_python3: fix Python 3.7 deprecation warnings - check for PY_VERSION_HEX >= 0x03070000 --- Modified: src/modules/app_python3/app_python3_mod.c Modified: src/modules/app_python3/python_support.c Modified: src/modules/app_python3/python_support.h --- Diff: https://github.com/kamailio/kamailio/commit/8bb866895c9260fa91143e892a2a77b… Patch: https://github.com/kamailio/kamailio/commit/8bb866895c9260fa91143e892a2a77b… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index fcc42fa899..464caadb35 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -177,7 +177,11 @@ static int child_init(int rank) return 0; } _apy_process_rank = rank; +#if PY_VERSION_HEX >= 0x03070000 + PyOS_AfterFork_Child(); +#else PyOS_AfterFork(); +#endif if (cfg_child_init()) { return -1; } @@ -431,7 +435,11 @@ int apy_init_script(int rank) { PyObject *pFunc, *pArgs, *pValue, *pResult; int rval = -1; +#if PY_VERSION_HEX >= 0x03070000 + const char *classname; +#else char *classname; +#endif PyGILState_STATE gstate; diff --git a/src/modules/app_python3/python_support.c b/src/modules/app_python3/python_support.c index e7dc47d526..0a8216f133 100644 --- a/src/modules/app_python3/python_support.c +++ b/src/modules/app_python3/python_support.c @@ -234,10 +234,18 @@ static char *make_message(const char *fmt, va_list ap) return NULL; // shall not happened, but who knows ;) } +#if PY_VERSION_HEX >= 0x03070000 +const char *get_class_name(PyObject *y) +#else char *get_class_name(PyObject *y) +#endif { PyObject *p; +#if PY_VERSION_HEX >= 0x03070000 + const char *name; +#else char *name; +#endif p = PyObject_GetAttrString(y, "__name__"); if (p == NULL || p == Py_None) @@ -253,10 +261,18 @@ char *get_class_name(PyObject *y) } +#if PY_VERSION_HEX >= 0x03070000 +const char *get_instance_class_name(PyObject *y) +#else char *get_instance_class_name(PyObject *y) +#endif { PyObject *p, *n; +#if PY_VERSION_HEX >= 0x03070000 + const char *name; +#else char *name; +#endif n = PyObject_GetAttrString(y, "__class__"); if (n == NULL || n == Py_None) diff --git a/src/modules/app_python3/python_support.h b/src/modules/app_python3/python_support.h index 4d25564119..97c4e72e3e 100644 --- a/src/modules/app_python3/python_support.h +++ b/src/modules/app_python3/python_support.h @@ -30,7 +30,12 @@ PyObject *format_exc_obj; void python_handle_exception(const char *, ...); PyObject *InitTracebackModule(void); +#if PY_VERSION_HEX >= 0x03070000 +const char *get_class_name(PyObject *); +const char *get_instance_class_name(PyObject *); +#else char *get_class_name(PyObject *); char *get_instance_class_name(PyObject *); +#endif #endif

1 0

git:master:fb79f4cb: modules: readme files regenerated - uac_redirect ... [skip ci]
by Kamailio Dev 17 Dec '18

17 Dec '18

Module: kamailio Branch: master Commit: fb79f4cb136acc8ab3ec9b4af5c97d925d767a2e URL: https://github.com/kamailio/kamailio/commit/fb79f4cb136acc8ab3ec9b4af5c97d9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-12-17T10:01:38+01:00 modules: readme files regenerated - uac_redirect ... [skip ci] --- Modified: src/modules/uac_redirect/README --- Diff: https://github.com/kamailio/kamailio/commit/fb79f4cb136acc8ab3ec9b4af5c97d9… Patch: https://github.com/kamailio/kamailio/commit/fb79f4cb136acc8ab3ec9b4af5c97d9…

1 0

git:master:4c44b1e5: uac_redirect: docs - fixed missing space in sectionid
by Daniel-Constantin Mierla 17 Dec '18

17 Dec '18

Module: kamailio Branch: master Commit: 4c44b1e53a135dc234d6c9cdfbddaefbd938f399 URL: https://github.com/kamailio/kamailio/commit/4c44b1e53a135dc234d6c9cdfbddaef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-17T09:51:33+01:00 uac_redirect: docs - fixed missing space in sectionid --- Modified: src/modules/uac_redirect/doc/uac_redirect_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4c44b1e53a135dc234d6c9cdfbddaef… Patch: https://github.com/kamailio/kamailio/commit/4c44b1e53a135dc234d6c9cdfbddaef… --- diff --git a/src/modules/uac_redirect/doc/uac_redirect_admin.xml b/src/modules/uac_redirect/doc/uac_redirect_admin.xml index 68eebccfe2..2c7fc0e883 100644 --- a/src/modules/uac_redirect/doc/uac_redirect_admin.xml +++ b/src/modules/uac_redirect/doc/uac_redirect_admin.xml @@ -144,7 +144,7 @@ modparam("uac_redirect","default_filter","deny") </programlisting> </example> </section> - <sectionid="uac_redirect.p.deny_filter"> + <section id="uac_redirect.p.deny_filter"> <title><varname>deny_filter</varname> (string)</title> <para> The regular expression for default deny filtering. It makes sense @@ -176,7 +176,7 @@ modparam("uac_redirect","deny_filter",".*(a)siphub\.net") </programlisting> </example> </section> - <sectionid="uac_redirect.p.accept_filter"> + <section id="uac_redirect.p.accept_filter"> <title><varname>accept_filter</varname> (string)</title> <para> The regular expression for default accept filtering. It makes sense

1 0

git:master:9de5c4af: modules: readme files regenerated - uac_redirect ... [skip ci]
by Kamailio Dev 17 Dec '18

17 Dec '18

Module: kamailio Branch: master Commit: 9de5c4af712434255ecf88d60f1cf5cefed8ad22 URL: https://github.com/kamailio/kamailio/commit/9de5c4af712434255ecf88d60f1cf5c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-12-17T09:16:57+01:00 modules: readme files regenerated - uac_redirect ... [skip ci] --- Modified: src/modules/uac_redirect/README --- Diff: https://github.com/kamailio/kamailio/commit/9de5c4af712434255ecf88d60f1cf5c… Patch: https://github.com/kamailio/kamailio/commit/9de5c4af712434255ecf88d60f1cf5c…

1 0

git:master:b6e4ebc6: uac_redirect: docs - added section ids
by Daniel-Constantin Mierla 17 Dec '18

17 Dec '18

Module: kamailio Branch: master Commit: b6e4ebc666877549796e09b721e1234e011b325e URL: https://github.com/kamailio/kamailio/commit/b6e4ebc666877549796e09b721e1234… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-17T08:57:35+01:00 uac_redirect: docs - added section ids --- Modified: src/modules/uac_redirect/doc/uac_redirect_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b6e4ebc666877549796e09b721e1234… Patch: https://github.com/kamailio/kamailio/commit/b6e4ebc666877549796e09b721e1234… --- diff --git a/src/modules/uac_redirect/doc/uac_redirect_admin.xml b/src/modules/uac_redirect/doc/uac_redirect_admin.xml index 7e80126482..68eebccfe2 100644 --- a/src/modules/uac_redirect/doc/uac_redirect_admin.xml +++ b/src/modules/uac_redirect/doc/uac_redirect_admin.xml @@ -123,7 +123,7 @@ <section> <title>Parameters</title> - <section> + <section id="uac_redirect.p.default_filter"> <title><varname>default_filter</varname> (string)</title> <para> The default behavior in filtering contacts. It may be @@ -144,7 +144,7 @@ modparam("uac_redirect","default_filter","deny") </programlisting> </example> </section> - <section> + <sectionid="uac_redirect.p.deny_filter"> <title><varname>deny_filter</varname> (string)</title> <para> The regular expression for default deny filtering. It makes sense @@ -176,7 +176,7 @@ modparam("uac_redirect","deny_filter",".*(a)siphub\.net") </programlisting> </example> </section> - <section> + <sectionid="uac_redirect.p.accept_filter"> <title><varname>accept_filter</varname> (string)</title> <para> The regular expression for default accept filtering. It makes sense @@ -208,7 +208,7 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") </programlisting> </example> </section> - <section> + <section id="uac_redirect.p.acc_function"> <title><varname>acc_function</varname> (string)</title> <para> Specifies the accounting function to be used. Just by defining @@ -248,7 +248,7 @@ modparam("uac_redirect","acc_function","acc_db_request") </programlisting> </example> </section> - <section> + <section id="uac_redirect.p.acc_db_table"> <title><varname>acc_db_table</varname> (string)</title> <para> Specifies the accounting table to be used if DB accounting was @@ -273,7 +273,7 @@ modparam("uac_redirect","acc_db_table","acc_redirect") </programlisting> </example> </section> - <section> + <section id="uac_redirect.p.bflags"> <title><varname>bflags</varname> (int)</title> <para> This parameter defines the branch-flags to be set for new, added branch. @@ -306,7 +306,7 @@ branch_route[1] { <section> <title>Functions</title> - <section> + <section id="uac_redirect.f.set_deny_filter"> <title> <function moreinfo="none">set_deny_filter(filter,flags) </function> @@ -356,7 +356,7 @@ set_deny_filter(".*(a)domain1.net",""); </example> </section> - <section> + <section id="uac_redirect.f.set_accept_filter"> <title> <function moreinfo="none">set_accept_filter(filter,flags) </function> @@ -406,7 +406,7 @@ set_accept_filter(".*(a)domain1.net",""); </example> </section> - <section> + <section id="uac_redirect.f.get_redirects1"> <title> <function moreinfo="none">get_redirects(max)</function> </title> @@ -465,7 +465,7 @@ get_redirects("*"); </example> </section> - <section> + <section id="uac_redirect.f.get_redirects2"> <title> <function moreinfo="none">get_redirects(max,reason)</function> </title> @@ -556,7 +556,5 @@ failure_route[REDIRECT_ACC] { </section> - - </chapter>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev