sr-dev February 2022

sr-dev@lists.kamailio.org

17 participants
243 discussions

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

← Newer
1
...
8
9
10
11
12
13
14
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2022