sr-dev March 2019

sr-dev@lists.kamailio.org

28 participants
323 discussions

git:master:22f31b21: core: increase max_defines from 256 to 512
by Henning Westerholt 09 Mar '19

09 Mar '19

Module: kamailio Branch: master Commit: 22f31b21470221dd042137f35695b808900dfe16 URL: https://github.com/kamailio/kamailio/commit/22f31b21470221dd042137f35695b80… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-03-09T12:52:43+01:00 core: increase max_defines from 256 to 512 --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/22f31b21470221dd042137f35695b80… Patch: https://github.com/kamailio/kamailio/commit/22f31b21470221dd042137f35695b80… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 04e40424dd..706c1b05ce 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1718,7 +1718,7 @@ static int sr_pop_yy_state() /* define/ifdef support */ -#define MAX_DEFINES 256 +#define MAX_DEFINES 512 static ksr_ppdefine_t pp_defines[MAX_DEFINES]; static int pp_num_defines = 0; static int pp_define_type = 0; @@ -1728,7 +1728,7 @@ static int pp_define_index = -1; * ifdef(defined), ifndef(undefined), or the opposite of these * two, but in an else branch */ -#define MAX_IFDEFS 256 +#define MAX_IFDEFS 512 static int pp_ifdef_stack[MAX_IFDEFS]; static int pp_sptr = 0; /* stack pointer */

1 0

git:master:f60ce62d: presence: add sockinfo to $subs
by Henning Westerholt 09 Mar '19

09 Mar '19

Module: kamailio Branch: master Commit: f60ce62d9bbf7a3f1c14ed85dc88425fd61f9c1c URL: https://github.com/kamailio/kamailio/commit/f60ce62d9bbf7a3f1c14ed85dc88425… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-03-09T12:52:43+01:00 presence: add sockinfo to $subs --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/f60ce62d9bbf7a3f1c14ed85dc88425… Patch: https://github.com/kamailio/kamailio/commit/f60ce62d9bbf7a3f1c14ed85dc88425… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index a8eb6c18a6..1ab693109e 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -760,7 +760,7 @@ subs_t *_pres_subs_last_sub = NULL; * version 21 * flags 22 * user_agent 23 - * + * sockinfo 24 */ int pv_parse_subscription_name(pv_spec_p sp, str *in) @@ -822,6 +822,8 @@ int pv_parse_subscription_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 9; } else if(strncmp(in->s, "from_tag", 8) == 0) { sp->pvp.pvn.u.isname.name.n = 11; + } else if(strncmp(in->s, "sockinfo", 8) == 0) { + sp->pvp.pvn.u.isname.name.n = 24; } else { goto error; }; @@ -961,6 +963,8 @@ int pv_get_subscription(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return pv_get_sintval(msg, param, res, _pres_subs_last_sub->flags); } else if(param->pvn.u.isname.name.n == 23) { return pv_get_strval(msg, param, res, &_pres_subs_last_sub->user_agent); + } else if(param->pvn.u.isname.name.n == 24) { + return pv_get_strval(msg, param, res, &_pres_subs_last_sub->sockinfo_str); } LM_ERR("unknown specifier\n");

1 0

git:master:0c93efec: core: free resources in xavp_clone_level_nodata
by Henning Westerholt 09 Mar '19

09 Mar '19

Module: kamailio Branch: master Commit: 0c93efec739551f3e74e119d4b789d0bb6e766d6 URL: https://github.com/kamailio/kamailio/commit/0c93efec739551f3e74e119d4b789d0… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-03-09T12:52:43+01:00 core: free resources in xavp_clone_level_nodata --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/0c93efec739551f3e74e119d4b789d0… Patch: https://github.com/kamailio/kamailio/commit/0c93efec739551f3e74e119d4b789d0… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 2c725e92ee..2fd5aaec49 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -714,14 +714,11 @@ sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold) if(navp==NULL) { LM_ERR("cannot create cloned embedded xavp\n"); - if(xnew->val.v.xavp == NULL) - { - shm_free(xnew); - return NULL; - } else { - xavp_destroy_list(&navp); - return NULL; + if(xnew->val.v.xavp != NULL) { + xavp_destroy_list(&xnew->val.v.xavp); } + shm_free(xnew); + return NULL; } LM_DBG("cloned inner xavp [%.*s]\n", oavp->name.len, oavp->name.s); if(xnew->val.v.xavp == NULL)

