- sr-dev - kamailio.org

git:master:5e91f429: core: use STR_STATIC_INIT() for defining core vars
by Daniel-Constantin Mierla 04 Jan '21

04 Jan '21

Module: kamailio Branch: master Commit: 5e91f429ef137625668dd41de9d227a2fcd1461a URL: https://github.com/kamailio/kamailio/commit/5e91f429ef137625668dd41de9d227a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-01T11:58:33+01:00 core: use STR_STATIC_INIT() for defining core vars --- Modified: src/core/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/5e91f429ef137625668dd41de9d227a… Patch: https://github.com/kamailio/kamailio/commit/5e91f429ef137625668dd41de9d227a… --- diff --git a/src/core/pv_core.c b/src/core/pv_core.c index 54fc6e6123..2b3132ccb4 100644 --- a/src/core/pv_core.c +++ b/src/core/pv_core.c @@ -141,11 +141,11 @@ static pv_export_t core_pvs[] = { { STR_STATIC_INIT("rc"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, { STR_STATIC_INIT("retcode"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, { STR_STATIC_INIT("env"), PVT_OTHER, pv_get_env, 0, - pv_parse_env_name, 0, 0, 0}, - {{"def", (sizeof("def")-1)}, PVT_OTHER, pv_get_def, 0, - pv_parse_def_name, 0, 0, 0}, - {{"defn", (sizeof("defn")-1)}, PVT_OTHER, pv_get_defn, 0, - pv_parse_defn_name, 0, 0, 0}, + pv_parse_env_name, 0, 0, 0 }, + { STR_STATIC_INIT("def"), PVT_OTHER, pv_get_def, 0, + pv_parse_def_name, 0, 0, 0 }, + { STR_STATIC_INIT("defn"), PVT_OTHER, pv_get_defn, 0, + pv_parse_defn_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } };

1 0

git:master:dd717b80: core: new core directive modparamx(mod, param, val)
by Daniel-Constantin Mierla 28 Dec '20

28 Dec '20

Module: kamailio Branch: master Commit: dd717b80be6f8e9519aa4b3d627cb88267b81146 URL: https://github.com/kamailio/kamailio/commit/dd717b80be6f8e9519aa4b3d627cb88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-28T14:08:16+01:00 core: new core directive modparamx(mod, param, val) - alternative to modparam() where all its parameters are evaluated for config script variables - note that only variables that do not depend on SIP message processing should be used at this stage - example - set a module parameter using the value of an evironment variable: modparamx("dispatcher", "db_url", "$env(DBURL)") --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/modparam.c Modified: src/core/modparam.h Modified: src/core/sr_module.h --- Diff: https://github.com/kamailio/kamailio/commit/dd717b80be6f8e9519aa4b3d627cb88… Patch: https://github.com/kamailio/kamailio/commit/dd717b80be6f8e9519aa4b3d627cb88…

1 0

git:master:d1b982cb: core: relocated $def(...) and $defn(...)
by Daniel-Constantin Mierla 28 Dec '20

28 Dec '20

Module: kamailio Branch: master Commit: d1b982cbebe187395b5677c9cdd8ad6c185a5a6b URL: https://github.com/kamailio/kamailio/commit/d1b982cbebe187395b5677c9cdd8ad6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-27T18:19:49+01:00 core: relocated $def(...) and $defn(...) --- Modified: src/core/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/d1b982cbebe187395b5677c9cdd8ad6… Patch: https://github.com/kamailio/kamailio/commit/d1b982cbebe187395b5677c9cdd8ad6… --- diff --git a/src/core/pv_core.c b/src/core/pv_core.c index 0998aa18a8..54fc6e6123 100644 --- a/src/core/pv_core.c +++ b/src/core/pv_core.c @@ -28,27 +28,12 @@ #include "pv_core.h" #include "pvar.h" +#include "ppcfg.h" #include "str.h" #include "mem/pkg.h" -static int pv_get_retcode(struct sip_msg*, pv_param_t*, pv_value_t*); -static int pv_parse_env_name(pv_spec_p sp, str *in); -static int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); - -static pv_export_t core_pvs[] = { - /* return code, various synonims */ - { STR_STATIC_INIT("?"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, - { STR_STATIC_INIT("rc"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, - { STR_STATIC_INIT("retcode"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, - { STR_STATIC_INIT("env"), PVT_OTHER, pv_get_env, 0, - pv_parse_env_name, 0, 0, 0}, - - { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } -}; - - -/** ugly hack to get the return code, needed because the PVs do not know (yet) +/** needed to get the return code, because the PVs do not know (yet) * about the script context */ extern int _last_returned_code; @@ -97,6 +82,73 @@ static int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } +static int pv_parse_def_name(pv_spec_p sp, str *in) +{ + if (in == NULL || in->s == NULL || sp == NULL) { + LM_ERR("INVALID DEF NAME\n"); + return -1; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = AVP_NAME_STR; + sp->pvp.pvn.u.isname.name.s = *in; + return 0; + +} + +static int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + str *val = pp_define_get(param->pvn.u.isname.name.s.len, param->pvn.u.isname.name.s.s); + + if (val) { + return pv_get_strval(msg, param, res, val); + } + return pv_get_null(msg, param, res); +} + +static int pv_parse_defn_name(pv_spec_p sp, str *in) +{ + if (in == NULL || in->s == NULL || sp == NULL) { + LM_ERR("INVALID DEF NAME\n"); + return -1; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = AVP_NAME_STR; + sp->pvp.pvn.u.isname.name.s = *in; + return 0; + +} + +static int pv_get_defn(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + int n = 0; + str *val = pp_define_get(param->pvn.u.isname.name.s.len, + param->pvn.u.isname.name.s.s); + + if (val) { + str2sint(val, &n); + return pv_get_intstrval(msg, param, res, n, val); + } else { + return pv_get_sintval(msg, param, res, n); + } +} + +/** + * + */ +static pv_export_t core_pvs[] = { + /* return code, various synonims */ + { STR_STATIC_INIT("?"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, + { STR_STATIC_INIT("rc"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, + { STR_STATIC_INIT("retcode"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, + { STR_STATIC_INIT("env"), PVT_OTHER, pv_get_env, 0, + pv_parse_env_name, 0, 0, 0}, + {{"def", (sizeof("def")-1)}, PVT_OTHER, pv_get_def, 0, + pv_parse_def_name, 0, 0, 0}, + {{"defn", (sizeof("defn")-1)}, PVT_OTHER, pv_get_defn, 0, + pv_parse_defn_name, 0, 0, 0}, + + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; /** * register built-in core pvars.

1 0

git:master:1ec0f77f: pv: removed code relocared to core
by Daniel-Constantin Mierla 28 Dec '20

28 Dec '20

Module: kamailio Branch: master Commit: 1ec0f77f5350abcaacc5831fb658f02ca4108580 URL: https://github.com/kamailio/kamailio/commit/1ec0f77f5350abcaacc5831fb658f02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-27T18:20:59+01:00 pv: removed code relocared to core --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/1ec0f77f5350abcaacc5831fb658f02… Patch: https://github.com/kamailio/kamailio/commit/1ec0f77f5350abcaacc5831fb658f02… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index c21298d752..20f0979d86 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -196,10 +196,6 @@ static pv_export_t mod_pvs[] = { {{"dd", (sizeof("dd")-1)}, /* */ PVT_OTHER, pv_get_dsturi_attr, 0, 0, 0, pv_init_iname, 1}, - {{"def", (sizeof("def")-1)}, PVT_OTHER, pv_get_def, 0, - pv_parse_def_name, 0, 0, 0}, - {{"defn", (sizeof("defn")-1)}, PVT_OTHER, pv_get_defn, 0, - pv_parse_defn_name, 0, 0, 0}, {{"di", (sizeof("di")-1)}, /* */ PVT_OTHER, pv_get_diversion, 0, 0, 0, pv_init_iname, 1}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index ed9abe7cce..746e12e3ed 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3736,53 +3736,3 @@ int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } } - -int pv_parse_def_name(pv_spec_p sp, str *in) -{ - if (in == NULL || in->s == NULL || sp == NULL) { - LM_ERR("INVALID DEF NAME\n"); - return -1; - } - sp->pvp.pvn.type = PV_NAME_INTSTR; - sp->pvp.pvn.u.isname.type = AVP_NAME_STR; - sp->pvp.pvn.u.isname.name.s = *in; - return 0; - -} - -int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) -{ - str *val = pp_define_get(param->pvn.u.isname.name.s.len, param->pvn.u.isname.name.s.s); - - if (val) { - return pv_get_strval(msg, param, res, val); - } - return pv_get_null(msg, param, res); -} - -int pv_parse_defn_name(pv_spec_p sp, str *in) -{ - if (in == NULL || in->s == NULL || sp == NULL) { - LM_ERR("INVALID DEF NAME\n"); - return -1; - } - sp->pvp.pvn.type = PV_NAME_INTSTR; - sp->pvp.pvn.u.isname.type = AVP_NAME_STR; - sp->pvp.pvn.u.isname.name.s = *in; - return 0; - -} - -int pv_get_defn(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) -{ - int n = 0; - str *val = pp_define_get(param->pvn.u.isname.name.s.len, - param->pvn.u.isname.name.s.s); - - if (val) { - str2sint(val, &n); - return pv_get_intstrval(msg, param, res, n, val); - } else { - return pv_get_sintval(msg, param, res, n); - } -} diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 02f1141fdf..865a48a2c0 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -390,11 +390,5 @@ int pv_parse_ksr_attrs_name(pv_spec_p sp, str *in); int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); -int pv_parse_def_name(pv_spec_p sp, str *in); -int pv_get_def(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); - -int pv_parse_defn_name(pv_spec_p sp, str *in); -int pv_get_defn(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); - #endif

