sr-dev December 2022

sr-dev@lists.kamailio.org

11 participants
266 discussions

git:master:b7bae49f: app_python3s: new parameter script_child_init

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b7bae49f9b522f223932375e8e3087a7d2a893f5 URL: https://github.com/kamailio/kamailio/commit/b7bae49f9b522f223932375e8e3087a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-06T10:55:20+01:00 app_python3s: new parameter script_child_init - specify the name of the function to be executed on child fork and reload of script --- Modified: src/modules/app_python3s/app_python3s_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b7bae49f9b522f223932375e8e3087a… Patch: https://github.com/kamailio/kamailio/commit/b7bae49f9b522f223932375e8e3087a… --- diff --git a/src/modules/app_python3s/app_python3s_mod.c b/src/modules/app_python3s/app_python3s_mod.c index aa2f1b1460..ba68d019e2 100644 --- a/src/modules/app_python3s/app_python3s_mod.c +++ b/src/modules/app_python3s/app_python3s_mod.c @@ -39,6 +39,7 @@ MODULE_VERSION str _sr_python_load_file = str_init("/usr/local/etc/" NAME "/" NAME ".py"); str _sr_apy3s_script_init = str_init(""); +str _sr_apy3s_script_child_init = str_init(""); static int mod_init(void); static int child_init(int rank); @@ -57,10 +58,13 @@ int _apy3s_process_rank = 0; PyThreadState *myThreadState = NULL; +int apy3s_script_init_exec(PyObject* pModule, str *fname, int *vparam); + /** module parameters */ static param_export_t params[]={ {"load", PARAM_STR, &_sr_python_load_file }, {"script_init", PARAM_STR, &_sr_apy3s_script_init }, + {"script_child_init", PARAM_STR, &_sr_apy3s_script_child_init }, {0,0,0} }; @@ -210,7 +214,8 @@ static int child_init(int rank) if (cfg_child_init()) { return -1; } - return 0; + return apy3s_script_init_exec(_sr_apy3s_handler_script, + &_sr_apy3s_script_child_init, &rank); } /** @@ -256,9 +261,12 @@ int w_app_python3s_exec2(sip_msg_t *_msg, char *pmethod, char *pparam) return apy3s_exec_func(_msg, method.s, param.s, 1); } -int apy3s_script_init_exec(PyObject* pModule, str *fname, int *rank) +/** + * + */ +int apy3s_script_init_exec(PyObject* pModule, str *fname, int *vparam) { - PyObject *pFunc, *pArgs, *pHandler; + PyObject *pFunc, *pArgs, *pHandler, *pValue; PyGILState_STATE gstate; int rval = -1; @@ -281,11 +289,30 @@ int apy3s_script_init_exec(PyObject* pModule, str *fname, int *rank) goto error; } - pArgs = PyTuple_New(0); - if (pArgs == NULL) { - apy3s_handle_exception("script_init"); - Py_DECREF(pFunc); - goto error; + if(vparam==NULL) { + pArgs = PyTuple_New(0); + if (pArgs == NULL) { + apy3s_handle_exception("script_init"); + Py_DECREF(pFunc); + goto error; + } + } else { + pArgs = PyTuple_New(1); + if (pArgs == NULL) { + apy3s_handle_exception("script_init"); + Py_DECREF(pFunc); + goto error; + } + + pValue = PyLong_FromLong((long)(*vparam)); + if (pValue == NULL) { + apy3s_handle_exception("script_init"); + Py_DECREF(pArgs); + Py_DECREF(pFunc); + goto error; + } + /* pValue moved to pArgs - no direct dec ref */ + PyTuple_SetItem(pArgs, 0, pValue); } pHandler = PyObject_CallObject(pFunc, pArgs); @@ -318,6 +345,9 @@ int apy3s_script_init_exec(PyObject* pModule, str *fname, int *rank) return rval; } +/** + * + */ int apy_reload_script(void) { PyGILState_STATE gstate; @@ -330,24 +360,33 @@ int apy_reload_script(void) PyErr_Format(PyExc_ImportError, "Reload module '%s'", _sr_apy3s_bname); apy3s_handle_exception("reload_script"); Py_DECREF(_sr_apy3s_format_exc_obj); - goto err; + goto error; } if (apy3s_script_init_exec(pModule, &_sr_apy3s_script_init, NULL)) { LM_ERR("Error calling mod_init on reload\n"); Py_DECREF(pModule); - goto err; + goto error; } Py_DECREF(_sr_apy3s_handler_script); _sr_apy3s_handler_script = pModule; + if(apy3s_script_init_exec(pModule, &_sr_apy3s_script_child_init, + &_apy3s_process_rank)<0) { + LM_ERR("Failed to run child init callback\n"); + goto error; + } rval = 0; -err: + +error: PyGILState_Release(gstate); return rval; } #define INTERNAL_VERSION "1008\n" +/** + * + */ int apy_load_script(void) { PyObject *sys_path, *pDir, *pModule;