1 0

git:master:a0fe5523: tm: add t_release_transaction to api
by Henning Westerholt 09 Mar '19

09 Mar '19

Module: kamailio Branch: master Commit: a0fe552305c44837ba4666d4142e4885ef0297f6 URL: https://github.com/kamailio/kamailio/commit/a0fe552305c44837ba4666d4142e488… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-03-09T12:52:43+01:00 tm: add t_release_transaction to api --- Modified: src/modules/tm/t_funcs.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/a0fe552305c44837ba4666d4142e488… Patch: https://github.com/kamailio/kamailio/commit/a0fe552305c44837ba4666d4142e488… --- diff --git a/src/modules/tm/t_funcs.h b/src/modules/tm/t_funcs.h index 68701c5342..1b90c20d45 100644 --- a/src/modules/tm/t_funcs.h +++ b/src/modules/tm/t_funcs.h @@ -191,6 +191,7 @@ int t_add_transaction( struct sip_msg* p_msg ); /* returns 1 if everything was OK or -1 for error */ int t_release_transaction( struct cell *trans ); +typedef int (*trelease_t)(struct cell *t); int get_ip_and_port_from_uri( str* uri , unsigned int *param_ip, diff --git a/src/modules/tm/tm_load.c b/src/modules/tm/tm_load.c index be5356fa13..1d58c06f0e 100644 --- a/src/modules/tm/tm_load.c +++ b/src/modules/tm/tm_load.c @@ -141,6 +141,7 @@ int load_tm( struct tm_binds *tmb) tmb->t_load_contacts = t_load_contacts; tmb->t_next_contacts = t_next_contacts; tmb->set_fr = t_set_fr; + tmb->t_release_transaction = t_release_transaction; return 1; } diff --git a/src/modules/tm/tm_load.h b/src/modules/tm/tm_load.h index c1fece4403..3fa52f8f28 100644 --- a/src/modules/tm/tm_load.h +++ b/src/modules/tm/tm_load.h @@ -128,6 +128,7 @@ struct tm_binds { cmd_function t_load_contacts; cmd_function t_next_contacts; tset_fr_f set_fr; + trelease_t t_release_transaction; }; typedef struct tm_binds tm_api_t;

1 0

git:master:dc9531af: pv: use parsed uri to compute tosocket
by Henning Westerholt 09 Mar '19

09 Mar '19

