- sr-dev - kamailio.org

git:master:cc4ac5c4: pkg/kamailio/deb: fix backports rules related to nats
by Victor Seva 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: cc4ac5c4b8133f435438bb322457eef7a8a642cf URL: https://github.com/kamailio/kamailio/commit/cc4ac5c4b8133f435438bb322457eef… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-25T16:19:51+01:00 pkg/kamailio/deb: fix backports rules related to nats --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/bullseye Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/focal Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/cc4ac5c4b8133f435438bb322457eef… Patch: https://github.com/kamailio/kamailio/commit/cc4ac5c4b8133f435438bb322457eef…

1 0

[kamailio/kamailio] pkg::deb: Missing spaces (PR #3041)
by Matthias Urlichs 25 Feb '22

25 Feb '22

fixes the deleted space after "erlang" introduced by a593f518dd62fd68c330eb42470ce5d5e1dce636   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] 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/3041 -- Commit Summary -- * pkg::deb: Missing spaces -- File Changes -- M pkg/kamailio/deb/bionic/rules (2) M pkg/kamailio/deb/bullseye/rules (2) M pkg/kamailio/deb/buster/rules (2) M pkg/kamailio/deb/focal/rules (2) M pkg/kamailio/deb/jessie/rules (2) M pkg/kamailio/deb/stretch/rules (2) M pkg/kamailio/deb/trusty/rules (2) M pkg/kamailio/deb/xenial/rules (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3041.patch https://github.com/kamailio/kamailio/pull/3041.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3041 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3041(a)github.com>

2 3

git:master:21efa40a: pkg::deb: Missing spaces
by Henning Westerholt 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: 21efa40ab781d3dffb271fbb3def0a9d12bf8a17 URL: https://github.com/kamailio/kamailio/commit/21efa40ab781d3dffb271fbb3def0a9… Author: Matthias Urlichs <matthias(a)urlichs.de> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-02-25T15:49:57+01:00 pkg::deb: Missing spaces fixes the deleted space after "erlang" introduced by a593f518dd62fd68c330eb42470ce5d5e1dce636 --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/21efa40ab781d3dffb271fbb3def0a9… Patch: https://github.com/kamailio/kamailio/commit/21efa40ab781d3dffb271fbb3def0a9…

1 0

[kamailio/kamailio] KEMI jsdt CommonJS-based module support (Issue #3037)
by Ian Carlson 25 Feb '22

25 Feb '22

### Description Kamailio uses Ducktape 2 without module-node or module-ducktape, requiring all routing in a single file. https://wiki.duktape.org/howtomodules I'm attempting to add module-node support and creating this issue to track with PR. Response from mailing list > Hello, > > I didn't notice that require() was not in the duktape 2.x, I will try to add support for module-duktape when I get a chance. If someone wants to do it, pull requests are welcome -- it does not seem to be complex: > * https://github.com/svaarala/duktape/tree/master/extras/module-duktape > The module-node sounds interesting, but not being familiar with node.js, looks it need more work to enable it: > * https://github.com/svaarala/duktape/tree/master/extras/module-node > > Cheers, > Daniel ### Expected behavior Include the required() JS file ` var test = require('./test'); ` #### Actual observed behavior Calling require() in a JSDT script throws TypeError: undefined not callable #### Log Messages ``` ERROR: app_jsdt [app_jsdt_api.c:448]: jsdt_kemi_load_script(): failed running: TypeError: undefined not callable ``` ### Possible Solutions I played around a little with `module-duktape` but wasn't smart enough to define a `Duktape.modSearch()` that would work as desired. I'm probably missing something obvious. I've recently been playing with `asterisk/node-ari-client` which got me curious if `module-node` might be more aligned with thinking. ### Additional Information * **Kamailio Version** - kamailio 5.5.4 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3037 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3037(a)github.com>

2 2

git:master:5ac41325: modules: readme files regenerated - app_jsdt ... [skip ci]
by Kamailio Dev 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: 5ac41325edcc323684bae5bfc8bd1c4617571553 URL: https://github.com/kamailio/kamailio/commit/5ac41325edcc323684bae5bfc8bd1c4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-25T09:46:16+01:00 modules: readme files regenerated - app_jsdt ... [skip ci] --- Modified: src/modules/app_jsdt/README --- Diff: https://github.com/kamailio/kamailio/commit/5ac41325edcc323684bae5bfc8bd1c4… Patch: https://github.com/kamailio/kamailio/commit/5ac41325edcc323684bae5bfc8bd1c4… --- diff --git a/src/modules/app_jsdt/README b/src/modules/app_jsdt/README index 4186cced58..dc8c13bda8 100644 --- a/src/modules/app_jsdt/README +++ b/src/modules/app_jsdt/README @@ -26,6 +26,7 @@ Daniel-Constantin Mierla 3. Parameters 3.1. load (str) + 3.2. mode (int) 4. Functions @@ -44,10 +45,11 @@ Daniel-Constantin Mierla List of Examples 1.1. Set load parameter - 1.2. jsdt_dofile usage - 1.3. jsdt_dostring usage - 1.4. jsdt_run usage - 1.5. jsdt_runstring usage + 1.2. Set mode parameter + 1.3. jsdt_dofile usage + 1.4. jsdt_dostring usage + 1.5. jsdt_run usage + 1.6. jsdt_runstring usage Chapter 1. Admin Guide @@ -62,6 +64,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. load (str) + 3.2. mode (int) 4. Functions @@ -119,6 +122,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. load (str) + 3.2. mode (int) 3.1. load (str) @@ -134,6 +138,18 @@ Chapter 1. Admin Guide modparam("app_jsdt", "load", "/usr/local/etc/kamailio/js/myscript.js") ... +3.2. mode (int) + + Control if the API to load JavaScript module (nodejs interface) is + initialized or not. + + Default value is “1” (initialize). + + Example 1.2. Set mode parameter +... +modparam("app_jsdt", "mode", 0) +... + 4. Functions 4.1. jsdt_dofile(path) @@ -146,7 +162,7 @@ modparam("app_jsdt", "load", "/usr/local/etc/kamailio/js/myscript.js") Execute the JavaScript script stored in 'path'. The parameter can be a string with pseudo-variables evaluated at runtime. - Example 1.2. jsdt_dofile usage + Example 1.3. jsdt_dofile usage ... jsdt_dofile("/usr/local/etc/kamailio/js/myscript.js"); ... @@ -156,7 +172,7 @@ jsdt_dofile("/usr/local/etc/kamailio/js/myscript.js"); Execute the JavaScript script stored in parameter. The parameter can be a string with pseudo-variables. - Example 1.3. jsdt_dostring usage + Example 1.4. jsdt_dostring usage ... if(!jsdt_dostring('KSR.dbg("test message\n")')) { @@ -171,7 +187,7 @@ if(!jsdt_dostring('KSR.dbg("test message\n")')) loaded at startup via parameter 'load'. Parameters can be strings with pseudo-variables that are evaluated at runtime. - Example 1.4. jsdt_run usage + Example 1.5. jsdt_run usage ... if(!jsdt_run("js_append_fu_to_reply")) { @@ -187,7 +203,7 @@ jsdt_run("js_funcx", "$rU", "2"); string with pseudo-variables. The script is executed in JS context specific to loaded JS files at startup. - Example 1.5. jsdt_runstring usage + Example 1.6. jsdt_runstring usage ... if(!jsdt_runstring('KSR.dbg("Hello World from $fU\n")')) {

1 0

git:master:0bc30ab5: app_jsdt: docs for mode parameter
by Daniel-Constantin Mierla 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: 0bc30ab5b54a9450552a968bdcdff8f39830733b URL: https://github.com/kamailio/kamailio/commit/0bc30ab5b54a9450552a968bdcdff8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-25T09:36:19+01:00 app_jsdt: docs for mode parameter --- Modified: src/modules/app_jsdt/doc/app_jsdt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0bc30ab5b54a9450552a968bdcdff8f… Patch: https://github.com/kamailio/kamailio/commit/0bc30ab5b54a9450552a968bdcdff8f… --- diff --git a/src/modules/app_jsdt/doc/app_jsdt_admin.xml b/src/modules/app_jsdt/doc/app_jsdt_admin.xml index d4fd89d377..4c3a746b9b 100644 --- a/src/modules/app_jsdt/doc/app_jsdt_admin.xml +++ b/src/modules/app_jsdt/doc/app_jsdt_admin.xml @@ -17,7 +17,7 @@ <section> <title>Overview</title> <para> - This module allows executing JavaScript scripts from the Kamailio + This module allows executing JavaScript scripts from the Kamailio configuration file. It exports all KEMI functions to JavaScript in order to access the currently processed SIP message. These functions are named within @@ -107,7 +107,26 @@ modparam("app_jsdt", "load", "/usr/local/etc/kamailio/js/myscript.js") </programlisting> </example> </section> - + <section id="app_jsdt.p.mode"> + <title><varname>mode</varname> (int)</title> + <para> + Control if the API to load JavaScript module (nodejs interface) is + initialized or not. + </para> + <para> + <emphasis> + Default value is <quote>1</quote> (initialize). + </emphasis> + </para> + <example> + <title>Set <varname>mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("app_jsdt", "mode", 0) +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:f7509533: app_jsdt: added parameter mode to control initialization of js module api
by Daniel-Constantin Mierla 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: f7509533685129a87f411e395eb87c07935b969d URL: https://github.com/kamailio/kamailio/commit/f7509533685129a87f411e395eb87c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-25T09:29:09+01:00 app_jsdt: added parameter mode to control initialization of js module api --- Modified: src/modules/app_jsdt/app_jsdt_api.c Modified: src/modules/app_jsdt/app_jsdt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f7509533685129a87f411e395eb87c0… Patch: https://github.com/kamailio/kamailio/commit/f7509533685129a87f411e395eb87c0… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index a3c1026a3a..b1ded049fc 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -54,6 +54,7 @@ typedef struct _sr_jsdt_env static sr_jsdt_env_t _sr_J_env = {0}; str _sr_jsdt_load_file = STR_NULL; +int _sr_jsdt_mode = 1; static int *_sr_jsdt_reload_version = NULL; static int _sr_jsdt_local_version = 0; @@ -471,12 +472,14 @@ int jsdt_sr_init_child(int rank) LM_ERR("cannot create load JS context (load)\n"); return -1; } - duk_push_object(_sr_J_env.JJ); - duk_push_c_function(_sr_J_env.JJ, cb_resolve_module, DUK_VARARGS); - duk_put_prop_string(_sr_J_env.JJ, -2, "resolve"); - duk_push_c_function(_sr_J_env.JJ, cb_load_module, DUK_VARARGS); - duk_put_prop_string(_sr_J_env.JJ, -2, "load"); - duk_module_node_init(_sr_J_env.JJ); + if(_sr_jsdt_mode == 1) { + duk_push_object(_sr_J_env.JJ); + duk_push_c_function(_sr_J_env.JJ, cb_resolve_module, DUK_VARARGS); + duk_put_prop_string(_sr_J_env.JJ, -2, "resolve"); + duk_push_c_function(_sr_J_env.JJ, cb_load_module, DUK_VARARGS); + duk_put_prop_string(_sr_J_env.JJ, -2, "load"); + duk_module_node_init(_sr_J_env.JJ); + } jsdt_sr_kemi_register_libs(_sr_J_env.JJ); LM_DBG("loading js script file: %.*s\n", _sr_jsdt_load_file.len, _sr_jsdt_load_file.s); diff --git a/src/modules/app_jsdt/app_jsdt_mod.c b/src/modules/app_jsdt/app_jsdt_mod.c index 526376a1d5..1328c3069b 100644 --- a/src/modules/app_jsdt/app_jsdt_mod.c +++ b/src/modules/app_jsdt/app_jsdt_mod.c @@ -56,6 +56,7 @@ static int w_app_jsdt_run3(sip_msg_t *msg, char *func, char *p1, char *p2, static int fixup_jsdt_run(void** param, int param_no); extern str _sr_jsdt_load_file; +extern int _sr_jsdt_mode; /* clang-format off */ static cmd_export_t cmds[]={ @@ -79,6 +80,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"load", PARAM_STR, &_sr_jsdt_load_file}, + {"mode", PARAM_INT, &_sr_jsdt_mode}, {0, 0, 0} };

1 0

git:master:c37ccdc6: core: fixed comment typo
by Daniel-Constantin Mierla 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: c37ccdc6e3bad0af4644941a872f510c51936c58 URL: https://github.com/kamailio/kamailio/commit/c37ccdc6e3bad0af4644941a872f510… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-25T09:13:46+01:00 core: fixed comment typo --- Modified: src/core/sr_module.h --- Diff: https://github.com/kamailio/kamailio/commit/c37ccdc6e3bad0af4644941a872f510… Patch: https://github.com/kamailio/kamailio/commit/c37ccdc6e3bad0af4644941a872f510… --- diff --git a/src/core/sr_module.h b/src/core/sr_module.h index 33f4f00095..251be938b0 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -160,7 +160,7 @@ void ksr_module_set_flag(unsigned int flag); @warning child_init(PROC_MAIN) is again called in the same process (main), but latter (before tcp), so make sure you don't init things - twice, bot in PROC_MAIN and PROC_INT */ + twice, both in PROC_MAIN and PROC_INT */ #define PROC_NOCHLDINIT -128 /**< no child init functions will be called if this rank is used in fork_process() */

1 0

git:master:3c1851ad: app_jsdt: skip child init for proc_init rank
by Daniel-Constantin Mierla 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: 3c1851ad546f574d1fda869348c8f7e5186079d2 URL: https://github.com/kamailio/kamailio/commit/3c1851ad546f574d1fda869348c8f7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-25T09:13:08+01:00 app_jsdt: skip child init for proc_init rank --- Modified: src/modules/app_jsdt/app_jsdt_api.c Modified: src/modules/app_jsdt/app_jsdt_api.h Modified: src/modules/app_jsdt/app_jsdt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3c1851ad546f574d1fda869348c8f7e… Patch: https://github.com/kamailio/kamailio/commit/3c1851ad546f574d1fda869348c8f7e… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 9d4711cc6f..a3c1026a3a 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -456,7 +456,7 @@ int jsdt_kemi_load_script(void) /** * */ -int jsdt_sr_init_child(void) +int jsdt_sr_init_child(int rank) { memset(&_sr_J_env, 0, sizeof(sr_jsdt_env_t)); _sr_J_env.J = duk_create_heap_default(); @@ -1692,4 +1692,4 @@ duk_ret_t cb_load_module(duk_context *JJ) { return duk_generic_error(JJ, "Could not load module '%s'", resolved_id); } return 1; /*nrets*/ -} \ No newline at end of file +} diff --git a/src/modules/app_jsdt/app_jsdt_api.h b/src/modules/app_jsdt/app_jsdt_api.h index 4b0f1ca169..a03d1e6ddf 100644 --- a/src/modules/app_jsdt/app_jsdt_api.h +++ b/src/modules/app_jsdt/app_jsdt_api.h @@ -27,7 +27,7 @@ #include "duktape.h" int jsdt_sr_init_mod(void); -int jsdt_sr_init_child(void); +int jsdt_sr_init_child(int rank); void jsdt_sr_destroy(void); int jsdt_sr_initialized(void); diff --git a/src/modules/app_jsdt/app_jsdt_mod.c b/src/modules/app_jsdt/app_jsdt_mod.c index 4245d2e77c..526376a1d5 100644 --- a/src/modules/app_jsdt/app_jsdt_mod.c +++ b/src/modules/app_jsdt/app_jsdt_mod.c @@ -117,7 +117,10 @@ static int mod_init(void) */ static int child_init(int rank) { - return jsdt_sr_init_child(); + if(rank==PROC_INIT) { + return 0; + } + return jsdt_sr_init_child(rank); } /**

1 0

git:master:4a2415e3: app_jsdt: add duk_module_node for JS module resolution
by Daniel-Constantin Mierla 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: 4a2415e33ea75bb103da3561312f7b850c4aedf6 URL: https://github.com/kamailio/kamailio/commit/4a2415e33ea75bb103da3561312f7b8… Author: Ian Carlson <ian(a)xantek.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-25T08:38:40+01:00 app_jsdt: add duk_module_node for JS module resolution - reported by GH #3037 - cb_resolve_module: resolves absolute and relative paths resolves absolute if request_id starts with a / if parent_id then resolved relative path based parent_id path if no parent_id resolves relative path based on app_jsdt load file path request_id without /, ./, or ../ are not resolved and return error - cb_load_module: use jsdt_load_file to load resolved file - see: https://github.com/svaarala/duktape/tree/master/extras/module-node --- Added: src/modules/app_jsdt/duk_module_node.c Added: src/modules/app_jsdt/duk_module_node.h Modified: src/modules/app_jsdt/app_jsdt_api.c Modified: src/modules/app_jsdt/app_jsdt_api.h --- Diff: https://github.com/kamailio/kamailio/commit/4a2415e33ea75bb103da3561312f7b8… Patch: https://github.com/kamailio/kamailio/commit/4a2415e33ea75bb103da3561312f7b8…

1 0

Info: SIP resources collection
by Daniel-Constantin Mierla 24 Feb '22

24 Feb '22

Hello, over the 20 years I used various SIP applications, libraries and tools but after a while I forgot many of them, therefore I tried to collect many in a list hosted on github at: * https://github.com/miconda/sip-resources Hoping it proves useful for some of you! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Feb 21-24, 2022 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

3 4

[kamailio/kamailio] segmentation fault on kamailio 5.4.4 (Issue #3039)
by descartin 24 Feb '22

24 Feb '22

hello all we have seen a segmentation fault on a kamailio 5.4.4 ``` #0 0x00007feb664346ad in print_lists (dlg=0x7feaa5f65290) at dlg_var.c:277 277 varlist = varlist->next; Missing separate debuginfos, use: debuginfo-install bzip2-libs-1.0.6-13.el7.x86_64 cyrus-sasl-lib-2.1.26-20.el7_2.x86_64 elfutils-libelf-0.166-2.el7.x86_64 elfutils-libs-0.166-2.el7.x86_64 glibc-2.17-157.el7_3.5.x86_64 jansson-2.10-1.el7.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-8.el7.x86_64 libattr-2.4.46-12.el7.x86_64 libcap-2.22-8.el7.x86_64 libcom_err-1.42.9-9.el7.x86_64 libcurl-7.29.0-35.el7.centos.x86_64 libev-4.15-7.el7.x86_64 libevent-2.0.21-4.el7.x86_64 libgcc-4.8.5-16.el7.x86_64 libidn-1.28-4.el7.x86_64 libselinux-2.5-6.el7.x86_64 libssh2-1.4.3-10.el7_2.1.x86_64 libuuid-2.23.2-33.el7_3.2.x86_64 libxml2-2.9.1-6.el7_2.3.x86_64 nspr-4.13.1-1.0.el7_3.x86_64 nss-3.28.4-1.2.el7_3.x86_64 nss-softokn-freebl-3.16.2.3-14.4.el7.x86_64 nss-util-3.28.4-1.0.el7_3.x86_64 openldap-2.4.40-13.el7.x86_64 openssl-libs-1.0.2k-19.el7.x86_64 pcre-8.32-15.el7_2.1.x86_64 systemd-libs-219-30.el7_3.9.x86_64 xz-libs-5.2.2-1.el7.x86_64 zlib-1.2.7-17.el7.x86_64 (gdb) bt #0 0x00007feb664346ad in print_lists (dlg=0x7feaa5f65290) at dlg_var.c:277 #1 0x00007feb664367ff in pv_set_dlg_variable (msg=0x7feb6a881bd8, param=0x7feb6adc85a0, op=254, val=0x7ffea166a7a0) at dlg_var.c:443 #2 0x00000000004bbaf2 in lval_pvar_assign (h=0x7ffea166bbd0, msg=0x7feb6a881bd8, lv=0x7feb6adc8668, rv=0x7feb6adc87e8) at core/lvalue.c:352 #3 0x00000000004bc5f0 in lval_assign (h=0x7ffea166bbd0, msg=0x7feb6a881bd8, lv=0x7feb6adc8668, rve=0x7feb6adc87e0) at core/lvalue.c:400 #4 0x0000000000487ddf in do_action (h=0x7ffea166bbd0, a=0x7feb6adc8f80, msg=0x7feb6a881bd8) at core/action.c:1455 #5 0x0000000000489b1b in run_actions (h=0x7ffea166bbd0, a=0x7feb6adc8338, msg=0x7feb6a881bd8) at core/action.c:1581 #6 0x000000000047c6d7 in do_action (h=0x7ffea166bbd0, a=0x7feb6adce4c0, msg=0x7feb6a881bd8) at core/action.c:1067 #7 0x0000000000489b1b in run_actions (h=0x7ffea166bbd0, a=0x7feb6adc3190, msg=0x7feb6a881bd8) at core/action.c:1581 #8 0x000000000048a25f in run_top_route (a=0x7feb6adc3190, msg=0x7feb6a881bd8, c=0x7ffea166bbd0) at core/action.c:1666 #9 0x00007feb69eab0a2 in reply_received (p_msg=0x7feb6a881bd8) at t_reply.c:2543 #10 0x000000000059dc77 in do_forward_reply (msg=0x7feb6a881bd8, mode=0) at core/forward.c:764 #11 0x000000000059f949 in forward_reply (msg=0x7feb6a881bd8) at core/forward.c:865 #12 0x00000000005f095a in receive_msg ( buf=0xacec80 <buf.7134> "SIP/2.0 100 Trying\r\nVia: SIP/2.0/UDP 79.170.70.13;branch=z9hG4bK7837.ffc6315fbd54de1e6a00b32fa1cc0eda.1\r\nVia: SIP/2.0/UDP 79.170.66.28:5080;received=79.170.66.28;rport=5080;branch=z9hG4bK83ve3c7ty27QF"..., len=426, rcv_info=0x7ffea166c6c0) at core/receive.c:509 #13 0x00000000004e3cd7 in udp_rcv_loop () at core/udp_server.c:543 #14 0x0000000000429f56 in main_loop () at main.c:1689 #15 0x0000000000434034 in main (argc=15, argv=0x7ffea166cf58) at main.c:2876 ``` [Uploading core_kamailio_mia_osp_feb18.log…]() could you please take a look to the attached full backtrace? thanks a lot and regards david -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3039 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3039(a)github.com>

2 2

git:master:f85cd7eb: blst: converted log macros and removed function names
by Daniel-Constantin Mierla 24 Feb '22

24 Feb '22

Module: kamailio Branch: master Commit: f85cd7eb9d3249ee93f0de7f978d0a9e7044df77 URL: https://github.com/kamailio/kamailio/commit/f85cd7eb9d3249ee93f0de7f978d0a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-24T14:12:44+01:00 blst: converted log macros and removed function names --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/f85cd7eb9d3249ee93f0de7f978d0a9… Patch: https://github.com/kamailio/kamailio/commit/f85cd7eb9d3249ee93f0de7f978d0a9… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index 5d33368bd8..1c2773c53c 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -119,11 +119,10 @@ static int ki_blst_add(sip_msg_t* msg, int t) S_TO_TICKS(t)); return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_add: blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_add: blocklist support not compiled-in" - " - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -193,12 +192,10 @@ static int ki_blst_add_retry_after(sip_msg_t* msg, int t_min, int t_max) S_TO_TICKS(t)); return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_add_retry_after:" - " blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_add_retry_after:" - " blocklist support not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -241,11 +238,10 @@ static int ki_blst_del(sip_msg_t* msg) if (dst_blocklist_del(&src, msg)) return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_del: blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_del: blocklist support not compiled-in" - " - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return -1; } @@ -281,8 +277,7 @@ static int ki_blst_is_blocklisted(sip_msg_t* msg) " blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_is_blocklisted:" - " blocklist support not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return -1; } @@ -309,8 +304,7 @@ static int ki_blst_set_ignore(sip_msg_t* msg, int mask) msg->fwd_send_flags.blst_imask|=blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -349,8 +343,7 @@ static int ki_blst_clear_ignore(sip_msg_t* msg, int mask) msg->fwd_send_flags.blst_imask&=~blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -390,8 +383,7 @@ static int ki_blst_rpl_set_ignore(sip_msg_t* msg, int mask) msg->rpl_send_flags.blst_imask|=blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -432,8 +424,7 @@ static int ki_blst_rpl_clear_ignore(sip_msg_t* msg, int mask) msg->rpl_send_flags.blst_imask&=~blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; }

1 0

git:master:a63fde36: pkg/kamailio/deb: add kamailio-nats-modules to bookworm
by Victor Seva 24 Feb '22

24 Feb '22

Module: kamailio Branch: master Commit: a63fde36f440b6d79cea6cdb0dfeee6258d96698 URL: https://github.com/kamailio/kamailio/commit/a63fde36f440b6d79cea6cdb0dfeee6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-23T14:25:46+01:00 pkg/kamailio/deb: add kamailio-nats-modules to bookworm https://tracker.debian.org/news/1305763/natsc-320-1-migrated-to-testing/ --- Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/debian/backports/bookworm --- Diff: https://github.com/kamailio/kamailio/commit/a63fde36f440b6d79cea6cdb0dfeee6… Patch: https://github.com/kamailio/kamailio/commit/a63fde36f440b6d79cea6cdb0dfeee6… --- diff --git a/pkg/kamailio/deb/bookworm/control b/pkg/kamailio/deb/bookworm/control index 8f425be82c..4e670a602c 100644 --- a/pkg/kamailio/deb/bookworm/control +++ b/pkg/kamailio/deb/bookworm/control @@ -29,6 +29,7 @@ Build-Depends: libmongoc-dev, libmono-2.0-dev [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x], libmosquitto-dev, + libnats-dev, libncurses5-dev, libpcre3-dev, libperl-dev, @@ -840,6 +841,24 @@ Description: Libwebsockets module for the Kamailio SIP server This package contains the lwcs module, which provides a client-side WebSockets API through libwebsockets. +Package: kamailio-nats-modules +Architecture: any +Multi-Arch: same +Pre-Depends: + ${misc:Pre-Depends}, +Depends: + kamailio (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Description: Nats module for the Kamailio SIP server + Kamailio is a very fast and flexible SIP (RFC3261) + server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package contains the nats module, which provides a NATS consumer for Kamailio. + NATS is a real time distributed messaging platform, more details about it can be + found at nats.io. + Package: kamailio-extra-modules Architecture: any Multi-Arch: same diff --git a/pkg/kamailio/deb/bookworm/rules b/pkg/kamailio/deb/bookworm/rules index ddf8846c9d..2161ac0bb4 100755 --- a/pkg/kamailio/deb/bookworm/rules +++ b/pkg/kamailio/deb/bookworm/rules @@ -21,7 +21,7 @@ include /usr/share/dpkg/buildflags.mk export RADCLI=1 # modules not in the "main" kamailio package -EXCLUDED_MODULES= java python nats +EXCLUDED_MODULES= java python # extra modules to skip, because they are not compilable now # - regardless if they go to the main kamailio package or to some module package, @@ -37,7 +37,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ snmpstats carrierroute xmpp cpl redisgeoip geoip2 \ sqlite json mono ruby ims sctp \ tls outbound websocket autheph kazoo cnxcc \ - erlangsystemd phonenum mongodb rabbitmq python3 mqtt secsipid lwsc + erlang nats systemd phonenum mongodb rabbitmq python3 mqtt secsipid lwsc # module groups to be packaged onto kamailio-extra-modules EXTRA_GROUPS=gzcompress uuid ev jansson http_async diff --git a/pkg/kamailio/deb/debian/backports/bookworm b/pkg/kamailio/deb/debian/backports/bookworm index 21dafb2d11..1d39bd6509 100755 --- a/pkg/kamailio/deb/debian/backports/bookworm +++ b/pkg/kamailio/deb/debian/backports/bookworm @@ -35,13 +35,6 @@ sed -i -e '/^ python,/d' -e '/python-dev/d' \ sed -i -e 's/ python [ ,$]*//' ${DIST}/rules sed -i -e '/^EXCLUDED_MODULES=/s/$/ python/' ${DIST}/rules -# no libnats-dev -sed -i -e '/^ libnats-dev,/d' \ - -e '/^Package: kamailio-nats-modules/,/^$/d' \ - ${DIST}/control -sed -i -e 's/ nats [ ,$]*//' ${DIST}/rules -sed -i -e '/^EXCLUDED_MODULES=/s/$/ nats/' ${DIST}/rules - wrap-and-sort -sat -d ${DIST} # clean backports scripts

2 2

[kamailio/kamailio] db_redis: cluster support (Issue #2977)
by Riccardo-78 23 Feb '22

23 Feb '22

### Description At the moment db_redis driver does not support interfacing with a redis cluster. This is a proposal to add support to it. The db_redis module will get a new module parameter to enable cluster support (with default 0 - disabled): ``` modparam("db_redis", "cluster", 1) ``` The redis url used by other modules needs to specify all nodes in the cluster, and must NOT include redis database number (since it's not supported in cluster mode): ``` #!define DBURL_USRLOC "redis://10.0.1.1:6379,10.0.1.2:6379,10.0.1.3:6379" ``` The implementation is going to use the [hiredis-cluster](https://github.com/Nordix/hiredis-cluster) library (BSD license). If cluster mode is not enabled the module will behave like before, i.e. all calls to redis will use hiredis library directly. If you find this proposal sensible, I'll start coding it. Feedback is welcome, of course! -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2977 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2977(a)github.com>

3 5

[kamailio/kamailio] nathelper: uninitialized data (PR #3035)
by Matthias Urlichs 23 Feb '22

23 Feb '22

#### 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The IP checksum is part of the header and must be zeroed before checksumming. This patch also silences another (benign) warning. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3035 -- Commit Summary -- * nathelper: Fix uninitialized data -- File Changes -- M src/modules/nathelper/nathelper.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3035.patch https://github.com/kamailio/kamailio/pull/3035.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3035 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3035(a)github.com>

2 2

git:master:7cbbd8fb: nathelper: Fix uninitialized data
by Daniel-Constantin Mierla 23 Feb '22

23 Feb '22

Module: kamailio Branch: master Commit: 7cbbd8fb22ac0d57a5dd3883dee185b3bc0601e2 URL: https://github.com/kamailio/kamailio/commit/7cbbd8fb22ac0d57a5dd3883dee185b… Author: Matthias Urlichs <matthias(a)urlichs.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-23T08:56:24+01:00 nathelper: Fix uninitialized data - the IP checksum is part of the header and must be zeroed before checksumming - also silence another (benign) warning --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/7cbbd8fb22ac0d57a5dd3883dee185b… Patch: https://github.com/kamailio/kamailio/commit/7cbbd8fb22ac0d57a5dd3883dee185b… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 22e128ac9c..cd657a7071 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1786,7 +1786,7 @@ static inline int replace_sdp_ip( { str body1, oldip, newip; str body = *org_body; - int pf, pf1 = 0; + int pf = 0, pf1 = 0; str body2; char *bodylimit = body.s + body.len; int ret; @@ -2145,6 +2145,7 @@ static int send_raw(const char *buf, int buf_len, union sockaddr_union *to, ip->ip_off = 0; ip->ip_ttl = 69; ip->ip_p = 17; + ip->ip_sum = 0; ip->ip_src.s_addr = s_ip; ip->ip_dst.s_addr = to->sin.sin_addr.s_addr;

1 0

[kamailio/kamailio] ims_ipsec_pcscf: fix issues with UEs not sending certain replies thro… (PR #3029)
by kristiyan-peychev-flolive 21 Feb '22

21 Feb '22

…ugh the ipsec tunnel   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  I've fixed an issue that would ignore legitimate replies that are sent by real-world UEs, causing calls to completely break due to timeouts. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3029 -- Commit Summary -- * ims_ipsec_pcscf: fix issues with UEs not sending certain replies through the ipsec tunnel -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (108) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (13) M src/modules/ims_ipsec_pcscf/ipsec.c (39) D src/modules/ims_ipsec_pcscf/port_gen.c (227) D src/modules/ims_ipsec_pcscf/port_gen.h (41) M src/modules/ims_ipsec_pcscf/sec_agree.c (26) M src/modules/ims_ipsec_pcscf/spi_gen.c (119) M src/modules/ims_ipsec_pcscf/spi_gen.h (6) M src/modules/ims_ipsec_pcscf/spi_list.c (72) M src/modules/ims_ipsec_pcscf/spi_list.h (13) M src/modules/ims_ipsec_pcscf/spi_list_tests.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3029.patch https://github.com/kamailio/kamailio/pull/3029.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3029 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3029(a)github.com>

4 10

[kamailio/kamailio] ims: fix a crash with contact parsing (PR #3032)
by kristiyan-peychev-flolive 21 Feb '22

21 Feb '22

When running as a P-CSCF a crash would occur with certain in-dialog replies. The `msg->contact->parsed` pointer is unreliably reused and would point to garbage.   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When running as a P-CSCF a crash would occur with certain in-dialog replies. The `msg->contact->parsed` pointer is unreliably reused and would point to garbage. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3032 -- Commit Summary -- * ims: fix a crash with contact parsing -- File Changes -- M src/lib/ims/ims_getters.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3032.patch https://github.com/kamailio/kamailio/pull/3032.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3032 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3032(a)github.com>

3 6

git:master:84898be4: modules: readme files regenerated - async ... [skip ci]
by Kamailio Dev 21 Feb '22

21 Feb '22

Module: kamailio Branch: master Commit: 84898be41740624ceb03a2f135683c880f5f95e0 URL: https://github.com/kamailio/kamailio/commit/84898be41740624ceb03a2f135683c8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-21T12:46:21+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/84898be41740624ceb03a2f135683c8… Patch: https://github.com/kamailio/kamailio/commit/84898be41740624ceb03a2f135683c8…

1 0

git:master:d5b09279: async: docs - fixed mismatching tags
by Daniel-Constantin Mierla 21 Feb '22

21 Feb '22

Module: kamailio Branch: master Commit: d5b0927983b308d36e512f0134b0aef015f22f89 URL: https://github.com/kamailio/kamailio/commit/d5b0927983b308d36e512f0134b0aef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-21T12:34:20+01:00 async: docs - fixed mismatching tags --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d5b0927983b308d36e512f0134b0aef… Patch: https://github.com/kamailio/kamailio/commit/d5b0927983b308d36e512f0134b0aef… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index 7185cbff52..126da999ec 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -111,8 +111,6 @@ modparam("async", "ms_timer", 10) </programlisting> </example> </section> - <section> - <title>Parameters</title> <section id="async.p.return"> <title><varname>return</varname> (int)</title> <para>

1 0

[kamailio/kamailio] Erlang: Fixes to get the module functional again (PR #3024)
by James Van Vleet 18 Feb '22

18 Feb '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2069 #### Description The Erlang module is not working at all with newer Kamailio versions. One of the issues was already found in #2069 but no code was submitted. The second one I believe is related to https://github.com/kamailio/kamailio/commit/7bb2669528a819ec29a8193eebc9c64… in that the erlang module assumes that pvi.type is zero and uses that field to type the custom fields it manages and this commit starts populating pvi.type with a 4. I don't have a solid grasp on pvapi.c so if the experts have a better way to fix this up I am all ears. These two commits do get the module working properly and I am able to use both the custom erlang PV terms and the RPC feature from my proxy now. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3024 -- Commit Summary -- * Erlang: Erlang module assumes pvi.type is zero * Erlang: Revert breaking change -- File Changes -- M src/modules/erlang/pv_atom.c (3) M src/modules/erlang/pv_pid.c (3) M src/modules/erlang/pv_ref.c (3) M src/modules/erlang/pv_xbuff.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3024.patch https://github.com/kamailio/kamailio/pull/3024.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3024 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3024(a)github.com>

2 2

git:master:1ed58f0d: Erlang: Revert breaking change
by Daniel-Constantin Mierla 18 Feb '22

18 Feb '22

Module: kamailio Branch: master Commit: 1ed58f0de4f7a3ab3a81dd84c1c3b94fa1df2c4b URL: https://github.com/kamailio/kamailio/commit/1ed58f0de4f7a3ab3a81dd84c1c3b94… Author: James Van Vleet <james(a)vanvleet.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-18T15:40:04+01:00 Erlang: Revert breaking change Revert https://github.com/kamailio/kamailio/commit/6542a367638ec5f8a2b62994f8c309e… xavp_add_xavp_value returns the root and not the xavp it added and that was the reason for the code the commit removed. Changed a variable name to help make that more clear. Also related to https://github.com/kamailio/kamailio/issues/2069. --- Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/1ed58f0de4f7a3ab3a81dd84c1c3b94… Patch: https://github.com/kamailio/kamailio/commit/1ed58f0de4f7a3ab3a81dd84c1c3b94… --- diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index 894c36784c..b19a22ac8e 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -86,11 +86,15 @@ sr_xavp_t *xbuff_new(str *name) if(!xbuffs_root) { - xbuff = xavp_add_xavp_value(&xbuff_list,name,&xbuff_val,xavp_get_crt_list()); - } else { - xbuff = xavp_get_child(&xbuff_list, name); + xbuffs_root = xavp_add_xavp_value(&xbuff_list,name,&xbuff_val,xavp_get_crt_list()); + if (!xbuffs_root){ + LM_ERR("cannot create xbuffs_root \n"); + return NULL; + } } + xbuff = xavp_get_child(&xbuff_list, name); + if (!xbuff) { xbuff_val.type = SR_XTYPE_NULL;

1 0

git:master:fa74be53: Erlang: Erlang module assumes pvi.type is zero
by Daniel-Constantin Mierla 18 Feb '22

18 Feb '22

Module: kamailio Branch: master Commit: fa74be53232d56797209a630823a20346f9d2597 URL: https://github.com/kamailio/kamailio/commit/fa74be53232d56797209a630823a203… Author: James Van Vleet <james(a)vanvleet.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-18T15:40:04+01:00 Erlang: Erlang module assumes pvi.type is zero Related to this commit: https://github.com/kamailio/kamailio/commit/7bb2669528a819ec29a8193eebc9c64… --- Modified: src/modules/erlang/pv_atom.c Modified: src/modules/erlang/pv_pid.c Modified: src/modules/erlang/pv_ref.c Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/fa74be53232d56797209a630823a203… Patch: https://github.com/kamailio/kamailio/commit/fa74be53232d56797209a630823a203… --- diff --git a/src/modules/erlang/pv_atom.c b/src/modules/erlang/pv_atom.c index b37f01560f..092672751c 100644 --- a/src/modules/erlang/pv_atom.c +++ b/src/modules/erlang/pv_atom.c @@ -51,6 +51,9 @@ int pv_atom_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_pid.c b/src/modules/erlang/pv_pid.c index 2de3f5e698..acb2bee5b2 100644 --- a/src/modules/erlang/pv_pid.c +++ b/src/modules/erlang/pv_pid.c @@ -54,6 +54,9 @@ int pv_pid_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_ref.c b/src/modules/erlang/pv_ref.c index 052f7ced90..927cb4b855 100644 --- a/src/modules/erlang/pv_ref.c +++ b/src/modules/erlang/pv_ref.c @@ -54,6 +54,9 @@ int pv_ref_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index ce6e2bd2eb..894c36784c 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -198,6 +198,9 @@ int pv_xbuff_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break;

1 0

git:master:02367309: modules: readme files regenerated - async ... [skip ci]
by Kamailio Dev 18 Feb '22

18 Feb '22

Module: kamailio Branch: master Commit: 0236730941b6cdd80009de40daeef5f095cc1d58 URL: https://github.com/kamailio/kamailio/commit/0236730941b6cdd80009de40daeef5f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-18T09:16:20+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/0236730941b6cdd80009de40daeef5f… Patch: https://github.com/kamailio/kamailio/commit/0236730941b6cdd80009de40daeef5f…

1 0

git:master:29035b39: async: module parameter to set return code on success
by Daniel-Constantin Mierla 18 Feb '22

18 Feb '22

Module: kamailio Branch: master Commit: 29035b39707a94436d24a4a8dce9c36632d4ec78 URL: https://github.com/kamailio/kamailio/commit/29035b39707a94436d24a4a8dce9c36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-18T09:04:27+01:00 async: module parameter to set return code on success - more flexibility to exit or not config file execution --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/29035b39707a94436d24a4a8dce9c36… Patch: https://github.com/kamailio/kamailio/commit/29035b39707a94436d24a4a8dce9c36… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index ee69e96e14..3b18eda957 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -42,6 +42,7 @@ MODULE_VERSION static int async_workers = 1; static int async_ms_timer = 0; +static int async_return = 0; static int mod_init(void); static int child_init(int); @@ -89,6 +90,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"workers", INT_PARAM, &async_workers}, {"ms_timer", INT_PARAM, &async_ms_timer}, + {"return", INT_PARAM, &async_return}, {0, 0, 0} }; @@ -231,7 +233,7 @@ static int w_async_sleep(sip_msg_t *msg, char *sec, char *str2) if(async_sleep(msg, s, ap->u.paction->next, NULL) < 0) return -1; /* force exit in config */ - return 0; + return async_return; } return -1; @@ -271,7 +273,7 @@ static int w_async_ms_sleep(sip_msg_t *msg, char *sec, char *str2) if(async_ms_sleep(msg, s, ap->u.paction->next, NULL) < 0) return -1; /* force exit in config */ - return 0; + return async_return; } return -1; @@ -334,7 +336,7 @@ int ki_async_route(sip_msg_t *msg, str *rn, int s) if(async_sleep(msg, s, act, rn) < 0) return -1; /* force exit in config */ - return 0; + return async_return; } /** @@ -370,7 +372,7 @@ int ki_async_ms_route(sip_msg_t *msg, str *rn, int s) if(async_ms_sleep(msg, s, act, rn) < 0) return -1; /* force exit in config */ - return 0; + return async_return; } /** @@ -478,7 +480,7 @@ int ki_async_task_group_route(sip_msg_t *msg, str *rn, str *gn) if(async_send_task(msg, act, rn, gn) < 0) return -1; /* force exit in config */ - return 0; + return async_return; } /**

1 0

git:master:73321a9a: async: docs for return parameter
by Daniel-Constantin Mierla 18 Feb '22

18 Feb '22

Module: kamailio Branch: master Commit: 73321a9a56e3772852c3254cc1936cb17d0a635d URL: https://github.com/kamailio/kamailio/commit/73321a9a56e3772852c3254cc1936cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-18T09:04:27+01:00 async: docs for return parameter --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/73321a9a56e3772852c3254cc1936cb… Patch: https://github.com/kamailio/kamailio/commit/73321a9a56e3772852c3254cc1936cb… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index b0e5ec45bd..4955f00036 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -108,6 +108,29 @@ modparam("async", "workers", 2) ... modparam("async", "ms_timer", 10) ... +</programlisting> + </example> + </section> + <section> + <title>Parameters</title> + <section id="async.p.return"> + <title><varname>return</varname> (int)</title> + <para> + The value to be returned by async functions on success. It does + not apply for async data functions, only for those that suspend + the SIP transaction. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>workers</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("async", "return", 1) +... </programlisting> </example> </section>

1 0

git:master:537d1118: async: docs - fixed typos
by Daniel-Constantin Mierla 18 Feb '22

18 Feb '22

Module: kamailio Branch: master Commit: 537d11183d4907101e69d00e92e3530d2eb7cb5e URL: https://github.com/kamailio/kamailio/commit/537d11183d4907101e69d00e92e3530… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-18T09:04:27+01:00 async: docs - fixed typos --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/537d11183d4907101e69d00e92e3530… Patch: https://github.com/kamailio/kamailio/commit/537d11183d4907101e69d00e92e3530… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index 4955f00036..7185cbff52 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -93,9 +93,9 @@ modparam("async", "workers", 2) <para> Enables millisecond timer for async_ms_sleep() and async_ms_route() functions. The integer value is the timer resolution in milliseconds. A smaller timer - resultion will generate a higher load on the system. If you set ms_timer - to 1 you will get a timer with 1 millisecond resultion, a setting of 20 - provides a resultion of 20ms. + resolution will generate a higher load on the system. If you set ms_timer + to 1 you will get a timer with 1 millisecond resolution, a setting of 20 + provides a resolution of 20ms. </para> <para> <emphasis>

1 0

git:master:ac96b585: uuid: set sruid uuid api hooks on module load
by Daniel-Constantin Mierla 18 Feb '22

18 Feb '22

Module: kamailio Branch: master Commit: ac96b585a5ed5a93fef65bcdbdb077fe6a75de22 URL: https://github.com/kamailio/kamailio/commit/ac96b585a5ed5a93fef65bcdbdb077f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-18T09:04:27+01:00 uuid: set sruid uuid api hooks on module load --- Modified: src/modules/uuid/uuid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ac96b585a5ed5a93fef65bcdbdb077f… Patch: https://github.com/kamailio/kamailio/commit/ac96b585a5ed5a93fef65bcdbdb077f… --- diff --git a/src/modules/uuid/uuid_mod.c b/src/modules/uuid/uuid_mod.c index 690d322b61..3bbee8bf6d 100644 --- a/src/modules/uuid/uuid_mod.c +++ b/src/modules/uuid/uuid_mod.c @@ -31,6 +31,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/pvar.h" +#include "../../core/kemi.h" #include "../../core/utils/sruid.h" MODULE_VERSION @@ -235,6 +236,95 @@ static int ksr_uuid_generate_random(char *out, int *len) return 0; } +/** + * + */ +static sr_kemi_xval_t _ksr_kemi_uuid_xval = {0}; + + +/** + * + */ +static sr_kemi_xval_t* ki_ksr_uuid_get(sip_msg_t *msg) +{ + int len = KSR_UUID_BSIZE; + + memset(&_ksr_kemi_uuid_xval, 0, sizeof(sr_kemi_xval_t)); + + if(ksr_uuid_generate(_k_uuid_str, &len)) { + sr_kemi_xval_null(&_ksr_kemi_uuid_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_uuid_xval; + } + _ksr_kemi_uuid_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_uuid_xval.v.s.s = _k_uuid_str; + _ksr_kemi_uuid_xval.v.s.len = len; + return &_ksr_kemi_uuid_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_ksr_uuid_rget(sip_msg_t *msg) +{ + int len = KSR_UUID_BSIZE; + + memset(&_ksr_kemi_uuid_xval, 0, sizeof(sr_kemi_xval_t)); + + if(ksr_uuid_generate_random(_k_uuid_str, &len)) { + sr_kemi_xval_null(&_ksr_kemi_uuid_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_uuid_xval; + } + _ksr_kemi_uuid_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_uuid_xval.v.s.s = _k_uuid_str; + _ksr_kemi_uuid_xval.v.s.len = len; + return &_ksr_kemi_uuid_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_ksr_uuid_tget(sip_msg_t *msg) +{ + int len = KSR_UUID_BSIZE; + + memset(&_ksr_kemi_uuid_xval, 0, sizeof(sr_kemi_xval_t)); + + if(ksr_uuid_generate_time(_k_uuid_str, &len)) { + sr_kemi_xval_null(&_ksr_kemi_uuid_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_uuid_xval; + } + _ksr_kemi_uuid_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_uuid_xval.v.s.s = _k_uuid_str; + _ksr_kemi_uuid_xval.v.s.len = len; + return &_ksr_kemi_uuid_xval; +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_uuid_exports[] = { + { str_init("uuid"), str_init("get"), + SR_KEMIP_XVAL, ki_ksr_uuid_get, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("uuid"), str_init("rget"), + SR_KEMIP_XVAL, ki_ksr_uuid_rget, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("uuid"), str_init("tget"), + SR_KEMIP_XVAL, ki_ksr_uuid_tget, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + + /** * */ @@ -248,5 +338,6 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) if(sruid_uuid_api_set(&sapi) < 0) { return -1; } + sr_kemi_modules_add(sr_kemi_uuid_exports); return 0; }

1 0

git:master:a593f518: pkg/kamailio/deb: fix rules
by Victor Seva 17 Feb '22

17 Feb '22

Module: kamailio Branch: master Commit: a593f518dd62fd68c330eb42470ce5d5e1dce636 URL: https://github.com/kamailio/kamailio/commit/a593f518dd62fd68c330eb42470ce5d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-18T00:18:03+01:00 pkg/kamailio/deb: fix rules --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/a593f518dd62fd68c330eb42470ce5d… Patch: https://github.com/kamailio/kamailio/commit/a593f518dd62fd68c330eb42470ce5d…

1 0

git:master:39a0a5d6: pkg/kamailio/deb: remove python*-dev dependency for module package
by Victor Seva 17 Feb '22

17 Feb '22

Module: kamailio Branch: master Commit: 39a0a5d6f43ab265f1003f7bbb6e981bcd2e3b72 URL: https://github.com/kamailio/kamailio/commit/39a0a5d6f43ab265f1003f7bbb6e981… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-17T23:38:57+01:00 pkg/kamailio/deb: remove python*-dev dependency for module package --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/39a0a5d6f43ab265f1003f7bbb6e981… Patch: https://github.com/kamailio/kamailio/commit/39a0a5d6f43ab265f1003f7bbb6e981…

1 0

git:master:d3ba5e29: pkg/kamailio/deb: sync control file with Debian
by Victor Seva 17 Feb '22

17 Feb '22

Module: kamailio Branch: master Commit: d3ba5e2927c2ac603637f26104177a7497fdb919 URL: https://github.com/kamailio/kamailio/commit/d3ba5e2927c2ac603637f26104177a7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-17T23:08:58+01:00 pkg/kamailio/deb: sync control file with Debian --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/d3ba5e2927c2ac603637f26104177a7… Patch: https://github.com/kamailio/kamailio/commit/d3ba5e2927c2ac603637f26104177a7…

1 0

git:master:7dbe4222: pkg/kamailio/deb: kamailio-nats-modules
by Victor Seva 17 Feb '22

17 Feb '22

Module: kamailio Branch: master Commit: 7dbe4222d0a20a7514c57a0ed3e9bdcfb14fb1c2 URL: https://github.com/kamailio/kamailio/commit/7dbe4222d0a20a7514c57a0ed3e9bdc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-17T23:27:27+01:00 pkg/kamailio/deb: kamailio-nats-modules for now just for sid, libnats-dev not yet in bookworm --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/bookworm Modified: pkg/kamailio/deb/debian/backports/bullseye Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/focal Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/7dbe4222d0a20a7514c57a0ed3e9bdc… Patch: https://github.com/kamailio/kamailio/commit/7dbe4222d0a20a7514c57a0ed3e9bdc…

1 0

git:master:c3ffbce5: uuid: set sruid hooks for uuid generation on mod register
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: master Commit: c3ffbce540d8a2fb58f193dcffebc2ed57cb802f URL: https://github.com/kamailio/kamailio/commit/c3ffbce540d8a2fb58f193dcffebc2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T13:00:48+01:00 uuid: set sruid hooks for uuid generation on mod register --- Modified: src/modules/uuid/uuid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c3ffbce540d8a2fb58f193dcffebc2e… Patch: https://github.com/kamailio/kamailio/commit/c3ffbce540d8a2fb58f193dcffebc2e… --- diff --git a/src/modules/uuid/uuid_mod.c b/src/modules/uuid/uuid_mod.c index 247d5830ab..690d322b61 100644 --- a/src/modules/uuid/uuid_mod.c +++ b/src/modules/uuid/uuid_mod.c @@ -31,6 +31,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/pvar.h" +#include "../../core/utils/sruid.h" MODULE_VERSION @@ -182,3 +183,70 @@ int pv_get_uuid(sip_msg_t *msg, pv_param_t *param, uuid_unparse_lower(_k_uuid_val, _k_uuid_str); return pv_get_strzval(msg, param, res, _k_uuid_str); } + + +/** + * generate uuid value + */ +static int ksr_uuid_generate(char *out, int *len) +{ + if(out==NULL || len==NULL || *len<KSR_UUID_BSIZE) { + return -1; + } + uuid_generate(_k_uuid_val); + uuid_unparse_lower(_k_uuid_val, out); + *len = strlen(out); + return 0; +} + +/** + * generate uuid time value + */ +static int ksr_uuid_generate_time(char *out, int *len) +{ + if(out==NULL || len==NULL || *len<KSR_UUID_BSIZE) { + return -1; + } +#ifndef __OS_darwin + if(uuid_generate_time_safe(_k_uuid_val)!=0) { + LM_ERR("uuid not generated in a safe mode\n"); + return -1; + } +#else + uuid_generate_time(_k_uuid_val); +#endif + + uuid_unparse_lower(_k_uuid_val, out); + *len = strlen(out); + return 0; +} + +/** + * generate uuid random value + */ +static int ksr_uuid_generate_random(char *out, int *len) +{ + if(out==NULL || len==NULL || *len<KSR_UUID_BSIZE) { + return -1; + } + uuid_generate_random(_k_uuid_val); + uuid_unparse_lower(_k_uuid_val, out); + *len = strlen(out); + return 0; +} + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sruid_uuid_api_t sapi; + memset(&sapi, 0, sizeof(sruid_uuid_api_t)); + sapi.fgenerate = ksr_uuid_generate; + sapi.fgenerate_time = ksr_uuid_generate_time; + sapi.fgenerate_random = ksr_uuid_generate_random; + if(sruid_uuid_api_set(&sapi) < 0) { + return -1; + } + return 0; +}

1 0

Kamailio v5.5.4 Released
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Hello, Kamailio SIP Server v5.5.4 stable release is out. This is a maintenance release of the latest stable branch, 5.5, that includes fixes since the release of v5.5.3. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.5.x. Deployments running previous v5.5.x versions are strongly recommended to be upgraded to v5.5.4. For more details about version 5.5.4 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2022/02/kamailio-v5-5-4-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

[kamailio/kamailio] Kamailio active error (Issue #3033)
by LeoM30 17 Feb '22

17 Feb '22

ERROR: connect_unix_sock: connect(/var/run/kamailio//kamailio_ctl): No such file or directory [2] Thanks -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3033 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3033(a)github.com>

2 2

git:5.5:54c9df16: ChangeLog: content updated for v5.5.4
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: 5.5 Commit: 54c9df16e8dde0fd5bf13e325dbead1eeb35c434 URL: https://github.com/kamailio/kamailio/commit/54c9df16e8dde0fd5bf13e325dbead1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T10:32:02+01:00 ChangeLog: content updated for v5.5.4 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/54c9df16e8dde0fd5bf13e325dbead1… Patch: https://github.com/kamailio/kamailio/commit/54c9df16e8dde0fd5bf13e325dbead1…

1 0

git:5.5:168a648d: Makefile.defs: version set to 5.5.4
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: 5.5 Commit: 168a648d82e2b4e25ac3ff9443f837071589ac39 URL: https://github.com/kamailio/kamailio/commit/168a648d82e2b4e25ac3ff9443f8370… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T10:17:27+01:00 Makefile.defs: version set to 5.5.4 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/168a648d82e2b4e25ac3ff9443f8370… Patch: https://github.com/kamailio/kamailio/commit/168a648d82e2b4e25ac3ff9443f8370… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5efcd134dc..5fdc880c31 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 5 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = # memory manager switcher

1 0

git:5.5:19be6f62: pkg/kamailio/deb: version set 5.5.4
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: 5.5 Commit: 19be6f620328bfcb6e5fad0088f15aa4461eefbb URL: https://github.com/kamailio/kamailio/commit/19be6f620328bfcb6e5fad0088f15aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T10:12:44+01:00 pkg/kamailio/deb: version set 5.5.4 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/19be6f620328bfcb6e5fad0088f15aa… Patch: https://github.com/kamailio/kamailio/commit/19be6f620328bfcb6e5fad0088f15aa…

1 0

git:5.5:d7b64f4b: pkg: version set to 5.5.4 for rpm and alpine specs
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: 5.5 Commit: d7b64f4b369b347654d4e8a956c39072303e464a URL: https://github.com/kamailio/kamailio/commit/d7b64f4b369b347654d4e8a956c3907… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T10:16:20+01:00 pkg: version set to 5.5.4 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/d7b64f4b369b347654d4e8a956c3907… Patch: https://github.com/kamailio/kamailio/commit/d7b64f4b369b347654d4e8a956c3907… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 9fcabf2cd1..7d27675324 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.5.3 +pkgver=5.5.4 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index fa6c13757e..ae5836f180 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.5.3 +%define ver 5.5.4 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.5:42d4359e: uuid: use define for buffer size
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: 5.5 Commit: 42d4359e6c3288fdfb705c5d0e38f47443048550 URL: https://github.com/kamailio/kamailio/commit/42d4359e6c3288fdfb705c5d0e38f47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T10:10:24+01:00 uuid: use define for buffer size - log error if uuid was not generated in safe mode (cherry picked from commit e81f2e318bc32802d152ef69d005b8194e17ca42) --- Modified: src/modules/uuid/uuid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/42d4359e6c3288fdfb705c5d0e38f47… Patch: https://github.com/kamailio/kamailio/commit/42d4359e6c3288fdfb705c5d0e38f47… --- diff --git a/src/modules/uuid/uuid_mod.c b/src/modules/uuid/uuid_mod.c index a5aae589d8..247d5830ab 100644 --- a/src/modules/uuid/uuid_mod.c +++ b/src/modules/uuid/uuid_mod.c @@ -34,12 +34,18 @@ MODULE_VERSION +#ifdef UUID_LEN_STR +#define KSR_UUID_BSIZE (UUID_LEN_STR + 4) +#else +#define KSR_UUID_BSIZE 40 +#endif + static int mod_init(void); static int child_init(int); static void mod_destroy(void); static uuid_t _k_uuid_val; -static char _k_uuid_str[40]; +static char _k_uuid_str[KSR_UUID_BSIZE]; int pv_get_uuid(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); @@ -162,8 +168,10 @@ int pv_get_uuid(sip_msg_t *msg, pv_param_t *param, break; case 3: #ifndef __OS_darwin - if(uuid_generate_time_safe(_k_uuid_val)) + if(uuid_generate_time_safe(_k_uuid_val)!=0) { + LM_ERR("uuid not generated in a safe mode\n"); return pv_get_null(msg, param, res); + } #else uuid_generate_time(_k_uuid_val); #endif

1 0

git:master:f54788b5: core: sruid - api hooks for setting uuid generation callbacks
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: master Commit: f54788b5ac1109a2113592871c1494704523d527 URL: https://github.com/kamailio/kamailio/commit/f54788b5ac1109a2113592871c14947… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T10:06:29+01:00 core: sruid - api hooks for setting uuid generation callbacks - allow modules to set funtions for generating uuid strings following the api from libuuid --- Modified: src/core/utils/sruid.c Modified: src/core/utils/sruid.h --- Diff: https://github.com/kamailio/kamailio/commit/f54788b5ac1109a2113592871c14947… Patch: https://github.com/kamailio/kamailio/commit/f54788b5ac1109a2113592871c14947… --- diff --git a/src/core/utils/sruid.c b/src/core/utils/sruid.c index 510da8bb81..e7a49f2a62 100644 --- a/src/core/utils/sruid.c +++ b/src/core/utils/sruid.c @@ -49,6 +49,8 @@ static unsigned int sruid_lfsr32 = 0; static unsigned int sruid_lfsr31 = 0; +static sruid_uuid_api_t _sruid_uuid_api = {0}; + static int sruid_shift_lfsr(unsigned int *lfsr, unsigned int mask) { int feedback; @@ -267,3 +269,54 @@ int sruid_next_safe(sruid_t *sid) if(unlikely(sid->pid!=my_pid())) sruid_reinit(sid, sid->mode); return sruid_nextx(sid, NULL); } + +/** + * + */ +int sruid_uuid_api_set(sruid_uuid_api_t *sapi) +{ + if(_sruid_uuid_api.fgenerate!=NULL) { + LM_ERR("sruid uuid api already set\n"); + return -1; + } + + memcpy(&_sruid_uuid_api, sapi, sizeof(sruid_uuid_api_t)); + return 0; +} + +/** + * + */ +int sruid_uuid_generate(char *out, int *len) +{ + if(_sruid_uuid_api.fgenerate == NULL) { + *len = 0; + return -1; + } + return _sruid_uuid_api.fgenerate(out, len); +} + +/** + * + */ +int sruid_uuid_generate_time(char *out, int *len) +{ + if(_sruid_uuid_api.fgenerate_time == NULL) { + *len = 0; + return -1; + } + return _sruid_uuid_api.fgenerate_time(out, len); +} + +/** + * + */ +int sruid_uuid_generate_random(char *out, int *len) +{ + if(_sruid_uuid_api.fgenerate_random == NULL) { + *len = 0; + return -1; + } + return _sruid_uuid_api.fgenerate_random(out, len); +} + diff --git a/src/core/utils/sruid.h b/src/core/utils/sruid.h index 8d44635619..a97675167f 100644 --- a/src/core/utils/sruid.h +++ b/src/core/utils/sruid.h @@ -54,4 +54,17 @@ int sruid_nextx_safe(sruid_t *sid, str *x); int sruid_nexthid(sruid_t *sid, str *sval); int sruid_nexthid_safe(sruid_t *sid, str *sval); +typedef int (*sruid_uuid_generate_f)(char *out, int *len); + +typedef struct sruid_uuid_api { + sruid_uuid_generate_f fgenerate; + sruid_uuid_generate_f fgenerate_time; + sruid_uuid_generate_f fgenerate_random; +} sruid_uuid_api_t; + +int sruid_uuid_api_set(sruid_uuid_api_t *sapi); +int sruid_uuid_generate(char *out, int *len); +int sruid_uuid_generate_time(char *out, int *len); +int sruid_uuid_generate_random(char *out, int *len); + #endif

1 0

[kamailio/kamailio] Gte the current debug level (Issue #3030)
by Matthias Urlichs 17 Feb '22

17 Feb '22

#3029 ## Description While the `kex` module exports a way to temporarily change the debug level, it cannot retrieve the current level. ### Expected behavior I can write Python code like this: ``` if KSR.kex.getdebug() > 2: ... # generate detailed and somewhat-time-consuming debug output ... # which would just get dropped on the floor otherwise ``` #### Actual observed behavior If there is a way to get Kamailio's current and/or configured debug level, I didn't find it. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3030 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3030(a)github.com>

2 2

Releasing Kamailio v5.5.4
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Hello, I am considering to release Kamailio v5.5.4 later this week, likely on Thursday, Feb 17, 2022. This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Feb 21-24, 2022 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

git:master:e721e926: core: sruid - functions to get sruid with suffix from hasing a string
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: e721e9262c4b48c3c2f5107f5f5d6195243662db URL: https://github.com/kamailio/kamailio/commit/e721e9262c4b48c3c2f5107f5f5d619… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T13:34:05+01:00 core: sruid - functions to get sruid with suffix from hasing a string --- Modified: src/core/utils/sruid.c Modified: src/core/utils/sruid.h --- Diff: https://github.com/kamailio/kamailio/commit/e721e9262c4b48c3c2f5107f5f5d619… Patch: https://github.com/kamailio/kamailio/commit/e721e9262c4b48c3c2f5107f5f5d619… --- diff --git a/src/core/utils/sruid.c b/src/core/utils/sruid.c index d9f089e685..510da8bb81 100644 --- a/src/core/utils/sruid.c +++ b/src/core/utils/sruid.c @@ -36,6 +36,9 @@ #include "../../core/dprint.h" #include "../../core/globals.h" #include "../../core/pt.h" +#include "../../core/ut.h" +#include "../../core/trim.h" +#include "../../core/hashes.h" #include "sruid.h" @@ -211,6 +214,25 @@ int sruid_nextx(sruid_t *sid, str *x) return 0; } +/** + * + */ +int sruid_nexthid(sruid_t *sid, str *sval) +{ + char buf_int[INT2STR_MAX_LEN]; + str hval = str_init("0"); + unsigned int hid = 0; + + if(sval==NULL || sval->s==NULL || sval->len<=0) { + return sruid_nextx(sid, &hval); + } + hval = *sval; + trim(&hval); + hid = get_hash1_raw(hval.s, hval.len); + hval.s = int2strbuf(hid, buf_int, INT2STR_MAX_LEN, &hval.len); + return sruid_nextx(sid, &hval); +} + /** * */ @@ -228,6 +250,15 @@ int sruid_nextx_safe(sruid_t *sid, str *x) return sruid_nextx(sid, x); } +/** + * + */ +int sruid_nexthid_safe(sruid_t *sid, str *sval) +{ + if(unlikely(sid->pid!=my_pid())) sruid_reinit(sid, sid->mode); + return sruid_nexthid(sid, sval); +} + /** * */ diff --git a/src/core/utils/sruid.h b/src/core/utils/sruid.h index 7fdde96a95..8d44635619 100644 --- a/src/core/utils/sruid.h +++ b/src/core/utils/sruid.h @@ -51,4 +51,7 @@ int sruid_next_safe(sruid_t *sid); int sruid_nextx(sruid_t *sid, str *x); int sruid_nextx_safe(sruid_t *sid, str *x); +int sruid_nexthid(sruid_t *sid, str *sval); +int sruid_nexthid_safe(sruid_t *sid, str *sval); + #endif

1 0

Info: sipexer v1.0.0 - sip cli tool
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Hello, I want to announce the availability of sipexer v1.0.0 - a sip cli tool that can facilitate testing and monitoring of SIP signalling systems. It tries to have a modern approach, with a flexible templating system, supporting both IPv4 and IPv6 with all the common transport layers, respectively UDP, TCP, TLS and WebSocket (for WebRTC). The project can be found at: * https://github.com/miconda/sipexer It is written in Go language for better portability, binaries for Linux, MacOS and Windows are made available for download in the release page: * https://github.com/miconda/sipexer/releases/tag/v1.0.0 Among its features: * send OPTIONS request (quick SIP ping to check if server is alive) * do registration and un-registration with customized expires value and contact URI * authentication with plain or HA1 passwords * set custom SIP headers * template system for building SIP requests * fields in the templates can be set via command line parameters or a JSON file * variables for setting field values (e.g., random number, data, time, environment variables, uuid, random string, …) * simulate SIP calls at signalling layer (INVITE-wait-BYE) * respond to requests coming during SIP calls (e.g., OPTIONS keepalives) * send instant messages with SIP MESSAGE requests * color output mode for easier troubleshooting * support for many transport layers: IPv4 and IPv6, UDP, TCP, TLS and WebSocket (for WebRTC) * send SIP requests of any type (e.g., INFO, SUBSCRIBE, NOTIFY, …) One usage example that could ease the testing of Kamailio is initiating registrations or simulating calls over WebSocket without the need of having a JavaScript soft phone application running in a web browser. Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

8 9

git:master:88f1a1a6: tmx: use trimmed call-id value for hashing
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: 88f1a1a671c4486e5000415b3d52eb42e6ad4cbb URL: https://github.com/kamailio/kamailio/commit/88f1a1a671c4486e5000415b3d52eb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T12:45:33+01:00 tmx: use trimmed call-id value for hashing --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/88f1a1a671c4486e5000415b3d52eb4… Patch: https://github.com/kamailio/kamailio/commit/88f1a1a671c4486e5000415b3d52eb4… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 256c82bf16..7bb2315fd3 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -243,7 +243,7 @@ int tmx_check_pretran(sip_msg_t *msg) sftag = get_from(msg)->tag_value; trim(&sftag); - chid = get_hash1_raw(msg->callid->body.s, msg->callid->body.len); + chid = get_hash1_raw(scallid.s, scallid.len); slotid = chid & (_tmx_ptran_size-1); if(unlikely(_tmx_proc_ptran == NULL)) {

1 0

git:master:0d688a69: async: exported functions to kemi to get async group name and data
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: 0d688a69e27b1ea49bf8c06469e1ce2e11006d95 URL: https://github.com/kamailio/kamailio/commit/0d688a69e27b1ea49bf8c06469e1ce2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T12:05:40+01:00 async: exported functions to kemi to get async group name and data --- Modified: src/modules/async/async_mod.c Modified: src/modules/async/async_sleep.c Modified: src/modules/async/async_sleep.h --- Diff: https://github.com/kamailio/kamailio/commit/0d688a69e27b1ea49bf8c06469e1ce2… Patch: https://github.com/kamailio/kamailio/commit/0d688a69e27b1ea49bf8c06469e1ce2… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 60cd10e677..ee69e96e14 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -674,6 +674,16 @@ static sr_kemi_t sr_kemi_async_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("async"), str_init("get_gname"), + SR_KEMIP_XVAL, ki_async_get_gname, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("async"), str_init("get_data"), + SR_KEMIP_XVAL, ki_async_get_data, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index cfbfe98cef..b51887e351 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -675,3 +675,44 @@ int pv_parse_geoip_name(pv_spec_t *sp, str *in) LM_ERR("unknown PV time name %.*s\n", in->len, in->s); return -1; } + +/** + * + */ +static sr_kemi_xval_t _ksr_kemi_async_xval = {0}; + +/** + * + */ +sr_kemi_xval_t* ki_async_get_gname(sip_msg_t *msg) +{ + async_wgroup_t *awg = NULL; + + memset(&_ksr_kemi_async_xval, 0, sizeof(sr_kemi_xval_t)); + + awg = async_task_workers_get_crt(); + if(awg==NULL || awg->name.s==NULL || awg->name.len<0) { + sr_kemi_xval_null(&_ksr_kemi_async_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_async_xval; + } + _ksr_kemi_async_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_async_xval.v.s = awg->name; + return &_ksr_kemi_async_xval; +} + +/** + * + */ +sr_kemi_xval_t* ki_async_get_data(sip_msg_t *msg) +{ + memset(&_ksr_kemi_async_xval, 0, sizeof(sr_kemi_xval_t)); + + if(_ksr_async_data_param==NULL || _ksr_async_data_param->sval.s==NULL + || _ksr_async_data_param->sval.len<0) { + sr_kemi_xval_null(&_ksr_kemi_async_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_async_xval; + } + _ksr_kemi_async_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_async_xval.v.s = _ksr_async_data_param->sval; + return &_ksr_kemi_async_xval; +} diff --git a/src/modules/async/async_sleep.h b/src/modules/async/async_sleep.h index bb7dd042ce..254962bd70 100644 --- a/src/modules/async/async_sleep.h +++ b/src/modules/async/async_sleep.h @@ -56,4 +56,7 @@ int async_send_data(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname, int pv_get_async(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_parse_async_name(pv_spec_t *sp, str *in); +sr_kemi_xval_t* ki_async_get_gname(sip_msg_t *msg); +sr_kemi_xval_t* ki_async_get_data(sip_msg_t *msg); + #endif

1 0

git:master:e81f2e31: uuid: use define for buffer size
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: e81f2e318bc32802d152ef69d005b8194e17ca42 URL: https://github.com/kamailio/kamailio/commit/e81f2e318bc32802d152ef69d005b81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T10:18:17+01:00 uuid: use define for buffer size - log error if uuid was not generated in safe mode --- Modified: src/modules/uuid/uuid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e81f2e318bc32802d152ef69d005b81… Patch: https://github.com/kamailio/kamailio/commit/e81f2e318bc32802d152ef69d005b81… --- diff --git a/src/modules/uuid/uuid_mod.c b/src/modules/uuid/uuid_mod.c index a5aae589d8..247d5830ab 100644 --- a/src/modules/uuid/uuid_mod.c +++ b/src/modules/uuid/uuid_mod.c @@ -34,12 +34,18 @@ MODULE_VERSION +#ifdef UUID_LEN_STR +#define KSR_UUID_BSIZE (UUID_LEN_STR + 4) +#else +#define KSR_UUID_BSIZE 40 +#endif + static int mod_init(void); static int child_init(int); static void mod_destroy(void); static uuid_t _k_uuid_val; -static char _k_uuid_str[40]; +static char _k_uuid_str[KSR_UUID_BSIZE]; int pv_get_uuid(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); @@ -162,8 +168,10 @@ int pv_get_uuid(sip_msg_t *msg, pv_param_t *param, break; case 3: #ifndef __OS_darwin - if(uuid_generate_time_safe(_k_uuid_val)) + if(uuid_generate_time_safe(_k_uuid_val)!=0) { + LM_ERR("uuid not generated in a safe mode\n"); return pv_get_null(msg, param, res); + } #else uuid_generate_time(_k_uuid_val); #endif

1 0

git:master:b311a01c: modules: readme files regenerated - async ... [skip ci]
by Kamailio Dev 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: b311a01cde334106cea4ee777d40a75f0fab491f URL: https://github.com/kamailio/kamailio/commit/b311a01cde334106cea4ee777d40a75… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-16T09:46:22+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/b311a01cde334106cea4ee777d40a75… Patch: https://github.com/kamailio/kamailio/commit/b311a01cde334106cea4ee777d40a75… --- diff --git a/src/modules/async/README b/src/modules/async/README index 744e98bf3e..8e165efa95 100644 --- a/src/modules/async/README +++ b/src/modules/async/README @@ -36,6 +36,8 @@ Daniel-Constantin Mierla 4.4. async_ms_sleep(milliseconds) 4.5. async_task_route(routename) 4.6. async_task_group_route(routename, groupname) + 4.7. async_task_data(routename, data) + 4.8. async_task_group_data(routename, groupname, data) List of Examples @@ -48,6 +50,8 @@ Daniel-Constantin Mierla 1.7. async_workers usage 1.8. async_task_route usage 1.9. async_task_group_route usage + 1.10. async_task_data usage + 1.11. async_task_group_data usage Chapter 1. Admin Guide @@ -72,6 +76,8 @@ Chapter 1. Admin Guide 4.4. async_ms_sleep(milliseconds) 4.5. async_task_route(routename) 4.6. async_task_group_route(routename, groupname) + 4.7. async_task_data(routename, data) + 4.8. async_task_group_data(routename, groupname, data) 1. Overview @@ -143,6 +149,8 @@ modparam("async", "ms_timer", 10) 4.4. async_ms_sleep(milliseconds) 4.5. async_task_route(routename) 4.6. async_task_group_route(routename, groupname) + 4.7. async_task_data(routename, data) + 4.8. async_task_group_data(routename, groupname, data) 4.1. async_route(routename, seconds) @@ -335,3 +343,54 @@ route[RESUME] { exit; } ... + +4.7. async_task_data(routename, data) + + Send the data to a asynchronous task process (in the first group) that + executes the route[rountename] and makes the data available via + $async(data). + + The current SIP message is not suspended and it is not available in the + asynchronous task process, a local faked SIP request is used there. + + The parameters can contain variables. + + This function can be used from ANY_ROUTE. + + Example 1.10. async_task_data usage +... +async_workers_group="name=abc;workers=4;nonblock=0;usleep=0" +... +request_route { + ... + async_task_data("RESUME", "caller: $fU - callee: $tU"); + ... +} +route[RESUME] { + xinfo("$async(data)\n"); + exit; +} +... + +4.8. async_task_group_data(routename, groupname, data) + + Similar to async_task_route(), but allows to specify the name of the + group for asynchronous workers. See also 'async_workers_group' core + global parameter. + + This function can be used from ANY_ROUTE. + + Example 1.11. async_task_group_data usage +... +async_workers_group="name=abc;workers=4;nonblock=0;usleep=0" +... +request_route { + ... + async_task_data("RESUME", "abc", "caller: $fU - callee: $tU"); + ... +} +route[RESUME] { + xinfo("$async(data)\n"); + exit; +} +...

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev