- sr-dev - kamailio.org

git:5.2:23a5c07e: tsilo: add check for empty aor
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 23a5c07e924a2feb5f09b727f4ad0faf6c5af349 URL: https://github.com/kamailio/kamailio/commit/23a5c07e924a2feb5f09b727f4ad0fa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:28:25+01:00 tsilo: add check for empty aor Fix: #1775 (cherry picked from commit 5a5d742eb459249995114eb6a3642f99c6770496) --- Modified: src/modules/tsilo/ts_store.c --- Diff: https:/… [View More]

1 0

git:5.2:3dd154fa: dialog: docs - more info about using the flag and dlg_manage()
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 3dd154faeead29f54145843d14367c5b28a4fb7b URL: https://github.com/kamailio/kamailio/commit/3dd154faeead29f54145843d14367c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:27:35+01:00 dialog: docs - more info about using the flag and dlg_manage() (cherry picked from commit e4dfe3587943d69d556b15df3492cf38c3b21a5f) --- Modified: src/modules/dialog/doc/… [View More]

1 0

git:master:0a5cba42: kamctl: added 'psa' command
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: master Commit: 0a5cba422967f2e861ce209942a42e09719f4fcb URL: https://github.com/kamailio/kamailio/commit/0a5cba422967f2e861ce209942a42e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T08:47:41+01:00 kamctl: added 'psa' command - print more attributes for running processes (extended 'ps') --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.ctlbase --- Diff: … [View More]

1 0

Regenerate module docs on github
by Julien Chavanton 13 Jan '19

13 Jan '19

Hi, not sure how to regenerate modules doc on the repo. Localy I can use make but it seems people are using a more standard procedure ? Acc_json is not updated with some improvement in the examples.

2 1

git:master:ee799504: modules: readme files regenerated - acc_json ... [skip ci]
by Kamailio Dev 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: ee799504ad5f7e272a9e61f1952099ca1183d461 URL: https://github.com/kamailio/kamailio/commit/ee799504ad5f7e272a9e61f1952099c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-13T16:46:28+01:00 modules: readme files regenerated - acc_json ... [skip ci] --- Modified: src/modules/acc_json/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:fb23d67b: acc_json: replaced angle brackets with xml tokens
by Daniel-Constantin Mierla 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: fb23d67b396bafb51f9c971e2546df0faff54262 URL: https://github.com/kamailio/kamailio/commit/fb23d67b396bafb51f9c971e2546df0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-13T16:45:23+01:00 acc_json: replaced angle brackets with xml tokens --- Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

Re: [sr-dev] [kamailio/kamailio] presence: do not include presence.h in other header files (eb1bf9a)
by Cui Gang 13 Jan '19

13 Jan '19

There is a compile ERROR: ``` presence_dmq.c:97:5: error: use of undeclared identifier 'pres_sruid' if(pres_sruid.pid == 0) { ^ ``` -- 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/eb1bf9a69abad3d237c136750fe8cac…

1 0

git:master:7412f771: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: 7412f7714f5a6b021c14d0eff4f5ed5ed890b8b6 URL: https://github.com/kamailio/kamailio/commit/7412f7714f5a6b021c14d0eff4f5ed5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-13T13:16:38+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/janssonrpcc/README --- Diff: https://github.com/… [View More]

1 0