Module: kamailio Branch: master Commit: dc9531affae6336ea3771792a80385de56205ff0 URL: https://github.com/kamailio/kamailio/commit/dc9531affae6336ea3771792a80385d… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-03-09T12:52:43+01:00 pv: use parsed uri to compute tosocket --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/dc9531affae6336ea3771792a80385d… Patch: https://github.com/kamailio/kamailio/commit/dc9531affae6336ea3771792a80385d… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index f8074170ac..efbf8e8cf2 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1389,29 +1389,24 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, } break; case TR_URI_TOSOCKET: - if(msg==NULL) { + if(get_valid_proto_string(_tr_parsed_uri.proto, 1, 0, &sproto)<0) { + LM_WARN("unknown transport protocol\n"); + val->rs = _tr_empty; + break; + } + tr_set_crt_buffer(); + val->rs.len = snprintf(_tr_buffer, TR_BUFFER_SIZE, + "%.*s:%.*s:%d", sproto.len, sproto.s, + _tr_parsed_uri.host.len, _tr_parsed_uri.host.s, + (_tr_parsed_uri.port_no!=0) + ?(int)_tr_parsed_uri.port_no:5060); + if(val->rs.len<=0 || val->rs.len>=TR_BUFFER_SIZE) { + LM_WARN("error converting uri to socket address [%.*s]\n", + _tr_uri.len, _tr_uri.s); val->rs = _tr_empty; break; - } else { - if(get_valid_proto_string(msg->rcv.proto, 1, 0, &sproto)<0) { - LM_WARN("unknown transport protocol\n"); - val->rs = _tr_empty; - break; - } - tr_set_crt_buffer(); - val->rs.len = snprintf(_tr_buffer, TR_BUFFER_SIZE, - "%.*s:%.*s:%d", sproto.len, sproto.s, - _tr_parsed_uri.host.len, _tr_parsed_uri.host.s, - (_tr_parsed_uri.port_no!=0) - ?(int)_tr_parsed_uri.port_no:5060); - if(val->rs.len<=0 || val->rs.len>=TR_BUFFER_SIZE) { - LM_WARN("error converting uri to socket address [%.*s]\n", - _tr_uri.len, _tr_uri.s); - val->rs = _tr_empty; - break; - } - val->rs.s = _tr_buffer; } + val->rs.s = _tr_buffer; break; default: LM_ERR("unknown subtype %d\n", @@ -2684,7 +2679,7 @@ char* tr_parse_uri(str* in, trans_t *t) } else if(name.len==6 && strncasecmp(name.s, "scheme", 6)==0) { t->subtype = TR_URI_SCHEME; goto done; - } else if(name.len==6 && strncasecmp(name.s, "tosocket", 8)==0) { + } else if(name.len==8 && strncasecmp(name.s, "tosocket", 8)==0) { t->subtype = TR_URI_TOSOCKET; goto done; }

1 0

git:master:e045e560: rtimer: use timer worker id
by Henning Westerholt 09 Mar '19

09 Mar '19

Module: kamailio Branch: master Commit: e045e5604464cdde4687acd0e29ecd449428f063 URL: https://github.com/kamailio/kamailio/commit/e045e5604464cdde4687acd0e29ecd4… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-03-09T12:52:43+01:00 rtimer: use timer worker id --- Modified: src/modules/rtimer/rtimer_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e045e5604464cdde4687acd0e29ecd4… Patch: https://github.com/kamailio/kamailio/commit/e045e5604464cdde4687acd0e29ecd4… --- diff --git a/src/modules/rtimer/rtimer_mod.c b/src/modules/rtimer/rtimer_mod.c index 018986b663..4b398148ee 100644 --- a/src/modules/rtimer/rtimer_mod.c +++ b/src/modules/rtimer/rtimer_mod.c @@ -74,8 +74,14 @@ static int child_init(int); int stm_t_param(modparam_t type, void* val); int stm_e_param(modparam_t type, void* val); -void stm_timer_exec(unsigned int ticks, void *param); +void stm_timer_exec(unsigned int ticks, int worker, void *param); +void stm_main_timer_exec(unsigned int ticks, void *param); +int stm_get_worker(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +static pv_export_t rtimer_pvs[] = { + {{"rtimer_worker", (sizeof("rtimer_worker")-1)}, PVT_OTHER, stm_get_worker, 0, 0, 0, 0, 0}, + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; static param_export_t params[]={ {"timer", PARAM_STRING|USE_FUNC_PARAM, (void*)stm_t_param}, @@ -91,7 +97,7 @@ struct module_exports exports= { 0, params, 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ + rtimer_pvs, /* exported pseudo-variables */ 0, mod_init, /* module initialization function */ child_init, /* per-child init function */ @@ -121,7 +127,7 @@ static int mod_init(void) { if(it->mode==0) { - if(register_timer(stm_timer_exec, (void*)it, it->interval)<0) + if(register_timer(stm_main_timer_exec, (void*)it, it->interval)<0) { LM_ERR("failed to register timer function\n"); return -1; @@ -156,15 +162,15 @@ static int child_init(int rank) i, it->name.len, it->name.s); if(it->flags & RTIMER_INTERVAL_USEC) { - if(fork_basic_utimer(PROC_TIMER, si_desc, 1 /*socks flag*/, - stm_timer_exec, (void*)it, it->interval + if(fork_basic_utimer_w(PROC_TIMER, si_desc, 1 /*socks flag*/, + stm_timer_exec, i, (void*)it, it->interval /*usec*/)<0) { LM_ERR("failed to start utimer routine as process\n"); return -1; /* error */ } } else { - if(fork_basic_timer(PROC_TIMER, si_desc, 1 /*socks flag*/, - stm_timer_exec, (void*)it, it->interval + if(fork_basic_timer_w(PROC_TIMER, si_desc, 1 /*socks flag*/, + stm_timer_exec, i, (void*)it, it->interval /*sec*/)<0) { LM_ERR("failed to start timer routine as process\n"); return -1; /* error */ @@ -177,13 +183,21 @@ static int child_init(int rank) return 0; } -void stm_timer_exec(unsigned int ticks, void *param) +int rt_worker = 0; + +void stm_main_timer_exec(unsigned int ticks, void *param) +{ + stm_timer_exec(ticks, 0, param); +} + +void stm_timer_exec(unsigned int ticks, int worker, void *param) { stm_timer_t *it; stm_route_t *rt; sip_msg_t *fmsg; sr_kemi_eng_t *keng = NULL; str evname = str_init("rtimer"); + rt_worker = worker; if(param==NULL) return; @@ -382,3 +396,7 @@ int stm_e_param(modparam_t type, void *val) return 0; } +int stm_get_worker(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) +{ + return pv_get_sintval(msg, param, res, rt_worker); +}

