sr-dev April 2016

sr-dev@lists.kamailio.org

23 participants
430 discussions

git:master:fb131bbd: tm: implemented the execution of branch_route callback via kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fb131bbd34d7bd40298095433a308f38e49b3e77 URL: https://github.com/kamailio/kamailio/commit/fb131bbd34d7bd40298095433a308f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-14T13:15:15+02:00 tm: implemented the execution of branch_route callback via kemi --- Modified: modules/tm/t_fwd.c Modified: modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/fb131bbd34d7bd40298095433a308f3… Patch: https://github.com/kamailio/kamailio/commit/fb131bbd34d7bd40298095433a308f3… --- diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 15f0969..dc97ad9 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -58,6 +58,7 @@ #include "../../dst_blacklist.h" #endif #include "../../atomic_ops.h" /* membar_depends() */ +#include "../../kemi.h" extern int tm_failure_exec_mode; @@ -152,6 +153,8 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, struct socket_info *force_send_socket_bak; struct dest_info *dst; struct run_act_ctx ctx; + struct run_act_ctx *bctx; + sr_kemi_eng_t *keng; shbuf=0; ret=E_UNSPEC; @@ -340,10 +343,20 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, /* set the new values */ i_req->fwd_send_flags=snd_flags /* intial value */; set_force_socket(i_req, fsocket); - if (run_top_route(branch_rt.rlist[branch_route], i_req, &ctx) - < 0) - { - LOG(L_DBG, "negative return code in run_top_route\n"); + keng = sr_kemi_eng_get(); + if(unlikely(keng!=NULL)) { + bctx = sr_kemi_act_ctx_get(); + sr_kemi_act_ctx_set(&ctx); + if(keng->froute(i_req, BRANCH_ROUTE, + sr_kemi_cbname_lookup_idx(branch_route))<0) { + LM_ERR("error running branch route kemi callback\n"); + } + sr_kemi_act_ctx_set(bctx); + } else { + if (run_top_route(branch_rt.rlist[branch_route], + i_req, &ctx) < 0) { + LOG(L_DBG, "negative return code in run_top_route\n"); + } } /* update dst send_flags and send socket*/ snd_flags=i_req->fwd_send_flags; diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 237c38b..6022d50 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -993,7 +993,7 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, if(unlikely(keng!=NULL)) { if(keng->froute(&faked_req, FAILURE_ROUTE, sr_kemi_cbname_lookup_idx(on_failure))<0) { - LM_ERR("error running failure kemi callback\n"); + LM_ERR("error running failure route kemi callback\n"); } } else { if (run_top_route(failure_rt.rlist[on_failure], &faked_req, 0)<0)

8 years, 8 months

git:master:000fa421: core: typedef'ed the action context structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 000fa421129a14fdad44e22545a04d2788040912 URL: https://github.com/kamailio/kamailio/commit/000fa421129a14fdad44e22545a04d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-14T13:15:15+02:00 core: typedef'ed the action context structure --- Modified: action.h --- Diff: https://github.com/kamailio/kamailio/commit/000fa421129a14fdad44e22545a04d2… Patch: https://github.com/kamailio/kamailio/commit/000fa421129a14fdad44e22545a04d2… --- diff --git a/action.h b/action.h index 62eed0c..b4591aa 100644 --- a/action.h +++ b/action.h @@ -40,14 +40,14 @@ #endif -struct run_act_ctx{ +typedef struct run_act_ctx { int rec_lev; int run_flags; int last_retcode; /* return from last route */ #ifdef USE_LONGJMP jmp_buf jmp_env; #endif -}; +} run_act_ctx_t; #define init_run_actions_ctx(ph) \

8 years, 8 months

git:master:43fc3cd6: tm: implementation of alternative failure_route callback execution via kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 43fc3cd6ea1fe8f9e96ca498ba0ed69d2c14589b URL: https://github.com/kamailio/kamailio/commit/43fc3cd6ea1fe8f9e96ca498ba0ed69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-14T13:15:15+02:00 tm: implementation of alternative failure_route callback execution via kemi --- Modified: modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/43fc3cd6ea1fe8f9e96ca498ba0ed69… Patch: https://github.com/kamailio/kamailio/commit/43fc3cd6ea1fe8f9e96ca498ba0ed69… --- diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 9011c87..237c38b 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -73,6 +73,7 @@ #include "../../sr_compat.h" #include "../../receive.h" #include "../../onsend.h" +#include "../../kemi.h" #include "t_stats.h" #include "uac.h" @@ -949,6 +950,7 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, static struct sip_msg faked_req; struct sip_msg *shmem_msg = t->uas.request; int on_failure; + sr_kemi_eng_t *keng = NULL; on_failure = t->uac[picked_branch].on_failure; @@ -987,8 +989,16 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, t->flags &= ~T_ASYNC_SUSPENDED; if (exec_pre_script_cb(&faked_req, FAILURE_CB_TYPE)>0) { /* run a failure_route action if some was marked */ - if (run_top_route(failure_rt.rlist[on_failure], &faked_req, 0)<0) - LOG(L_ERR, "ERROR: run_failure_handlers: Error in run_top_route\n"); + keng = sr_kemi_eng_get(); + if(unlikely(keng!=NULL)) { + if(keng->froute(&faked_req, FAILURE_ROUTE, + sr_kemi_cbname_lookup_idx(on_failure))<0) { + LM_ERR("error running failure kemi callback\n"); + } + } else { + if (run_top_route(failure_rt.rlist[on_failure], &faked_req, 0)<0) + LM_ERR("error running run_top_route for failure handler\n"); + } exec_post_script_cb(&faked_req, FAILURE_CB_TYPE); } /* update message flags, if changed in failure route */

8 years, 8 months

git:master:68dce497: app_lua: extend the kemi engine to handle the routing block types

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 68dce4972cff006693dbd80837b16d07e565b0ac URL: https://github.com/kamailio/kamailio/commit/68dce4972cff006693dbd80837b16d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-14T13:15:15+02:00 app_lua: extend the kemi engine to handle the routing block types --- Modified: modules/app_lua/app_lua_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/68dce4972cff006693dbd80837b16d0… Patch: https://github.com/kamailio/kamailio/commit/68dce4972cff006693dbd80837b16d0… --- diff --git a/modules/app_lua/app_lua_mod.c b/modules/app_lua/app_lua_mod.c index 11134ea..8cf74a1 100644 --- a/modules/app_lua/app_lua_mod.c +++ b/modules/app_lua/app_lua_mod.c @@ -111,10 +111,33 @@ int sr_kemi_config_engine_lua(sip_msg_t *msg, int rtype, str *rname) { int ret; + ret = -1; if(rtype==REQUEST_ROUTE) { 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) { + if(rname!=NULL && rname->s!=NULL) { + ret = app_lua_run_ex(msg, rname->s, NULL, NULL, NULL, 0); + } + } else if(rtype==FAILURE_ROUTE) { + if(rname!=NULL && rname->s!=NULL) { + ret = app_lua_run_ex(msg, rname->s, NULL, NULL, NULL, 0); + } + } else if(rtype==BRANCH_FAILURE_ROUTE) { + if(rname!=NULL && rname->s!=NULL) { + ret = app_lua_run_ex(msg, rname->s, NULL, NULL, NULL, 0); + } + } else if(rtype==TM_ONREPLY_ROUTE) { + if(rname!=NULL && rname->s!=NULL) { + ret = app_lua_run_ex(msg, rname->s, NULL, NULL, NULL, 0); + } + } else if(rtype==ONSEND_ROUTE) { + 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); + } } else { if(rname!=NULL) { LM_ERR("route type %d with name [%.*s] not implemented\n",

8 years, 8 months

git:master:b3f97918: tm: export several functions to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b3f97918ee9338c40a23f639c62b17160ba6ab4c URL: https://github.com/kamailio/kamailio/commit/b3f97918ee9338c40a23f639c62b171… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-14T13:15:15+02:00 tm: export several functions to kemi --- Modified: modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/b3f97918ee9338c40a23f639c62b171… Patch: https://github.com/kamailio/kamailio/commit/b3f97918ee9338c40a23f639c62b171…

8 years, 8 months

git:master:710118e5: app_lua: reset the values for api parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 710118e55999198d1282f18ea7ef37de4a50e5f5 URL: https://github.com/kamailio/kamailio/commit/710118e55999198d1282f18ea7ef37d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-14T13:15:15+02:00 app_lua: reset the values for api parameters --- Modified: modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/710118e55999198d1282f18ea7ef37d… Patch: https://github.com/kamailio/kamailio/commit/710118e55999198d1282f18ea7ef37d… --- diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index b7bb39c..63edd5b 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -1478,6 +1478,7 @@ int sr_kemi_exec_func(lua_State* L, str *mname, int midx, str *fname) return app_lua_return_false(L); } + memset(vps, 0, SR_KEMI_PARAMS_MAX*sizeof(sr_kemi_val_t)); for(i=0; i<SR_KEMI_PARAMS_MAX; i++) { if(ket->ptypes[i]==SR_KEMIP_NONE) { break;

8 years, 8 months

git:master:5b2da38a: modules/ims_dialog: change logging ERR to DBG

by jaybeepee

Module: kamailio Branch: master Commit: 5b2da38a4dfe5240c353281a45fd2d6e0003b26a URL: https://github.com/kamailio/kamailio/commit/5b2da38a4dfe5240c353281a45fd2d6… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-04-14T12:32:11+02:00 modules/ims_dialog: change logging ERR to DBG --- Modified: modules/ims_dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/5b2da38a4dfe5240c353281a45fd2d6… Patch: https://github.com/kamailio/kamailio/commit/5b2da38a4dfe5240c353281a45fd2d6… --- diff --git a/modules/ims_dialog/dlg_handlers.c b/modules/ims_dialog/dlg_handlers.c index dd23154..394c779 100644 --- a/modules/ims_dialog/dlg_handlers.c +++ b/modules/ims_dialog/dlg_handlers.c @@ -1226,7 +1226,7 @@ void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) { // get to tag LM_DBG("Extracting to-tag from reply"); if (!rpl->to && ((parse_headers(rpl, HDR_TO_F, 0) < 0) || !rpl->to)) { - LM_ERR("bad reply or missing TO hdr :-/\n"); + LM_DBG("bad reply or missing TO hdr :-/\n"); to_tag.s = 0; to_tag.len = 0; } else { @@ -1235,7 +1235,7 @@ void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) { to_tag = get_to(rpl)->tag_value; if (to_tag.s == 0 || to_tag.len == 0) { - LM_ERR("missing TAG param in TO hdr :-/\n"); + LM_DBG("missing TAG param in TO hdr :-/\n"); to_tag.s = 0; to_tag.len = 0; //Here we assume that the transaction module timer will remove any early dialogs @@ -1377,7 +1377,7 @@ void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) { /* extract the contact address to update if present*/ if (!rpl->contact && (parse_headers(rpl, HDR_CONTACT_F, 0) < 0 || !rpl->contact)) { - LM_ERR("Can not update callee contact: bad sip message or missing Contact hdr\n"); + LM_DBG("Can not update callee contact: bad sip message or missing Contact hdr\n"); } else if (parse_contact(rpl->contact) < 0 || ((contact_body_t *) rpl->contact->parsed)->contacts == NULL || ((contact_body_t *) rpl->contact->parsed)->contacts->next != NULL) {

8 years, 8 months

git:master:01ec5207: modules/ims_registrar_scscf: reset t pointer if tx not found - avoid crash

by jaybeepee

Module: kamailio Branch: master Commit: 01ec5207c0fd6c01e05568397754e1880c4ab4c5 URL: https://github.com/kamailio/kamailio/commit/01ec5207c0fd6c01e05568397754e18… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-04-14T12:31:07+02:00 modules/ims_registrar_scscf: reset t pointer if tx not found - avoid crash --- Modified: modules/ims_registrar_scscf/cxdx_sar.c --- Diff: https://github.com/kamailio/kamailio/commit/01ec5207c0fd6c01e05568397754e18… Patch: https://github.com/kamailio/kamailio/commit/01ec5207c0fd6c01e05568397754e18… --- diff --git a/modules/ims_registrar_scscf/cxdx_sar.c b/modules/ims_registrar_scscf/cxdx_sar.c index c2bb291..eac67fc 100644 --- a/modules/ims_registrar_scscf/cxdx_sar.c +++ b/modules/ims_registrar_scscf/cxdx_sar.c @@ -141,7 +141,8 @@ void async_cdp_callback(int is_timeout, void *param, AAAMessage *saa, long elaps LM_DBG("There is transaction data this must have been called from save or assign server unreg"); data = (saved_transaction_t*) param; if (tmb.t_lookup_ident(&t, data->tindex, data->tlabel) < 0) { - LM_ERR("t_continue: transaction not found\n"); + LM_ERR("t_continue: transaction not found and t is now pointing to %p and will be set to NULL\n", t); + t = NULL; rerrno = R_SAR_FAILED; goto error_no_send; }

8 years, 8 months

git:master:f85ea362: tm Add improved documentation for t_replicate

by Olle E. Johansson

Module: kamailio Branch: master Commit: f85ea36269a1234bd85a6b6afbd2590e6e566060 URL: https://github.com/kamailio/kamailio/commit/f85ea36269a1234bd85a6b6afbd2590… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-04-14T10:07:53+02:00 tm Add improved documentation for t_replicate --- Modified: modules/tm/README Modified: modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/f85ea36269a1234bd85a6b6afbd2590… Patch: https://github.com/kamailio/kamailio/commit/f85ea36269a1234bd85a6b6afbd2590… --- diff --git a/modules/tm/README b/modules/tm/README index 9b31ebc..40cee22 100644 --- a/modules/tm/README +++ b/modules/tm/README @@ -2585,7 +2585,9 @@ if(!t_relay()) { 5.46. t_replicate([params]) - Replicate the SIP request to a specific address. + Replicate the SIP request to a specific address. Return values are the + same as for t_relay(). Note that responses to the replicated request + are suppressed and will not show up in any reply_route. There are several function prototypes: * t_replicate([uri]), diff --git a/modules/tm/doc/functions.xml b/modules/tm/doc/functions.xml index b022fd9..4ad34fc 100644 --- a/modules/tm/doc/functions.xml +++ b/modules/tm/doc/functions.xml @@ -1508,7 +1508,10 @@ if(!t_relay()) { <function>t_replicate([params])</function> </title> <para> - Replicate the SIP request to a specific address. + Replicate the SIP request to a specific address. Return + values are the same as for <function>t_relay()</function>. + Note that responses to the replicated request are suppressed + and will not show up in any reply_route. </para> <para> There are several function prototypes:

8 years, 8 months

git:master:ff992f97: imc Remove SVN ID's and history

by Olle E. Johansson

Module: kamailio Branch: master Commit: ff992f9781f8685a8ba8842f6455218c37d04eec URL: https://github.com/kamailio/kamailio/commit/ff992f9781f8685a8ba8842f6455218… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-04-13T20:36:31+02:00 imc Remove SVN ID's and history --- Modified: modules/imc/imc.c Modified: modules/imc/imc.h Modified: modules/imc/imc_cmd.c Modified: modules/imc/imc_cmd.h Modified: modules/imc/imc_mng.c Modified: modules/imc/imc_mng.h --- Diff: https://github.com/kamailio/kamailio/commit/ff992f9781f8685a8ba8842f6455218… Patch: https://github.com/kamailio/kamailio/commit/ff992f9781f8685a8ba8842f6455218… --- diff --git a/modules/imc/imc.c b/modules/imc/imc.c index 8fbfd14..4ed222f 100644 --- a/modules/imc/imc.c +++ b/modules/imc/imc.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * imc module - instant messaging conferencing implementation * * Copyright (C) 2006 Voice Sistem S.R.L. @@ -21,9 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History: - * --------- - * 2006-10-06 first version (anca) */ #include <stdio.h> diff --git a/modules/imc/imc.h b/modules/imc/imc.h index 71bf011..ef3f742 100644 --- a/modules/imc/imc.h +++ b/modules/imc/imc.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * imc module - instant messaging conferencing implementation * * Copyright (C) 2006 Voice Sistem S.R.L. diff --git a/modules/imc/imc_cmd.c b/modules/imc/imc_cmd.c index c4a87ea..4f0915f 100644 --- a/modules/imc/imc_cmd.c +++ b/modules/imc/imc_cmd.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * imc module - instant messaging conferencing implementation * * Copyright (C) 2006 Voice Sistem S.R.L. diff --git a/modules/imc/imc_cmd.h b/modules/imc/imc_cmd.h index 0dfcfc9..a54b69a 100644 --- a/modules/imc/imc_cmd.h +++ b/modules/imc/imc_cmd.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * imc module - instant messaging conferencing implementation * * Copyright (C) 2006 Voice Sistem S.R.L. @@ -21,8 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History: - * --------- */ diff --git a/modules/imc/imc_mng.c b/modules/imc/imc_mng.c index 2f3d6ab..69f747f 100644 --- a/modules/imc/imc_mng.c +++ b/modules/imc/imc_mng.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * imc module - instant messaging conferencing implementation * * Copyright (C) 2006 Voice Sistem S.R.L. @@ -21,9 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History: - * --------- - * 2006-10-06 first version (anca) */ diff --git a/modules/imc/imc_mng.h b/modules/imc/imc_mng.h index 20e19e2..905dbb1 100644 --- a/modules/imc/imc_mng.h +++ b/modules/imc/imc_mng.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * imc module - instant messaging conferencing implementation * * Copyright (C) 2006 Voice Sistem S.R.L. @@ -21,9 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History: - * --------- - * 2006-10-06 first version (anca) */

8 years, 8 months

← Newer
1
...
25
26
27
28
29
30
31
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2016