1 0

Merry Christmas and Happy Holidays!
by Daniel-Constantin Mierla 27 Dec '20

27 Dec '20

A year that was very tough for the entire world is getting close to its end, no doubt that was the most challenging in our life so far for many of us, however, with a distributed, friendly and collaborative community, Kamailio project continued to develop consistently, bringing out a new major release. I trust it helped people and companies world wide to to connect with the dear ones and build a better way of living. The season holidays are ahead, time to rest a bit, spend time with family and friends, being online or face to face. As usual, I take this chance to express my thanks and greetings to all the friends, developers, supporting companies and community members that made 2020 another great year for Kamailio project. Enjoy the holidays! Merry Christmas! Daniel * Santa is flying Kamailio! * -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

6 5

git:master:b1286bd8: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 26 Dec '20

26 Dec '20

Module: kamailio Branch: master Commit: b1286bd8d2c3d8bc2672141ebd1055f075bdd6c5 URL: https://github.com/kamailio/kamailio/commit/b1286bd8d2c3d8bc2672141ebd1055f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-26T12:31:18+01:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/b1286bd8d2c3d8bc2672141ebd1055f… Patch: https://github.com/kamailio/kamailio/commit/b1286bd8d2c3d8bc2672141ebd1055f… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index a3852c7e73..c125b689d6 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -82,10 +82,12 @@ Chapter 1. Admin Guide 1. Overview - The module implements secure SIP identity specifications - STIR and - SHAKEN IETF extensions for SIP (RFC8224, RFC 8588). + The module implements secure SIP identity specifications - STIR (Secure + Telephony Identity Revisited) and SHAKEN (Signature-based Handling of + Asserted information using toKENs) IETF extensions for SIP (RFC8224, + RFC8588). - It exports the functions to check and generate Identity header. + It exports the functions to check and generate SIP Identity header. 2. Dependencies @@ -253,7 +255,7 @@ request_route { request_route { ... secsipid_add_identity("$fU", "$rU", "A", "", - "http://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem"); + "https://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem"); ... } ...

1 0

git:master:c1e06e02: secsipid: docs - details of the acronyms
by Daniel-Constantin Mierla 26 Dec '20

26 Dec '20

Module: kamailio Branch: master Commit: c1e06e029b192a4db45841fa78e9bcfee91f125d URL: https://github.com/kamailio/kamailio/commit/c1e06e029b192a4db45841fa78e9bcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-24T10:09:02+01:00 secsipid: docs - details of the acronyms --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c1e06e029b192a4db45841fa78e9bcf… Patch: https://github.com/kamailio/kamailio/commit/c1e06e029b192a4db45841fa78e9bcf… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 878000efa5..4e2ea74750 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -16,11 +16,13 @@ <section> <title>Overview</title> <para> - The module implements secure SIP identity specifications - STIR and SHAKEN - IETF extensions for SIP (RFC8224, RFC 8588). + The module implements secure SIP identity specifications - STIR + (Secure Telephony Identity Revisited) and SHAKEN + (Signature-based Handling of Asserted information using toKENs) + IETF extensions for SIP (RFC8224, RFC8588). </para> <para> - It exports the functions to check and generate Identity header. + It exports the functions to check and generate SIP Identity header. </para> </section> <section> @@ -260,7 +262,7 @@ request_route { request_route { ... secsipid_add_identity("$fU", "$rU", "A", "", - "http://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem"); + "https://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem"); ... } ...

1 0

git:master:5f93bb6f: xhttp: kemi funtion to return $hu - http uri
by Daniel-Constantin Mierla 26 Dec '20

26 Dec '20

Module: kamailio Branch: master Commit: 5f93bb6fed27e41e001a4748081ab6e3f32e737d URL: https://github.com/kamailio/kamailio/commit/5f93bb6fed27e41e001a4748081ab6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-26T10:00:49+01:00 xhttp: kemi funtion to return $hu - http uri --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5f93bb6fed27e41e001a4748081ab6e… Patch: https://github.com/kamailio/kamailio/commit/5f93bb6fed27e41e001a4748081ab6e… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index ba57066849..f62c880a9a 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -513,6 +513,28 @@ int bind_xhttp(xhttp_api_t *api) return 0; } +/** + * + */ +static sr_kemi_xval_t _sr_kemi_xhttp_xval = {0}; + +/** + * + */ +static sr_kemi_xval_t* ki_xhttp_get_hu(sip_msg_t *msg) +{ + memset(&_sr_kemi_xhttp_xval, 0, sizeof(sr_kemi_xval_t)); + + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_xhttp_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_xhttp_xval; + } + + _sr_kemi_xhttp_xval.vtype = SR_KEMIP_STR; + _sr_kemi_xhttp_xval.v.s = msg->first_line.u.request.uri; + return &_sr_kemi_xhttp_xval; +} + /** * */ @@ -523,6 +545,11 @@ static sr_kemi_t sr_kemi_xhttp_exports[] = { { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("xhttp"), str_init("get_hu"), + SR_KEMIP_XVAL, ki_xhttp_get_hu, + { 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 } } };

1 0

git:master:004190b2: core: evaluate replacement expression for substdef
by Daniel-Constantin Mierla 23 Dec '20

23 Dec '20

Module: kamailio Branch: master Commit: 004190b2ebe62681ae1f4f65f18de1a9e430742d URL: https://github.com/kamailio/kamailio/commit/004190b2ebe62681ae1f4f65f18de1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-23T14:00:48+01:00 core: evaluate replacement expression for substdef - done fore define when it includes variables, to be coherent with subst --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/004190b2ebe62681ae1f4f65f18de1a… Patch: https://github.com/kamailio/kamailio/commit/004190b2ebe62681ae1f4f65f18de1a… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index c6b7d2e14d..627402ba66 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -29,6 +29,7 @@ #include "mem/mem.h" #include "ut.h" #include "re.h" +#include "pvar.h" #include "dprint.h" #include "ppcfg.h" @@ -91,6 +92,8 @@ int pp_substdef_add(char *data, int mode) char *p; str defname; str defvalue; + str newval; + sip_msg_t *fmsg; if(pp_subst_add(data)<0) { LM_ERR("subst rule cannot be added\n"); @@ -147,6 +150,12 @@ int pp_substdef_add(char *data, int mode) defvalue.s--; defvalue.len += 2; } + if(memchr(defvalue.s, '$', defvalue.len) != NULL) { + fmsg = faked_msg_get_next(); + if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { + defvalue = newval; + } + } if(pp_define_set(defvalue.len, defvalue.s)<0) { LM_ERR("cannot set define value\n"); goto error;

1 0

git:master:80b3d5d0: core: info message made dbg when adding a subst expression
by Daniel-Constantin Mierla 23 Dec '20

23 Dec '20

Module: kamailio Branch: master Commit: 80b3d5d036da493316a93594c770df1ef8218e5e URL: https://github.com/kamailio/kamailio/commit/80b3d5d036da493316a93594c770df1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-22T20:33:27+01:00 core: info message made dbg when adding a subst expression --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/80b3d5d036da493316a93594c770df1… Patch: https://github.com/kamailio/kamailio/commit/80b3d5d036da493316a93594c770df1… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 115707aa00..c6b7d2e14d 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -80,7 +80,7 @@ int pp_subst_add(char *data) } pp_subst_rules_tail = pr; - LM_INFO("### added subst expression: %s\n", data); + LM_DBG("### added subst expression: [%s]\n", data); return 0; }

1 0

git:master:bd2b5c6e: core: renamed core init list of pvs
by Daniel-Constantin Mierla 23 Dec '20

23 Dec '20

Module: kamailio Branch: master Commit: bd2b5c6e8ee7e5e81732b7242279c79e552db4dd URL: https://github.com/kamailio/kamailio/commit/bd2b5c6e8ee7e5e81732b7242279c79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-22T21:15:12+01:00 core: renamed core init list of pvs - similar name is used in pv_core.c --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/bd2b5c6e8ee7e5e81732b7242279c79… Patch: https://github.com/kamailio/kamailio/commit/bd2b5c6e8ee7e5e81732b7242279c79… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 30b2a7cdfe..5fc2952ed9 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -2061,7 +2061,7 @@ tr_export_t* tr_lookup_class(str *tclass) * core PVs, initialization and destroy APIs ********************************************************/ -static pv_export_t _core_pvs[] = { +static pv_export_t _core_init_pvs[] = { {{"null", (sizeof("null")-1)}, /* */ PVT_NULL, pv_get_null, 0, 0, 0, 0, 0}, @@ -2085,7 +2085,7 @@ int pv_init_api(void) strcpy(pv_str_null_buf, PV_STR_NULL_VAL); pv_str_null.s = pv_str_null_buf; - if(register_pvars_mod("core", _core_pvs)<0) + if(register_pvars_mod("core", _core_init_pvs)<0) return -1; return 0; }

1 0

git:master:62a08366: core: pv api - relocated implementation of $env(name)
by Daniel-Constantin Mierla 22 Dec '20

22 Dec '20