1 0

git:master:98ea3b05: core: allow a worker id in timer routines
by Henning Westerholt 09 Mar '19

09 Mar '19

Module: kamailio Branch: master Commit: 98ea3b05528d0277ebe9618e43df301411e38210 URL: https://github.com/kamailio/kamailio/commit/98ea3b05528d0277ebe9618e43df301… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-03-09T12:52:43+01:00 core: allow a worker id in timer routines --- Modified: src/core/timer.h Modified: src/core/timer_proc.c Modified: src/core/timer_proc.h --- Diff: https://github.com/kamailio/kamailio/commit/98ea3b05528d0277ebe9618e43df301… Patch: https://github.com/kamailio/kamailio/commit/98ea3b05528d0277ebe9618e43df301… --- diff --git a/src/core/timer.h b/src/core/timer.h index 3b1669ab19..2c7f330f89 100644 --- a/src/core/timer.h +++ b/src/core/timer.h @@ -62,6 +62,7 @@ extern pid_t slow_timer_pid; /* deprecated, old, kept for compatibility */ typedef void (timer_function)(unsigned int ticks, void* param); +typedef void (timer_function_w)(unsigned int ticks, int worker, void* param); /* deprecated, old, kept for compatibility get_ticks()*TIMER_TICK used to be the time in s for new code, use get_ticks_raw() and one of the macros defined in @@ -70,6 +71,7 @@ typedef void (timer_function)(unsigned int ticks, void* param); /*function prototype to execute on mili-second based basic timers */ typedef void (utimer_function)(unsigned int uticks, void* param); +typedef void (utimer_function_w)(unsigned int uticks, int worker, void* param); struct timer_ln; /* forward decl */ /* new diff --git a/src/core/timer_proc.c b/src/core/timer_proc.c index 20c50e0dcd..d153c635cc 100644 --- a/src/core/timer_proc.c +++ b/src/core/timer_proc.c @@ -84,6 +84,27 @@ int fork_basic_timer(int child_id, char* desc, int make_sock, return pid; } +int fork_basic_timer_w(int child_id, char* desc, int make_sock, + timer_function_w* f, int worker, void* param, int interval) +{ + int pid; + + pid=fork_process(child_id, desc, make_sock); + if (pid<0) return -1; + if (pid==0){ + /* child */ + if (cfg_child_init()) return -1; + for(;;){ + sleep(interval); + cfg_update(); + f(get_ticks(), worker, param); /* ticks in s for compatibility with old + * timers */ + } + } + /* parent */ + return pid; +} + /** * \brief Forks a separate simple microsecond-sleep() periodic timer * @@ -123,6 +144,28 @@ int fork_basic_utimer(int child_id, char* desc, int make_sock, return pid; } +int fork_basic_utimer_w(int child_id, char* desc, int make_sock, + utimer_function_w* f, int worker, void* param, int uinterval) +{ + int pid; + ticks_t ts; + + pid=fork_process(child_id, desc, make_sock); + if (pid<0) return -1; + if (pid==0){ + /* child */ + if (cfg_child_init()) return -1; + for(;;){ + sleep_us(uinterval); + cfg_update(); + ts = get_ticks_raw(); + f(TICKS_TO_MS(ts), worker, param); /* ticks in mili-seconds */ + } + } + /* parent */ + return pid; +} + /** * \brief Forks a timer process based on the local timer diff --git a/src/core/timer_proc.h b/src/core/timer_proc.h index baaf366564..8c4c6fa3ee 100644 --- a/src/core/timer_proc.h +++ b/src/core/timer_proc.h @@ -58,6 +58,8 @@ int register_basic_timers(int timers); */ int fork_basic_timer(int child_id, char* desc, int make_sock, timer_function* f, void* param, int interval); +int fork_basic_timer_w(int child_id, char* desc, int make_sock, + timer_function_w* f, int worker, void* param, int interval); #define fork_dummy_timer fork_basic_timer @@ -80,6 +82,8 @@ int fork_basic_timer(int child_id, char* desc, int make_sock, */ int fork_basic_utimer(int child_id, char* desc, int make_sock, timer_function* f, void* param, int uinterval); +int fork_basic_utimer_w(int child_id, char* desc, int make_sock, + timer_function_w* f, int worker, void* param, int uinterval); /** * \brief Forks a timer process based on the local timer *

