sr-dev November 2016

sr-dev@lists.kamailio.org

27 participants
289 discussions

git:master:9d3499a0: htable: remove additional search for event route block

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9d3499a037a40c0a2f169daa8e456a24b53d3608 URL: https://github.com/kamailio/kamailio/commit/9d3499a037a40c0a2f169daa8e456a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-14T16:30:07+01:00 htable: remove additional search for event route block --- Modified: modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/9d3499a037a40c0a2f169daa8e456a2… Patch: https://github.com/kamailio/kamailio/commit/9d3499a037a40c0a2f169daa8e456a2… --- diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 424a8e7..4b36493 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -272,7 +272,6 @@ static int child_init(int rank) goto done; } } - rt = route_get(&event_rt, "htable:mod-init"); if(rt>=0 || ht_event_callback.len>0) { LM_DBG("executing event_route[%s] (%d)\n", evname.s, rt); if(faked_msg_init()<0)

8 years

[kamailio/kamailio] ds_is_from_list() in kamailio 5 (devel) (#848)

by Timmo Verlaan

Hi, It seems there is a regression with ds_is_from_list(). When used without arguments it works on kamailio 4.4, but it doesn't work on kamailio 5.0. I used the same dispatcher set and configuration for both versions. On kamailio 4.4 ds_is_from_list() returned true and on kamailio 5.0 it returned false. I used the build from last night by sipwise. I haven't had time yet to figure out what changed. I'm reporting it here to see if it is known already. -- Timmo -- 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/issues/848

8 years

git:master:b51d5283: modules: readme files regenerated - htable ...

by Kamailio Dev

Module: kamailio Branch: master Commit: b51d5283f147d55f76d1a6755adb62c3d3b944be URL: https://github.com/kamailio/kamailio/commit/b51d5283f147d55f76d1a6755adb62c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-11-14T11:01:25+01:00 modules: readme files regenerated - htable ... --- Modified: modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/b51d5283f147d55f76d1a6755adb62c… Patch: https://github.com/kamailio/kamailio/commit/b51d5283f147d55f76d1a6755adb62c…

8 years

git:master:6dd359e3: htable: documentation for event_callback parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6dd359e3c55c43b385dc801ba76afe5ad1316c76 URL: https://github.com/kamailio/kamailio/commit/6dd359e3c55c43b385dc801ba76afe5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-14T10:55:12+01:00 htable: documentation for event_callback parameter --- Modified: modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6dd359e3c55c43b385dc801ba76afe5… Patch: https://github.com/kamailio/kamailio/commit/6dd359e3c55c43b385dc801ba76afe5… --- diff --git a/modules/htable/doc/htable_admin.xml b/modules/htable/doc/htable_admin.xml index 034733c..53ceb8b 100644 --- a/modules/htable/doc/htable_admin.xml +++ b/modules/htable/doc/htable_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -31,7 +31,7 @@ be adjusted per item via assignment operation at runtime. </para> <para> - Replication between multiple servers is performed automatically (if + Replication between multiple servers is performed automatically (if enabled) via the DMQ module. </para> <para> @@ -621,9 +621,9 @@ modparam("htable", "db_expires", 1) <section id="htable.p.enable_dmq"> <title><varname>enable_dmq</varname> (integer)</title> <para> - If set to 1, will enable DMQ replication of actions performed upon - entries in all tables having "dmqreplicate" parameter set. Any update - action performed via pseudo-variables, MI and RPC commands will be + If set to 1, will enable DMQ replication of actions performed upon + entries in all tables having "dmqreplicate" parameter set. Any update + action performed via pseudo-variables, MI and RPC commands will be repeated on all other nodes. Therefore, it is important to ensure the table definition (size, autoexpire etc.) is identical across all instances. </para> @@ -633,7 +633,7 @@ modparam("htable", "db_expires", 1) </emphasis> </para> <para> - Currently, values are not replicated on load from DB as it is expected + Currently, values are not replicated on load from DB as it is expected that in these cases, all servers will load their values from the same DB. </para> <para> @@ -672,6 +672,34 @@ modparam("htable", "timer_procs", 4) </programlisting> </example> </section> + <section id="htable.p.event_callback"> + <title><varname>event_callback</varname> (str)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[...] blocks. The function receives a string parameter + with the name of the event. + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("htable", "event_callback", "ksr_htable_event") +... +-- event callback function implemented in Lua +function ksr_htable_event(evname) + KSR.info("===== htable module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> </section> <section> <title>Functions</title>

8 years

git:master:a70f9739: htable: implementation of kemi callback for event routes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a70f973942621173756e0da38af23a1f54a4cdcb URL: https://github.com/kamailio/kamailio/commit/a70f973942621173756e0da38af23a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-14T10:44:11+01:00 htable: implementation of kemi callback for event routes - done for event htable:mod-init - new parameter 'event_callback' - set the name of the function from kemi embedded scripting language to be executed on event. The function receives a string parameter with event name --- Modified: modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/a70f973942621173756e0da38af23a1… Patch: https://github.com/kamailio/kamailio/commit/a70f973942621173756e0da38af23a1… --- diff --git a/modules/htable/htable.c b/modules/htable/htable.c index dd29cb7..424a8e7 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -55,6 +55,8 @@ int ht_db_expires_flag = 0; int ht_enable_dmq = 0; int ht_timer_procs = 0; +str ht_event_callback = STR_NULL; + static int htable_init_rpc(void); /** module functions */ @@ -148,6 +150,7 @@ static param_export_t params[]={ {"db_expires", INT_PARAM, &ht_db_expires_flag}, {"enable_dmq", INT_PARAM, &ht_enable_dmq}, {"timer_procs", PARAM_INT, &ht_timer_procs}, + {"event_callback", PARAM_STR, &ht_event_callback}, {0,0,0} }; @@ -234,6 +237,8 @@ static int child_init(int rank) struct run_act_ctx ctx; int rtb, rt; int i; + sr_kemi_eng_t *keng = NULL; + str evname = str_init("htable:mod-init"); LM_DBG("rank is (%d)\n", rank); @@ -252,24 +257,49 @@ static int child_init(int rank) if (rank!=PROC_INIT) return 0; + + rt = -1; + if(ht_event_callback.s==NULL || ht_event_callback.len<=0) { + rt = route_lookup(&event_rt, evname.s); + if(rt<0 || event_rt.rlist[rt]==NULL) { + rt = -1; + } + } else { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_DBG("event callback (%s) set, but no cfg engine\n", + ht_event_callback.s); + goto done; + } + } rt = route_get(&event_rt, "htable:mod-init"); - if(rt>=0 && event_rt.rlist[rt]!=NULL) { - LM_DBG("executing event_route[htable:mod-init] (%d)\n", rt); + if(rt>=0 || ht_event_callback.len>0) { + LM_DBG("executing event_route[%s] (%d)\n", evname.s, rt); if(faked_msg_init()<0) return -1; fmsg = faked_msg_next(); rtb = get_route_type(); set_route_type(REQUEST_ROUTE); init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], fmsg, &ctx); - if(ctx.run_flags&DROP_R_F) - { + if(rt>0) { + run_top_route(event_rt.rlist[rt], fmsg, &ctx); + } else { + if(keng!=NULL) { + if(keng->froute(fmsg, EVENT_ROUTE, + &ht_event_callback, &evname)<0) { + LM_ERR("error running event route kemi callback\n"); + return -1; + } + } + } + if(ctx.run_flags&DROP_R_F) { LM_ERR("exit due to 'drop' in event route\n"); return -1; } set_route_type(rtb); } +done: return 0; }

8 years

git:master:404e1e1d: app_python: extended kemi implementation to support routing function parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 404e1e1de066e86ff0f99cb1546af4400d92eef9 URL: https://github.com/kamailio/kamailio/commit/404e1e1de066e86ff0f99cb1546af44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-14T10:42:49+01:00 app_python: extended kemi implementation to support routing function parameter --- Modified: modules/app_python/apy_kemi.c Modified: modules/app_python/apy_kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/404e1e1de066e86ff0f99cb1546af44… Patch: https://github.com/kamailio/kamailio/commit/404e1e1de066e86ff0f99cb1546af44… --- diff --git a/modules/app_python/apy_kemi.c b/modules/app_python/apy_kemi.c index fd4ed7f..859bebc 100644 --- a/modules/app_python/apy_kemi.c +++ b/modules/app_python/apy_kemi.c @@ -39,13 +39,19 @@ /** * */ -int sr_kemi_config_engine_python(sip_msg_t *msg, int rtype, str *rname) +int sr_kemi_config_engine_python(sip_msg_t *msg, int rtype, str *rname, + str *rparam) { int ret; ret = -1; if(rtype==REQUEST_ROUTE) { - ret = apy_exec(msg, "ksr_request_route", NULL, 1); + if(rname!=NULL && rname->s!=NULL) { + ret = apy_exec(msg, rname->s, + (rparam && rparam->s)?rparam->s:NULL, 0); + } else { + ret = apy_exec(msg, "ksr_request_route", NULL, 1); + } } else if(rtype==CORE_ONREPLY_ROUTE) { ret = apy_exec(msg, "ksr_reply_route", NULL, 0); } else if(rtype==BRANCH_ROUTE) { @@ -68,7 +74,8 @@ int sr_kemi_config_engine_python(sip_msg_t *msg, int rtype, str *rname) ret = apy_exec(msg, "ksr_onsend_route", NULL, 0); } else if(rtype==EVENT_ROUTE) { if(rname!=NULL && rname->s!=NULL) { - ret = apy_exec(msg, rname->s, NULL, 0); + ret = apy_exec(msg, rname->s, + (rparam && rparam->s)?rparam->s:NULL, 0); } } else { if(rname!=NULL) { diff --git a/modules/app_python/apy_kemi.h b/modules/app_python/apy_kemi.h index 8840cd2..e34cdf5 100644 --- a/modules/app_python/apy_kemi.h +++ b/modules/app_python/apy_kemi.h @@ -27,7 +27,8 @@ int sr_apy_init_ksr(void); void sr_apy_destroy_ksr(void); -int sr_kemi_config_engine_python(sip_msg_t *msg, int rtype, str *rname); +int sr_kemi_config_engine_python(sip_msg_t *msg, int rtype, str *rname, + str *rparam); PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx);

8 years

git:master:c17f410e: app_lua: extended kemi implementation to support routing function parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c17f410e60b77baf284e88384d5f482f9ab6f142 URL: https://github.com/kamailio/kamailio/commit/c17f410e60b77baf284e88384d5f482… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-14T10:42:15+01:00 app_lua: extended kemi implementation to support routing function parameter --- Modified: modules/app_lua/app_lua_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c17f410e60b77baf284e88384d5f482… Patch: https://github.com/kamailio/kamailio/commit/c17f410e60b77baf284e88384d5f482… --- diff --git a/modules/app_lua/app_lua_mod.c b/modules/app_lua/app_lua_mod.c index fea80bb..84bb0cd 100644 --- a/modules/app_lua/app_lua_mod.c +++ b/modules/app_lua/app_lua_mod.c @@ -108,13 +108,19 @@ struct module_exports exports = { /** * */ -int sr_kemi_config_engine_lua(sip_msg_t *msg, int rtype, str *rname) +int sr_kemi_config_engine_lua(sip_msg_t *msg, int rtype, str *rname, + str *rparam) { int ret; ret = -1; if(rtype==REQUEST_ROUTE) { - ret = app_lua_run_ex(msg, "ksr_request_route", NULL, NULL, NULL, 1); + if(rname!=NULL && rname->s!=NULL) { + ret = app_lua_run_ex(msg, rname->s, + (rparam && rparam->s)?rparam->s:NULL, NULL, NULL, 0); + } else { + ret = app_lua_run_ex(msg, "ksr_request_route", NULL, NULL, NULL, 1); + } } else if(rtype==CORE_ONREPLY_ROUTE) { ret = app_lua_run_ex(msg, "ksr_reply_route", NULL, NULL, NULL, 0); } else if(rtype==BRANCH_ROUTE) { @@ -137,7 +143,8 @@ int sr_kemi_config_engine_lua(sip_msg_t *msg, int rtype, str *rname) ret = app_lua_run_ex(msg, "ksr_onsend_route", NULL, NULL, NULL, 0); } else if(rtype==EVENT_ROUTE) { if(rname!=NULL && rname->s!=NULL) { - ret = app_lua_run_ex(msg, rname->s, NULL, NULL, NULL, 0); + ret = app_lua_run_ex(msg, rname->s, + (rparam && rparam->s)?rparam->s:NULL, NULL, NULL, 0); } } else { if(rname!=NULL) {

8 years

git:master:0f94306a: tm: extended the kemi callbacks after updates to prototype

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0f94306a4e9fefde75d0b447a114f01cc0ade01f URL: https://github.com/kamailio/kamailio/commit/0f94306a4e9fefde75d0b447a114f01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-14T10:31:10+01:00 tm: extended the kemi callbacks after updates to prototype --- Modified: modules/tm/t_fwd.c Modified: modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/0f94306a4e9fefde75d0b447a114f01… Patch: https://github.com/kamailio/kamailio/commit/0f94306a4e9fefde75d0b447a114f01… --- diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 2ccac64..75286ae 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -348,7 +348,7 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, init_run_actions_ctx(&ctx); sr_kemi_act_ctx_set(&ctx); if(keng->froute(i_req, BRANCH_ROUTE, - sr_kemi_cbname_lookup_idx(branch_route))<0) { + sr_kemi_cbname_lookup_idx(branch_route), NULL)<0) { LM_ERR("error running branch route kemi callback\n"); } sr_kemi_act_ctx_set(bctx); diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 48c3d22..c577509 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -944,7 +944,7 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, keng = sr_kemi_eng_get(); if(unlikely(keng!=NULL)) { if(keng->froute(&faked_req, FAILURE_ROUTE, - sr_kemi_cbname_lookup_idx(on_failure))<0) { + sr_kemi_cbname_lookup_idx(on_failure), NULL)<0) { LM_ERR("error running failure route kemi callback\n"); } } else { @@ -1013,7 +1013,7 @@ int run_branch_failure_handlers(struct cell *t, struct sip_msg *rpl, keng = sr_kemi_eng_get(); if(unlikely(keng!=NULL)) { if(keng->froute(&faked_req, BRANCH_FAILURE_ROUTE, - sr_kemi_cbname_lookup_idx(on_branch_failure))<0) { + sr_kemi_cbname_lookup_idx(on_branch_failure), NULL)<0) { LM_ERR("error running branch failure route kemi callback\n"); } } else { @@ -2304,7 +2304,7 @@ int reply_received( struct sip_msg *p_msg ) init_run_actions_ctx(&ctx); sr_kemi_act_ctx_set(&ctx); keng->froute(p_msg, TM_ONREPLY_ROUTE, - sr_kemi_cbname_lookup_idx(onreply_route)); + sr_kemi_cbname_lookup_idx(onreply_route), NULL); sr_kemi_act_ctx_set(bctx); } else { run_top_route(onreply_rt.rlist[onreply_route], p_msg, &ctx);

8 years

git:master:ae6413a6: core: updates to kemi callbacks for core routing blocks

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ae6413a65b8c233eadd19706df6a69d7181ffd37 URL: https://github.com/kamailio/kamailio/commit/ae6413a65b8c233eadd19706df6a69d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-14T10:30:41+01:00 core: updates to kemi callbacks for core routing blocks --- Modified: onsend.h Modified: receive.c --- Diff: https://github.com/kamailio/kamailio/commit/ae6413a65b8c233eadd19706df6a69d… Patch: https://github.com/kamailio/kamailio/commit/ae6413a65b8c233eadd19706df6a69d… --- diff --git a/onsend.h b/onsend.h index 2f15663..cba56f4 100644 --- a/onsend.h +++ b/onsend.h @@ -86,7 +86,7 @@ static inline int run_onsend(struct sip_msg* orig_msg, struct dest_info* dst, if(unlikely(keng!=NULL)) { bctx = sr_kemi_act_ctx_get(); sr_kemi_act_ctx_set(&ra_ctx); - ret=keng->froute(orig_msg, ONSEND_ROUTE, NULL); + ret=keng->froute(orig_msg, ONSEND_ROUTE, NULL, NULL); sr_kemi_act_ctx_set(bctx); } else { ret=run_actions(&ra_ctx, onsend_rt.rlist[DEFAULT_RT], orig_msg); diff --git a/receive.c b/receive.c index 11918ed..f2cdeeb 100644 --- a/receive.c +++ b/receive.c @@ -257,7 +257,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) LM_ERR("no config routing engine registered\n"); goto error_req; } - if(keng->froute(msg, REQUEST_ROUTE, NULL)<0) { + if(keng->froute(msg, REQUEST_ROUTE, NULL, NULL)<0) { LM_NOTICE("negative return code from engine function\n"); } } else { @@ -321,7 +321,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) bctx = sr_kemi_act_ctx_get(); init_run_actions_ctx(&ctx); sr_kemi_act_ctx_set(&ctx); - ret = keng->froute(msg, CORE_ONREPLY_ROUTE, NULL); + ret = keng->froute(msg, CORE_ONREPLY_ROUTE, NULL, NULL); sr_kemi_act_ctx_set(bctx); } else { ret=run_top_route(onreply_rt.rlist[DEFAULT_RT], msg, &ctx);

8 years

git:master:f7fc3af2: core: kemi engine callback function extended to accept routing parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f7fc3af274e3c84167e1cd991eada0a93d96db02 URL: https://github.com/kamailio/kamailio/commit/f7fc3af274e3c84167e1cd991eada0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-14T10:26:31+01:00 core: kemi engine callback function extended to accept routing parameter --- Modified: kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/f7fc3af274e3c84167e1cd991eada0a… Patch: https://github.com/kamailio/kamailio/commit/f7fc3af274e3c84167e1cd991eada0a… --- diff --git a/kemi.h b/kemi.h index f98448e..4145950 100644 --- a/kemi.h +++ b/kemi.h @@ -100,7 +100,7 @@ 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 *); +typedef int (*sr_kemi_eng_route_f)(sip_msg_t*, int, str*, str*); #define SR_KEMI_BNAME_SIZE 256 typedef struct sr_kemi_eng {

8 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2016