Module: kamailio Branch: master Commit: 62a08366b4424578ffd9a9f42855ce5f4c710668 URL: https://github.com/kamailio/kamailio/commit/62a08366b4424578ffd9a9f42855ce5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-22T19:44:16+01:00 core: pv api - relocated implementation of $env(name) --- Modified: src/core/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/62a08366b4424578ffd9a9f42855ce5… Patch: https://github.com/kamailio/kamailio/commit/62a08366b4424578ffd9a9f42855ce5… --- diff --git a/src/core/pv_core.c b/src/core/pv_core.c index 3279a0a22a..0998aa18a8 100644 --- a/src/core/pv_core.c +++ b/src/core/pv_core.c @@ -24,17 +24,25 @@ * Module: \ref core */ +#include <stdlib.h> + #include "pv_core.h" #include "pvar.h" #include "str.h" +#include "mem/pkg.h" static int pv_get_retcode(struct sip_msg*, pv_param_t*, pv_value_t*); +static int pv_parse_env_name(pv_spec_p sp, str *in); +static int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); + static pv_export_t core_pvs[] = { /* return code, various synonims */ { STR_STATIC_INIT("?"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, { STR_STATIC_INIT("rc"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, { STR_STATIC_INIT("retcode"), PVT_OTHER, pv_get_retcode, 0, 0, 0, 0, 0 }, + { STR_STATIC_INIT("env"), PVT_OTHER, pv_get_env, 0, + pv_parse_env_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; @@ -52,6 +60,43 @@ static int pv_get_retcode(struct sip_msg* msg, pv_param_t* p, pv_value_t* res) } +static int pv_parse_env_name(pv_spec_p sp, str *in) +{ + char *csname; + + if(in->s==NULL || in->len<=0) + return -1; + + csname = pkg_malloc(in->len + 1); + + if (csname == NULL) { + LM_ERR("no more pkg memory"); + return -1; + } + + memcpy(csname, in->s, in->len); + csname[in->len] = '\0'; + + sp->pvp.pvn.u.dname = (void*)csname; + sp->pvp.pvn.type = PV_NAME_OTHER; + return 0; +} + +static int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + char *val; + char *csname = (char *) param->pvn.u.dname; + + if (csname) { + val = getenv(csname); + + if (val) { + return pv_get_strzval(msg, param, res, val); + } + } + return pv_get_null(msg, param, res); +} + /** * register built-in core pvars.

1 0

git:master:bdf92b1e: pv: removed implementation of $env(name)
by Daniel-Constantin Mierla 22 Dec '20

22 Dec '20

Module: kamailio Branch: master Commit: bdf92b1eee120d4dce22079faf4d4cf73133c3d7 URL: https://github.com/kamailio/kamailio/commit/bdf92b1eee120d4dce22079faf4d4cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-22T19:44:47+01:00 pv: removed implementation of $env(name) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/bdf92b1eee120d4dce22079faf4d4cf… Patch: https://github.com/kamailio/kamailio/commit/bdf92b1eee120d4dce22079faf4d4cf… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 67f42c227d..c21298d752 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -227,8 +227,6 @@ static pv_export_t mod_pvs[] = { {{"duri", (sizeof("duri")-1)}, /* */ PVT_DSTURI, pv_get_dsturi, pv_set_dsturi, 0, 0, 0, 0}, - {{"env", (sizeof("env")-1)}, PVT_OTHER, pv_get_env, 0, - pv_parse_env_name, 0, 0, 0}, {{"err.class", (sizeof("err.class")-1)}, /* */ PVT_OTHER, pv_get_errinfo_attr, 0, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 681e6beab1..ed9abe7cce 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3737,43 +3737,6 @@ int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } -int pv_parse_env_name(pv_spec_p sp, str *in) -{ - char *csname; - - if(in->s==NULL || in->len<=0) - return -1; - - csname = pkg_malloc(in->len + 1); - - if (csname == NULL) { - LM_ERR("no more pkg memory"); - return -1; - } - - memcpy(csname, in->s, in->len); - csname[in->len] = '\0'; - - sp->pvp.pvn.u.dname = (void*)csname; - sp->pvp.pvn.type = PV_NAME_OTHER; - return 0; -} - -int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) -{ - char *val; - char *csname = (char *) param->pvn.u.dname; - - if (csname) { - val = getenv(csname); - - if (val) { - return pv_get_strzval(msg, param, res, val); - } - } - return pv_get_null(msg, param, res); -} - int pv_parse_def_name(pv_spec_p sp, str *in) { if (in == NULL || in->s == NULL || sp == NULL) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index afcaa1f84a..02f1141fdf 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -385,10 +385,6 @@ int pv_parse_msg_attrs_name(pv_spec_p sp, str *in); int pv_get_msg_attrs(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); -int pv_parse_env_name(pv_spec_p sp, str *in); - -int pv_get_env(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); - int pv_parse_ksr_attrs_name(pv_spec_p sp, str *in); int pv_get_ksr_attrs(sip_msg_t *msg, pv_param_t *param,

1 0

git:master:924125d8: nathelper: refine log statement, remove redundant info
by Henning Westerholt 22 Dec '20

22 Dec '20

Module: kamailio Branch: master Commit: 924125d833998e09c9d73a382225430b9ac0ef16 URL: https://github.com/kamailio/kamailio/commit/924125d833998e09c9d73a382225430… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-22T13:47:15Z nathelper: refine log statement, remove redundant info --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/924125d833998e09c9d73a382225430… Patch: https://github.com/kamailio/kamailio/commit/924125d833998e09c9d73a382225430… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 12206ba152..b883b52472 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2154,8 +2154,7 @@ static void nh_timer(unsigned int ticks, void *timer_idx) } else if(path.len && udpping_from_path) { path_ip_str = extract_last_path_ip(path); if(path_ip_str == NULL) { - LM_ERR("ERROR:nathelper:nh_timer: unable to parse path from " - "location\n"); + LM_ERR("unable to parse path from location\n"); continue; } if(get_natping_socket(path_ip_str, &path_ip, &path_port)) {

1 0

Python 2 EoL and app_python in > 5.4?
by Anthony Alba 22 Dec '20

22 Dec '20

Hi devs, Background: I am the porter of app_python.so to Python 3 (app_python3.so) nearly 3 years ago. As we all know Python 2 reached EoL almost one year ago, it may be timely to discuss the issue of when(if) to remove the Python 2 module app_python.so in kamailio. 1. Debian: just over a year ago: https://lists.debian.org/debian-devel-announce/2019/11/msg00000.html 2. Python 2 EOL: https://www.infoworld.com/article/3365221/python-2-end-of-life-how-to-survi… 3. Debian Bullseye (not yet released): https://wiki.debian.org/Python/2Removal "; "port upstream package to python3 (or file upstream bug): make sure package doesn't call python at build- or compile time (as there won't be a python package and no python command in bullseye, only python3.) " 4. Debian Buster/Stretch - used in CI by the (Sipwise I think) builders. EoL LTS ~2022 for Stretch, ~2024 for Buster. https://wiki.debian.org/DebianReleases Discussion: should app_python be dropped for Kamailio 5.5.x or 5.6.x? What are your thoughts? Cheers Anthony

2 1

Kamailio not under GPL2
by tom Gross 22 Dec '20

22 Dec '20

Hallo I hope I am writing to the right mailing address. We are interested in Kamailio source code but We would like to purchase Kamailio (for a fee) that is not under the GPL2 category . Do you offer that? Thank you Tom <https://docs.google.com/uc?export=download&id=1zTACqAqtPFWXnR_r-T8kaF4TaJpg AJ7l&revid=0Bx0wng2lOd16cCtVL1kyWWZmdHpGdktTbXFpNHJmQTRzWm9JPQ> Tom Gross Director of Operations and Corporate +972-52-3922304 <http://www.flolive.net/> www.flolive.net The information contained in this e-mail message is intended for the use of individual or entity named above and may include information that is confidential and proprietary. Please keep the content of this email in strict confidence. If you are not the intended recipient, please immediately notify us by return e-mail, delete this e-mail and destroy any copies. -- *The information contained in this e-mail message is intended for the use of individual or entity named above and may include information that is confidential and proprietary. Please keep the content of this email in strict confidence. If you are not the intended recipient, please immediately notify us by return e-mail, delete this e-mail and destroy any copies.*

2 1

Kamailio v5.3.8 released
by Henning Westerholt 21 Dec '20

21 Dec '20

Hello, Kamailio SIP Server v5.3.8 stable has been released. This is a maintenance release of the previous stable branch (5.3), that includes fixes since the release of v5.3.7. There are no change to database schema or configuration language structure that you have to do on previous installations of v5.3.x. Deployments running previous v5.3.x versions are recommended to be upgraded to v5.3.8. For more details about version 5.3.8 (including links and guidelines to download the tar file or from GIT repository), visit: https://www.kamailio.org/w/2020/12/kamailio-v5-3-8-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 0

git:5.3:05d4d530: Makefile.defs: set version to 5.3.8
by Henning Westerholt 21 Dec '20

21 Dec '20

Module: kamailio Branch: 5.3 Commit: 05d4d530d56ddad05103b222d734e0429ca3457b URL: https://github.com/kamailio/kamailio/commit/05d4d530d56ddad05103b222d734e04… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T17:02:17Z Makefile.defs: set version to 5.3.8 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/05d4d530d56ddad05103b222d734e04… Patch: https://github.com/kamailio/kamailio/commit/05d4d530d56ddad05103b222d734e04… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index d0d1e46338..83e48e6f0d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 3 -SUBLEVEL = 7 +SUBLEVEL = 8 EXTRAVERSION = # memory manager switcher

1 0

git:5.3:cd35b944: pkg: set version to 5.3.8 for packaging files
by Henning Westerholt 21 Dec '20

21 Dec '20

Module: kamailio Branch: 5.3 Commit: cd35b9440e3bf1f4509cc3d481846addf9236774 URL: https://github.com/kamailio/kamailio/commit/cd35b9440e3bf1f4509cc3d481846ad… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T17:02:17Z pkg: set version to 5.3.8 for packaging files --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/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 Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/cd35b9440e3bf1f4509cc3d481846ad… Patch: https://github.com/kamailio/kamailio/commit/cd35b9440e3bf1f4509cc3d481846ad…

