sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
427 discussions

git:master:d6a91a42: evrexec: support to execute functions from kemi embedded language
by Daniel-Constantin Mierla 12 Apr '17

12 Apr '17

Module: kamailio Branch: master Commit: d6a91a42bc722f51b975241b098c62e2010f0c10 URL: https://github.com/kamailio/kamailio/commit/d6a91a42bc722f51b975241b098c62e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-12T20:25:54+02:00 evrexec: support to execute functions from kemi embedded language --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d6a91a42bc722f51b975241b098c62e… Patch: https://github.com/kamailio/kamailio/commit/d6a91a42bc722f51b975241b098c62e… --- diff --git a/src/modules/evrexec/evrexec_mod.c b/src/modules/evrexec/evrexec_mod.c index 1001571..5d45e6f 100644 --- a/src/modules/evrexec/evrexec_mod.c +++ b/src/modules/evrexec/evrexec_mod.c @@ -32,6 +32,7 @@ #include "../../core/ut.h" #include "../../core/cfg/cfg_struct.h" #include "../../core/parser/parse_param.h" +#include "../../core/kemi.h" #include "../../core/fmsg.h" @@ -52,7 +53,7 @@ static int mod_init(void); static int child_init(int); int evrexec_param(modparam_t type, void* val); -void evrexec_process(evrexec_task_t *it); +void evrexec_process(evrexec_task_t *it, int idx); static param_export_t params[]={ @@ -123,7 +124,7 @@ static int child_init(int rank) while(it) { for(i=0; i<it->workers; i++) { snprintf(si_desc, MAX_PT_DESC, "EVREXEC child=%d exec=%.*s", - i, it->ename.len, it->ename.s); + i, it->ename.len, it->ename.s); pid=fork_process(PROC_RPC, si_desc, 1); if (pid<0) return -1; /* error */ @@ -133,7 +134,7 @@ static int child_init(int rank) if (cfg_child_init()) return -1; - evrexec_process(it); + evrexec_process(it, i); } } it = it->next; @@ -145,15 +146,26 @@ static int child_init(int rank) /** * */ -void evrexec_process(evrexec_task_t *it) +void evrexec_process(evrexec_task_t *it, int idx) { sip_msg_t *fmsg; + sr_kemi_eng_t *keng = NULL; + str sidx = STR_NULL; if(it!=NULL) { fmsg = faked_msg_next(); set_route_type(LOCAL_ROUTE); if(it->wait>0) sleep_us(it->wait); - run_top_route(event_rt.rlist[it->rtid], fmsg, 0); + keng = sr_kemi_eng_get(); + if(keng==NULL) { + run_top_route(event_rt.rlist[it->rtid], fmsg, 0); + } else { + sidx.s = int2str(idx, &sidx.len); + if(keng->froute(fmsg, EVENT_ROUTE, + &it->ename, &sidx)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } } /* avoid exiting the process */ while(1) { sleep(3600); } @@ -169,6 +181,7 @@ int evrexec_param(modparam_t type, void *val) param_t *pit=NULL; evrexec_task_t *it; evrexec_task_t tmp; + sr_kemi_eng_t *keng = NULL; str s; char c; @@ -211,15 +224,18 @@ int evrexec_param(modparam_t type, void *val) free_params(params_list); return -1; } - /* get the route name */ - c = s.s[s.len]; - s.s[s.len] = '\0'; - tmp.rtid = route_lookup(&event_rt, s.s); - s.s[s.len] = c; - if(tmp.rtid == -1) { - LM_ERR("event route not found: %.*s\n", s.len, s.s); - free_params(params_list); - return -1; + /* set '\0' at the end of route name */ + tmp.ename.s[tmp.ename.len] = '\0'; + keng = sr_kemi_eng_get(); + if(keng==NULL) { + tmp.rtid = route_lookup(&event_rt, tmp.ename.s); + if(tmp.rtid == -1) { + LM_ERR("event route not found: %.*s\n", tmp.ename.len, tmp.ename.s); + free_params(params_list); + return -1; + } + } else { + tmp.rtid = -1; } it = (evrexec_task_t*)pkg_malloc(sizeof(evrexec_task_t));

1 0

New developer: Mikko Lehto
by Daniel-Constantin Mierla 12 Apr '17

12 Apr '17

Hello, just to let everyone know that I invited Mikko Lehto into the developer group on Kamailio gihub project. He has made a lot of good pull requests over the time, specially to documentation and unit tests that could have been just committed directly without delay on waiting for a review, saving also time from the other developers. Taking time to express my thanks for all his contributions so far and reviving those unit tests, and I am looking forward to future collaboration! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - May 22-24 (USA) - www.asipto.com Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

2 1

git:master:8a08d42f: modules: readme files regenerated - rtimer ... [skip ci]
by Kamailio Dev 11 Apr '17

11 Apr '17

Module: kamailio Branch: master Commit: 8a08d42f028a8e12dc380c964dc008d211d5424b URL: https://github.com/kamailio/kamailio/commit/8a08d42f028a8e12dc380c964dc008d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-04-11T20:16:19+02:00 modules: readme files regenerated - rtimer ... [skip ci] --- Modified: src/modules/rtimer/README --- Diff: https://github.com/kamailio/kamailio/commit/8a08d42f028a8e12dc380c964dc008d… Patch: https://github.com/kamailio/kamailio/commit/8a08d42f028a8e12dc380c964dc008d… --- diff --git a/src/modules/rtimer/README b/src/modules/rtimer/README index 98dd0cd..e5e8454 100644 --- a/src/modules/rtimer/README +++ b/src/modules/rtimer/README @@ -123,7 +123,7 @@ modparam("rtimer", "timer", "name=ta;interval=10;mode=1;") modparam("rtimer", "exec", "timer=ta;route=8") route[8] { - xlog("timer routine: time is %TF\n"); + xlog("timer routine: time is $TF\n"); # delete from my sql cache table entries older than 2H sql_query("delete from kamailio_cache where last_updated<$TS-3600"); }

1 0

git:master:c3c110e8: modules/rtimer: fix pseudo variable typo in example [skip ci]
by Mikko Lehto 11 Apr '17

11 Apr '17

Module: kamailio Branch: master Commit: c3c110e8a8519f6521678b5d9e0ec497b07883c4 URL: https://github.com/kamailio/kamailio/commit/c3c110e8a8519f6521678b5d9e0ec49… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-04-11T21:18:16+03:00 modules/rtimer: fix pseudo variable typo in example [skip ci] --- Modified: src/modules/rtimer/doc/rtimer_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c3c110e8a8519f6521678b5d9e0ec49… Patch: https://github.com/kamailio/kamailio/commit/c3c110e8a8519f6521678b5d9e0ec49… --- diff --git a/src/modules/rtimer/doc/rtimer_admin.xml b/src/modules/rtimer/doc/rtimer_admin.xml index 76bc419..c70a4e5 100644 --- a/src/modules/rtimer/doc/rtimer_admin.xml +++ b/src/modules/rtimer/doc/rtimer_admin.xml @@ -153,7 +153,7 @@ modparam("rtimer", "timer", "name=ta;interval=10;mode=1;") modparam("rtimer", "exec", "timer=ta;route=8") route[8] { - xlog("timer routine: time is %TF\n"); + xlog("timer routine: time is $TF\n"); # delete from my sql cache table entries older than 2H sql_query("delete from kamailio_cache where last_updated<$TS-3600"); }

1 0

git:master:b433f901: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 11 Apr '17

11 Apr '17

Module: kamailio Branch: master Commit: b433f901a6dfce7e8a5358f5a6b563e2885907c2 URL: https://github.com/kamailio/kamailio/commit/b433f901a6dfce7e8a5358f5a6b563e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-04-11T17:46:23+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/b433f901a6dfce7e8a5358f5a6b563e… Patch: https://github.com/kamailio/kamailio/commit/b433f901a6dfce7e8a5358f5a6b563e…

1 0

git:master:315be997: Merge pull request #1067 from mslehto/filter_server_id
by GitHub 11 Apr '17

11 Apr '17

Module: kamailio Branch: master Commit: 315be997e8e6d3466d5d1d89b155566dab6168d5 URL: https://github.com/kamailio/kamailio/commit/315be997e8e6d3466d5d1d89b155566… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-04-11T17:34:48+02:00 Merge pull request #1067 from mslehto/filter_server_id modules/nathelper: add undocumented filter_server_id --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/315be997e8e6d3466d5d1d89b155566… Patch: https://github.com/kamailio/kamailio/commit/315be997e8e6d3466d5d1d89b155566… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index fa5ca7b..d08f80c 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -439,6 +439,28 @@ modparam("nathelper", "append_sdp_oldmediaip", 1) </programlisting> </example> </section> + + <section id="nathelper.p.filter_server_id"> + <title><varname>filter_server_id</varname> (int)</title> + <para> + Filter contacts by <quote>server_id</quote> core parameter. + Use this parameter to limit pinging. When set to <quote>1</quote>, + only proxy instances which send packets are those where core server_id + matches server_id saved in usrloc. + <emphasis> + Default value is <quote>0</quote> (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>filter_server_id</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nathelper", "filter_server_id", 1) +... +</programlisting> + </example> + </section> + </section>

1 0

git:master:5a346f9a: modules/nathelper: add undocumented filter_server_id [skip ci]
by Mikko Lehto 11 Apr '17

11 Apr '17

Module: kamailio Branch: master Commit: 5a346f9ac423e3e1e62c3e979bd5c5594ce277b5 URL: https://github.com/kamailio/kamailio/commit/5a346f9ac423e3e1e62c3e979bd5c55… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-04-11T18:29:03+03:00 modules/nathelper: add undocumented filter_server_id [skip ci] --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5a346f9ac423e3e1e62c3e979bd5c55… Patch: https://github.com/kamailio/kamailio/commit/5a346f9ac423e3e1e62c3e979bd5c55… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index fa5ca7b..d08f80c 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -439,6 +439,28 @@ modparam("nathelper", "append_sdp_oldmediaip", 1) </programlisting> </example> </section> + + <section id="nathelper.p.filter_server_id"> + <title><varname>filter_server_id</varname> (int)</title> + <para> + Filter contacts by <quote>server_id</quote> core parameter. + Use this parameter to limit pinging. When set to <quote>1</quote>, + only proxy instances which send packets are those where core server_id + matches server_id saved in usrloc. + <emphasis> + Default value is <quote>0</quote> (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>filter_server_id</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nathelper", "filter_server_id", 1) +... +</programlisting> + </example> + </section> + </section>

1 0

[kamailio/kamailio] modules/nathelper: add undocumented filter_server_id (#1067)
by Mikko Lehto 11 Apr '17

11 Apr '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1067 -- Commit Summary -- * modules/nathelper: add undocumented filter_server_id [skip ci] -- File Changes -- M src/modules/nathelper/doc/nathelper_admin.xml (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1067.patch https://github.com/kamailio/kamailio/pull/1067.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/1067

2 2

git:master:5cd813c3: app_jsdt: exported functions to kemi framework
by Daniel-Constantin Mierla 11 Apr '17

11 Apr '17

Module: kamailio Branch: master Commit: 5cd813c32b0bf02471ebe17d098ca2b42f56b748 URL: https://github.com/kamailio/kamailio/commit/5cd813c32b0bf02471ebe17d098ca2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-11T17:33:00+02:00 app_jsdt: exported functions to kemi framework --- Modified: src/modules/app_jsdt/app_jsdt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5cd813c32b0bf02471ebe17d098ca2b… Patch: https://github.com/kamailio/kamailio/commit/5cd813c32b0bf02471ebe17d098ca2b…

1 0

git:master:255acf8c: app_python: exported functions to kemi framework
by Daniel-Constantin Mierla 11 Apr '17

11 Apr '17

Module: kamailio Branch: master Commit: 255acf8c981dbe440b520163e44cadf7af8f11ae URL: https://github.com/kamailio/kamailio/commit/255acf8c981dbe440b520163e44cadf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-11T17:12:08+02:00 app_python: exported functions to kemi framework --- Modified: src/modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/255acf8c981dbe440b520163e44cadf… Patch: https://github.com/kamailio/kamailio/commit/255acf8c981dbe440b520163e44cadf… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index 6f3e51d..dd57ea9 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -95,18 +95,6 @@ struct module_exports exports = { /** * */ -int mod_register(char *path, int *dlflags, void *p1, void *p2) -{ - str ename = str_init("python"); - - sr_kemi_eng_register(&ename, sr_kemi_config_engine_python); - - return 0; -} - -/** - * - */ static int mod_init(void) { char *dname_src, *bname_src; @@ -421,3 +409,77 @@ static void mod_destroy(void) destroy_mod_Logger(); destroy_mod_Router(); } + +/** + * + */ +static int ki_app_python_exec(sip_msg_t *msg, str *method) +{ + if(method==NULL || method->s==NULL || method->len<=0) { + LM_ERR("invalid method name\n"); + return -1; + } + if(method->s[method->len]!='\0') { + LM_ERR("invalid terminated method name\n"); + return -1; + } + return apy_exec(msg, method->s, NULL, 1); +} + +/** + * + */ +static int ki_app_python_exec_p1(sip_msg_t *msg, str *method, str *p1) +{ + if(method==NULL || method->s==NULL || method->len<=0) { + LM_ERR("invalid method name\n"); + return -1; + } + if(method->s[method->len]!='\0') { + LM_ERR("invalid terminated method name\n"); + return -1; + } + if(p1==NULL || p1->s==NULL || p1->len<0) { + LM_ERR("invalid p1 value\n"); + return -1; + } + if(p1->s[p1->len]!='\0') { + LM_ERR("invalid terminated p1 value\n"); + return -1; + } + + return apy_exec(msg, method->s, p1->s, 1); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_app_python_exports[] = { + { str_init("app_python"), str_init("exec"), + SR_KEMIP_INT, ki_app_python_exec, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("app_python"), str_init("exec_p1"), + SR_KEMIP_INT, ki_app_python_exec_p1, + { 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 */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + str ename = str_init("python"); + + sr_kemi_eng_register(&ename, sr_kemi_config_engine_python); + sr_kemi_modules_add(sr_kemi_app_python_exports); + + return 0; +}

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
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 2017