1 year, 11 months

git:master:cc96ebfa: app_python3s: more generic form of the function executing script init callback

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cc96ebfa7f4bebf45b368ee69dc4f9612575ee9b URL: https://github.com/kamailio/kamailio/commit/cc96ebfa7f4bebf45b368ee69dc4f96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-06T10:55:20+01:00 app_python3s: more generic form of the function executing script init callback --- Modified: src/modules/app_python3s/app_python3s_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cc96ebfa7f4bebf45b368ee69dc4f96… Patch: https://github.com/kamailio/kamailio/commit/cc96ebfa7f4bebf45b368ee69dc4f96… --- diff --git a/src/modules/app_python3s/app_python3s_mod.c b/src/modules/app_python3s/app_python3s_mod.c index 77c9665b53..aa2f1b1460 100644 --- a/src/modules/app_python3s/app_python3s_mod.c +++ b/src/modules/app_python3s/app_python3s_mod.c @@ -256,27 +256,26 @@ int w_app_python3s_exec2(sip_msg_t *_msg, char *pmethod, char *pparam) return apy3s_exec_func(_msg, method.s, param.s, 1); } -int apy3s_script_init(PyObject* pModule) +int apy3s_script_init_exec(PyObject* pModule, str *fname, int *rank) { PyObject *pFunc, *pArgs, *pHandler; PyGILState_STATE gstate; int rval = -1; - if(_sr_apy3s_script_init.len<=0) { + if(fname==NULL || fname->len<=0) { return 0; } - LM_DBG("script init callback: %.*s()\n", _sr_apy3s_script_init.len, - _sr_apy3s_script_init.s); + LM_DBG("script init callback: %.*s()\n", fname->len, fname->s); gstate = PyGILState_Ensure(); - pFunc = PyObject_GetAttrString(pModule, _sr_apy3s_script_init.s); + pFunc = PyObject_GetAttrString(pModule, fname->s); /* pFunc is a new reference */ if (pFunc == NULL || !PyCallable_Check(pFunc)) { if (!PyErr_Occurred()) PyErr_Format(PyExc_AttributeError, "'module' object '%s' has no attribute '%s'", - _sr_apy3s_bname, _sr_apy3s_script_init.s); + _sr_apy3s_bname, fname->s); apy3s_handle_exception("script_init"); Py_XDECREF(pFunc); goto error; @@ -307,7 +306,7 @@ int apy3s_script_init(PyObject* pModule) PyErr_Format(PyExc_TypeError, "Function '%s' of module '%s' has returned not returned" " object. Should be a class instance.", - _sr_apy3s_script_init.s, _sr_apy3s_bname); + fname->s, _sr_apy3s_bname); apy3s_handle_exception("script_init"); Py_DECREF(pHandler); goto error; @@ -333,7 +332,7 @@ int apy_reload_script(void) Py_DECREF(_sr_apy3s_format_exc_obj); goto err; } - if (apy3s_script_init(pModule)) { + if (apy3s_script_init_exec(pModule, &_sr_apy3s_script_init, NULL)) { LM_ERR("Error calling mod_init on reload\n"); Py_DECREF(pModule); goto err; @@ -422,7 +421,7 @@ int apy_load_script(void) Py_DECREF(_sr_apy3s_format_exc_obj); goto err; } - if (apy3s_script_init(pModule) != 0) { + if (apy3s_script_init_exec(pModule, &_sr_apy3s_script_init, NULL) != 0) { LM_ERR("failed calling script init callback function\n"); Py_DECREF(pModule); goto err;

1 year, 11 months

[kamailio/kamailio] ims_usrloc_pcscf: implementation of db_mode DB_ONLY (value 3) (PR #3279)

by petermarianF

In order to support a redundant PCSCF configuration - i.e. a logical PCSCF consists of 2 physical nodes (node1 and node2) some enhancements were introduced for handling of contacts. Redundancy means that SIP messages for a client are normally handled by node1 but in case node1 is not reachable SIP messages are redirected to node2. Of course the DB_ONLY mode must work also for single PCSCF node configuration. Important aspects of this implementation are database integrity - i.e. avoid invalid table entries (for example data which are expired long time ago or have invalid states) - and keeping PCSCF cache in sync with database tables. A wrapper was built for method get_pcontact which tries to find the pcontact in cache and if search is not successful tries to download and insert from db location table - also some effort is added here to find the pcontact if it exists in cache. The contact expiry handler was modified to sync contact expiry in cache with db location entry and in case of real contact expiry sends PUBLISH to SCSCF to let NOTIFY finally delete the contact. An audit for older expired pcontacts was introduced which cares for getting rid of these contacts. So db queries for this db mode are only supported for Mysql. Some code was introduced to help registering callbacks for contacts which are inserted into cache when being downloaded from database - for example ims_qos callback as at the time of insertion the message that triggered the original callback registering is long gone.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally in local branch based on 5.5.4 - [ ] 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/3279 -- Commit Summary -- * ims_usrloc_pcscf: implementation of db_mode DB_ONLY (value 3) -- File Changes -- M src/modules/ims_usrloc_pcscf/README (11) M src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c (22) M src/modules/ims_usrloc_pcscf/pcontact.c (85) M src/modules/ims_usrloc_pcscf/udomain.c (511) M src/modules/ims_usrloc_pcscf/udomain.h (5) M src/modules/ims_usrloc_pcscf/ul_callback.c (52) M src/modules/ims_usrloc_pcscf/ul_callback.h (10) M src/modules/ims_usrloc_pcscf/ul_rpc.c (156) M src/modules/ims_usrloc_pcscf/usrloc.c (7) M src/modules/ims_usrloc_pcscf/usrloc.h (12) M src/modules/ims_usrloc_pcscf/usrloc_db.c (50) M src/modules/ims_usrloc_pcscf/usrloc_db.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3279.patch https://github.com/kamailio/kamailio/pull/3279.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3279 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3279(a)github.com>

1 year, 11 months

git:master:7a1f2be3: ims_usrloc_pcscf: implementation of db_mode DB_ONLY (value 3) (#3279)

by GitHub

Module: kamailio Branch: master Commit: 7a1f2be30ea68c4ee7ab71a32c88e31d136e7b71 URL: https://github.com/kamailio/kamailio/commit/7a1f2be30ea68c4ee7ab71a32c88e31… Author: petermarianF <62649923+petermarianF(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2022-12-06T10:51:58+01:00 ims_usrloc_pcscf: implementation of db_mode DB_ONLY (value 3) (#3279) * ims_usrloc_pcscf: implementation of db_mode DB_ONLY (value 3) In order to support a redundant PCSCF configuration - i.e. a logical PCSCF consists of 2 physical nodes (node1 and node2) some enhancements were introduced for handling of contacts. Redundancy means that SIP messages for a client are normally handled by node1 but in case node1 is not reachable SIP messages are redirected to node2. Of course the DB_ONLY mode must work also for single PCSCF node configuration. Important aspects of this implementation are database integrity - i.e. avoid invalid table entries (for example data which are expired long time ago or have invalid states) - and keeping PCSCF cache in sync with database tables. * A wrapper was built for method get_pcontact which tries to find the pcontact in cache and if search is not successful tries to download and insert from db location table - also some effort is added here to find the pcontact if it exists in cache. The contact expiry handler was modified to sync contact expiry in cache with db location entry and in case of real contact expiry sends PUBLISH to SCSCF to let NOTIFY finally delete the contact. * An audit for older expired pcontacts was introduced which cares for getting rid of these contacts. Some code was introduced to help registering callbacks for contacts which are inserted into cache when being downloaded from database - for example ims_qos callback as at the time of insertion the message that triggered the original callback registering is long gone. * changes required for PR #3279 * add modparam db_mode to usrloc_api * remove unused method db_delete_presentity_uri_from_pua Co-authored-by: Annemarie Mandl <mandl(a)rpmbld.novalocal> --- Modified: src/modules/ims_usrloc_pcscf/README Modified: src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml Modified: src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c Modified: src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.h Modified: src/modules/ims_usrloc_pcscf/pcontact.c Modified: src/modules/ims_usrloc_pcscf/udomain.c Modified: src/modules/ims_usrloc_pcscf/udomain.h Modified: src/modules/ims_usrloc_pcscf/ul_callback.c Modified: src/modules/ims_usrloc_pcscf/ul_callback.h Modified: src/modules/ims_usrloc_pcscf/ul_rpc.c Modified: src/modules/ims_usrloc_pcscf/usrloc.c Modified: src/modules/ims_usrloc_pcscf/usrloc.h Modified: src/modules/ims_usrloc_pcscf/usrloc_db.c Modified: src/modules/ims_usrloc_pcscf/usrloc_db.h --- Diff: https://github.com/kamailio/kamailio/commit/7a1f2be30ea68c4ee7ab71a32c88e31… Patch: https://github.com/kamailio/kamailio/commit/7a1f2be30ea68c4ee7ab71a32c88e31…

1 year, 11 months

[kamailio/kamailio] Does Kamailio supports Voice and Video call support for 5G Core? (Issue #3293)

by p00jaY

Hi Kamailio community, We just want to check does Kamailio supports Voice and Video call support (Vo5G) with Open5Gs? If yes, please share the document reference. Else, please guide us when it will be available. If there anyway by which we can simulate the Vo5G (voice and video call support). Your inputs will be highly appreciated. Thanks & Regards, Pooja Yadav -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3293 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3293(a)github.com>

1 year, 11 months

git:master:ca48d23e: modules: readme files regenerated - app_python3 ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: ca48d23e569f94e5a59235c5c3b66d1c7c595e17 URL: https://github.com/kamailio/kamailio/commit/ca48d23e569f94e5a59235c5c3b66d1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-12-05T16:01:51+01:00 modules: readme files regenerated - app_python3 ... [skip ci] --- Modified: src/modules/app_python3/README Modified: src/modules/app_python3s/README --- Diff: https://github.com/kamailio/kamailio/commit/ca48d23e569f94e5a59235c5c3b66d1… Patch: https://github.com/kamailio/kamailio/commit/ca48d23e569f94e5a59235c5c3b66d1…

1 year, 11 months

git:master:0f36ffb2: app_python3s: docs for script_init parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0f36ffb2c5a5cd21761c0e8edea7ef66cbab9477 URL: https://github.com/kamailio/kamailio/commit/0f36ffb2c5a5cd21761c0e8edea7ef6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-05T15:53:56+01:00 app_python3s: docs for script_init parameter --- Modified: src/modules/app_python3s/doc/app_python3s_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0f36ffb2c5a5cd21761c0e8edea7ef6… Patch: https://github.com/kamailio/kamailio/commit/0f36ffb2c5a5cd21761c0e8edea7ef6… --- diff --git a/src/modules/app_python3s/doc/app_python3s_admin.xml b/src/modules/app_python3s/doc/app_python3s_admin.xml index 90bd17393e..6d7af04a60 100644 --- a/src/modules/app_python3s/doc/app_python3s_admin.xml +++ b/src/modules/app_python3s/doc/app_python3s_admin.xml @@ -104,7 +104,30 @@ modparam("app_python3s", "load", "/usr/local/etc/kamailio/myscript.py") </programlisting> </example> </section> - + <section id="app_python3s.p.load"> + <title><varname>script_init</varname> (string)</title> + <para> + The name of the Python function to be executed when the script is + loaded or reloaded. + </para> + <para> + <emphasis> + Default value is <quote></quote> (not set). + </emphasis> + </para> + <example> + <title>Set <varname>script_init</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("app_python3s", "script_init", "ksr_script_init") +... +def ksr_script_init(): + KSR.info("init python script\n") + return 1 +... +</programlisting> + </example> + </section> </section> <section> @@ -170,7 +193,7 @@ app_python3s_exec("my_python_function", "$rU"); <para> Note that reload is done for the Python script provided as parameter to this &kamailio; module. To reload the Python libraries imported - in this script, use something like: + in this script, leverage "script_init" and use something like: </para> <programlisting format="linespecific"> ... @@ -179,7 +202,7 @@ import mod1 import modN from importlib import reload -def mod_init(): +def ksr_script_init(): reload(mod1) ... reload(modN) @@ -231,7 +254,6 @@ cfgengine "python" For more details about KEMI, see: <ulink url="https://www.kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/">https://www.kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/</ulink> </para> - </section> </chapter>

1 year, 11 months

git:master:4ccd5019: app_python3s: added script_init parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4ccd5019a5c8300f3193e8261075987e4e41ca8e URL: https://github.com/kamailio/kamailio/commit/4ccd5019a5c8300f3193e8261075987… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-05T15:47:20+01:00 app_python3s: added script_init parameter - specify function to be executed when the script is (re-)loaded --- Modified: src/modules/app_python3s/app_python3s_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4ccd5019a5c8300f3193e8261075987… Patch: https://github.com/kamailio/kamailio/commit/4ccd5019a5c8300f3193e8261075987…

1 year, 11 months

git:master:d53db5e0: app_python3: docs - section for kemi usage

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d53db5e0a24cedf95abf79766509d45b2359da99 URL: https://github.com/kamailio/kamailio/commit/d53db5e0a24cedf95abf79766509d45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-05T13:53:17+01:00 app_python3: docs - section for kemi usage --- Modified: src/modules/app_python3/doc/app_python3_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d53db5e0a24cedf95abf79766509d45… Patch: https://github.com/kamailio/kamailio/commit/d53db5e0a24cedf95abf79766509d45… --- diff --git a/src/modules/app_python3/doc/app_python3_admin.xml b/src/modules/app_python3/doc/app_python3_admin.xml index 67f6058020..9a86a128e6 100644 --- a/src/modules/app_python3/doc/app_python3_admin.xml +++ b/src/modules/app_python3/doc/app_python3_admin.xml @@ -267,5 +267,26 @@ def mod_init(): </section> </section> + <section id="app_python3.kemi_usage"> + <title>KEMI Usage</title> + <para> + The module exports KEMI engine with id "python". + </para> + <para> + Example: + </para> + <programlisting format="linespecific"> +... +loadmodule "app_python3.so" +... +cfgengine "python" +... + </programlisting> + <para> + For more details about KEMI, see: + <ulink url="https://www.kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/">https://www.kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/</ulink> + </para> + </section> + </chapter>

1 year, 11 months

git:master:38eca199: app_python3s: docs - section about kemi usage

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 38eca1994d90897d6fb9912b2cc12da4f3ab039c URL: https://github.com/kamailio/kamailio/commit/38eca1994d90897d6fb9912b2cc12da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-05T10:38:38+01:00 app_python3s: docs - section about kemi usage --- Modified: src/modules/app_python3s/doc/app_python3s_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/38eca1994d90897d6fb9912b2cc12da… Patch: https://github.com/kamailio/kamailio/commit/38eca1994d90897d6fb9912b2cc12da… --- diff --git a/src/modules/app_python3s/doc/app_python3s_admin.xml b/src/modules/app_python3s/doc/app_python3s_admin.xml index 300383cc35..90bd17393e 100644 --- a/src/modules/app_python3s/doc/app_python3s_admin.xml +++ b/src/modules/app_python3s/doc/app_python3s_admin.xml @@ -212,5 +212,27 @@ def mod_init(): </section> </section> + <section id="app_python3s.kemi_usage"> + <title>KEMI Usage</title> + <para> + The module exports KEMI engine with id "python". + </para> + <para> + Example: + </para> + <programlisting format="linespecific"> +... +loadmodule "app_python3s.so" +... +cfgengine "python" +... + </programlisting> + <para> + For more details about KEMI, see: + <ulink url="https://www.kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/">https://www.kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/</ulink> + </para> + + </section> + </chapter>

1 year, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2022