1 0

git:5.3:a5815595: Changelog: update content for 5.3.8 release
by Henning Westerholt 21 Dec '20

21 Dec '20

Module: kamailio Branch: 5.3 Commit: a5815595511d298a9948027fb0d9410a2fd65e66 URL: https://github.com/kamailio/kamailio/commit/a5815595511d298a9948027fb0d9410… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T17:06:38Z Changelog: update content for 5.3.8 release --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/a5815595511d298a9948027fb0d9410… Patch: https://github.com/kamailio/kamailio/commit/a5815595511d298a9948027fb0d9410…

1 0

git:5.3:c6718920: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 21 Dec '20

21 Dec '20

Module: kamailio Branch: 5.3 Commit: c67189205cad464cb8480c9883cfaa6531062fac URL: https://github.com/kamailio/kamailio/commit/c67189205cad464cb8480c9883cfaa6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-21T16:46:54+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/http_client/README Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/c67189205cad464cb8480c9883cfaa6… Patch: https://github.com/kamailio/kamailio/commit/c67189205cad464cb8480c9883cfaa6… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 465f6055af..0be13f07c5 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -90,7 +90,7 @@ Hugh Waite 2. Developer Guide - 1. + 1. Introduction 2. Available Functions 2.1. int http_connect(msg, connection, url, result, @@ -855,7 +855,7 @@ Chapter 2. Developer Guide Table of Contents - 1. + 1. Introduction 2. Available Functions 2.1. int http_connect(msg, connection, url, result, content_type, @@ -865,6 +865,8 @@ Chapter 2. Developer Guide 2.3. int http_query(msg, url, dest, post) 2.4. http_get_content_type(str connection) +1. Introduction + This module provides a set of API functions that other modules can use in order to integrate with HTTP services. diff --git a/src/modules/lost/README b/src/modules/lost/README index 357c41d388..ae24ac2676 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -156,7 +156,7 @@ $var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$va r(pidf)"); ... -$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)"", "$var(err)"); +$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)", "$var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$va r(pidf)\n"); ...

1 0

git: new commits in branch 5.3
by Henning Westerholt 21 Dec '20

21 Dec '20

- URL: https://github.com/kamailio/kamailio/commit/8cc9193404e7dac358e96fe8b9dd744… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:00:51Z exec: debug message when command returns non-zero (cherry picked from commit e9eee1ead964992a2d81014709755bbfd1e995c9) - URL: https://github.com/kamailio/kamailio/commit/f0732ee99ee486a71790b2ce4419ba1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:04:25Z dialog: skip doing cseq update processing for non-sip requests (cherry picked from commit 960b60ede8543f38b61ad2769e81e11d5a777df8) - URL: https://github.com/kamailio/kamailio/commit/580afabee9f76f1e37b09b1f7b7086c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:06:25Z core: init origproto to fix compiler warning - GH #2543 (cherry picked from commit ef3233d14080936486d09edbe9598d7d92bd2f33) - URL: https://github.com/kamailio/kamailio/commit/6e7858b0b1837bfa17fb374f01b3ad2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:06:54Z http_async_client: include poll.h instead sys/poll.h - according to POSIX specs - GH #2543 (cherry picked from commit 8f30c75cff7787a39f7c934e00e933b1beb43c20) - URL: https://github.com/kamailio/kamailio/commit/0b09dd1f5453f66684053f5b3ea3d2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:07:04Z sctp: memcpy field data to avoid unaligned access warning - GH #2543 (cherry picked from commit 4bb099b046939b85e1827b804167a51ef4bc00c4) - URL: https://github.com/kamailio/kamailio/commit/164c4f1523d8400b84a4359b1e15d56… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-12-21T15:07:16Z core: added missing field in sip_msg_update_buffer - added a missing field in sip_msg_update_buffer() when restoring message fiedls: msg->pid. (cherry picked from commit 57be5c1f33344275c15777a7927d9c48df4a69ba) - URL: https://github.com/kamailio/kamailio/commit/63022e0d95500e5da0d1a7cc4d14ced… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:08:40Z jsonrpcs: exported dispatch() function to kemi (cherry picked from commit 08a9ed3d136c861f990e4f63c2c0544e08d9078d) - URL: https://github.com/kamailio/kamailio/commit/fc91871294ff7d23fadb642550122e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:09:04Z drouting: give portparameter set to 0 to sip_resolvehost() - enable doing SRV query, GH #2553 (cherry picked from commit 18f59c10582845da5eea280990daf19c804978fb) - URL: https://github.com/kamailio/kamailio/commit/833e3d0f9bbc2e4e00c662f4927ace9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:09:12Z dispatcher: test no-dns flag to skip ip matching for hostnames - no dns done at startup if the flag is set in the destination record (cherry picked from commit 1c58b8e0ed221404a15c1426f40df167654e3860) - URL: https://github.com/kamailio/kamailio/commit/a9a35d0ba6e6f55a7788bf8cee945b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:09:36Z tm: print ruri mode in debug message from t load contacts (cherry picked from commit 3214ecd8ee82d1b69cde57d96dddefe1301c190c) - URL: https://github.com/kamailio/kamailio/commit/41761ed5d158ab59ef51aca11a849ce… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-12-21T15:10:48Z smsops: fix len calc for a concatenated sms - fixed the calculation for concatenated SMSs based on TS 23.040, Sec. 9.2.3.16 (cherry picked from commit d90f29b3b03386add989aebe3865bdc78dff8fbe) - URL: https://github.com/kamailio/kamailio/commit/7cecd70c29bd5e0b8fa918ad99b016a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:11:00Z tm: proper fill of From/To URI/tag values using parsed structure in t_uac_send() (cherry picked from commit aa6e9963b2725c1b6b7e5ff995a77c222d95fa3c) - URL: https://github.com/kamailio/kamailio/commit/1f5bd88fd60f98e36fd0b59b54398a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:11:08Z misc/examples: note that sr is exported by app_lua_sr - hint for lua syntax check (cherry picked from commit 889431746d24c73eeff73705fab36a0e154116a9) - URL: https://github.com/kamailio/kamailio/commit/a76f06eb010765216450bd78bcc1040… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:11:16Z kemix: exported function get_rcvadvip() and get_rcvadvport() - return advertised address and port of the receiving socket (cherry picked from commit 070a9c042a1caf19162d3d97b26f8d7548747cbb) - URL: https://github.com/kamailio/kamailio/commit/6f6dda289c5c26a3098cae0d8df37e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:11:25Z kemix: exported functions to get socket string and name (cherry picked from commit b59204eb1df8c85bcdde65f2a840f55986f01223) - URL: https://github.com/kamailio/kamailio/commit/b4f83c8001569c99582eb3f92433083… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T15:13:46Z tls: log version, gh #2561 (cherry picked from commit c9f0adddde8321bfaf368691fea74079e40bd789) - URL: https://github.com/kamailio/kamailio/commit/f7e7c3501a79415ff12ae77b5428a88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:15:45Z dispatcher: removed unnecessary return (cherry picked from commit 721d533317c735d7ddbd16ad94684b483468c010) - URL: https://github.com/kamailio/kamailio/commit/91d4c181c5472c9e1d1727c74e7e637… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:16:16Z core: check if the tcp clone rcv buffer is set when applying changes (cherry picked from commit aa13720e5d78dde5ae5235c13399848cb8f5a0cc) - URL: https://github.com/kamailio/kamailio/commit/f21627f0e24c5717ca29198a1c8f457… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-12-21T15:17:22Z ndb_redis: set message level to debug on reconnect * logging error makes no sense here since there's going to be a reconnection afterwards (cherry picked from commit 98805c723fbe01556e56d5b00ffc686b92014847) - URL: https://github.com/kamailio/kamailio/commit/5c685f3d3d091dfd56fea5cb2ae7668… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-12-21T15:18:02Z lost: removed extra `"` symbol in example (cherry picked from commit 124499c12db185d85805e5c71d5cc4222e608b68) - URL: https://github.com/kamailio/kamailio/commit/7465d23be7b0e9f27dc4f95c99fba7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:20:13Z auth_diameter: init variable and check before freeing (cherry picked from commit 04dc5d6c66c85d0d411aa23b27bc6be00258eff6) - URL: https://github.com/kamailio/kamailio/commit/6a4e6784dd787f3c33af8907771c023… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:24:55Z tm: check end of header name in lw parser - proper identification of header type, prior could mistakenly set the type by matching the prefix of long header name - GH #2572 (cherry picked from commit c0f5382bfbd2022896a9b206967977f827517700) - URL: https://github.com/kamailio/kamailio/commit/7d2fc9e4e480fb811983212136938ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:26:36Z core: tcp - debug messages merged, print bytes read and flags (cherry picked from commit efb9c5f83b37c316b848ae7b6dc829e2f8ca6275) - URL: https://github.com/kamailio/kamailio/commit/ef4bb80111a3eb8e7741a814ae3b113… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:26:40Z core: tcp - log connection state and flags on debug message (cherry picked from commit 41040a0420ee48f51901bf32e29526c8948ecea0) - URL: https://github.com/kamailio/kamailio/commit/4bc84f40b0fe7e9a654a1d24ee190fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:27:07Z dispatcher: check weight value to be in expected range (cherry picked from commit e00f610203fee957a22afc5f8103c1482a925138) - URL: https://github.com/kamailio/kamailio/commit/65b9c2d085f8d0b2f73fc948f185f59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:29:17Z dispatcher: info log message when adding extra weight or rweight percentages (cherry picked from commit ba27633ca22bcfc18fd4bb7d62c2f5bb32e56962) - URL: https://github.com/kamailio/kamailio/commit/b0c05e51d2fdfba36cd1e023a9d44e7… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T15:29:49Z Revert "kemix: exported functions to get socket string and name" This reverts commit 6f6dda289c5c26a3098cae0d8df37e6bc51e1ac1. - URL: https://github.com/kamailio/kamailio/commit/dcc0b84d12d2a8591e91019cd626047… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:31:08Z http_client: do not set empty headers and body (cherry picked from commit ce58411c462231d6ea1fc3b4acbf50520c2962ce) - URL: https://github.com/kamailio/kamailio/commit/03505654c7ecd4b0e026a561d36ca2c… Author: tsearle <tsearle(a)gmail.com> Date: 2020-12-21T15:31:26Z modules/siptrace: fix regression preventing variables to be used (#2588) * modules/siptrace: fix regression preventing variables to be used Commit fa7eb2a switched the 2 parameter version of sip_trace from using the builtin fixup_spve_spve to the custom fixup method to using the custom fixup_siptrace. As it is a custom fixup method, the corresponding free method can not be auto-detected causing the config parser to require the parameters to be a constant. This patch adds a free method, allowing variables to be once again passed as the 2nd parameter of this method (as well as fixing a memory leak for the 3rd parameter). * change free for parameter 3 Co-authored-by: Torrey Searle <tsearle(a)voxbone.com> (cherry picked from commit 7c98d547996637a7bf1c7025c93142f574fe3ac9) - URL: https://github.com/kamailio/kamailio/commit/8283f280977a5edc8973028a05d70d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:34:12Z dialog: handle CANCEL requests for CSeq updates (cherry picked from commit fd35a1a4eee2c50a3b7bf4ee6b1f6f20f4fa7d62) - URL: https://github.com/kamailio/kamailio/commit/70aaf931cf24738b6909721405657f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T15:35:17Z http_client: docs - section title to get proper entry in toc - bits of whitespacing fixing (cherry picked from commit fadc0fc499fb57a763aa71a76b24cff152bbd927)