1 0

git:master:4d5622b2: app_jsdt: execution log message based on core latency_limit_action
by Daniel-Constantin Mierla 09 Mar '19

09 Mar '19

Module: kamailio Branch: master Commit: 4d5622b25039a0b35ae3e6d447843d3fb33af334 URL: https://github.com/kamailio/kamailio/commit/4d5622b25039a0b35ae3e6d447843d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-09T09:55:04+01:00 app_jsdt: execution log message based on core latency_limit_action --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/4d5622b25039a0b35ae3e6d447843d3… Patch: https://github.com/kamailio/kamailio/commit/4d5622b25039a0b35ae3e6d447843d3… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index ee25fd5379..8ecd62c46b 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1346,9 +1346,34 @@ int sr_kemi_jsdt_exec_func_ex(duk_context *J, sr_kemi_t *ket) int sr_kemi_jsdt_exec_func(duk_context *J, int eidx) { sr_kemi_t *ket; + int ret; + unsigned int ms = 0; + int sline = 0; ket = sr_kemi_jsdt_export_get(eidx); - return 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()); + } + + 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))) { + 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", + (ket->mname.len>0)?ket->mname.s:"", + (ket->mname.len>0)?".":"", ket->fname.s, ms, sline); + } + } + + return ret; } /**

1 0

git:master:b292adb6: tm: more debug to track decision to relay reply or not
by Daniel-Constantin Mierla 09 Mar '19

09 Mar '19

Module: kamailio Branch: master Commit: b292adb668528340fca381925724540afc7f13e8 URL: https://github.com/kamailio/kamailio/commit/b292adb668528340fca381925724540… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-09T09:41:20+01:00 tm: more debug to track decision to relay reply or not --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/b292adb668528340fca381925724540… Patch: https://github.com/kamailio/kamailio/commit/b292adb668528340fca381925724540…

1 0

git:master:ad29d393: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 08 Mar '19

08 Mar '19

Module: kamailio Branch: master Commit: ad29d393d0d21bbb236ea6d8cf2a03a9998b0278 URL: https://github.com/kamailio/kamailio/commit/ad29d393d0d21bbb236ea6d8cf2a03a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-03-08T22:16:42+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/ad29d393d0d21bbb236ea6d8cf2a03a… Patch: https://github.com/kamailio/kamailio/commit/ad29d393d0d21bbb236ea6d8cf2a03a…

1 0

← Newer
1
...
26
27
28
29
30
31
32
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2019