sr-dev February 2022

sr-dev@lists.kamailio.org

17 participants
242 discussions

[kamailio/kamailio] Erlang: Fixes to get the module functional again (PR #3024)

by James Van Vleet

#### 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 years, 9 months

git:master:1ed58f0d: Erlang: Revert breaking change

by Daniel-Constantin Mierla

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;

2 years, 9 months

git:master:fa74be53: Erlang: Erlang module assumes pvi.type is zero

by Daniel-Constantin Mierla

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;

2 years, 9 months

git:master:02367309: modules: readme files regenerated - async ... [skip ci]

by Kamailio Dev

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…

2 years, 9 months

git:master:537d1118: async: docs - fixed typos

by Daniel-Constantin Mierla

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>

2 years, 9 months

git:master:73321a9a: async: docs for return parameter

by Daniel-Constantin Mierla

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>

2 years, 9 months

git:master:29035b39: async: module parameter to set return code on success

by Daniel-Constantin Mierla

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; } /**

2 years, 9 months

git:master:ac96b585: uuid: set sruid uuid api hooks on module load

by Daniel-Constantin Mierla

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; }

2 years, 9 months

git:master:a593f518: pkg/kamailio/deb: fix rules

by Victor Seva

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…

2 years, 9 months

git:master:39a0a5d6: pkg/kamailio/deb: remove python*-dev dependency for module package

by Victor Seva

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…

2 years, 9 months

← Newer
1
...
10
11
12
13
14
15
16
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2022