1 0

git:5.4:573dd7e6: tls: log version, gh #2561
by Henning Westerholt 21 Dec '20

21 Dec '20

Module: kamailio Branch: 5.4 Commit: 573dd7e63ac3d2629367f72c967ec7fbd4edfcf1 URL: https://github.com/kamailio/kamailio/commit/573dd7e63ac3d2629367f72c967ec7f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-21T15:14:31Z tls: log version, gh #2561 (cherry picked from commit c9f0adddde8321bfaf368691fea74079e40bd789) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/573dd7e63ac3d2629367f72c967ec7f… Patch: https://github.com/kamailio/kamailio/commit/573dd7e63ac3d2629367f72c967ec7f… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 0b9fd39fc8..fed9749624 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -385,6 +385,7 @@ static int mod_init(void) if (tls_check_sockets(*tls_domains_cfg) < 0) goto error; + LM_INFO("use OpenSSL version: %08x\n", (uint32_t)(OPENSSL_VERSION_NUMBER)); #ifndef OPENSSL_NO_ECDH LM_INFO("With ECDH-Support!\n"); #endif

1 0

git:master:8e54f027: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: 8e54f027e8193b70e840033b9c3c5a94ebf5486b URL: https://github.com/kamailio/kamailio/commit/8e54f027e8193b70e840033b9c3c5a9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-21T14:46:11+01:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/8e54f027e8193b70e840033b9c3c5a9… Patch: https://github.com/kamailio/kamailio/commit/8e54f027e8193b70e840033b9c3c5a9… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index 3298f6f41d..8100557bd5 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -722,13 +722,15 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") Defines the name of XAVP class to store runtime module config values. The values are stored as inner XAVPs, like $xavp(class=>attribute). Valid inner XAVP names: + * expires - the number of maximum contacts to be stored for the + current registration AoR. It overwrites the 'max_contacts' module + parameter value. + * q - the expires value, to overwrite the value from SIP headers. * max_contacts - the number of maximum contacts to be stored for the current registration AoR. It overwrites the 'max_contacts' module parameter value. * socket - the string representing the socket on which the register request was received, as alternative to using the sock_hdr. - * q - q value of contact (integer 0-1000). It overrides q value given - in contact header and default_q parameter. For example. if this parameter is set to 'reg', then the number of maximum contacts can be set in $xavp(reg=>max_contacts). @@ -742,6 +744,7 @@ modparam("registrar", "xavp_cfg", "reg") request_route { ... $xavp(reg=>max_contacts) = 4; + $xavp(reg[0]=>expires) = 600; save("location"); ... }

1 0

git:master:132c9d03: registrar: allow taking expires value from xavp_cfg expires field
by Daniel-Constantin Mierla 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: 132c9d03a458c1c8371dfe5bfe07d996e4407cb2 URL: https://github.com/kamailio/kamailio/commit/132c9d03a458c1c8371dfe5bfe07d99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T14:31:08+01:00 registrar: allow taking expires value from xavp_cfg expires field --- Modified: src/modules/registrar/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/132c9d03a458c1c8371dfe5bfe07d99… Patch: https://github.com/kamailio/kamailio/commit/132c9d03a458c1c8371dfe5bfe07d99… --- diff --git a/src/modules/registrar/sip_msg.c b/src/modules/registrar/sip_msg.c index 2b43dd7611..905e3d6b9d 100644 --- a/src/modules/registrar/sip_msg.c +++ b/src/modules/registrar/sip_msg.c @@ -246,27 +246,36 @@ contact_t* get_next_contact(contact_t* _c) void calc_contact_expires(struct sip_msg* _m, param_t* _ep, int* _e, int novariation) { int range = 0; + sr_xavp_t *vavp = NULL; + str xename = str_init("expires"); - if (!_ep || !_ep->body.len) { - *_e = get_expires_hf(_m); + if (reg_xavp_cfg.s != NULL) { + vavp = xavp_get_child_with_ival(&reg_xavp_cfg, &xename); + } - if ( *_e < 0 ) { - *_e = cfg_get(registrar, registrar_cfg, default_expires); - range = cfg_get(registrar, registrar_cfg, default_expires_range); - } else { - range = cfg_get(registrar, registrar_cfg, expires_range); - } + if (vavp != NULL && vavp->val.v.i >= 0) { + *_e = vavp->val.v.i; } else { - if (str2int(&_ep->body, (unsigned int*)_e) < 0) { - *_e = cfg_get(registrar, registrar_cfg, default_expires); - range = cfg_get(registrar, registrar_cfg, default_expires_range); + if (!_ep || !_ep->body.len) { + *_e = get_expires_hf(_m); + + if ( *_e < 0 ) { + *_e = cfg_get(registrar, registrar_cfg, default_expires); + range = cfg_get(registrar, registrar_cfg, default_expires_range); + } else { + range = cfg_get(registrar, registrar_cfg, expires_range); + } } else { - range = cfg_get(registrar, registrar_cfg, expires_range); + if (str2int(&_ep->body, (unsigned int*)_e) < 0) { + *_e = cfg_get(registrar, registrar_cfg, default_expires); + range = cfg_get(registrar, registrar_cfg, default_expires_range); + } else { + range = cfg_get(registrar, registrar_cfg, expires_range); + } } } - if ( *_e != 0 ) - { + if ( *_e != 0 ) { if (*_e < cfg_get(registrar, registrar_cfg, min_expires)) { if(reg_min_expires_mode) { rerrno = R_LOW_EXP;

1 0

git:master:4b7c02c9: registrar: docs for expires field of xavp_cfg
by Daniel-Constantin Mierla 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: 4b7c02c93053076d3089499a0290203157b63c0d URL: https://github.com/kamailio/kamailio/commit/4b7c02c93053076d3089499a0290203… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T14:34:16+01:00 registrar: docs for expires field of xavp_cfg --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b7c02c93053076d3089499a0290203… Patch: https://github.com/kamailio/kamailio/commit/4b7c02c93053076d3089499a0290203… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 94ce4b3a0b..f4bb213b14 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -745,24 +745,29 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") <itemizedlist> <listitem> <para> - <emphasis>max_contacts</emphasis> - the number of maximum + <emphasis>expires</emphasis> - the number of maximum contacts to be stored for the current registration AoR. It overwrites the 'max_contacts' module parameter value. </para> </listitem> <listitem> <para> - <emphasis>socket</emphasis> - the string representing the - socket on which the register request was received, as alternative - to using the sock_hdr. + <emphasis>q</emphasis> - the expires value, to overwrite the + value from SIP headers. + </para> + </listitem> + <listitem> + <para> + <emphasis>max_contacts</emphasis> - the number of maximum + contacts to be stored for the current registration AoR. It + overwrites the 'max_contacts' module parameter value. </para> </listitem> <listitem> <para> - <emphasis>q</emphasis> - q value of contact - (integer 0-1000). It - overrides q value given in contact header and - default_q parameter. + <emphasis>socket</emphasis> - the string representing the + socket on which the register request was received, as alternative + to using the sock_hdr. </para> </listitem> </itemizedlist> @@ -784,6 +789,7 @@ modparam("registrar", "xavp_cfg", "reg") request_route { ... $xavp(reg=>max_contacts) = 4; + $xavp(reg[0]=>expires) = 600; save("location"); ... }

1 0

Releasing Kamailio 5.3.8
by Henning Westerholt 21 Dec '20

21 Dec '20