[kamailio/kamailio] janssonrpcc: add new parameter "keep_alive" (#1808)
by Emmanuel Schmidbauer 13 Jan '19

13 Jan '19

- send periodic tcp keepalive packets to server in order to prevent connection from closing You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1808 -- Commit Summary -- * janssonrpcc: add new parameter "keep_alive" -- File Changes -- M src/modules/janssonrpcc/doc/janssonrpcc_admin.xml (19) M src/modules/janssonrpcc/janssonrpc_connect.c (56) M src/modules/janssonrpcc/janssonrpc_server.h (1) M src/modules/janssonrpcc/… [View More]

2 4

git:master:786b2645: janssonrpcc: add new parameter "keep_alive"
by Emmanuel Schmidbauer 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: 786b2645d38386a9a1771f7fbd6a151af22b5c64 URL: https://github.com/kamailio/kamailio/commit/786b2645d38386a9a1771f7fbd6a151… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2019-01-11T12:47:07-05:00 janssonrpcc: add new parameter "keep_alive" - send periodic tcp keepalive packets to server in order to prevent connection from closing --- Modified: src/modules/janssonrpcc/… [View More]

1 0

git:master:d6628516: Merge pull request #1808 from kamailio/janssonrpcc-keepalive
by GitHub 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: d66285162af2baa2335e6b2ff811b64cf9c84891 URL: https://github.com/kamailio/kamailio/commit/d66285162af2baa2335e6b2ff811b64… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-13T07:08:04-05:00 Merge pull request #1808 from kamailio/janssonrpcc-keepalive janssonrpcc: add new parameter "keep_alive" --- Modified: src/modules/janssonrpcc/doc/janssonrpcc_admin.xml Modified: src/modules/… [View More]

1 0

git:master:4269fc7c: Merge pull request #1782 from tverlaan/dispatcher_rpc_add_inmemory
by GitHub 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: 4269fc7cb134387e4d0c6bf4ad8d96988f7987fc URL: https://github.com/kamailio/kamailio/commit/4269fc7cb134387e4d0c6bf4ad8d969… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-13T13:07:41+01:00 Merge pull request #1782 from tverlaan/dispatcher_rpc_add_inmemory dispatcher: add destination to in-memory dispatcher list --- Modified: src/modules/dispatcher/dispatch.c Modified: src/… [View More]

1 0

git:master:97a198b4: dispatcher: add destination to in-memory dispatcher list
by Timmo Verlaan 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: 97a198b4569d7237798c9e507c60ecfebb728ab3 URL: https://github.com/kamailio/kamailio/commit/97a198b4569d7237798c9e507c60ecf… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2019-01-02T22:46:45+01:00 dispatcher: add destination to in-memory dispatcher list - add dispatcher.add rpc call to add destinations to in-memory dispatcher list - refactored ds_log_set to allow for re-use of loop over … [View More]

1 0

[kamailio/kamailio] dispatcher: add destination to in-memory dispatcher list (#1782)
by Timmo Verlaan 13 Jan '19

13 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 To prevent code duplication I refactored ds_log_set a bit to allow for re-use of loop over all destinations and execute a callback. Perhaps there are more places this could be useful. Add dispatcher.add rpc call to add destinations to in-memory dispatcher list. This allows for more quick and flexible updates to dispatcher list in kamailio. _A few ideas that build on top of this change are:_ 1. modparam for reload to keep in-memory entries or not 2. modparam to not read list or db 3. `dispatcher.remove _group_ _destination_` 4. modifying in routing script with `ds_add_dst`/`ds_remove_dst` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1782 -- Commit Summary -- * dispatcher: add destination to in-memory dispatcher list -- File Changes -- M src/modules/dispatcher/dispatch.c (81) M src/modules/dispatcher/dispatch.h (1) M src/modules/dispatcher/dispatcher.c (29) M src/modules/dispatcher/doc/dispatcher_admin.xml (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1782.patch https://github.com/kamailio/kamailio/pull/1782.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/1782 [View Less]

2 3

git:master:eb1bf9a6: presence: do not include presence.h in other header files
by Daniel-Constantin Mierla 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: eb1bf9a69abad3d237c136750fe8cacea4cd0a31 URL: https://github.com/kamailio/kamailio/commit/eb1bf9a69abad3d237c136750fe8cac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-13T11:31:22+01:00 presence: do not include presence.h in other header files - it exports as extern the module parameter variables and other modules built on top of presence can end up including … [View More]

1 0

git:master:f0e0a849: presence_xml: do not include ../presence/presence.h
by Daniel-Constantin Mierla 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: f0e0a849f5dfe5dae0cd0e755b9739cbc7fa8200 URL: https://github.com/kamailio/kamailio/commit/f0e0a849f5dfe5dae0cd0e755b9739c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-13T11:34:25+01:00 presence_xml: do not include ../presence/presence.h - it is not needed, that header file is related to modparams of presence module - renamed db_url to presxml_db_url just to … [View More]avoid possible conflict in the future like for GH #1809 --- Modified: src/modules/presence_xml/presence_xml.c Modified: src/modules/presence_xml/presence_xml.h --- Diff: https://github.com/kamailio/kamailio/commit/f0e0a849f5dfe5dae0cd0e755b9739c… Patch: https://github.com/kamailio/kamailio/commit/f0e0a849f5dfe5dae0cd0e755b9739c… --- diff --git a/src/modules/presence_xml/presence_xml.c b/src/modules/presence_xml/presence_xml.c index 36995c8b3c..228896c18a 100644 --- a/src/modules/presence_xml/presence_xml.c +++ b/src/modules/presence_xml/presence_xml.c @@ -81,7 +81,7 @@ pres_get_sphere_t pres_get_sphere; /* Module parameter variables */ str xcap_table= str_init("xcap"); -str db_url = str_init(DEFAULT_DB_URL); +static str presxml_db_url = str_init(DEFAULT_DB_URL); int force_active= 0; int force_dummy_presence = 0; int integrated_xcap_server= 0; @@ -115,7 +115,7 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ - { "db_url", PARAM_STR, &db_url}, + { "db_url", PARAM_STR, &presxml_db_url}, { "xcap_table", PARAM_STR, &xcap_table}, { "force_active", INT_PARAM, &force_active }, { "integrated_xcap_server", INT_PARAM, &integrated_xcap_server}, @@ -156,7 +156,8 @@ static int mod_init(void) if(passive_mode==1) return 0; - LM_DBG("db_url=%s/%d/%p\n",ZSW(db_url.s),db_url.len, db_url.s); + LM_DBG("db_url=%s (len=%d addr=%p)\n", ZSW(presxml_db_url.s), + presxml_db_url.len, presxml_db_url.s); /* bind the SL API */ if (sl_load_api(&slb)!=0) { @@ -196,7 +197,7 @@ static int mod_init(void) if(force_active== 0) { /* binding to mysql module */ - if (db_bind_mod(&db_url, &pxml_dbf)) + if (db_bind_mod(&presxml_db_url, &pxml_dbf)) { LM_ERR("Database module not found\n"); return -1; @@ -208,7 +209,7 @@ static int mod_init(void) return -1; } - pxml_db = pxml_dbf.init(&db_url); + pxml_db = pxml_dbf.init(&presxml_db_url); if (!pxml_db) { LM_ERR("while connecting to database\n"); @@ -284,7 +285,7 @@ static int child_init(int rank) { if(pxml_db) return 0; - pxml_db = pxml_dbf.init(&db_url); + pxml_db = pxml_dbf.init(&presxml_db_url); if (pxml_db== NULL) { LM_ERR("while connecting database\n"); diff --git a/src/modules/presence_xml/presence_xml.h b/src/modules/presence_xml/presence_xml.h index 7b523ef028..e165852684 100644 --- a/src/modules/presence_xml/presence_xml.h +++ b/src/modules/presence_xml/presence_xml.h @@ -35,7 +35,6 @@ #include "../../lib/srdb1/db.h" #include "../../modules/sl/sl.h" #include "../presence/event_list.h" -#include "../presence/presence.h" #include "../presence/presentity.h" #include "../xcap_client/xcap_functions.h" [View Less]

1 0

git:master:d3208e18: presence: Makefile - link agaist libicu on macos/darwin
by Daniel-Constantin Mierla 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: d3208e1859051eb09013f855126f7f5f5ec47ab8 URL: https://github.com/kamailio/kamailio/commit/d3208e1859051eb09013f855126f7f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-13T11:03:28+01:00 presence: Makefile - link agaist libicu on macos/darwin - libxml2 needs it but its pkg-config doesn't list it --- Modified: src/modules/presence/Makefile --- Diff: https://… [View More]

1 0

git:master:869f57aa: presence_xml: Makefile - link agaist libicu on macos/darwin
by Daniel-Constantin Mierla 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: 869f57aac4496e10480094c36373f485aef11a80 URL: https://github.com/kamailio/kamailio/commit/869f57aac4496e10480094c36373f48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-13T11:04:16+01:00 presence_xml: Makefile - link agaist libicu on macos/darwin - libxml2 needs it but its pkg-config doesn't list it --- Modified: src/modules/presence_xml/Makefile --- Diff: … [View More]

1 0

git:master:c47c759e: cnxcc: updated the export signature of set_max_credit() to kemi
by Daniel-Constantin Mierla 12 Jan '19

12 Jan '19

Module: kamailio Branch: master Commit: c47c759e6f59ec674c9c83a9e38d2620c36323c8 URL: https://github.com/kamailio/kamailio/commit/c47c759e6f59ec674c9c83a9e38d262… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-12T18:15:28+01:00 cnxcc: updated the export signature of set_max_credit() to kemi - affected by last addition with connection cost --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: … [View More]

1 0

git:5.0:3dcde884: cdp: fix three coverity errors (ressource leaks and error checks)
by Henning Westerholt 11 Jan '19

11 Jan '19

Module: kamailio Branch: 5.0 Commit: 3dcde88477e243131acd6f06f945ec367e9d5f27 URL: https://github.com/kamailio/kamailio/commit/3dcde88477e243131acd6f06f945ec3… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-11T16:11: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 … [View More]

2 2

git:5.0:3f0d4174: core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com
by Henning Westerholt 11 Jan '19

11 Jan '19

Module: kamailio Branch: 5.0 Commit: 3f0d41742e41f117dc9426afd148cf906c271e46 URL: https://github.com/kamailio/kamailio/commit/3f0d41742e41f117dc9426afd148cf9… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-11T16:11:53+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 … [View More]

1 0

git:5.0:ccf6bfe1: core: check for optarg before passing it to external library (coverity report)
by Henning Westerholt 11 Jan '19

11 Jan '19

Module: kamailio Branch: 5.0 Commit: ccf6bfe19e9402e616633c9b18fef0a08c27d304 URL: https://github.com/kamailio/kamailio/commit/ccf6bfe19e9402e616633c9b18fef0a… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-11T16:11:43+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://… [View More]

1 0

git:5.0:85e45ced: cdp: fix two errors from coverty scan (missing check, var initialization)
by Henning Westerholt 11 Jan '19

11 Jan '19

Module: kamailio Branch: 5.0 Commit: 85e45cede3c463fbe8186d19a8d7d024dd42cb76 URL: https://github.com/kamailio/kamailio/commit/85e45cede3c463fbe8186d19a8d7d02… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-11T16:10:57+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 … [View More]

1 0

git:5.2:1e56e4df: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 11 Jan '19

11 Jan '19

Module: kamailio Branch: 5.2 Commit: 1e56e4df35865f7138565213e35da8fd32096332 URL: https://github.com/kamailio/kamailio/commit/1e56e4df35865f7138565213e35da8f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-11T16:16:32+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.2:0d25cb4e: phonenum: fixing documentation typo (#1807)
by Henning Westerholt 11 Jan '19

11 Jan '19

Module: kamailio Branch: 5.2 Commit: 0d25cb4e9d4f4cc6d3e4a864ef2fa3aaca746511 URL: https://github.com/kamailio/kamailio/commit/0d25cb4e9d4f4cc6d3e4a864ef2fa3a… Author: Rick <dunst0(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-11T16:03:59+01:00 phonenum: fixing documentation typo (#1807) (cherry picked from commit 77316f7567e0bbabcc7897969b68fdf64432d645) --- Modified: src/modules/phonenum/doc/phonenum_admin.xml --- Diff: https://… [View More]

1 0

git:master:b98e0558: modules: readme files regenerated - phonenum ... [skip ci]
by Kamailio Dev 11 Jan '19

11 Jan '19

Module: kamailio Branch: master Commit: b98e0558c9f94a314e802baa7b50345a3f0d1270 URL: https://github.com/kamailio/kamailio/commit/b98e0558c9f94a314e802baa7b50345… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-11T16:01:46+01:00 modules: readme files regenerated - phonenum ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] phonenum: fixing documentation typo (#1807)
by Rick 11 Jan '19

11 Jan '19

<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed … [View More]

2 2

git:master:77316f75: phonenum: fixing documentation typo (#1807)
by Henning Westerholt 11 Jan '19

11 Jan '19

Module: kamailio Branch: master Commit: 77316f7567e0bbabcc7897969b68fdf64432d645 URL: https://github.com/kamailio/kamailio/commit/77316f7567e0bbabcc7897969b68fdf… Author: Rick <dunst0(a)users.noreply.github.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-01-11T16:00:55+01:00 phonenum: fixing documentation typo (#1807) --- Modified: src/modules/phonenum/doc/phonenum_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:4ed69046: kamctl: version set to 5.3.0
by Daniel-Constantin Mierla 11 Jan '19

11 Jan '19

Module: kamailio Branch: master Commit: 4ed69046984eb9be58e858cc652f14e8dd714f87 URL: https://github.com/kamailio/kamailio/commit/4ed69046984eb9be58e858cc652f14e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-11T15:51:38+01:00 kamctl: version set to 5.3.0 --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/4ed69046984eb9be58e858cc652f14e… Patch: https://github.… [View More]

1 0

git:master:249e96f7: github: small syntax fix for contribution guide
by Henning Westerholt 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: 249e96f7409a8c954b9512c1b351eb67cb293ced URL: https://github.com/kamailio/kamailio/commit/249e96f7409a8c954b9512c1b351eb6… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-10T23:27:43+01:00 github: small syntax fix for contribution guide --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/249e96f7409a8c954b9512c1b351eb6… Patch: https://… [View More]

1 0

git:master:5bccf99b: sdpops: rename new function get_sdp_address_family to sdp_get_address_family()
by Henning Westerholt 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: 5bccf99bbcaec9fc6742a6e303623a0e790459b8 URL: https://github.com/kamailio/kamailio/commit/5bccf99bbcaec9fc6742a6e303623a0… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-10T23:24:29+01:00 sdpops: rename new function get_sdp_address_family to sdp_get_address_family() --- Modified: src/modules/sdpops/doc/sdpops_admin.xml Modified: src/modules/sdpops/sdpops_mod.c --- Diff: … [View More]https://github.com/kamailio/kamailio/commit/5bccf99bbcaec9fc6742a6e303623a0… Patch: https://github.com/kamailio/kamailio/commit/5bccf99bbcaec9fc6742a6e303623a0… --- diff --git a/src/modules/sdpops/doc/sdpops_admin.xml b/src/modules/sdpops/doc/sdpops_admin.xml index 91374eb489..6cd8a68f69 100644 --- a/src/modules/sdpops/doc/sdpops_admin.xml +++ b/src/modules/sdpops/doc/sdpops_admin.xml @@ -573,21 +573,21 @@ if(sdp_get_line_startswith("$avp(mline)", "m=")) { </programlisting> </example> </section> - <section id="sdpops.f.get_sdp_address_family"> + <section id="sdpops.f.sdp_get_address_family"> <title> - <function moreinfo="none">get_sdp_address_family()</function> + <function moreinfo="none">sdp_get_address_family()</function> </title> <para> it helps to get IP address family at c line from sdp body. it returns -1 on error , 4 for IP4 and 6 for IP6 </para> <example> - <title><function>get_sdp_address_family</function>usage</title> + <title><function>sdp_get_address_family</function>usage</title> <programlisting format="linespecific"> ... if(is_method("INVITE") && has_body("application/sdp")){ - $avp(af) = get_sdp_address_family(); + $avp(af) = sdp_get_address_family(); xlog("L_INFO","ADDRESS FAMILY OF SDP C line $avp(af) "); } ... diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 6c692c338c..11d8d69c2a 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -65,7 +65,7 @@ static int w_sdp_get_line_startswith(sip_msg_t* msg, char *foo, char *bar); static int sdp_get_sess_version(sip_msg_t* msg, str* sess_version, int* sess_version_num); static int sdp_set_sess_version(sip_msg_t* msg, str* sess_version, int* sess_version_num); -static int w_get_sdp_address_family(sip_msg_t* msg); +static int w_sdp_get_address_family(sip_msg_t* msg); static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); @@ -126,7 +126,7 @@ static cmd_export_t cmds[] = { 0, 0, 0, ANY_ROUTE}, {"sdp_get_line_startswith", (cmd_function)w_sdp_get_line_startswith, 2, fixup_none_spve, 0, ANY_ROUTE}, - {"get_sdp_address_family", (cmd_function)w_get_sdp_address_family, + {"sdp_get_address_family", (cmd_function)w_sdp_get_address_family, 0, 0, 0, ANY_ROUTE}, {"bind_sdpops", (cmd_function)bind_sdpops, 1, 0, 0, 0}, @@ -1004,7 +1004,7 @@ it helps to extract IP adress family at c line from sdp 6 for IP6 */ -static int w_get_sdp_address_family(sip_msg_t *msg){ +static int w_sdp_get_address_family(sip_msg_t *msg){ sdp_session_cell_t* session; int sdp_session_num; [View Less]

1 0

[kamailio/kamailio] sdpops : added new function named as get_sdp_address_family (#1801)
by Yasin CANER 10 Jan '19

10 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  added new function that helps to extract IP address family at c line from SDP body. it returns -1 on error , 4 for IP4 , 6 for IP6 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1801 -- Commit Summary -- * sdpops : removed commented function * sdpops : added new function as named get_sdp_address_family() * sdpops : added documentation about get_sdp_address_family -- File Changes -- M src/modules/sdpops/doc/sdpops_admin.xml (25) M src/modules/sdpops/sdpops_mod.c (66) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1801.patch https://github.com/kamailio/kamailio/pull/1801.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/1801 [View Less]

3 4

git:master:a142b781: github: update contribution guidelines about our README file change process
by Henning Westerholt 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: a142b781edf2c6c22128987c32cb38b029005fe4 URL: https://github.com/kamailio/kamailio/commit/a142b781edf2c6c22128987c32cb38b… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-10T23:18:55+01:00 github: update contribution guidelines about our README file change process --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:e2978071: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: e29780715a2021ddf4a4b74011817849fe11c30c URL: https://github.com/kamailio/kamailio/commit/e29780715a2021ddf4a4b7401181784… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-10T23:16:36+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/sdpops/README --- Diff: https://github.com/kamailio/… [View More]

1 0

git:master:14b4d23a: dispatcher: docs - typo and indentation for the rpc flags paragraph
by Daniel-Constantin Mierla 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: 14b4d23a06fdc9b9f6b17781c50902beaff0cd94 URL: https://github.com/kamailio/kamailio/commit/14b4d23a06fdc9b9f6b17781c50902b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-10T23:09:07+01:00 dispatcher: docs - typo and indentation for the rpc flags paragraph --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/… [View More]

1 0

git:master:547a40dc: sdpops : added new function named as get_sdp_address_family (#1801)
by Henning Westerholt 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: 547a40dca93cb30769d57d51e299f85dd0980416 URL: https://github.com/kamailio/kamailio/commit/547a40dca93cb30769d57d51e299f85… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-01-10T23:08:24+01:00 sdpops : added new function named as get_sdp_address_family (#1801) - added new function as named get_sdp_address_family() to extract the IP address family from the SDP … [View More]

1 0

git:master:d0831cf3: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: d0831cf336f6f4a2cad87698f60ecd151dcd28b9 URL: https://github.com/kamailio/kamailio/commit/d0831cf336f6f4a2cad87698f60ecd1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-10T22:01:38+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]d0831cf336f6f4a2cad87698f60ecd1… Patch: https://github.com/kamailio/kamailio/commit/d0831cf336f6f4a2cad87698f60ecd1… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 53a464d8ff..55cc631c1f 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -697,10 +697,15 @@ Note Controls what gateways are tested to see if they are reachable. * Value 0: If set to 0, only the gateways with state PROBING are tested. After a gateway is probed, the PROBING state is cleared in - this mode. + this mode. This means that no probing will be executed at all only + if flag in config file is set to 8/PROBING (please check + destination list file syntaxis for more details), it will probe + only one time at startup or after dispatcher reload. * Value 1: If set to 1, all gateways are tested. If set to 1 and there is a failure of keepalive to an active gateway, then it is - set to TRYING state. + set to TRYING state. This means that probing will be executed all + the time, but you can skip some servers with flag 4 in destination + list file, for example. * Value 2: if set to 2, only gateways in inactive state with probing mode set are tested. * Value 3: If set to 3, any gateway with state PROBING is continually @@ -1388,6 +1393,21 @@ kamcmd dispatcher.set_state ip 3 all Example: kamcmd dispatcher.list + ... +DEST: { + URI: sip:192.168.0.1:5060 + FLAGS: AP + PRIORITY: 12 +} + ... + + FLAGS consist out of 2 letters. First letter describe status of + destination: A-active, I â inactive, T â trying, D â disabled. + Second letter might be P or X. P is for probing, so AP means + destination is active and it is tested by SIP options continuously. X + means that there are no probing or sip pinging. So AX means that + destination is assumed as active and it is not tested by SIP options. + DX respectively is disabled destination what is not tested and etc. 5.3. dispatcher.reload [View Less]

1 0

[kamailio/kamailio] Update for Readme Dispatcher module (#1804)
by Jurijs I 10 Jan '19

10 Jan '19

Update for Readme Dispatcher module. I added some minor comments for dispatcher module, what I think might be useful for somebody. Additionally I added description, what several states means when dispatcher list are executed, as discussed.   #### 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/1804 -- Commit Summary -- * Update for Readme Dispatcher module -- File Changes -- M src/modules/dispatcher/doc/dispatcher_admin.xml (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1804.patch https://github.com/kamailio/kamailio/pull/1804.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/1804 [View Less]

2 2

git:master:14a87383: dispatcher: update for module docs (#1804)
by Henning Westerholt 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: 14a87383fbae102b430ed6cfdba2559f1768cdd0 URL: https://github.com/kamailio/kamailio/commit/14a87383fbae102b430ed6cfdba2559… Author: Jurijs I <jurijs.ivolga(a)gmail.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-01-10T21:49:58+01:00 dispatcher: update for module docs (#1804) - update for module docs (#1804) - Some minor comments for dispatcher module were added - Additionally a description were added, what … [View More]the several states means when dispatcher list are executed --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/14a87383fbae102b430ed6cfdba2559… Patch: https://github.com/kamailio/kamailio/commit/14a87383fbae102b430ed6cfdba2559… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 3b40c04622..c0a55b27ad 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -631,12 +631,16 @@ modparam("dispatcher", "force_dst", 1) <itemizedlist> <listitem> <para>Value 0: If set to 0, only the gateways with state PROBING are tested. - After a gateway is probed, the PROBING state is cleared in this mode.</para> + After a gateway is probed, the PROBING state is cleared in this mode. + This means that no probing will be executed at all only if flag in config file is set to 8/PROBING + (please check destination list file syntaxis for more details), it will probe only one time at startup or + after dispatcher reload.</para> </listitem> <listitem> <para>Value 1: If set to 1, all gateways are tested. If set to 1 and there is a failure of keepalive to an active gateway, then it is - set to TRYING state.</para> + set to TRYING state. This means that probing will be executed all the time, + but you can skip some servers with flag 4 in destination list file, for example.</para> </listitem> <listitem> <para>Value 2: if set to 2, only gateways in inactive state with @@ -1701,8 +1705,21 @@ onreply_route { </para> <programlisting format="linespecific"> &sercmd; dispatcher.list - </programlisting> - </section> + ... +DEST: { + URI: sip:192.168.0.1:5060 + FLAGS: AP + PRIORITY: 12 +} + ... +</programlisting> +<para>FLAGS consist out of 2 letters. First letter describe status of destination: A-active, + I – inactive, T – trying, D – disabled. Second letter might be P or X. P is for probing, + so AP means destination is active and it is tested by SIP options continuously. + X means that there are no probing or sip pinging. So AX means that destination is assumed as active + and it is not tested by SIP options. DX respectively is disabled destination what is not tested and etc. +</para> + </section> <section id="dispatcher.r.reload"> <title> <function moreinfo="none">dispatcher.reload</function> [View Less]

1 0

Re: [sr-dev] [kamailio/kamailio] auth_db: database table version updated to 7 (673f4af)
by Victor Seva 10 Jan '19

10 Jan '19

If you want to document the changes needed to upgrade the config defined in the howto, please, be my guest and write a post in your blog, or a whole howto, if you prefer, so other people can benefit of those hours you spent searching for the solution of your problem. Sorry, but, I still don't see how this is related to kamailio default config or the lack of upgrade documentation. Again, there's a mailing list sr-users(a)lists.kamailio.org where you can ask for help. This is for actual bugs in … [View More]

1 0

Re: [sr-dev] [kamailio/kamailio] auth_db: database table version updated to 7 (673f4af)
by PICCORO Lenz McKAY 10 Jan '19

10 Jan '19

hi @linuxmaniac due either kamailo or asterisk talk about that problem i spend many days in setup the migration from 4 to 5.. due kamailio does not property redirect to asterisk due that changes in the related commit.. that change are in nowhere place in the network.. neither in the documentation that you pointed.. due the table sopected "sipusers" are related to asterisk.. that seems not changed between vesions of asterisk.. but has a change in kamailio! due the cited " asipto howto, " are … [View More]

1 0

Re: [sr-dev] [kamailio/kamailio] auth_db: database table version updated to 7 (673f4af)
by bryanbencomo4 10 Jan '19

10 Jan '19

seems there's a spected table version 7 in asterisk that are not documented a change in nowhere -- 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/673f4af214fcb613ce227b5c9b1b805…

1 0

Re: [sr-dev] [kamailio/kamailio] auth_db: database table version updated to 7 (673f4af)
by Victor Seva 10 Jan '19

10 Jan '19

Again, the change in auth_db was documented at the [wiki](https://www.kamailio.org/wiki/install/upgrade/4.4.x-to-5.0.0) There's no kamailio and asterisk integration per se. It seems that You followed the [asipto howto](https://kb.asipto.com/asterisk:realtime:kamailio-4.0.x-asterisk-11.3…, and that's fine but please don't complain about lack of documentation for upgrades between kamailio versions. -- You are receiving this because you are subscribed to this thread. Reply to this email … [View More]

1 0

Re: [sr-dev] [kamailio/kamailio] auth_db: database table version updated to 7 (673f4af)
by PICCORO Lenz McKAY 10 Jan '19

10 Jan '19

related to https://github.com/kamailio/kamailio/issues/1780 that was silenced due a really true! was update a force upgrade without documented! now kamalio and asterisk integration has a version check incompatibility that can be workaround with ... `modparam("auth_db", "version_table", 0)` that by default are "1" -- 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/673f4af214fcb613ce227b5c9b1b805…

1 0

[kamailio/kamailio] Update for Readme Dispatcher module (#1803)
by Jurijs I 10 Jan '19

10 Jan '19

Update for Readme Dispatcher module. I added some minor comments for dispatcher module, what I think might be useful for somebody.   #### 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/1803 -- Commit Summary -- * Update for Readme Dispatcher module -- File Changes -- M src/modules/dispatcher/doc/dispatcher_admin.xml (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1803.patch https://github.com/kamailio/kamailio/pull/1803.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/1803 [View Less]

2 4

git:master:5a5d742e: tsilo: add check for empty aor
by Victor Seva 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: 5a5d742eb459249995114eb6a3642f99c6770496 URL: https://github.com/kamailio/kamailio/commit/5a5d742eb459249995114eb6a3642f9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-01-09T17:44:09+01:00 tsilo: add check for empty aor Fix: #1775 --- Modified: src/modules/tsilo/ts_store.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:fe0a2b2f: Merge pull request #1802 from kamailio/vseva_1775
by GitHub 10 Jan '19

10 Jan '19

Module: kamailio Branch: master Commit: fe0a2b2fafcaa28a1f5f964ade8d26686e8f660d URL: https://github.com/kamailio/kamailio/commit/fe0a2b2fafcaa28a1f5f964ade8d266… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-01-10T09:46:25+01:00 Merge pull request #1802 from kamailio/vseva_1775 tsilo: add check for empty aor --- Modified: src/modules/tsilo/ts_store.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] tsilo: add check for empty aor (#1802)
by Victor Seva 10 Jan '19

10 Jan '19

Fix: #1775 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1802 -- Commit Summary -- * tsilo: add check for empty aor -- File Changes -- M src/modules/tsilo/ts_store.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1802.patch https://github.com/kamailio/kamailio/pull/1802.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/1802

2 2

[kamailio/kamailio] dialog: The result of this check is always false (#1791)
by Jose Luis Verdeguer 09 Jan '19

09 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) - [ ] New feature (non-breaking change which adds new functionality) - [x] 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 #1783 #### Description  The result of this check is always false (or I think so because I always obtain 0!=8) and the function dlg_new_dialog() is never executed. The function dlg_new_dialog() must be executed to save the new dialog. In other case the cnxcc module (I don know if there are more modules affected) doesn't work. Can anyone review if this check is important, please? You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1791 -- Commit Summary -- * dialog: The result of this check is always false and the function dlg_new_dialog() is never executed -- File Changes -- M src/modules/dialog/dlg_handlers.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1791.patch https://github.com/kamailio/kamailio/pull/1791.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/1791 [View Less]

2 6

[kamailio/kamailio] Update for Readme Dispatcher module (#1800)
by Jurijs I 09 Jan '19

09 Jan '19

Update for Readme Dispatcher module. I added some minor comments for dispatcher module, what I think might be useful for somebody.   #### 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/1800 -- Commit Summary -- * Update for Readme Dispatcher module -- File Changes -- M src/modules/dispatcher/README (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1800.patch https://github.com/kamailio/kamailio/pull/1800.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/1800 [View Less]

1 2

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

09 Jan '19

Module: kamailio Branch: master Commit: 56e5e6a8fa06cb0cd4855df5f405f9a1d89e7123 URL: https://github.com/kamailio/kamailio/commit/56e5e6a8fa06cb0cd4855df5f405f9a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-09T14:16:38+01:00 modules: readme files regenerated - cnxcc ... [skip ci] --- Modified: src/modules/cnxcc/README --- Diff: https://github.com/kamailio/kamailio/commit/56e5e6a8fa06cb0cd4855df5f405f9a…… [View More]

1 0

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/… [View More]

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/… [View More]

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/… [View More]

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 … [View More]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 [View Less]

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 [View Less]

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/… [View More]

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/… [View More]

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/… [View More]

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/… [View More]

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/… [View More]

1 0

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

09 Jan '19

<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed … [View More]

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/… [View More]

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=… [View More]

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 … [View More]

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 … [View More]

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...… [View More]

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  <!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for … [View More]

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/… [View More]

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/… [View More]

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 [View Less]

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 … [View More]

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/… [View More]

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/… [View More]

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/… [View More]

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/… [View More]

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/… [View More]

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…… [View More] 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) [View Less]

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 [View Less]

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 … [View More]

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/… [View More]

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 … [View More]

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 … [View More]

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/… [View More]

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/… [View More]

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 [View Less]

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/… [View More]

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.… [View More]

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/… [View More]

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: … [View More]

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 … [View More]

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 … [View More]

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 … [View More]

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 … [View More]

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 … [View More]

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 … [View More]

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 … [View More]

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 --- … [View More]

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 [View Less]

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:… [View More]

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/… [View More]

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/… [View More]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; +} [View Less]

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, … [View More] 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 [View Less]

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: … [View More]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; [View Less]

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/… [View More]

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… … [View More]

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" -… [View More]

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 … [View More]

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 … [View More]

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://… [View More]

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 … [View More]

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 … [View More]

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 … [View More]

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 … [View More]

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://… [View More]

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… … [View More]

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/… [View More]

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->… [View More]

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/… [View More]

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 … [View More]

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/… [View More]

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 --- … [View More]

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 --- … [View More]

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 … [View More]

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… … [View More]

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 *… [View More]

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 … [View More]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 [View Less]

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/… [View More]

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.… [View More]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 [View Less]

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/… [View More]

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/… [View More]

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/… [View More]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; [View Less]

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/… [View More]

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 --… [View More]- 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); [View Less]

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/… [View More]

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.… [View More]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); [View Less]

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/… [View More]

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/… [View More]

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/… [View More]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)); [View Less]

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/… [View More]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 [View Less]

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://… [View More]

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/… [View More]

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 … [View More]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; + } } [View Less]

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 … [View More]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; } [View Less]

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/… [View More]

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 … [View More]

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/… [View More]

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 -- * … [View More]

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 [… [View More]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 [View Less]

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: … [View More]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)) { [View Less]

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: … [View More]

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/… [View More]

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/… [View More]

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 More]

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 … [View More]

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/… [View More]

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…… [View More]

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: … [View More]

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/… [View More]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 - */ - - [View Less]

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…… [View More]

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 … [View More]

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: … [View More]

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.… [View More]

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/… [View More]

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… … [View More]

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 - … [View More]

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 - … [View More]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) [View Less]

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 … [View More]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 [View Less]

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 … [View More]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 [View Less]

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/… [View More]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); [View Less]

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/… [View More]

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/… [View More]

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/… [View More]

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/… [View More]

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…… [View More]

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/… [View More]

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(… [View More]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 [View Less]

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/… [View More]

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/… [View More]

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 … [View More]

1 0

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

24 Dec '18

<!-- Kamailio Project uses GitHub Issues only for bugs in the code or feature requests. If you have questions about using Kamailio or related to its configuration file, ask on sr-users mailing list: * http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users If you have questions about developing extensions to Kamailio or its existing C code, ask on sr-dev mailing list * http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev Please try to fill this template as much as … [View More]

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 … [View More]

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/… [View More]

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 … [View More]

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 … [View More]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… [View Less]

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: … [View More]

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 … [View More]

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/… [View More]

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 [View Less]

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/… [View More]

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 `… [View More]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 [View Less]

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 … [View More]

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 { … [View More] 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 [View Less]

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/… [View More]

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 [View Less]

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/… [View More]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev