sr-dev April 2016

sr-dev@lists.kamailio.org

23 participants
430 discussions

git:master:98fa9495: core: cfgengine - new global parameter/statement
by Daniel-Constantin Mierla 12 Apr '16

12 Apr '16

Module: kamailio Branch: master Commit: 98fa9495747fc89ef85f222bb37dbe63f82ed1b3 URL: https://github.com/kamailio/kamailio/commit/98fa9495747fc89ef85f222bb37dbe6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-12T14:10:28+02:00 core: cfgengine - new global parameter/statement - set the config interpreter engine, can be used like: cfgengine="name" cfgengine "name" If name is "native" or "default", it expects to have in native config interpreter for routing logic. The name can be the identifier of an embedded language interpreter, such as "lua" which is registered by the app_lua module: cfgengine "lua" --- Modified: cfg.lex Modified: cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/98fa9495747fc89ef85f222bb37dbe6… Patch: https://github.com/kamailio/kamailio/commit/98fa9495747fc89ef85f222bb37dbe6… --- diff --git a/cfg.lex b/cfg.lex index 1544e6e..336322c 100644 --- a/cfg.lex +++ b/cfg.lex @@ -452,6 +452,8 @@ LOADMODULE loadmodule LOADPATH "loadpath"|"mpath" MODPARAM modparam +CFGENGINE "cfgengine" + /* values */ YES "yes"|"true"|"on"|"enable" NO "no"|"false"|"off"|"disable" @@ -916,6 +918,7 @@ IMPORTFILE "import_file" <INITIAL>{LOADMODULE} { count(); yylval.strval=yytext; return LOADMODULE; } <INITIAL>{LOADPATH} { count(); yylval.strval=yytext; return LOADPATH; } <INITIAL>{MODPARAM} { count(); yylval.strval=yytext; return MODPARAM; } +<INITIAL>{CFGENGINE} { count(); yylval.strval=yytext; return CFGENGINE; } <INITIAL>{EQUAL} { count(); return EQUAL; } <INITIAL>{ADDEQ} { count(); return ADDEQ; } diff --git a/cfg.y b/cfg.y index 24b2240..55d4220 100644 --- a/cfg.y +++ b/cfg.y @@ -67,6 +67,7 @@ #include "msg_translator.h" #include "async_task.h" +#include "kemi.h" #include "ppcfg.h" #include "pvapi.h" #include "config.h" @@ -390,6 +391,7 @@ extern char *default_routename; %token LOADMODULE %token LOADPATH %token MODPARAM +%token CFGENGINE %token MAXBUFFER %token SQL_BUFFER_SIZE %token USER @@ -1643,6 +1645,21 @@ module_stm: } } | MODPARAM error { yyerror("Invalid arguments"); } + | CFGENGINE STRING { + if(sr_kemi_eng_setz($2, NULL)) { + yyerror("Can't set config routing engine"); + YYABORT; + } + } + | CFGENGINE error { yyerror("string expected"); } + | CFGENGINE EQUAL STRING { + if(sr_kemi_eng_setz($3, NULL)) { + yyerror("Can't set config routing engine"); + YYABORT; + } + } + | CFGENGINE EQUAL error { yyerror("string expected"); } + ; ip: ipv4 { $$=$1; }

1 0

git:master:7de8a92f: core: receive.c coherent indentation
by Daniel-Constantin Mierla 12 Apr '16

12 Apr '16

Module: kamailio Branch: master Commit: 7de8a92fd805b73495cc929cf9ca981ecd509c9a URL: https://github.com/kamailio/kamailio/commit/7de8a92fd805b73495cc929cf9ca981… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-12T13:48:22+02:00 core: receive.c coherent indentation --- Modified: receive.c --- Diff: https://github.com/kamailio/kamailio/commit/7de8a92fd805b73495cc929cf9ca981… Patch: https://github.com/kamailio/kamailio/commit/7de8a92fd805b73495cc929cf9ca981…

1 0

git:master:d0436602: core: foundation for config interpreter engine via kemi
by Daniel-Constantin Mierla 12 Apr '16

12 Apr '16

Module: kamailio Branch: master Commit: d0436602dd9459f00945f47e67ea4bb9225caf43 URL: https://github.com/kamailio/kamailio/commit/d0436602dd9459f00945f47e67ea4bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-12T12:21:56+02:00 core: foundation for config interpreter engine via kemi - to allow execution of a config file written in an embedded language --- Modified: kemi.c Modified: kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/d0436602dd9459f00945f47e67ea4bb… Patch: https://github.com/kamailio/kamailio/commit/d0436602dd9459f00945f47e67ea4bb… --- diff --git a/kemi.c b/kemi.c index 305d066..22f55c0 100644 --- a/kemi.c +++ b/kemi.c @@ -145,3 +145,71 @@ sr_kemi_t* sr_kemi_lookup(str *mname, int midx, str *fname) } return NULL; } + +/** + * + */ + +#define SR_KEMI_ENG_LIST_MAX_SIZE 8 +static sr_kemi_eng_t _sr_kemi_eng_list[SR_KEMI_ENG_LIST_MAX_SIZE]; +sr_kemi_eng_t *_sr_kemi_eng = NULL; +static int _sr_kemi_eng_list_size=0; + +/** + * + */ +int sr_kemi_eng_register(str *ename, sr_kemi_eng_route_f froute) +{ + int i; + + for(i=0; i<_sr_kemi_eng_list_size; i++) { + if(_sr_kemi_eng_list[i].ename.len==ename->len + && strncasecmp(_sr_kemi_eng_list[i].ename.s, ename->s, + ename->len)==0) { + /* found */ + return 1; + } + } + if(_sr_kemi_eng_list_size>=SR_KEMI_ENG_LIST_MAX_SIZE) { + LM_ERR("too many config routing engines registered\n"); + return -1; + } + if(ename->len>=SR_KEMI_BNAME_SIZE) { + LM_ERR("config routing engine name too long\n"); + return -1; + } + strncpy(_sr_kemi_eng_list[_sr_kemi_eng_list_size].bname, + ename->s, ename->len); + _sr_kemi_eng_list[_sr_kemi_eng_list_size].ename.s + = _sr_kemi_eng_list[_sr_kemi_eng_list_size].bname; + _sr_kemi_eng_list[_sr_kemi_eng_list_size].ename.len = ename->len; + _sr_kemi_eng_list[_sr_kemi_eng_list_size].ename.s[ename->len] = 0; + _sr_kemi_eng_list[_sr_kemi_eng_list_size].froute = froute; + _sr_kemi_eng_list_size++; + + return 0; +} + +/** + * + */ +int sr_kemi_eng_set(str *ename, str *cpath) +{ + int i; + + for(i=0; i<_sr_kemi_eng_list_size; i++) { + if(_sr_kemi_eng_list[i].ename.len==ename->len + && strncasecmp(_sr_kemi_eng_list[i].ename.s, ename->s, + ename->len)==0) { + /* found */ + _sr_kemi_eng = &_sr_kemi_eng_list[i]; + return 0; + } + } + return -1; +} + +sr_kemi_eng_t* sr_kemi_eng_get(void) +{ + return _sr_kemi_eng; +} diff --git a/kemi.h b/kemi.h index 45b98a2..c0087c6 100644 --- a/kemi.h +++ b/kemi.h @@ -89,4 +89,17 @@ int sr_kemi_modules_add(sr_kemi_t *klist); int sr_kemi_modules_size_get(void); sr_kemi_module_t* sr_kemi_modules_get(void); +typedef int (*sr_kemi_eng_route_f)(sip_msg_t*, int, str *); + +#define SR_KEMI_BNAME_SIZE 256 +typedef struct sr_kemi_eng { + char bname[SR_KEMI_BNAME_SIZE]; + str ename; + sr_kemi_eng_route_f froute; +} sr_kemi_eng_t; + +int sr_kemi_eng_register(str *ename, sr_kemi_eng_route_f froute); +int sr_kemi_eng_set(str *ename, str *cpath); +sr_kemi_eng_t* sr_kemi_eng_get(void); + #endif

1 0

git:master:07f15a30: sl: export embedded api functions via mod_register()
by Daniel-Constantin Mierla 12 Apr '16

12 Apr '16

Module: kamailio Branch: master Commit: 07f15a300b49774e5017afa631e9ad34dd417bd8 URL: https://github.com/kamailio/kamailio/commit/07f15a300b49774e5017afa631e9ad3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-12T08:22:37+02:00 sl: export embedded api functions via mod_register() --- Modified: modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/07f15a300b49774e5017afa631e9ad3… Patch: https://github.com/kamailio/kamailio/commit/07f15a300b49774e5017afa631e9ad3… --- diff --git a/modules/sl/sl.c b/modules/sl/sl.c index 12db27c..7028094 100644 --- a/modules/sl/sl.c +++ b/modules/sl/sl.c @@ -50,6 +50,7 @@ #include "../../mod_fix.h" #include "../../script_cb.h" #include "../../mem/mem.h" +#include "../../kemi.h" #include "../../modules/tm/tm_load.h" @@ -499,3 +500,27 @@ static int bind_sl(sl_api_t* api) return 0; } + +/** + * + */ +static sr_kemi_t sl_kemi_exports[] = { + { str_init("sl"), str_init("sreply"), + SR_KEMIP_INT, sl_send_reply_str, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sl"), str_init("freply"), + SR_KEMIP_INT, send_reply, + { SR_KEMIP_INT, 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 } } +}; + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sl_kemi_exports); + return 0; +}

1 0

git:master:0e5f2767: app_lua: register the functions exported by modules for kemi
by Daniel-Constantin Mierla 12 Apr '16

12 Apr '16

Module: kamailio Branch: master Commit: 0e5f2767ad4f91429fe7331e282e8eb8fae48311 URL: https://github.com/kamailio/kamailio/commit/0e5f2767ad4f91429fe7331e282e8eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-12T08:22:37+02:00 app_lua: register the functions exported by modules for kemi --- Modified: modules/app_lua/app_lua_api.c Modified: modules/app_lua/app_lua_sr.c Modified: modules/app_lua/app_lua_sr.h --- Diff: https://github.com/kamailio/kamailio/commit/0e5f2767ad4f91429fe7331e282e8eb… Patch: https://github.com/kamailio/kamailio/commit/0e5f2767ad4f91429fe7331e282e8eb…

1 0

git:master:16a41dba: core: kemi - index embedded api functions by module
by Daniel-Constantin Mierla 12 Apr '16

12 Apr '16

Module: kamailio Branch: master Commit: 16a41dba5c7baef489f735d15e6c912e59d8857f URL: https://github.com/kamailio/kamailio/commit/16a41dba5c7baef489f735d15e6c912… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-12T08:22:37+02:00 core: kemi - index embedded api functions by module --- Modified: kemi.c Modified: kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/16a41dba5c7baef489f735d15e6c912… Patch: https://github.com/kamailio/kamailio/commit/16a41dba5c7baef489f735d15e6c912… --- diff --git a/kemi.c b/kemi.c index fa3ad8f..305d066 100644 --- a/kemi.c +++ b/kemi.c @@ -27,3 +27,121 @@ #include "kemi.h" +#define SR_KEMI_MODULES_MAX_SIZE 1024 +static int _sr_kemi_modules_size = 1; +static sr_kemi_module_t _sr_kemi_modules[SR_KEMI_MODULES_MAX_SIZE]; + +/** + * + */ +int sr_kemi_modules_add(sr_kemi_t *klist) +{ + if(_sr_kemi_modules_size>=SR_KEMI_MODULES_MAX_SIZE) { + return -1; + } + LM_DBG("adding module: %.*s\n", klist[0].mname.len, klist[0].mname.s); + _sr_kemi_modules[_sr_kemi_modules_size].mname = klist[0].mname; + _sr_kemi_modules[_sr_kemi_modules_size].kexp = klist; + _sr_kemi_modules_size++; + return 0; +} + +/** + * + */ +int sr_kemi_modules_size_get(void) +{ + return _sr_kemi_modules_size; +} + +/** + * + */ +sr_kemi_module_t* sr_kemi_modules_get(void) +{ + return _sr_kemi_modules; +} + +/** + * + */ +static int lua_sr_kemi_dbg(sip_msg_t *msg, str *txt) +{ + if(txt!=NULL && txt->s!=NULL) + LM_DBG("%.*s", txt->len, txt->s); + return 0; +} + +/** + * + */ +static int lua_sr_kemi_err(sip_msg_t *msg, str *txt) +{ + if(txt!=NULL && txt->s!=NULL) + LM_ERR("%.*s", txt->len, txt->s); + return 0; +} + +/** + * + */ +static int lua_sr_kemi_info(sip_msg_t *msg, str *txt) +{ + if(txt!=NULL && txt->s!=NULL) + LM_INFO("%.*s", txt->len, txt->s); + return 0; +} + + +/** + * + */ +static sr_kemi_t _sr_kemi_core[] = { + { str_init(""), str_init("dbg"), + SR_KEMIP_NONE, lua_sr_kemi_dbg, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("err"), + SR_KEMIP_NONE, lua_sr_kemi_err, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("info"), + SR_KEMIP_NONE, lua_sr_kemi_info, + { SR_KEMIP_STR, 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 } } +}; + +/** + * + */ +sr_kemi_t* sr_kemi_lookup(str *mname, int midx, str *fname) +{ + int i; + sr_kemi_t *ket; + + if(mname==NULL || mname->len<=0) { + for(i=0; ; i++) { + ket = &_sr_kemi_core[i]; + if(ket->fname.len==fname->len + && strncasecmp(ket->fname.s, fname->s, fname->len)==0) { + return ket; + } + } + } else { + if(midx>0 && midx<SR_KEMI_MODULES_MAX_SIZE) { + for(i=0; ; i++) { + ket = &_sr_kemi_modules[midx].kexp[i]; + if(ket->fname.len==fname->len + && strncasecmp(ket->fname.s, fname->s, fname->len)==0) { + return ket; + } + } + } + } + return NULL; +} diff --git a/kemi.h b/kemi.h index cc49212..45b98a2 100644 --- a/kemi.h +++ b/kemi.h @@ -46,6 +46,11 @@ typedef struct sr_kemi_item { struct sr_kemi_item *next; } sr_kemi_item_t; +typedef struct sr_kemi_module { + str mname; + sr_kemi_t *kexp; +} sr_kemi_module_t; + typedef union { int n; str s; @@ -74,4 +79,14 @@ typedef int (*sr_kemi_fmsns_f)(sip_msg_t*, str*, int, str*); typedef int (*sr_kemi_fmssn_f)(sip_msg_t*, str*, str*, int); typedef int (*sr_kemi_fmsss_f)(sip_msg_t*, str*, str*, str*); +typedef int (*sr_kemi_fmssss_f)(sip_msg_t*, str*, str*, str*, str*); +typedef int (*sr_kemi_fmsssss_f)(sip_msg_t*, str*, str*, str*, str*, str*); +typedef int (*sr_kemi_fmssssss_f)(sip_msg_t*, str*, str*, str*, str*, str*, str*); + +sr_kemi_t* sr_kemi_lookup(str *mname, int midx, str *fname); + +int sr_kemi_modules_add(sr_kemi_t *klist); +int sr_kemi_modules_size_get(void); +sr_kemi_module_t* sr_kemi_modules_get(void); + #endif

1 0

git:4.3:84c715b5: dialog: fix $dlg(from_bindaddr) getter
by Camille Oudot 11 Apr '16

11 Apr '16

Module: kamailio Branch: 4.3 Commit: 84c715b524da26d8c62308cfe83ed41edb75dd63 URL: https://github.com/kamailio/kamailio/commit/84c715b524da26d8c62308cfe83ed41… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-04-11T18:55:00+02:00 dialog: fix $dlg(from_bindaddr) getter (cherry picked from commit a4e3cee470d27a691ec33b5dc11ad2e54246664a) --- Modified: modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/84c715b524da26d8c62308cfe83ed41… Patch: https://github.com/kamailio/kamailio/commit/84c715b524da26d8c62308cfe83ed41… --- diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c index 450f8a5..8d76b8f 100644 --- a/modules/dialog/dlg_var.c +++ b/modules/dialog/dlg_var.c @@ -878,7 +878,7 @@ int pv_parse_dlg_name(pv_spec_p sp, str *in) break; case 13: if(strncmp(in->s, "from_bindaddr", 13)==0) - sp->pvp.pvn.u.isname.name.n = 2; + sp->pvp.pvn.u.isname.name.n = 20; else goto error; break; default:

1 0

git:4.4:02b17b88: dialog: fix $dlg(from_bindaddr) getter
by Camille Oudot 11 Apr '16

11 Apr '16

Module: kamailio Branch: 4.4 Commit: 02b17b881d63fe91221f5673dd3418831c943bd0 URL: https://github.com/kamailio/kamailio/commit/02b17b881d63fe91221f5673dd34188… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-04-11T18:54:16+02:00 dialog: fix $dlg(from_bindaddr) getter --- Modified: modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/02b17b881d63fe91221f5673dd34188… Patch: https://github.com/kamailio/kamailio/commit/02b17b881d63fe91221f5673dd34188… --- diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c index 450f8a5..8d76b8f 100644 --- a/modules/dialog/dlg_var.c +++ b/modules/dialog/dlg_var.c @@ -878,7 +878,7 @@ int pv_parse_dlg_name(pv_spec_p sp, str *in) break; case 13: if(strncmp(in->s, "from_bindaddr", 13)==0) - sp->pvp.pvn.u.isname.name.n = 2; + sp->pvp.pvn.u.isname.name.n = 20; else goto error; break; default:

1 0

git:master:a4e3cee4: dialog: fix $dlg(from_bindaddr) getter
by Camille Oudot 11 Apr '16

11 Apr '16

Module: kamailio Branch: master Commit: a4e3cee470d27a691ec33b5dc11ad2e54246664a URL: https://github.com/kamailio/kamailio/commit/a4e3cee470d27a691ec33b5dc11ad2e… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-04-11T18:53:05+02:00 dialog: fix $dlg(from_bindaddr) getter --- Modified: modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/a4e3cee470d27a691ec33b5dc11ad2e… Patch: https://github.com/kamailio/kamailio/commit/a4e3cee470d27a691ec33b5dc11ad2e… --- diff --git a/modules/dialog/dlg_var.c b/modules/dialog/dlg_var.c index 450f8a5..8d76b8f 100644 --- a/modules/dialog/dlg_var.c +++ b/modules/dialog/dlg_var.c @@ -878,7 +878,7 @@ int pv_parse_dlg_name(pv_spec_p sp, str *in) break; case 13: if(strncmp(in->s, "from_bindaddr", 13)==0) - sp->pvp.pvn.u.isname.name.n = 2; + sp->pvp.pvn.u.isname.name.n = 20; else goto error; break; default:

1 0

git:master:9fc4028a: app_lua: use kamailio embeded interface to export KSR object
by Daniel-Constantin Mierla 11 Apr '16

11 Apr '16

Module: kamailio Branch: master Commit: 9fc4028ac35c9612f842a96a719407487e207bcc URL: https://github.com/kamailio/kamailio/commit/9fc4028ac35c9612f842a96a7194074… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-11T18:06:14+02:00 app_lua: use kamailio embeded interface to export KSR object - KSR is an hash table exported to Lua to host functions from Kamailio core and modules - now dbg(txt), err(txt) and info(txt) were exported - in a lua script, can be used like: KSR.info("message from lua\n"); --- Modified: modules/app_lua/app_lua_api.c Modified: modules/app_lua/app_lua_sr.c Modified: modules/app_lua/app_lua_sr.h --- Diff: https://github.com/kamailio/kamailio/commit/9fc4028ac35c9612f842a96a7194074… Patch: https://github.com/kamailio/kamailio/commit/9fc4028ac35c9612f842a96a7194074…

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2016