Hello, I am planning to release next week (likely on Monday 21st December) the next minor version out of branch 5.3, version 5.3.8. Backports of fixed issues from git master will be integrated as usual. If you are aware of new issues which were not yet reported, let us know (by creating an issue on the tracker). Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 1

git:master:58468c3a: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: 58468c3ac6cbfcf426e2f7a89d2becbec09aac32 URL: https://github.com/kamailio/kamailio/commit/58468c3ac6cbfcf426e2f7a89d2becb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-21T10:31:37+01:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/58468c3ac6cbfcf426e2f7a89d2becb… Patch: https://github.com/kamailio/kamailio/commit/58468c3ac6cbfcf426e2f7a89d2becb… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 6724cc5716..0028f9e623 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -72,6 +72,7 @@ Hugh Waite 4.3. http_get_redirect(connection, result) 4.4. http_client_query(url, [post-data], [hdrs], result) + 4.5. http_client_get(url, body, hdrs, respv) 5. Pseudovariables @@ -128,6 +129,7 @@ Hugh Waite 1.23. http_connect_raw() usage 1.24. http_get_redirect() usage 1.25. http_client_query() usage + 1.26. http_client_get() usage Chapter 1. Admin Guide @@ -169,6 +171,7 @@ Chapter 1. Admin Guide 4.3. http_get_redirect(connection, result) 4.4. http_client_query(url, [post-data], [hdrs], result) + 4.5. http_client_get(url, body, hdrs, respv) 5. Pseudovariables @@ -670,6 +673,7 @@ modparam("http_client", "netinterface", "eth0") 4.2. http_connect_raw(connection, url, content_type, data, result) 4.3. http_get_redirect(connection, result) 4.4. http_client_query(url, [post-data], [hdrs], result) + 4.5. http_client_get(url, body, hdrs, respv) 4.1. http_connect(connection, url, [content_type, data,] result) @@ -818,6 +822,28 @@ http_client_query("http://api.com/index.php", "src=$si", "Content-Type: text/plain", "$var(result)"); ... +4.5. http_client_get(url, body, hdrs, respv) + + Perform a HTTP GET request to "url", storing the response body in the + "respv" variable. The "body" and "hdrs" can be empty strings to skip + setting them. The first three parameters can contain variables that are + evaluated at runtime. The "respv" has to be the name of a writable + variable. + + Note: usually HTTP GET requests should have no body, according to specs + the body in HTTP GET does not affect the response, but is not + explicitely forbidden. + + Example 1.26. http_client_get() usage +... +http_client_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu +{s.escape.param})", + "", "X-Token: abc", "$var(result)"); +switch ($rc) { + ... +} +... + 5. Pseudovariables 5.1. $curlerror(error)

1 0

git:master:729340ff: http_client: docs for http_client_get()
by Daniel-Constantin Mierla 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: 729340ff8c80ac836f1889c505cf361abc4fe0ae URL: https://github.com/kamailio/kamailio/commit/729340ff8c80ac836f1889c505cf361… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T10:29:28+01:00 http_client: docs for http_client_get() --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/729340ff8c80ac836f1889c505cf361… Patch: https://github.com/kamailio/kamailio/commit/729340ff8c80ac836f1889c505cf361… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 6f1c897690..2c8295f07f 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -897,6 +897,35 @@ http_client_query("http://api.com/index.php", # POST-Request http_client_query("http://api.com/index.php", "src=$si", "Content-Type: text/plain", "$var(result)"); +... + </programlisting> + </example> + </section> + <section id="http_client.f.http_get"> + <title> + <function moreinfo="none">http_client_get(url, body, hdrs, respv)</function> + </title> + <para> + Perform a HTTP GET request to "url", storing the response body + in the "respv" variable. The "body" and "hdrs" can be empty strings + to skip setting them. The first three parameters can contain + variables that are evaluated at runtime. The "respv" has to be + the name of a writable variable. + </para> + <para> + Note: usually HTTP GET requests should have no body, according to + specs the body in HTTP GET does not affect the response, but is + not explicitely forbidden. + </para> + <example> + <title><function>http_client_get()</function> usage</title> + <programlisting format="linespecific"> +... +http_client_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", + "", "X-Token: abc", "$var(result)"); +switch ($rc) { + ... +} ... </programlisting> </example>

1 0

git:master:b6a10887: http_client: new function http_client_get()
by Daniel-Constantin Mierla 21 Dec '20

21 Dec '20

Module: kamailio Branch: master Commit: b6a1088767c4d9d483113ad06ac4700dcf46820f URL: https://github.com/kamailio/kamailio/commit/b6a1088767c4d9d483113ad06ac4700… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-21T10:15:53+01:00 http_client: new function http_client_get() - do explicit GET request with headers (and body) - exported KSR.http_client.get_hdrs() --- Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/b6a1088767c4d9d483113ad06ac4700… Patch: https://github.com/kamailio/kamailio/commit/b6a1088767c4d9d483113ad06ac4700…

1 0

git:master:b04111b5: core: kemi - KSR.is_method_in() uses E/e to match PRACK
by Daniel-Constantin Mierla 19 Dec '20

19 Dec '20

Module: kamailio Branch: master Commit: b04111b583b454b12ea0c6a265a14858c195b213 URL: https://github.com/kamailio/kamailio/commit/b04111b583b454b12ea0c6a265a1485… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-19T15:34:05+01:00 core: kemi - KSR.is_method_in() uses E/e to match PRACK --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b04111b583b454b12ea0c6a265a1485… Patch: https://github.com/kamailio/kamailio/commit/b04111b583b454b12ea0c6a265a1485… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 4060ad9d4d..ba0b435dce 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -852,6 +852,12 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) return SR_KEMI_TRUE; } break; + case 'E': + case 'e': + if(imethod==METHOD_PRACK) { + return SR_KEMI_TRUE; + } + break; case 'P': case 'p': if(imethod==METHOD_PUBLISH) {

1 0

git:master:8693fabb: tls: kemi function KSR.tls.cget(aname)
by Daniel-Constantin Mierla 18 Dec '20

18 Dec '20

Module: kamailio Branch: master Commit: 8693fabb57af9428af5d3110da7dce12fe5cd634 URL: https://github.com/kamailio/kamailio/commit/8693fabb57af9428af5d3110da7dce1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-18T09:19:08+01:00 tls: kemi function KSR.tls.cget(aname) - get connection/certificates attributes by providing a corresponding tls pv name --- Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_select.c Modified: src/modules/tls/tls_select.h --- Diff: https://github.com/kamailio/kamailio/commit/8693fabb57af9428af5d3110da7dce1… Patch: https://github.com/kamailio/kamailio/commit/8693fabb57af9428af5d3110da7dce1…

1 0

git:master:797db215: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 18 Dec '20

18 Dec '20

Module: kamailio Branch: master Commit: 797db215d4a71723012b4a6e2ce54ccf55dbcedd URL: https://github.com/kamailio/kamailio/commit/797db215d4a71723012b4a6e2ce54cc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-12-18T08:31:24+01:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/797db215d4a71723012b4a6e2ce54cc… Patch: https://github.com/kamailio/kamailio/commit/797db215d4a71723012b4a6e2ce54cc… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 623d873204..6724cc5716 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -91,7 +91,7 @@ Hugh Waite 2. Developer Guide - 1. + 1. Introduction 2. Available Functions 2.1. int http_connect(msg, connection, url, result, @@ -872,7 +872,7 @@ Chapter 2. Developer Guide Table of Contents - 1. + 1. Introduction 2. Available Functions 2.1. int http_connect(msg, connection, url, result, content_type, @@ -882,6 +882,8 @@ Chapter 2. Developer Guide 2.3. int http_query(msg, url, dest, post) 2.4. http_get_content_type(str connection) +1. Introduction + This module provides a set of API functions that other modules can use in order to integrate with HTTP services.

1 0

git:master:fadc0fc4: http_client: docs - section title to get proper entry in toc
by Daniel-Constantin Mierla 18 Dec '20

18 Dec '20

Module: kamailio Branch: master Commit: fadc0fc499fb57a763aa71a76b24cff152bbd927 URL: https://github.com/kamailio/kamailio/commit/fadc0fc499fb57a763aa71a76b24cff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-18T08:18:51+01:00 http_client: docs - section title to get proper entry in toc - bits of whitespacing fixing --- Modified: src/modules/http_client/doc/http_client.xml Modified: src/modules/http_client/doc/http_client_admin.xml Modified: src/modules/http_client/doc/http_client_devel.xml --- Diff: https://github.com/kamailio/kamailio/commit/fadc0fc499fb57a763aa71a76b24cff… Patch: https://github.com/kamailio/kamailio/commit/fadc0fc499fb57a763aa71a76b24cff…

1 0

git:5.4:88d1eb7a: dialog: handle CANCEL requests for CSeq updates
by Daniel-Constantin Mierla 17 Dec '20

17 Dec '20

Module: kamailio Branch: 5.4 Commit: 88d1eb7a79acd6afecb3d6760889433f69646b5b URL: https://github.com/kamailio/kamailio/commit/88d1eb7a79acd6afecb3d6760889433… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-17T14:55:13+01:00 dialog: handle CANCEL requests for CSeq updates (cherry picked from commit fd35a1a4eee2c50a3b7bf4ee6b1f6f20f4fa7d62) --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/88d1eb7a79acd6afecb3d6760889433… Patch: https://github.com/kamailio/kamailio/commit/88d1eb7a79acd6afecb3d6760889433… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 17c63bbb1c..70b2b43c2b 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -387,8 +387,9 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) } if(get_to(&msg)->tag_value.len<=0) { - /* intial request - handle only INVITEs */ - if(msg.first_line.u.request.method_value!=METHOD_INVITE) { + /* intial request - handle only INVITEs, ACKs and CANCELs */ + if(!(msg.first_line.u.request.method_value + & (METHOD_INVITE|METHOD_ACK|METHOD_CANCEL))) { goto done; } }

1 0

git:master:fd35a1a4: dialog: handle CANCEL requests for CSeq updates
by Daniel-Constantin Mierla 17 Dec '20

17 Dec '20

Module: kamailio Branch: master Commit: fd35a1a4eee2c50a3b7bf4ee6b1f6f20f4fa7d62 URL: https://github.com/kamailio/kamailio/commit/fd35a1a4eee2c50a3b7bf4ee6b1f6f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-17T14:54:04+01:00 dialog: handle CANCEL requests for CSeq updates --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/fd35a1a4eee2c50a3b7bf4ee6b1f6f2… Patch: https://github.com/kamailio/kamailio/commit/fd35a1a4eee2c50a3b7bf4ee6b1f6f2… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 17c63bbb1c..70b2b43c2b 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -387,8 +387,9 @@ int dlg_cseq_msg_sent(sr_event_param_t *evp) } if(get_to(&msg)->tag_value.len<=0) { - /* intial request - handle only INVITEs */ - if(msg.first_line.u.request.method_value!=METHOD_INVITE) { + /* intial request - handle only INVITEs, ACKs and CANCELs */ + if(!(msg.first_line.u.request.method_value + & (METHOD_INVITE|METHOD_ACK|METHOD_CANCEL))) { goto done; } }

1 0

[kamailio/kamailio] lost: removed not used namespace (#2584)
by sergey-safarov 17 Dec '20

17 Dec '20

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Caller LIS server may use namepace prefix `gml` or any other. When created LOST request, then `location-info` payload created from `pidf-lo` and `p2` prefix namespace not used. I suggest make some code cleanup and remove not used strings. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2584 -- Commit Summary -- * lost: removed not used namespace -- File Changes -- M src/modules/lost/utilities.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2584.patch https://github.com/kamailio/kamailio/pull/2584.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2584

3 5

git:master:6c1c957b: Merge pull request #2584 from sergey-safarov/master
by GitHub 17 Dec '20

17 Dec '20

Module: kamailio Branch: master Commit: 6c1c957b18a395e2dad79a8b3a3c0de347aa4f2d URL: https://github.com/kamailio/kamailio/commit/6c1c957b18a395e2dad79a8b3a3c0de… Author: Wolfgang Kampichler <49035738+wkampich(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2020-12-17T09:25:19+01:00 Merge pull request #2584 from sergey-safarov/master lost: removed not used namespace --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/6c1c957b18a395e2dad79a8b3a3c0de… Patch: https://github.com/kamailio/kamailio/commit/6c1c957b18a395e2dad79a8b3a3c0de… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index ab717fce18..4e3450b21b 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -955,12 +955,15 @@ char *lost_find_service_request(p_loc_t loc, int *lgth) /* set properties */ xmlNewProp(ptrFindService, BAD_CAST "xmlns", BAD_CAST "urn:ietf:params:xml:ns:lost1"); - xmlNewProp(ptrFindService, BAD_CAST "xmlns:p2", - BAD_CAST "http://www.opengis.net/gml"); xmlNewProp(ptrFindService, BAD_CAST "serviceBoundary", (loc->boundary == 1) ? BAD_CAST "value" : BAD_CAST "reference"); xmlNewProp(ptrFindService, BAD_CAST "recursive", (loc->recursive == 1) ? BAD_CAST "true" : BAD_CAST "false"); + if(loc->xpath == NULL) { + xmlNewProp(ptrFindService, BAD_CAST "xmlns:p2", + BAD_CAST "http://www.opengis.net/gml"); + } + /* location - element */ ptrLocation = xmlNewChild(ptrFindService, NULL, BAD_CAST "location", NULL); xmlNewProp(ptrLocation, BAD_CAST "id", BAD_CAST loc->identity);

1 0

git:master:205cad46: lost: removed not used namespace
by Sergey Safarov 17 Dec '20

17 Dec '20

Module: kamailio Branch: master Commit: 205cad460ba5c519e4c6411a3b0c2d33cacba534 URL: https://github.com/kamailio/kamailio/commit/205cad460ba5c519e4c6411a3b0c2d3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-12-14T14:14:52+03:00 lost: removed not used namespace fix #2584 --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/205cad460ba5c519e4c6411a3b0c2d3… Patch: https://github.com/kamailio/kamailio/commit/205cad460ba5c519e4c6411a3b0c2d3… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index ab717fce18..4e3450b21b 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -955,12 +955,15 @@ char *lost_find_service_request(p_loc_t loc, int *lgth) /* set properties */ xmlNewProp(ptrFindService, BAD_CAST "xmlns", BAD_CAST "urn:ietf:params:xml:ns:lost1"); - xmlNewProp(ptrFindService, BAD_CAST "xmlns:p2", - BAD_CAST "http://www.opengis.net/gml"); xmlNewProp(ptrFindService, BAD_CAST "serviceBoundary", (loc->boundary == 1) ? BAD_CAST "value" : BAD_CAST "reference"); xmlNewProp(ptrFindService, BAD_CAST "recursive", (loc->recursive == 1) ? BAD_CAST "true" : BAD_CAST "false"); + if(loc->xpath == NULL) { + xmlNewProp(ptrFindService, BAD_CAST "xmlns:p2", + BAD_CAST "http://www.opengis.net/gml"); + } + /* location - element */ ptrLocation = xmlNewChild(ptrFindService, NULL, BAD_CAST "location", NULL); xmlNewProp(ptrLocation, BAD_CAST "id", BAD_CAST loc->identity);

1 0

[kamailio/kamailio] keepalive: fix initialization when using destination mod param (#2579)
by Nacho G. 17 Dec '20

17 Dec '20

- Fixed the way the module is initialized, causing problems when using destination mod parameter because when invoking this parameter some utilities are not initialized (timers).   #### 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 - [x] Related to issue #2476 (replace XXXX with an open issue number) #### Description  Fixed the way the module is initialized, causing problems when using destination mod parameter because when invoking this parameter some utilities are not yet initialized (timers). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2579 -- Commit Summary -- * keepalive: fix initialization when using destination mod param -- File Changes -- M src/modules/keepalive/keepalive.h (8) M src/modules/keepalive/keepalive_mod.c (68) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2579.patch https://github.com/kamailio/kamailio/pull/2579.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2579

3 9

git:master:70cb87bd: Merge pull request #2579 from NGSegovia/keepalive_fix_crash_on_destination_mod_param
by GitHub 17 Dec '20

17 Dec '20

Module: kamailio Branch: master Commit: 70cb87bd98f054f6e493992ae844bcfea0ea98fa URL: https://github.com/kamailio/kamailio/commit/70cb87bd98f054f6e493992ae844bcf… Author: Nacho G <nacho.gs(a)zaleos.net> Committer: GitHub <noreply(a)github.com> Date: 2020-12-17T08:58:22+01:00 Merge pull request #2579 from NGSegovia/keepalive_fix_crash_on_destination_mod_param keepalive: fix initialization when using destination mod param --- Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/70cb87bd98f054f6e493992ae844bcf… Patch: https://github.com/kamailio/kamailio/commit/70cb87bd98f054f6e493992ae844bcf…

1 0

git:master:871ae263: keepalive: fix initialization when using destination mod param
by Nacho Garcia Segovia 17 Dec '20

17 Dec '20

Module: kamailio Branch: master Commit: 871ae263f0547c4a1d7c394d8fded054e0d55818 URL: https://github.com/kamailio/kamailio/commit/871ae263f0547c4a1d7c394d8fded05… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-12-16T19:21:59+01:00 keepalive: fix initialization when using destination mod param - Fixed the way the module is initialized, causing problems when using destination mod parameter because when invoking this parameter some utilities are not initialized (timers). --- Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/871ae263f0547c4a1d7c394d8fded05… Patch: https://github.com/kamailio/kamailio/commit/871ae263f0547c4a1d7c394d8fded05…

1 0

[kamailio/kamailio] modules/siptrace: fix regression preventing variables to be used (#2588)
by tsearle 17 Dec '20

17 Dec '20

Commit fa7eb2a switched the 2 parameter version of sip_trace from using the builtin fixup_spve_spve to the custom fixup method to using the custom fixup_siptrace. As it is a custom fixup method, the corresponding free method can not be auto-detected causing the config parser to require the parameters to be a constant. This patch adds a free method, allowing variables to be once again passed as the 2nd parameter of this method (as well as fixing a memory leak for the 3rd parameter).   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2588 -- Commit Summary -- * modules/siptrace: fix regression preventing variables to be used -- File Changes -- M src/modules/siptrace/siptrace.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2588.patch https://github.com/kamailio/kamailio/pull/2588.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2588

2 5

git:master:4a2c1ea8: rtpengine: fix param mos_min_roundtrip_B_pv
by Julien Chavanton 16 Dec '20

16 Dec '20

Module: kamailio Branch: master Commit: 4a2c1ea81dcb58a5b31ad3d090d5694366b8fde0 URL: https://github.com/kamailio/kamailio/commit/4a2c1ea81dcb58a5b31ad3d090d5694… Author: Julien Chavanton <jchavanton(a)subspace.com> Committer: Julien Chavanton <jchavanton(a)subspace.com> Date: 2020-12-16T13:08:59-08:00 rtpengine: fix param mos_min_roundtrip_B_pv --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/4a2c1ea81dcb58a5b31ad3d090d5694… Patch: https://github.com/kamailio/kamailio/commit/4a2c1ea81dcb58a5b31ad3d090d5694… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index f69ca4b255..fb736b2f10 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -508,7 +508,7 @@ static param_export_t params[] = { {"mos_min_packetloss_B_pv", PARAM_STR, &side_B_mos_stats.min.packetloss_param }, {"mos_min_jitter_B_pv", PARAM_STR, &side_B_mos_stats.min.jitter_param }, {"mos_min_roundtrip_B_pv", PARAM_STR, &side_B_mos_stats.min.roundtrip_param }, - {"mos_min_roundtrip_B_pv", PARAM_STR, &side_B_mos_stats.min.roundtrip_param }, + {"mos_min_roundtrip_leg_B_pv", PARAM_STR, &side_B_mos_stats.min.roundtrip_leg_param }, {"mos_max_B_pv", PARAM_STR, &side_B_mos_stats.max.mos_param }, {"mos_max_at_B_pv", PARAM_STR, &side_B_mos_stats.max.at_param }, {"mos_max_packetloss_B_pv", PARAM_STR, &side_B_mos_stats.max.packetloss_param },

1 0

git:master:7c98d547: modules/siptrace: fix regression preventing variables to be used (#2588)
by GitHub 16 Dec '20

16 Dec '20

Module: kamailio Branch: master Commit: 7c98d547996637a7bf1c7025c93142f574fe3ac9 URL: https://github.com/kamailio/kamailio/commit/7c98d547996637a7bf1c7025c93142f… Author: tsearle <tsearle(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-12-16T21:47:11+01:00 modules/siptrace: fix regression preventing variables to be used (#2588) * modules/siptrace: fix regression preventing variables to be used Commit fa7eb2a switched the 2 parameter version of sip_trace from using the builtin fixup_spve_spve to the custom fixup method to using the custom fixup_siptrace. As it is a custom fixup method, the corresponding free method can not be auto-detected causing the config parser to require the parameters to be a constant. This patch adds a free method, allowing variables to be once again passed as the 2nd parameter of this method (as well as fixing a memory leak for the 3rd parameter). * change free for parameter 3 Co-authored-by: Torrey Searle <tsearle(a)voxbone.com> --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/7c98d547996637a7bf1c7025c93142f… Patch: https://github.com/kamailio/kamailio/commit/7c98d547996637a7bf1c7025c93142f… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 2e8e690ac0..e9c44ec548 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -91,6 +91,7 @@ static int w_sip_trace1(struct sip_msg *, char *dest, char *p2); static int w_sip_trace2(struct sip_msg *, char *dest, char *correlation_id); static int w_sip_trace3(struct sip_msg *, char *dest, char *correlation_id, char *trace_type); static int fixup_siptrace(void **param, int param_no); +static int fixup_free_siptrace(void **param, int param_no); static int w_sip_trace_mode(sip_msg_t *msg, char *pmode, char *p2); static int siptrace_parse_uri(str* duri, dest_info_t* dst); @@ -203,9 +204,9 @@ static cmd_export_t cmds[] = { ANY_ROUTE}, {"sip_trace", (cmd_function)w_sip_trace1, 1, fixup_siptrace, 0, ANY_ROUTE}, - {"sip_trace", (cmd_function)w_sip_trace2, 2, fixup_siptrace, 0, + {"sip_trace", (cmd_function)w_sip_trace2, 2, fixup_siptrace, fixup_free_siptrace, ANY_ROUTE}, - {"sip_trace", (cmd_function)w_sip_trace3, 3, fixup_siptrace, 0, + {"sip_trace", (cmd_function)w_sip_trace3, 3, fixup_siptrace, fixup_free_siptrace, ANY_ROUTE}, {"hlog", (cmd_function)w_hlog1, 1, fixup_spve_null, 0, ANY_ROUTE}, @@ -785,6 +786,21 @@ static int fixup_siptrace(void **param, int param_no) return 0; } +static int fixup_free_siptrace(void **param, int param_no) +{ + if (param_no == 1 || param_no == 2) { + /* correlation id */ + return fixup_free_spve_all(param, param_no); + } if (param_no == 3) { + /* tracing type; string only */ + if (*param) { + pkg_free(*param); + } + } + + return 0; +} + /** *

1 0

[kamailio/kamailio] textops: added functions to manipulate the body in the exported api (#2586)
by Daniel Martínez Ruiz 16 Dec '20

16 Dec '20

Functions added: - set_body - set_body_multipart - append_body_part   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] 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/2586 -- Commit Summary -- * textops: added functions to manipulate the body in the exported api -- File Changes -- M src/modules/textops/api.c (18) M src/modules/textops/api.h (6) M src/modules/textops/textops.c (19) M src/modules/textops/textops.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2586.patch https://github.com/kamailio/kamailio/pull/2586.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2586

2 2

git:master:67f74139: Merge pull request #2586 from danielmartinezruiz/textops_add_body_functions_to_api
by GitHub 16 Dec '20

16 Dec '20

Module: kamailio Branch: master Commit: 67f741395d5a8dbd4a0a8e50aaffefbc0a72e414 URL: https://github.com/kamailio/kamailio/commit/67f741395d5a8dbd4a0a8e50aaffefb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-12-16T21:30:49+01:00 Merge pull request #2586 from danielmartinezruiz/textops_add_body_functions_to_api textops: added functions to manipulate the body in the exported api --- Modified: src/modules/textops/api.c Modified: src/modules/textops/api.h Modified: src/modules/textops/textops.c Modified: src/modules/textops/textops.h --- Diff: https://github.com/kamailio/kamailio/commit/67f741395d5a8dbd4a0a8e50aaffefb… Patch: https://github.com/kamailio/kamailio/commit/67f741395d5a8dbd4a0a8e50aaffefb…

1 0

git:master:ed8c3605: textops: added functions to manipulate the body in the exported api
by Daniel MartÃnez Ruiz 16 Dec '20

16 Dec '20

Module: kamailio Branch: master Commit: ed8c360544b86061b7a517dc256e85089079fe02 URL: https://github.com/kamailio/kamailio/commit/ed8c360544b86061b7a517dc256e850… Author: Daniel MartÃnez Ruiz <d.martinez(a)zaleos.net> Committer: Daniel MartÃnez Ruiz <d.martinez(a)zaleos.net> Date: 2020-12-16T11:02:52+01:00 textops: added functions to manipulate the body in the exported api Functions added: - set_body - set_body_multipart - append_body_part --- Modified: src/modules/textops/api.c Modified: src/modules/textops/api.h Modified: src/modules/textops/textops.c Modified: src/modules/textops/textops.h --- Diff: https://github.com/kamailio/kamailio/commit/ed8c360544b86061b7a517dc256e850… Patch: https://github.com/kamailio/kamailio/commit/ed8c360544b86061b7a517dc256e850…

1 0

[kamailio/kamailio] evapi: export async_multicast() to kemi (#2582)
by Balajee SV 16 Dec '20

16 Dec '20

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Evapi: added KEMI function for evapi_async_multicast You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2582 -- Commit Summary -- * evapi: export async_multicast() to kemi -- File Changes -- M src/modules/evapi/evapi_mod.c (58) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2582.patch https://github.com/kamailio/kamailio/pull/2582.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2582

2 2

git:master:ccaba976: evapi: export async_multicast() to kemi
by balajeesv 16 Dec '20

16 Dec '20

Module: kamailio Branch: master Commit: ccaba976cd1c599ba64067df0896fdd4888af00f URL: https://github.com/kamailio/kamailio/commit/ccaba976cd1c599ba64067df0896fdd… Author: balajeesv <balajee.sv(a)gmail.com> Committer: balajeesv <balajee.sv(a)gmail.com> Date: 2020-12-11T21:31:27+05:30 evapi: export async_multicast() to kemi --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ccaba976cd1c599ba64067df0896fdd… Patch: https://github.com/kamailio/kamailio/commit/ccaba976cd1c599ba64067df0896fdd… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index bcc582f6e3..a9c4d9ad37 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -756,6 +756,59 @@ static int ki_evapi_async_unicast(sip_msg_t *msg, str *sdata, str *stag) return 1; } +static int ki_evapi_async_multicast(sip_msg_t *msg, str *sdata, str *stag) +{ + unsigned int tindex; + unsigned int tlabel; + tm_cell_t *t = 0; + + if(tmb.t_suspend==NULL) { + LM_ERR("evapi async relay is disabled - tm module not loaded\n"); + return -1; + } + + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + if(tmb.t_newtran(msg)<0) + { + LM_ERR("cannot create the transaction\n"); + return -1; + } + t = tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) + { + LM_ERR("cannot lookup the transaction\n"); + return -1; + } + } + if(tmb.t_suspend(msg, &tindex, &tlabel)<0) + { + LM_ERR("failed to suspend request processing\n"); + return -1; + } + + LM_DBG("transaction suspended [%u:%u]\n", tindex, tlabel); + + + if(sdata->s==NULL || sdata->len == 0) { + LM_ERR("invalid data parameter\n"); + return -1; + } + + if(stag->s==NULL || stag->len == 0) { + LM_ERR("invalid tag parameter\n"); + return -1; + } + + if(evapi_relay_multicast(sdata, stag)<0) { + LM_ERR("failed to relay event: [[%.*s]] to [%.*s] \n", + sdata->len, sdata->s, stag->len, stag->s); + return -2; + } + return 1; +} + /** * */ @@ -824,6 +877,11 @@ static sr_kemi_t sr_kemi_evapi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("evapi"), str_init("async_multicast"), + SR_KEMIP_INT, ki_evapi_async_multicast, + { SR_KEMIP_STR, SR_KEMIP_STR, 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 */

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev