sr-dev April 2019

sr-dev@lists.kamailio.org

23 participants
317 discussions

git:5.2:56f87246: app_jsdt: use system time to compute execution duration

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 56f87246f7bd1571b030ef230d78beed408dbdec URL: https://github.com/kamailio/kamailio/commit/56f87246f7bd1571b030ef230d78bee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:48:40+02:00 app_jsdt: use system time to compute execution duration (cherry picked from commit 626a8bf3e6cbc6dbdf11de0e6f8737f08c79a0bb) --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/56f87246f7bd1571b030ef230d78bee… Patch: https://github.com/kamailio/kamailio/commit/56f87246f7bd1571b030ef230d78bee… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 7d55804623..f938448ac8 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1337,29 +1337,34 @@ int sr_kemi_jsdt_exec_func(duk_context *J, int eidx) { sr_kemi_t *ket; int ret; - unsigned int ms = 0; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; int sline = 0; ket = sr_kemi_jsdt_export_get(eidx); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()); + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); } ret = sr_kemi_jsdt_exec_func_ex(J, ket); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action) - && is_printable(cfg_get(core, core_cfg, latency_log))) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { duk_inspect_callstack_entry(J, -1); duk_get_prop_string(J, -1, "lineNumber"); sline = (int)duk_to_int(J, -1); duk_pop_2(J); LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" - " took too long [%u ms] (line: %d)\n", + " took too long [%u us] (line: %d)\n", (ket->mname.len>0)?ket->mname.s:"", - (ket->mname.len>0)?".":"", ket->fname.s, ms, sline); + (ket->mname.len>0)?".":"", ket->fname.s, tdiff, sline); } }

5 years, 7 months

git:5.2:1becba8e: app_sqlang: execution log message based on core latency_limit_action

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 1becba8ef4b901f3fd67842711b079e8011beb2e URL: https://github.com/kamailio/kamailio/commit/1becba8ef4b901f3fd67842711b079e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:48:28+02:00 app_sqlang: execution log message based on core latency_limit_action (cherry picked from commit 639db054d0d2e8b0bb50c9109750419654dedbe1) --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/1becba8ef4b901f3fd67842711b079e… Patch: https://github.com/kamailio/kamailio/commit/1becba8ef4b901f3fd67842711b079e… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 302e78a3b3..b23f8dad61 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -1448,9 +1448,36 @@ int sr_kemi_sqlang_exec_func_ex(HSQUIRRELVM J, sr_kemi_t *ket) int sr_kemi_sqlang_exec_func(HSQUIRRELVM J, int eidx) { sr_kemi_t *ket; + int ret; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; ket = sr_kemi_sqlang_export_get(eidx); - return sr_kemi_sqlang_exec_func_ex(J, ket); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); + } + + ret = sr_kemi_sqlang_exec_func_ex(J, ket); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { + LOG(cfg_get(core, core_cfg, latency_log), + "alert - action KSR.%s%s%s(...)" + " took too long [%u us]\n", + (ket->mname.len>0)?ket->mname.s:"", + (ket->mname.len>0)?".":"", ket->fname.s, + tdiff); + } + } + + return ret; } /**

5 years, 7 months

git:master:7f20200c: tls: set execution context for kemi callbacks

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7f20200c9e0bca5c4ed16c55b9db162922a51e76 URL: https://github.com/kamailio/kamailio/commit/7f20200c9e0bca5c4ed16c55b9db162… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:40:14+02:00 tls: set execution context for kemi callbacks --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/7f20200c9e0bca5c4ed16c55b9db162… Patch: https://github.com/kamailio/kamailio/commit/7f20200c9e0bca5c4ed16c55b9db162… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 812015f622..5d3bc94522 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -1477,7 +1477,7 @@ int tls_run_event_routes(struct tcp_connection *c) } else { keng = sr_kemi_eng_get(); if(keng!=NULL) { - if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &sr_tls_event_callback, &evname)<0) { LM_ERR("error running event route kemi callback\n"); return -1;

5 years, 7 months

git:master:501c2b88: msrp: set the context to kemi callback function execution

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 501c2b88e8e0bf16f2be0b0255d35d449467a60d URL: https://github.com/kamailio/kamailio/commit/501c2b88e8e0bf16f2be0b0255d35d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:36:17+02:00 msrp: set the context to kemi callback function execution --- Modified: src/modules/msrp/msrp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/501c2b88e8e0bf16f2be0b0255d35d4… Patch: https://github.com/kamailio/kamailio/commit/501c2b88e8e0bf16f2be0b0255d35d4… --- diff --git a/src/modules/msrp/msrp_mod.c b/src/modules/msrp/msrp_mod.c index d69beea133..dfe7056f39 100644 --- a/src/modules/msrp/msrp_mod.c +++ b/src/modules/msrp/msrp_mod.c @@ -531,16 +531,13 @@ static int msrp_frame_received(sr_event_param_t *evp) fmsg->rcv = *tev->rcv; rtb = get_route_type(); set_route_type(EVENT_ROUTE); + init_run_actions_ctx(&ctx); if(msrp_event_callback.s == NULL || msrp_event_callback.len <= 0) { /* native cfg script execution */ rt = route_get(&event_rt, evname.s); LM_DBG("executing event_route[msrp:frame-in] (%d)\n", rt); if(rt >= 0 && event_rt.rlist[rt] != NULL) { - init_run_actions_ctx(&ctx); run_top_route(event_rt.rlist[rt], fmsg, &ctx); - if(ctx.run_flags & DROP_R_F) { - LM_DBG("exit due to 'drop' in event route\n"); - } } else { LM_ERR("empty event route block for msrp handling\n"); } @@ -551,12 +548,15 @@ static int msrp_frame_received(sr_event_param_t *evp) LM_ERR("event callback (%s) set, but no cfg engine\n", msrp_event_callback.s); } else { - if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &msrp_event_callback, &evname)<0) { LM_ERR("error running event route kemi callback\n"); } } } + if(ctx.run_flags & DROP_R_F) { + LM_DBG("exit due to 'drop' in event route\n"); + } set_route_type(rtb); if(fmsg != NULL) free_sip_msg(fmsg);

5 years, 7 months

git:master:9eafd82c: htable: execute the kemi event route callbacks with context

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9eafd82c3e29ec4480bc5be3e6aa1e9d66243dc5 URL: https://github.com/kamailio/kamailio/commit/9eafd82c3e29ec4480bc5be3e6aa1e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:15:09+02:00 htable: execute the kemi event route callbacks with context --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/9eafd82c3e29ec4480bc5be3e6aa1e9… Patch: https://github.com/kamailio/kamailio/commit/9eafd82c3e29ec4480bc5be3e6aa1e9… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 268241cf3c..4d70d6e317 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -288,7 +288,7 @@ static int child_init(int rank) run_top_route(event_rt.rlist[rt], fmsg, &ctx); } else { if(keng!=NULL) { - if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &ht_event_callback, &evname)<0) { LM_ERR("error running event route kemi callback\n"); return -1;

5 years, 7 months

git:master:d2cb91df: topos: execute the kemi event route callbacks with context

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d2cb91dffc262060337f553b178dbeb5dedb3dfb URL: https://github.com/kamailio/kamailio/commit/d2cb91dffc262060337f553b178dbeb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T10:00:00+02:00 topos: execute the kemi event route callbacks with context --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d2cb91dffc262060337f553b178dbeb… Patch: https://github.com/kamailio/kamailio/commit/d2cb91dffc262060337f553b178dbeb… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 06f1bd9c41..c1a597eb1e 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -554,7 +554,7 @@ int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp) run_top_route(event_rt.rlist[_th_eventrt_outgoing], fmsg, &ctx); } else { if(keng!=NULL) { - if(sr_kemi_route(keng, fmsg, EVENT_ROUTE, + if(sr_kemi_ctx_route(keng, &ctx, fmsg, EVENT_ROUTE, &_th_eventrt_callback, &_th_eventrt_name)<0) { LM_ERR("error running event route kemi callback\n"); p_onsend=NULL;

5 years, 7 months

git:master:0689ac59: core: kemi - backpup and restore old context inside sr_kemi_ctx_route()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0689ac5976121d5a8edf815c0cee51da1098530f URL: https://github.com/kamailio/kamailio/commit/0689ac5976121d5a8edf815c0cee51d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-10T09:56:20+02:00 core: kemi - backpup and restore old context inside sr_kemi_ctx_route() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/0689ac5976121d5a8edf815c0cee51d… Patch: https://github.com/kamailio/kamailio/commit/0689ac5976121d5a8edf815c0cee51d… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index deb9285b9d..039ba1557f 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2429,6 +2429,12 @@ int sr_kemi_route(sr_kemi_eng_t *keng, sip_msg_t *msg, int rtype, int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, int rtype, str *ename, str *edata) { + run_act_ctx_t *bctx; + int ret; + + bctx = sr_kemi_act_ctx_get(); sr_kemi_act_ctx_set(ctx); - return sr_kemi_route(keng, msg, rtype, ename, edata); + ret = sr_kemi_route(keng, msg, rtype, ename, edata); + sr_kemi_act_ctx_set(bctx); + return ret; }

5 years, 7 months

git:master:b89637ca: siptrace: regenerate deleted README

by Kamailio Dev

Module: kamailio Branch: master Commit: b89637caa8601741d8a698b215a88caef54f6dd7 URL: https://github.com/kamailio/kamailio/commit/b89637caa8601741d8a698b215a88ca… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-09T21:55:16+02:00 siptrace: regenerate deleted README --- Added: src/modules/ims_usrloc_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/b89637caa8601741d8a698b215a88ca… Patch: https://github.com/kamailio/kamailio/commit/b89637caa8601741d8a698b215a88ca…

5 years, 7 months

git:master:3e1c9b6b: modules: readme files regenerated - siptrace ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3e1c9b6b76e89ad2b253769685e24ae252f91f5a URL: https://github.com/kamailio/kamailio/commit/3e1c9b6b76e89ad2b253769685e24ae… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-09T22:49:32+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/3e1c9b6b76e89ad2b253769685e24ae… Patch: https://github.com/kamailio/kamailio/commit/3e1c9b6b76e89ad2b253769685e24ae…

5 years, 7 months

git:master:4e17a9c5: modules: readme files regenerated - ims_isc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 4e17a9c5329afec6e4fa5161c949f25fc00de050 URL: https://github.com/kamailio/kamailio/commit/4e17a9c5329afec6e4fa5161c949f25… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-09T21:46:46+02:00 modules: readme files regenerated - ims_isc ... [skip ci] --- Modified: src/modules/ims_isc/README --- Diff: https://github.com/kamailio/kamailio/commit/4e17a9c5329afec6e4fa5161c949f25… Patch: https://github.com/kamailio/kamailio/commit/4e17a9c5329afec6e4fa5161c949f25… --- diff --git a/src/modules/ims_isc/README b/src/modules/ims_isc/README index 91eecf7a6e..f3f5dba7de 100644 --- a/src/modules/ims_isc/README +++ b/src/modules/ims_isc/README @@ -186,6 +186,14 @@ modparam("ims_isc", "add_p_served_user", 1) A positive return code (1) means that the REGISTER message has matched to Initial Filter Criteria and is armed for routing. + This function handles also the Service Info (if sent by the HSS), the + InsertRegisterRequest flag (if sent by the HSS) or the + InsertRegisterResponse flag (if sent by the HSS). Either the Service + Info OR the original REGISTER request OR the original REGISTER response + is added to the body of the REGISTER message, before it is forwarded to + the relevant Application Server. Multipart body is not supported in + this case. + Meaning of the parameters is as follows: * reg_state if the user was previously registered 0 - for initial registration, 1 for re/de-registration.

5 years, 7 months

← Newer
1
...
19
20
21
22
23
24
25
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2019