sr-dev December 2020

sr-dev@lists.kamailio.org

18 participants
206 discussions

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: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

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

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: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: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: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: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: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

← Newer
1
...
7
8
9
10
11
12
13
...
21
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2020