- sr-dev - kamailio.org

git:master:d02732ad: core: helper function to get mod param function in a string buffer
by Daniel-Constantin Mierla 17 Nov '22

17 Nov '22

Module: kamailio Branch: master Commit: d02732adef800b7a1107d106ac8e58730e256485 URL: https://github.com/kamailio/kamailio/commit/d02732adef800b7a1107d106ac8e587… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-17T14:40:07+01:00 core: helper function to get mod param function in a string buffer --- Modified: src/core/mod_fix.h Modified: src/core/sr_module.c Modified: src/core/sr_module.h --- Diff: https://github.com/kamailio/kamailio/commit/d02732adef800b7a1107d106ac8e587… Patch: https://github.com/kamailio/kamailio/commit/d02732adef800b7a1107d106ac8e587… --- diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 8c2c766c1e..043b1e3546 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -62,6 +62,8 @@ int fixup_get_svalue(struct sip_msg* msg, gparam_p gp, str *val); */ #define fixup_get_svalue(msg, fp, sval) get_str_fparam(sval, msg, fp) +#define fixup_get_bufvalue(msg, fp, sval) get_strbuf_fparam(sval, msg, fp) + /** get an int value out of a fparam_t. * * Note: this macro/function is for kamailio compatibility diff --git a/src/core/sr_module.c b/src/core/sr_module.c index d869b8ae63..154ce27740 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -1727,6 +1727,92 @@ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param) } +/** Get the function parameter value as string cpoied in the dst->s buffer. + * - dst->len has to provide size of dst->s buffer and it is updated to the + * size of the value + * @return 0 - Success + * -1 - Cannot get value + */ +int get_strbuf_fparam(str* dst, struct sip_msg* msg, fparam_t* param) +{ + int_str val; + int ret; + avp_t* avp; + pv_value_t pv_val; + str sv = STR_NULL; + + if(dst==NULL || dst->s==NULL || dst->len<=0) { + return -1; + } + + switch(param->type) { + case FPARAM_REGEX: + case FPARAM_UNSPEC: + case FPARAM_INT: + return -1; + case FPARAM_STRING: + sv.s = param->v.asciiz; + sv.len = strlen(param->v.asciiz); + break; + case FPARAM_STR: + sv = param->v.str; + break; + case FPARAM_AVP: + avp = search_first_avp(param->v.avp.flags, param->v.avp.name, + &val, 0); + if (unlikely(!avp)) { + LM_DBG("Could not find AVP from function parameter '%s'\n", + param->orig); + return -1; + } + if (likely(avp->flags & AVP_VAL_STR)) { + sv = val.s; + } else { + /* The caller does not know of what type the AVP will be so + * convert int AVPs into string here + */ + sv.s = int2str(val.n, &sv.len); + } + break; + case FPARAM_SELECT: + ret = run_select(&sv, param->v.select, msg); + if (unlikely(ret < 0 || ret > 0)) return -1; + break; + case FPARAM_PVS: + if (likely((pv_get_spec_value(msg, param->v.pvs, &pv_val)==0) && + ((pv_val.flags&(PV_VAL_NULL|PV_VAL_STR))==PV_VAL_STR))){ + sv=pv_val.rs; + }else{ + LM_ERR("Could not convert PV to str\n"); + return -1; + } + break; + case FPARAM_PVE: + if (unlikely(pv_printf(msg, param->v.pve, dst->s, &dst->len)!=0)){ + LM_ERR("Could not convert the PV-formated string to str\n"); + dst->len=0; + return -1; + }; + break; + } + if(param->type != FPARAM_PVE) { + if(sv.len>=dst->len-1) { + LM_ERR("not enough space in output buffer (size: %d need: %d)\n", + dst->len, sv.len); + return -1; + } + if(sv.len > 0) { + memcpy(dst->s, sv.s, sv.len); + dst->len = sv.len; + dst->s[dst->len] = '\0'; + } else { + dst->len = 0; + dst->s[dst->len] = '\0'; + } + } + return 0; +} + /** Get the function parameter value as integer. * @return 0 - Success * -1 - Cannot get value diff --git a/src/core/sr_module.h b/src/core/sr_module.h index 7235c2840a..ba6f54bd8d 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -489,6 +489,8 @@ int fixup_str_2(void** param, int param_no); */ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param); +int get_strbuf_fparam(str* dst, struct sip_msg* msg, fparam_t* param); + /** * @brief Get the function parameter value as integer * @param dst string destination

1 0

git:master:1256392a: modules: readme files regenerated - jansson ... [skip ci]
by Kamailio Dev 17 Nov '22

17 Nov '22

Module: kamailio Branch: master Commit: 1256392ab12ec1ada491f2fc5212bb99ba6fc14c URL: https://github.com/kamailio/kamailio/commit/1256392ab12ec1ada491f2fc5212bb9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-11-17T13:46:55+01:00 modules: readme files regenerated - jansson ... [skip ci] --- Modified: src/modules/jansson/README --- Diff: https://github.com/kamailio/kamailio/commit/1256392ab12ec1ada491f2fc5212bb9… Patch: https://github.com/kamailio/kamailio/commit/1256392ab12ec1ada491f2fc5212bb9…

1 0

git:master:d47d62f5: jansson: docs for jansson_pv_get() function
by Daniel-Constantin Mierla 17 Nov '22

17 Nov '22

Module: kamailio Branch: master Commit: d47d62f54c9115c765a1437ffc8c8e619e056f54 URL: https://github.com/kamailio/kamailio/commit/d47d62f54c9115c765a1437ffc8c8e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-17T13:44:37+01:00 jansson: docs for jansson_pv_get() function --- Modified: src/modules/jansson/doc/jansson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d47d62f54c9115c765a1437ffc8c8e6… Patch: https://github.com/kamailio/kamailio/commit/d47d62f54c9115c765a1437ffc8c8e6… --- diff --git a/src/modules/jansson/doc/jansson_admin.xml b/src/modules/jansson/doc/jansson_admin.xml index b65fb70d8cd..969804c96b2 100644 --- a/src/modules/jansson/doc/jansson_admin.xml +++ b/src/modules/jansson/doc/jansson_admin.xml @@ -59,7 +59,8 @@ <function moreinfo="none">jansson_get(key/path, src, dst)</function> </title> <para> - Copy the value at the location 'path' from the json object 'src' and store it in pvar 'dst'. + Copy the value at the location 'path' from the json object 'src' and store it in pvar 'dst'. + The 'src' can be a static string or a dynamic string with variables. </para> <para> The path string supports dot delimited notation (e.g. foo.bar.baz), @@ -82,7 +83,29 @@ <title><function>jansson_get</function> usage</title> <programlisting format="linespecific"> ... -if(!jansson_get("inner.deep.list[3]", $var(myjson), "$var(n)")) { +if(!jansson_get("inner.deep.list[3]", "$var(myjson)", "$var(n)")) { + xlog("L_ERR", "Can't parse json data"); +} +xlog("L_INFO", "foo is $var(n)"); +... +jansson_get("test", "{\"test\":\"abc\",\"idx\":20}", "$var(n)") +... + </programlisting> + </example> + </section> + <section id="jansson.f.jansson_pv_get"> + <title> + <function moreinfo="none">jansson_pv_get(key/path, srcvar, dst)</function> + </title> + <para> + Similar to jansson_get(), but the 'srcvar' parameter can be only a + variable name. + </para> + <example> + <title><function>jansson_pv_get</function> usage</title> + <programlisting format="linespecific"> +... +if(!jansson_pv_get("inner.deep.list[3]", "$var(myjson)", "$var(n)")) { xlog("L_ERR", "Can't parse json data"); } xlog("L_INFO", "foo is $var(n)");

1 0

git:master:3ce5c42c: jansson: added jansson_pv_get(...)
by Daniel-Constantin Mierla 17 Nov '22

17 Nov '22

Module: kamailio Branch: master Commit: 3ce5c42c53dcf6f3f1da952d3b523876c7381913 URL: https://github.com/kamailio/kamailio/commit/3ce5c42c53dcf6f3f1da952d3b52387… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-17T13:38:05+01:00 jansson: added jansson_pv_get(...) - similar to jansson_geet(), but the input has to be a single variable name, not a dynamic string --- Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_funcs.h Modified: src/modules/jansson/jansson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3ce5c42c53dcf6f3f1da952d3b52387… Patch: https://github.com/kamailio/kamailio/commit/3ce5c42c53dcf6f3f1da952d3b52387… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 857b6871f0c..0ff937ee7be 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -92,6 +92,29 @@ int janssonmod_get(struct sip_msg* msg, char* path_in, char* src_in, char* dst) return janssonmod_get_helper(msg, &path_s, &src_s, (pv_spec_t *)dst); } +int janssonmod_pv_get(struct sip_msg* msg, char* path_in, char* src_in, char* dst) +{ + str path_s; + pv_value_t val; + int ret; + + if((pv_get_spec_value(msg, (pv_spec_t*)src_in, &val) < 0) + || ((val.flags & PV_VAL_STR) == 0)) { + ERR("cannot get json string value\n"); + return -1; + } + if (fixup_get_svalue(msg, (gparam_p)path_in, &path_s) != 0) { + ERR("cannot get path string value\n"); + return -1; + } + + ret = janssonmod_get_helper(msg, &path_s, &val.rs, (pv_spec_t*)dst); + + pv_value_destroy(&val); + + return ret; +} + #define STR_EQ_STATIC(a,b) ((a.len == sizeof(b)-1) && (strncmp(a.s, b, sizeof(b)-1)==0)) int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, diff --git a/src/modules/jansson/jansson_funcs.h b/src/modules/jansson/jansson_funcs.h index aeaf0791b90..ce8e9d5b4a1 100644 --- a/src/modules/jansson/jansson_funcs.h +++ b/src/modules/jansson/jansson_funcs.h @@ -27,6 +27,8 @@ int janssonmod_get(struct sip_msg* msg, char* path_in, char* json_in, char* result); +int janssonmod_pv_get(struct sip_msg* msg, char* path_in, char* json_in, + char* result); int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, char* path_in, char* value_in, char* result); int janssonmod_array_size(struct sip_msg* msg, char* json_in, diff --git a/src/modules/jansson/jansson_mod.c b/src/modules/jansson/jansson_mod.c index 6a2fe6ead66..46cfda2fec4 100644 --- a/src/modules/jansson/jansson_mod.c +++ b/src/modules/jansson/jansson_mod.c @@ -36,6 +36,8 @@ MODULE_VERSION static int mod_init(void); static int fixup_get_params(void** param, int param_no); static int fixup_get_params_free(void** param, int param_no); +static int fixup_pv_get_params(void** param, int param_no); +static int fixup_pv_get_params_free(void** param, int param_no); static int fixup_set_params(void** param, int param_no); static int fixup_set_params_free(void** param, int param_no); static int fixup_xencode(void** param, int param_no); @@ -60,6 +62,8 @@ int janssonmod_get_field(struct sip_msg* msg, char* jansson_in, char* path_in, static cmd_export_t cmds[]={ {"jansson_get", (cmd_function)janssonmod_get, 3, fixup_get_params, fixup_get_params_free, ANY_ROUTE}, + {"jansson_pv_get", (cmd_function)janssonmod_pv_get, 3, + fixup_pv_get_params, fixup_pv_get_params_free, ANY_ROUTE}, {"jansson_array_size", (cmd_function)janssonmod_array_size, 3, fixup_get_params, fixup_get_params_free, ANY_ROUTE}, {"jansson_set", (cmd_function)janssonmod_set_replace, 4, @@ -121,6 +125,34 @@ static int fixup_get_params_free(void** param, int param_no) return -1; } +static int fixup_pv_get_params(void** param, int param_no) +{ + if (param_no == 1) { + return fixup_spve_null(param, 1); + } + + if (param_no == 2 || param_no == 3) { + return fixup_pvar_null(param, 1); + } + + ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + +static int fixup_pv_get_params_free(void** param, int param_no) +{ + if (param_no == 1) { + return fixup_free_spve_null(param, 1); + } + + if (param_no == 2 || param_no == 3) { + return fixup_free_pvar_null(param, 1); + } + + ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + static int fixup_set_params(void** param, int param_no) { if(param_no <= 3) { @@ -232,4 +264,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_jansson_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:a83e44b7: core: new global parameter return_mode
by Daniel-Constantin Mierla 17 Nov '22

17 Nov '22

Module: kamailio Branch: master Commit: a83e44b7a942afcf1770fa179cda8e530c74e28a URL: https://github.com/kamailio/kamailio/commit/a83e44b7a942afcf1770fa179cda8e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-17T13:08:59+01:00 core: new global parameter return_mode - control the return code evaluation mode: - 0 (default) - evaluation is like so far (negative is false, positive is true) - 1 - propagate return value and evaluation has to be done with >0 or <0, otherwise value!=0 is evaluated to true no matter is negative or positive --- Modified: src/core/action.c Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/rvalue.c --- Diff: https://github.com/kamailio/kamailio/commit/a83e44b7a942afcf1770fa179cda8e5… Patch: https://github.com/kamailio/kamailio/commit/a83e44b7a942afcf1770fa179cda8e5… --- diff --git a/src/core/action.c b/src/core/action.c index 48b150dd70..b95c531e1d 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -1065,7 +1065,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & break in expr*/ ret=1; /*default is continue */ - if (v>0) { + if ((ksr_return_mode==0 && v>0) || (ksr_return_mode!=0 && v!=0)) { if ((a->val[1].type==ACTIONS_ST)&&a->val[1].u.data){ ret=run_actions(h, (struct action*)a->val[1].u.data, msg); @@ -1363,12 +1363,13 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) rve=(struct rval_expr*)a->val[0].u.data; ret=1; while(!(flags & (BREAK_R_F|RETURN_R_F|EXIT_R_F)) && - (rval_expr_eval_int(h, msg, &v, rve) == 0) && v){ + (rval_expr_eval_int(h, msg, &v, rve) == 0) && + ((ksr_return_mode==0 && v>0) || (ksr_return_mode!=0 && v!=0))) { if (cfg_get(core, core_cfg, max_while_loops) > 0) i++; if (unlikely(i > cfg_get(core, core_cfg, max_while_loops))){ - LM_ERR("runaway while (%d, %d): more then %d loops\n", + LM_ERR("runaway while (%d, %d): more then %d loops\n", rve->fpos.s_line, rve->fpos.s_col, cfg_get(core, core_cfg, max_while_loops)); ret=-1; diff --git a/src/core/cfg.lex b/src/core/cfg.lex index cc0afb8f22..d4379da3fc 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -147,6 +147,7 @@ FORWARD_SCTP forward_sctp DROP "drop" EXIT "exit" RETURN "return" +RETURN_MODE "return_mode" BREAK "break" LOG log ERROR error @@ -1049,6 +1050,7 @@ IMPORTFILE "import_file" <INITIAL>{CFGENGINE} { count(); yylval.strval=yytext; return CFGENGINE; } <INITIAL>{URI_HOST_EXTRA_CHARS} { yylval.strval=yytext; return URI_HOST_EXTRA_CHARS; } <INITIAL>{HDR_NAME_EXTRA_CHARS} { yylval.strval=yytext; return HDR_NAME_EXTRA_CHARS; } +<INITIAL>{RETURN_MODE} { count(); yylval.strval=yytext; return RETURN_MODE; } <INITIAL>{EQUAL} { count(); return EQUAL; } <INITIAL>{ADDEQ} { count(); return ADDEQ; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 89eb5c210f..230be193dd 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -227,6 +227,7 @@ extern char *default_routename; %token EXIT %token DROP %token RETURN +%token RETURN_MODE %token BREAK %token LOG_TOK %token ERROR @@ -1900,6 +1901,8 @@ assign_stm: | WAIT_WORKER1_USLEEP EQUAL error { yyerror("number expected"); } | SERVER_ID EQUAL NUMBER { server_id=$3; } | SERVER_ID EQUAL error { yyerror("number expected"); } + | RETURN_MODE EQUAL NUMBER { ksr_return_mode=$3; } + | RETURN_MODE EQUAL error { yyerror("number expected"); } | KEMI DOT ONSEND_ROUTE_CALLBACK EQUAL STRING { kemi_onsend_route_callback.s = $5; kemi_onsend_route_callback.len = strlen($5); diff --git a/src/core/globals.h b/src/core/globals.h index 03eb1ef897..8d72807aee 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -219,6 +219,7 @@ extern str _ksr_xavp_via_params; extern str _ksr_xavp_via_fields; extern int ksr_sip_parser_mode; extern int ksr_cfg_print_mode; +extern int ksr_return_mode; extern int ksr_wait_worker1_mode; extern int ksr_wait_worker1_time; diff --git a/src/core/rvalue.c b/src/core/rvalue.c index 9e5268c888..4ab93f44f4 100644 --- a/src/core/rvalue.c +++ b/src/core/rvalue.c @@ -82,6 +82,9 @@ #define rv_unref(rv) ((--(rv)->refcnt)==0) +/* control return code evaluation mode */ +int ksr_return_mode = 0; + inline static void rval_force_clean(struct rvalue* rv) { if (rv->flags & RV_CNT_ALLOCED_F){ @@ -946,7 +949,11 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: if (rv->v.action) { - *i=(run_actions_safe(h, rv->v.action, msg)>0); + if(unlikely(ksr_return_mode==1)) { + *i=run_actions_safe(h, rv->v.action, msg); + } else { + *i=(run_actions_safe(h, rv->v.action, msg)>0); + } h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & break in expr*/ } else

1 0

git:5.5:fdfb8c55: dialog: remove dialog variable debugging function, it might cause race conditions
by Henning Westerholt 16 Nov '22

16 Nov '22

Module: kamailio Branch: 5.5 Commit: fdfb8c5563bd327774802cb08b68b27faee2e840 URL: https://github.com/kamailio/kamailio/commit/fdfb8c5563bd327774802cb08b68b27… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-11-16T16:05:42Z dialog: remove dialog variable debugging function, it might cause race conditions --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/fdfb8c5563bd327774802cb08b68b27… Patch: https://github.com/kamailio/kamailio/commit/fdfb8c5563bd327774802cb08b68b27… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index b2a373a5018..8fd261c4bf5 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -254,31 +254,6 @@ int pv_parse_dialog_var_name(pv_spec_p sp, str *in) return 0; } -/*! Internal debugging function: Prints the list of dialogs */ -void print_lists(struct dlg_cell *dlg) { - struct dlg_var *varlist; - varlist = _dlg_var_table; - LM_DBG("Internal var-list (%p):\n", varlist); - while (varlist) { - LM_DBG("%.*s=%.*s (flags %i)\n", - varlist->key.len, varlist->key.s, - varlist->value.len, varlist->value.s, - varlist->vflags); - varlist = varlist->next; - } - if (dlg) { - varlist = dlg->vars; - LM_DBG("Dialog var-list (%p):\n", varlist); - while (varlist) { - LM_DBG("%.*s=%.*s (flags %i)\n", - varlist->key.len, varlist->key.s, - varlist->value.len, varlist->value.s, - varlist->vflags); - varlist = varlist->next; - } - } -} - str * get_dlg_variable(struct dlg_cell *dlg, str *key) { str* var = NULL; @@ -317,8 +292,6 @@ int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) if ( dlg_db_mode==DB_MODE_REALTIME ) update_dialog_dbinfo(dlg); - print_lists(dlg); - return 0; done: @@ -366,8 +339,6 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) } } - print_lists(dlg); - /* unlock dialog */ if (dlg) { dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); @@ -440,8 +411,6 @@ int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value } dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); } - print_lists(dlg); - dlg_release(dlg); return 0; error:

1 0

git:5.6:1e083043: dialog: remove dialog variable debugging function, it might cause race conditions
by Henning Westerholt 16 Nov '22

16 Nov '22

Module: kamailio Branch: 5.6 Commit: 1e0830433e46827ed9424a6d9cc01e95546c04f0 URL: https://github.com/kamailio/kamailio/commit/1e0830433e46827ed9424a6d9cc01e9… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-11-16T16:02:09Z dialog: remove dialog variable debugging function, it might cause race conditions --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/1e0830433e46827ed9424a6d9cc01e9… Patch: https://github.com/kamailio/kamailio/commit/1e0830433e46827ed9424a6d9cc01e9… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 473736b4373..883b99b630f 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -254,31 +254,6 @@ int pv_parse_dialog_var_name(pv_spec_p sp, str *in) return 0; } -/*! Internal debugging function: Prints the list of dialogs */ -void print_lists(struct dlg_cell *dlg) { - struct dlg_var *varlist; - varlist = _dlg_var_table; - LM_DBG("Internal var-list (%p):\n", varlist); - while (varlist) { - LM_DBG("%.*s=%.*s (flags %i)\n", - varlist->key.len, varlist->key.s, - varlist->value.len, varlist->value.s, - varlist->vflags); - varlist = varlist->next; - } - if (dlg) { - varlist = dlg->vars; - LM_DBG("Dialog var-list (%p):\n", varlist); - while (varlist) { - LM_DBG("%.*s=%.*s (flags %i)\n", - varlist->key.len, varlist->key.s, - varlist->value.len, varlist->value.s, - varlist->vflags); - varlist = varlist->next; - } - } -} - /** * return reference to the dlg variable value * - unsafe - use only when it is sure that the value is not updated @@ -449,8 +424,6 @@ int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) if ( dlg_db_mode==DB_MODE_REALTIME ) update_dialog_dbinfo(dlg); - print_lists(dlg); - return 0; done: @@ -510,8 +483,6 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) } } - print_lists(dlg); - /* unlock dialog */ if (dlg) { dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); @@ -584,8 +555,6 @@ int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value } dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); } - print_lists(dlg); - dlg_release(dlg); return 0; error:

1 0

git:master:83b1ebb1: dialog: remove variable self-assignment that causes compilation warnings
by Henning Westerholt 16 Nov '22

16 Nov '22

Module: kamailio Branch: master Commit: 83b1ebb1ef7f6eb5a2fbc05f0da5a0e9a1109eca URL: https://github.com/kamailio/kamailio/commit/83b1ebb1ef7f6eb5a2fbc05f0da5a0e… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-11-16T15:51:21Z dialog: remove variable self-assignment that causes compilation warnings --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/83b1ebb1ef7f6eb5a2fbc05f0da5a0e… Patch: https://github.com/kamailio/kamailio/commit/83b1ebb1ef7f6eb5a2fbc05f0da5a0e… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index c073988448..05305950b0 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -488,7 +488,6 @@ dlg_t * build_dlg_t_early(struct sip_msg *msg, struct dlg_cell * cell, branch_id, cell->t->nr_of_outgoings); goto error; } - msg = msg; } if (!msg->contact && (parse_headers(msg,HDR_CONTACT_F,0)<0

1 1

git:master:d1c13663: lrkproxy: switch to long pvar field
by Daniel-Constantin Mierla 16 Nov '22

16 Nov '22

Module: kamailio Branch: master Commit: d1c13663538349282915ce7f861b337f8923fff6 URL: https://github.com/kamailio/kamailio/commit/d1c13663538349282915ce7f861b337… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-16T16:49:30+01:00 lrkproxy: switch to long pvar field --- Modified: src/modules/lrkproxy/lrkproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/d1c13663538349282915ce7f861b337… Patch: https://github.com/kamailio/kamailio/commit/d1c13663538349282915ce7f861b337… --- diff --git a/src/modules/lrkproxy/lrkproxy.c b/src/modules/lrkproxy/lrkproxy.c index cdd69bf75e..ef0734e9db 100644 --- a/src/modules/lrkproxy/lrkproxy.c +++ b/src/modules/lrkproxy/lrkproxy.c @@ -1613,7 +1613,7 @@ set_lrkproxy_set_f(struct sip_msg * msg, char * str1, char * str2) } selected_lrkp_set = select_lrkp_set(val.ri); if(selected_lrkp_set==NULL) { - LM_ERR("could not locate lrkproxy set %d\n", val.ri); + LM_ERR("could not locate lrkproxy set %ld\n", val.ri); return -1; } current_msg_id = msg->id;

1 0

git:master:6be9476b: debugger: switch to long pvar field
by Daniel-Constantin Mierla 16 Nov '22

16 Nov '22

Module: kamailio Branch: master Commit: 6be9476b722e0496e8416acce691b8e5529a9882 URL: https://github.com/kamailio/kamailio/commit/6be9476b722e0496e8416acce691b8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-16T16:49:30+01:00 debugger: switch to long pvar field --- Modified: src/modules/debugger/debugger_api.c --- Diff: https://github.com/kamailio/kamailio/commit/6be9476b722e0496e8416acce691b8e… Patch: https://github.com/kamailio/kamailio/commit/6be9476b722e0496e8416acce691b8e… --- diff --git a/src/modules/debugger/debugger_api.c b/src/modules/debugger/debugger_api.c index dce2fbb19c9..19586921d46 100644 --- a/src/modules/debugger/debugger_api.c +++ b/src/modules/debugger/debugger_api.c @@ -488,7 +488,7 @@ int dbg_cfg_trace(sr_event_param_t *evp) { olen = snprintf(_dbg_pid_list[process_no].out.buf, DBG_CMD_SIZE, - "%s : t=int v=%d", + "%s : t=int v=%ld", pvn.s, val.ri); if(olen<0) { @@ -498,7 +498,7 @@ int dbg_cfg_trace(sr_event_param_t *evp) _dbg_pid_list[process_no].out.cmd = DBG_CMD_READ; } else { LOG(_dbg_cfgtrace_level, - "breakpoint eval: %s : t=int v=%d\n", + "breakpoint eval: %s : t=int v=%ld\n", pvn.s, val.ri ); } @@ -1706,7 +1706,7 @@ int _dbg_log_assign_action_pvar(struct sip_msg* msg, struct lvalue* lv) if(value.flags&(PV_VAL_NULL|PV_VAL_EMPTY|PV_VAL_NONE)){ LM_DBG("%.*s: $null\n", name->len, name->s); }else if(value.flags&(PV_VAL_INT)){ - LM_DBG("%.*s:%d\n", name->len, name->s, value.ri); + LM_DBG("%.*s:%ld\n", name->len, name->s, value.ri); }else if(value.flags&(PV_VAL_STR)){ LM_DBG("%.*s:\"%.*s\"\n", name->len, name->s, value.rs.len, value.rs.s); }

1 0

git:master:17bc73c9: tls: switch to long pvar field
by Daniel-Constantin Mierla 16 Nov '22

16 Nov '22

Module: kamailio Branch: master Commit: 17bc73c9dc35c0ec551e851bbff32f06ac4c32dd URL: https://github.com/kamailio/kamailio/commit/17bc73c9dc35c0ec551e851bbff32f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-16T16:49:30+01:00 tls: switch to long pvar field --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/17bc73c9dc35c0ec551e851bbff32f0… Patch: https://github.com/kamailio/kamailio/commit/17bc73c9dc35c0ec551e851bbff32f0… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index 9e597c1d789..0b69815d24a 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -237,7 +237,7 @@ static int pv_cipher(sip_msg_t* msg, pv_param_t* param, pv_value_t* res) } -static int get_bits(str* res, int* i, sip_msg_t* msg) +static int get_bits(str* res, long* i, sip_msg_t* msg) { str bits; int b; @@ -444,7 +444,7 @@ static int pv_cert_version(sip_msg_t* msg, pv_param_t* param, pv_value_t* res) * Check whether peer certificate exists and verify the result * of certificate verification */ -static int check_cert(str* res, int* ires, int local, int err, sip_msg_t* msg) +static int check_cert(str* res, long* ires, int local, int err, sip_msg_t* msg) { static str succ = STR_STATIC_INIT("1"); static str fail = STR_STATIC_INIT("0");

1 0

git:master:d096290d: rtpengine: switch to long pvar field
by Daniel-Constantin Mierla 16 Nov '22

16 Nov '22

Module: kamailio Branch: master Commit: d096290d7b9d27a5e817bc40eebd16e1e09be885 URL: https://github.com/kamailio/kamailio/commit/d096290d7b9d27a5e817bc40eebd16e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-16T16:49:30+01:00 rtpengine: switch to long pvar field --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/d096290d7b9d27a5e817bc40eebd16e… Patch: https://github.com/kamailio/kamailio/commit/d096290d7b9d27a5e817bc40eebd16e… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index d3f8e599db..2ae607fcdb 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3801,7 +3801,7 @@ set_rtpengine_set_n(struct sip_msg *msg, rtpp_set_link_t *rtpl, struct rtpp_set } *out = select_rtpp_set(val.ri); if(*out==NULL) { - LM_ERR("could not locate rtpengine set %u\n", val.ri); + LM_ERR("could not locate rtpengine set %ld\n", val.ri); return -1; } current_msg_id = msg->id;

1 0

git:master:2aefad22: pv: switch to long pvar field
by Daniel-Constantin Mierla 16 Nov '22

16 Nov '22

Module: kamailio Branch: master Commit: 2aefad224788891f61b25e2ea683a9a6b35ac069 URL: https://github.com/kamailio/kamailio/commit/2aefad224788891f61b25e2ea683a9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-16T16:49:30+01:00 pv: switch to long pvar field --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/2aefad224788891f61b25e2ea683a9a… Patch: https://github.com/kamailio/kamailio/commit/2aefad224788891f61b25e2ea683a9a… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index a2b546d02a..2cedfc2416 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -216,7 +216,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, case TR_S_INT: if(!(val->flags&PV_VAL_INT)) { - if(str2sint(&val->rs, &val->ri)!=0) + if(str2slong(&val->rs, &val->ri)!=0) return -1; } else { if(!(val->flags&PV_VAL_STR))

1 0

git:master:0fccc094: sdpops: switch to long pvar field
by Daniel-Constantin Mierla 16 Nov '22

16 Nov '22

Module: kamailio Branch: master Commit: 0fccc0949ac682dc59a4a5e00f3ee895c244ee6a URL: https://github.com/kamailio/kamailio/commit/0fccc0949ac682dc59a4a5e00f3ee89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-16T16:49:30+01:00 sdpops: switch to long pvar field --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0fccc0949ac682dc59a4a5e00f3ee89… Patch: https://github.com/kamailio/kamailio/commit/0fccc0949ac682dc59a4a5e00f3ee89…

1 0

git:master:721b7283: rtpproxy: switch to long pvar field
by Daniel-Constantin Mierla 16 Nov '22

16 Nov '22

Module: kamailio Branch: master Commit: 721b728356fa31bd35721d9ba5d047121f535d5e URL: https://github.com/kamailio/kamailio/commit/721b728356fa31bd35721d9ba5d0471… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-16T16:49:30+01:00 rtpproxy: switch to long pvar field --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/721b728356fa31bd35721d9ba5d0471… Patch: https://github.com/kamailio/kamailio/commit/721b728356fa31bd35721d9ba5d0471… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 46184310c4e..986959d0237 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1696,7 +1696,7 @@ set_rtp_proxy_set_f(struct sip_msg * msg, char * str1, char * str2) } selected_rtpp_set = select_rtpp_set(val.ri); if(selected_rtpp_set==NULL) { - LM_ERR("could not locate rtpproxy set %d\n", val.ri); + LM_ERR("could not locate rtpproxy set %ld\n", val.ri); return -1; } current_msg_id = msg->id;

1 0

git:master:b8d74973: core: rename RV_INT to RV_LONG and RVE_INT_OP to RVE_LONG_OP
by Daniel-Constantin Mierla 16 Nov '22

16 Nov '22

Module: kamailio Branch: master Commit: b8d74973cffc504a76c543f65940a4810633efe5 URL: https://github.com/kamailio/kamailio/commit/b8d74973cffc504a76c543f65940a48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-16T16:49:30+01:00 core: rename RV_INT to RV_LONG and RVE_INT_OP to RVE_LONG_OP --- Modified: src/core/cfg.y Modified: src/core/lvalue.c Modified: src/core/route.c Modified: src/core/rvalue.c Modified: src/core/rvalue.h --- Diff: https://github.com/kamailio/kamailio/commit/b8d74973cffc504a76c543f65940a48… Patch: https://github.com/kamailio/kamailio/commit/b8d74973cffc504a76c543f65940a48…

1 0

git:master:90557633: core: pv - field for int value switched to long
by Daniel-Constantin Mierla 16 Nov '22

16 Nov '22

Module: kamailio Branch: master Commit: 9055763381d56fb78384fd33589c7c2e768f0572 URL: https://github.com/kamailio/kamailio/commit/9055763381d56fb78384fd33589c7c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-16T16:49:30+01:00 core: pv - field for int value switched to long --- Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/9055763381d56fb78384fd33589c7c2… Patch: https://github.com/kamailio/kamailio/commit/9055763381d56fb78384fd33589c7c2… --- diff --git a/src/core/pvar.h b/src/core/pvar.h index 155b0125fb..292a5b2f98 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -90,7 +90,7 @@ typedef void (*pv_name_free_f)(void*); typedef struct _pv_value { str rs; /*!< string value */ - int ri; /*!< integer value */ + long ri; /*!< long value */ int flags; /*!< flags about the type of value */ } pv_value_t, *pv_value_p; @@ -266,7 +266,7 @@ enum _tr_param_type { TR_PARAM_NONE=0, TR_PARAM_STRING, TR_PARAM_NUMBER, typedef struct _tr_param { int type; union { - int n; + long n; str s; void *data; } v;

1 0

git:master:9ecbdce1: call_control: switch to long pvar field
by Daniel-Constantin Mierla 16 Nov '22

16 Nov '22

Module: kamailio Branch: master Commit: 9ecbdce1a5ded2c5247a9a204b7841627f5e172a URL: https://github.com/kamailio/kamailio/commit/9ecbdce1a5ded2c5247a9a204b78416… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-16T16:49:30+01:00 call_control: switch to long pvar field --- Modified: src/modules/call_control/call_control.c --- Diff: https://github.com/kamailio/kamailio/commit/9ecbdce1a5ded2c5247a9a204b78416… Patch: https://github.com/kamailio/kamailio/commit/9ecbdce1a5ded2c5247a9a204b78416… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index 98de64523d0..14455ec967f 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -589,7 +589,7 @@ make_custom_request(struct sip_msg *msg, CallInfo *call) } if (pt.flags & PV_VAL_INT) { len += snprintf(request + len0, sizeof(request)-len0, - "%.*s = %d ", al->name.len, al->name.s, + "%.*s = %ld ", al->name.len, al->name.s, pt.ri); } else if (pt.flags & PV_VAL_STR) { len += snprintf(request + len0, sizeof(request)-len0,

1 0

git:master:9762c5f0: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 16 Nov '22

16 Nov '22

Module: kamailio Branch: master Commit: 9762c5f0d8268e76d55030203b5f0021509fffe6 URL: https://github.com/kamailio/kamailio/commit/9762c5f0d8268e76d55030203b5f002… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-11-16T16:46:25+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/9762c5f0d8268e76d55030203b5f002… Patch: https://github.com/kamailio/kamailio/commit/9762c5f0d8268e76d55030203b5f002…

1 0

git:master:a6d9505b: dialog: deactivate print variable function which is only used for debugging
by Henning Westerholt 16 Nov '22

16 Nov '22

Module: kamailio Branch: master Commit: a6d9505b107204ffbe613d9f78beac22e09e8915 URL: https://github.com/kamailio/kamailio/commit/a6d9505b107204ffbe613d9f78beac2… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-11-16T15:35:25Z dialog: deactivate print variable function which is only used for debugging - deactivate print variable function which is only used for debugging - this function is not good for performance and might also cause race conditions --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_var.c Modified: src/modules/dialog/dlg_var.h Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a6d9505b107204ffbe613d9f78beac2… Patch: https://github.com/kamailio/kamailio/commit/a6d9505b107204ffbe613d9f78beac2… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 9fcff42fb9..2bcbd32833 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -144,6 +144,8 @@ stat_var *expired_dlgs = 0; stat_var *failed_dlgs = 0; stat_var *early_dlgs = 0; +int debug_variables_list = 0; + struct tm_binds d_tmb; struct rr_binds d_rrb; pv_spec_t timeout_avp; @@ -363,6 +365,7 @@ static param_export_t mod_params[]={ { "bye_early_code", PARAM_INT, &bye_early_code }, { "bye_early_reason", PARAM_STR, &bye_early_reason }, { "dlg_ctxiuid_mode", PARAM_INT, &dlg_ctxiuid_mode }, + { "debug_variables", PARAM_INT, &debug_variables_list }, { 0,0,0 } }; diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 473736b437..0e165c5e49 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -449,7 +449,9 @@ int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) if ( dlg_db_mode==DB_MODE_REALTIME ) update_dialog_dbinfo(dlg); - print_lists(dlg); + if(unlikely(debug_variables_list)) { + print_lists(dlg); + } return 0; @@ -510,7 +512,9 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) } } - print_lists(dlg); + if(unlikely(debug_variables_list)) { + print_lists(dlg); + } /* unlock dialog */ if (dlg) { @@ -584,7 +588,9 @@ int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value } dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); } - print_lists(dlg); + if(unlikely(debug_variables_list)) { + print_lists(dlg); + } dlg_release(dlg); return 0; diff --git a/src/modules/dialog/dlg_var.h b/src/modules/dialog/dlg_var.h index 292e9f701b..44bd6ecb73 100644 --- a/src/modules/dialog/dlg_var.h +++ b/src/modules/dialog/dlg_var.h @@ -89,6 +89,8 @@ extern stat_var *processed_dlgs; /*!< number of processed dialogs */ extern stat_var *expired_dlgs; /*!< number of expired dialogs */ extern stat_var *failed_dlgs; /*!< number of failed dialogs */ +extern int debug_variables_list; + int pv_get_dlg_ctx(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_set_dlg_ctx(sip_msg_t *msg, pv_param_t *param, diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 7a1a11c59a..cea057c797 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -1733,6 +1733,28 @@ modparam("dialog", "dlg_ctxiuid_mode", 1) </example> </section> + <section id="dialog.p.debug_variables"> + <title><varname>debug_variables</varname> (int)</title> + <para> + Activate additional debugging for printing internal lists for dialog variables. + This output is only visible at debug log level and should only be used for + debugging. By default its deactivated. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>debug_variables</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialog", "debug_variables", 1) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:8c59f8e7: modules: readme files regenerated - app_python3 ... [skip ci]
by Kamailio Dev 15 Nov '22

15 Nov '22

Module: kamailio Branch: master Commit: 8c59f8e782381811b1afb6a75b8b8c9fa6959933 URL: https://github.com/kamailio/kamailio/commit/8c59f8e782381811b1afb6a75b8b8c9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-11-15T17:31:21+01:00 modules: readme files regenerated - app_python3 ... [skip ci] --- Modified: src/modules/app_python3/README --- Diff: https://github.com/kamailio/kamailio/commit/8c59f8e782381811b1afb6a75b8b8c9… Patch: https://github.com/kamailio/kamailio/commit/8c59f8e782381811b1afb6a75b8b8c9… --- diff --git a/src/modules/app_python3/README b/src/modules/app_python3/README index f59291a078..914350572b 100644 --- a/src/modules/app_python3/README +++ b/src/modules/app_python3/README @@ -195,9 +195,9 @@ python_exec("my_python_function", "$rU"); in each worker when it next invokes a Python method. The module uses a worker process lock to prevent recursive reloads. - This function only reloads the user script and creates a new script - object. It does not reinitialize the interpreter. E.g., references in - the old module remain if not redefined by the new version. + This function only reloads (re-executes) the user script and creates a + new script object. It does not reinitialize the interpreter (references + in the old module remain if not redefined by the new version). Name: app_python.reload @@ -208,6 +208,24 @@ python_exec("my_python_function", "$rU"); kamcmd app_python.reload ... + Note that reload is done for the Python script provided as parameter to + this Kamailio module. To reload the Python libraries imported in this + script, use something like: +... +import mod1 +... +import modN +from importlib import reload + +def mod_init(): + reload(mod1) + ... + reload(modN) + return kamailio() +... + + Where "modX" are the modules imported at the top. + 5.2. app_python.api_list List the functions available via Kemi framework.

1 0

git:master:34d60608: app_python3: docs - added note about how Python modules used in script can be reloaded
by Daniel-Constantin Mierla 15 Nov '22

15 Nov '22

Module: kamailio Branch: master Commit: 34d60608bea449ab7258a5d88894651303b80adf URL: https://github.com/kamailio/kamailio/commit/34d60608bea449ab7258a5d88894651… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-15T17:24:23+01:00 app_python3: docs - added note about how Python modules used in script can be reloaded --- Modified: src/modules/app_python3/doc/app_python3_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/34d60608bea449ab7258a5d88894651… Patch: https://github.com/kamailio/kamailio/commit/34d60608bea449ab7258a5d88894651… --- diff --git a/src/modules/app_python3/doc/app_python3_admin.xml b/src/modules/app_python3/doc/app_python3_admin.xml index 0f4c63ffd0..67f6058020 100644 --- a/src/modules/app_python3/doc/app_python3_admin.xml +++ b/src/modules/app_python3/doc/app_python3_admin.xml @@ -203,12 +203,12 @@ python_exec("my_python_function", "$rU"); <para> Marks the need to reload the Python script. The actual reload is done in each worker when it next invokes a Python method. - The module uses a worker process lock to prevent recursive reloads. + The module uses a worker process lock to prevent recursive reloads. </para> <para> - This function only reloads the user script and creates a new script object. - It does not reinitialize the interpreter. - E.g., references in the old module remain if not redefined by the new version. + This function only reloads (re-executes) the user script and creates + a new script object. It does not reinitialize the interpreter (references + in the old module remain if not redefined by the new version). </para> <para> Name: <emphasis>app_python.reload</emphasis> @@ -222,6 +222,28 @@ python_exec("my_python_function", "$rU"); &kamcmd; app_python.reload ... </programlisting> + <para> + Note that reload is done for the Python script provided as parameter + to this &kamailio; module. To reload the Python libraries imported + in this script, use something like: + </para> + <programlisting format="linespecific"> +... +import mod1 +... +import modN +from importlib import reload + +def mod_init(): + reload(mod1) + ... + reload(modN) + return kamailio() +... + </programlisting> + <para> + Where "modX" are the modules imported at the top. + </para> </section> <section id="app_python3.r.api_list"> <title>

1 0

Kamailio devel event starting tomorrow
by Daniel-Constantin Mierla 15 Nov '22

15 Nov '22

Hello, as some of you may know from previous announcements, a few of us meet tomorrow and the day after in Dusseldorf at sipgate.de for a Kamailio development event. Should anyone want to join remotely, we can make available a video conference bridge. Join if you want to work together to add new features to Kamailio or help improving existing tools and documentation. It is not an event for discussing about Kamailio or how to use it. Reply to this email (can be only to me this time) if you want to join remotely and eventually provide the time you think you would be around and, if you have something in mind, what you would like to work on. You can also join if you don't have already something to work on, you can become part of another team and help them. You will receive privately the details of how to join the video conference room. Tomorrow we plan to to start the day around 10:30 Berlin time zone (UTC + 1), probably wrapping up around 17:00. The schedule for Thursday will be given tomorrow once it is decided. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:master:5ecae10f: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 10 Nov '22

10 Nov '22

Module: kamailio Branch: master Commit: 5ecae10fabb5da1911c7a7843ba3fb595bfb39e0 URL: https://github.com/kamailio/kamailio/commit/5ecae10fabb5da1911c7a7843ba3fb5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-11-10T12:01:36+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/5ecae10fabb5da1911c7a7843ba3fb5… Patch: https://github.com/kamailio/kamailio/commit/5ecae10fabb5da1911c7a7843ba3fb5… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index d850087b7f..06e279ec4f 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1814,7 +1814,7 @@ if(dlg_get_var("$var(ci)", "$var(ft)", "456", "test", "$var(tmp)")) Meaning of the parameters is as follows: * callid - SIP call-id. * ftag - SIP From tag. - * ttag - SIP To tag. + * ttag - SIP To tag. Use "" value to indicate early dialog. * name - key name of the $dlg_var. * value - string value to store at $dlg_var(name). @@ -1827,6 +1827,11 @@ if(dlg_set_var("$var(ci)", "$var(ft)", "456", "test", "$var(tmp)")) { xdbg("set $$dlg_var(test):$var(tmp)\n"); } +# you can set vars in early dialog too +if(dlg_set_var("$var(ci)", "$var(ft)", "", "test", "$var(tmp)")) +{ + xdbg("set $$dlg_var(test):$var(tmp)\n"); +} ... 7.15. is_known_dlg()

1 0

git:master:91da5bd0: dialog: add a note for early dialogs in dlg_set_var()
by Victor Seva 10 Nov '22

10 Nov '22

Module: kamailio Branch: master Commit: 91da5bd0c9d08d4a2979bab6053b417e16b51cf6 URL: https://github.com/kamailio/kamailio/commit/91da5bd0c9d08d4a2979bab6053b417… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-11-10T11:47:14+01:00 dialog: add a note for early dialogs in dlg_set_var() --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/91da5bd0c9d08d4a2979bab6053b417… Patch: https://github.com/kamailio/kamailio/commit/91da5bd0c9d08d4a2979bab6053b417… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 162ad965331..7a1a11c59a7 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2239,7 +2239,7 @@ if(dlg_get_var("$var(ci)", "$var(ft)", "456", "test", "$var(tmp)")) </para> </listitem> <listitem> - <para><emphasis>ttag</emphasis> - SIP To tag. + <para><emphasis>ttag</emphasis> - SIP To tag. Use "" value to indicate early dialog. </para> </listitem> <listitem> @@ -2263,6 +2263,11 @@ if(dlg_set_var("$var(ci)", "$var(ft)", "456", "test", "$var(tmp)")) { xdbg("set $$dlg_var(test):$var(tmp)\n"); } +# you can set vars in early dialog too +if(dlg_set_var("$var(ci)", "$var(ft)", "", "test", "$var(tmp)")) +{ + xdbg("set $$dlg_var(test):$var(tmp)\n"); +} ... </programlisting> </example>

1 0

git:master:966dab75: dialog: dlg_set_var() support empty totag parameter
by Victor Seva 10 Nov '22

10 Nov '22

Module: kamailio Branch: master Commit: 966dab757d094b99c48431f7a22c2b557d53c4d1 URL: https://github.com/kamailio/kamailio/commit/966dab757d094b99c48431f7a22c2b5… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-11-10T11:47:14+01:00 dialog: dlg_set_var() support empty totag parameter * support setting vars for non established dialogs --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/966dab757d094b99c48431f7a22c2b5… Patch: https://github.com/kamailio/kamailio/commit/966dab757d094b99c48431f7a22c2b5… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 7fa6bd57c68..9fcff42fb98 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1922,7 +1922,7 @@ static int ki_dlg_set_var(sip_msg_t *msg, str *sc, str *sf, str *st, str *key, s LM_ERR("invalid From tag parameter\n"); return -1; } - if(st==NULL || st->s==NULL || st->len == 0) { + if(st==NULL) { LM_ERR("invalid To tag parameter\n"); return -1; } @@ -1966,11 +1966,7 @@ static int w_dlg_set_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char LM_ERR("unable to get To Tag\n"); return -1; } - if(st.s==NULL || st.len == 0) - { - LM_ERR("invalid To tag parameter\n"); - return -1; - } + if(fixup_get_svalue(msg, (gparam_p)key, &k)!=0) { LM_ERR("unable to get key name\n");

1 0

[kamailio/kamailio] Vseva/dlg (PR #3277)
by Victor Seva 10 Nov '22

10 Nov '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally #### Description support setting vars for non established dialogs You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3277 -- Commit Summary -- * dialog: dlg_set_var() support empty totag parameter * dialog: add a note for early dialogs in dlg_set_var() -- File Changes -- M src/modules/dialog/dialog.c (8) M src/modules/dialog/doc/dialog_admin.xml (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3277.patch https://github.com/kamailio/kamailio/pull/3277.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3277 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3277(a)github.com>

1 1

git:master:4172faaa: modules: readme files regenerated - ims_usrloc_pcscf ... [skip ci]
by Kamailio Dev 09 Nov '22

09 Nov '22

Module: kamailio Branch: master Commit: 4172faaaa60333595fe6444deefbaa2babe8e9e1 URL: https://github.com/kamailio/kamailio/commit/4172faaaa60333595fe6444deefbaa2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-11-09T21:31:29+01:00 modules: readme files regenerated - ims_usrloc_pcscf ... [skip ci] --- Modified: src/modules/ims_usrloc_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/4172faaaa60333595fe6444deefbaa2… Patch: https://github.com/kamailio/kamailio/commit/4172faaaa60333595fe6444deefbaa2… --- diff --git a/src/modules/ims_usrloc_pcscf/README b/src/modules/ims_usrloc_pcscf/README index 93efefc076..553ee25bbe 100644 --- a/src/modules/ims_usrloc_pcscf/README +++ b/src/modules/ims_usrloc_pcscf/README @@ -34,6 +34,7 @@ Carsten Bock 3.3. db_url (int) 3.4. db_mode (int) 3.5. match_contact_host_port (int) + 3.6. expires_grace (int) 4. RPC Commands @@ -54,6 +55,7 @@ Carsten Bock 1.3. Set db_url parameter 1.4. Set db_mode parameter 1.5. Set match_contact_host_port parameter + 1.6. Set expires_grace parameter Chapter 1. Admin Guide @@ -72,6 +74,7 @@ Chapter 1. Admin Guide 3.3. db_url (int) 3.4. db_mode (int) 3.5. match_contact_host_port (int) + 3.6. expires_grace (int) 4. RPC Commands @@ -122,6 +125,7 @@ Chapter 1. Admin Guide 3.3. db_url (int) 3.4. db_mode (int) 3.5. match_contact_host_port (int) + 3.6. expires_grace (int) 3.1. hash_size (int) @@ -194,6 +198,18 @@ modparam("ims_usrloc_pcscf", "db_mode", 1) modparam("ims_usrloc_pcscf", "match_contact_host_port", 0) ... +3.6. expires_grace (int) + + Specify a grace time for keeping the contacts until they are finally + deleted. The value of the parameter is defined in seconds. + + Default value is 3600. + + Example 1.6. Set expires_grace parameter +... +modparam("ims_usrloc_pcscf", "expires_grace", 1800) +... + 4. RPC Commands 4.1. ulpcscf.status

1 0

git:master:c4afb8da: ims_usrloc_pcscf: document expires_grace parameter
by Henning Westerholt 09 Nov '22

09 Nov '22

Module: kamailio Branch: master Commit: c4afb8dab4f12a3a305894e4e260292b5bdca0d7 URL: https://github.com/kamailio/kamailio/commit/c4afb8dab4f12a3a305894e4e260292… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-11-09T20:28:45Z ims_usrloc_pcscf: document expires_grace parameter --- Modified: src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c4afb8dab4f12a3a305894e4e260292… Patch: https://github.com/kamailio/kamailio/commit/c4afb8dab4f12a3a305894e4e260292… --- diff --git a/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml b/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml index a237a1eb61f..da4f99a7b9b 100644 --- a/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml +++ b/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml @@ -180,6 +180,24 @@ modparam("ims_usrloc_pcscf", "db_mode", 1) <programlisting format="linespecific">... modparam("ims_usrloc_pcscf", "match_contact_host_port", 0) ... +</programlisting> + </example> + </section> + + <section> + <title>expires_grace (int)</title> + + <para>Specify a grace time for keeping the contacts until they are finally deleted. + The value of the parameter is defined in seconds.</para> + + <para><emphasis>Default value is 3600.</emphasis></para> + + <example> + <title>Set expires_grace parameter</title> + + <programlisting format="linespecific">... +modparam("ims_usrloc_pcscf", "expires_grace", 1800) +... </programlisting> </example> </section>

1 0

git:master:e7bd1570: websocket: more details on debig messages
by Daniel-Constantin Mierla 08 Nov '22

08 Nov '22

Module: kamailio Branch: master Commit: e7bd1570e3788e9d04047b4d1d00cb8bd8b172d3 URL: https://github.com/kamailio/kamailio/commit/e7bd1570e3788e9d04047b4d1d00cb8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-07T21:11:56+01:00 websocket: more details on debig messages --- Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/e7bd1570e3788e9d04047b4d1d00cb8… Patch: https://github.com/kamailio/kamailio/commit/e7bd1570e3788e9d04047b4d1d00cb8… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index a56eb492388..1a4f8ffbb3c 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -464,7 +464,7 @@ ws_connection_t *wsconn_get(int id) for(wsc = wsconn_id_hash[id_hash]; wsc; wsc = wsc->id_next) { if(wsc->id == id) { wsconn_ref(wsc); - LM_DBG("wsconn_get returns wsc [%p] refcnt [%d]\n", wsc, + LM_DBG("wsconn_get id [%d] returns wsc [%p] refcnt [%d]\n", id, wsc, atomic_get(&wsc->refcnt)); WSCONN_UNLOCK; diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 2da0863de5f..583e9040522 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -811,7 +811,8 @@ void ws_keepalive(unsigned int ticks, void *param) } else if (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_CONCHECK) { tcp_connection_t *con = tcpconn_get(wsc->id, 0, 0, 0, 0); if(con==NULL) { - LM_INFO("tcp connection has been lost\n"); + LM_INFO("tcp connection has been lost (id: %d wsc: %p)\n", + wsc->id, wsc); wsc->state = WS_S_CLOSING; } else { tcpconn_put(con);

1 0

git:master:0920aa1a: secsipid: debug message if identity header is not found
by Daniel-Constantin Mierla 04 Nov '22

04 Nov '22

Module: kamailio Branch: master Commit: 0920aa1a27565bc52fd1ff9f4b9fc31dbd0d2a75 URL: https://github.com/kamailio/kamailio/commit/0920aa1a27565bc52fd1ff9f4b9fc31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-04T09:28:23+01:00 secsipid: debug message if identity header is not found --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0920aa1a27565bc52fd1ff9f4b9fc31… Patch: https://github.com/kamailio/kamailio/commit/0920aa1a27565bc52fd1ff9f4b9fc31… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 96f01487a3..1676c37c9a 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -251,6 +251,10 @@ static int ki_secsipid_check_identity(sip_msg_t *msg, str *keypath) } } + if(ibody.len==0) { + LM_DBG("identity header not found\n"); + } + LM_DBG("identity check: failed\n"); return ret; } @@ -301,6 +305,10 @@ static int ki_secsipid_check_identity_pubkey(sip_msg_t *msg, str *keyval) } } + if(ibody.len==0) { + LM_DBG("identity header not found\n"); + } + LM_DBG("identity check: failed\n"); return ret; }

1 0

git:master:a0d9deb9: secsipid: ensure headers are parsed
by Daniel-Constantin Mierla 04 Nov '22

04 Nov '22

Module: kamailio Branch: master Commit: a0d9deb9f852f887bed7c0809f3056b5f75379c8 URL: https://github.com/kamailio/kamailio/commit/a0d9deb9f852f887bed7c0809f3056b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-04T09:55:22+01:00 secsipid: ensure headers are parsed --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a0d9deb9f852f887bed7c0809f3056b… Patch: https://github.com/kamailio/kamailio/commit/a0d9deb9f852f887bed7c0809f3056b… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 1676c37c9a..fa1b864404 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -225,6 +225,11 @@ static int ki_secsipid_check_identity(sip_msg_t *msg, str *keypath) str ibody = STR_NULL; hdr_field_t *hf; + if (parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("error while parsing message\n"); + return -1; + } + if(secsipid_cache_dir.len > 0) { _secsipid_papi.SecSIPIDSetFileCacheOptions(secsipid_cache_dir.s, secsipid_cache_expire); @@ -283,6 +288,11 @@ static int ki_secsipid_check_identity_pubkey(sip_msg_t *msg, str *keyval) str ibody = STR_NULL; hdr_field_t *hf; + if (parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("error while parsing message\n"); + return -1; + } + if(secsipid_libopt_list_used==0) { str_list_t *sit; for(sit=secsipid_libopt_list; sit!=NULL; sit=sit->next) {

1 0

git:master:e617ef84: secfilter: little fix in w_check_sqli
by Jose Luis Verdeguer 03 Nov '22

03 Nov '22

Module: kamailio Branch: master Commit: e617ef84c3bbd3bbcb780991bc45216112056f94 URL: https://github.com/kamailio/kamailio/commit/e617ef84c3bbd3bbcb780991bc45216… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2022-11-03T14:34:17+01:00 secfilter: little fix in w_check_sqli --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/e617ef84c3bbd3bbcb780991bc45216… Patch: https://github.com/kamailio/kamailio/commit/e617ef84c3bbd3bbcb780991bc45216… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index 90e7891aa6..5e967b2204 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -283,7 +283,7 @@ static int w_check_sqli(str val) memcpy(cval, val.s, val.len); if(strstr(cval, "'") || strstr(cval, "\"") || strstr(cval, "--") - || strstr(cval, "%27") || strstr(cval, "%24") + || strstr(cval, "%27") || strstr(cval, "%22") || strstr(cval, "%60")) { /* Illegal characters found */ lock_get(secf_lock);

1 0

git:master:cd3b7766: secsipid: iterate through all Identity headers
by Daniel-Constantin Mierla 03 Nov '22

03 Nov '22

Module: kamailio Branch: master Commit: cd3b776649e652b5d27b2718c22f08736b1e9e84 URL: https://github.com/kamailio/kamailio/commit/cd3b776649e652b5d27b2718c22f087… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-03T10:20:10+01:00 secsipid: iterate through all Identity headers --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cd3b776649e652b5d27b2718c22f087… Patch: https://github.com/kamailio/kamailio/commit/cd3b776649e652b5d27b2718c22f087… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 43c1ab4cb42..96f01487a3a 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -221,24 +221,10 @@ static void mod_destroy(void) */ static int ki_secsipid_check_identity(sip_msg_t *msg, str *keypath) { - int ret = 1; + int ret = -1; str ibody = STR_NULL; hdr_field_t *hf; - for (hf=msg->headers; hf; hf=hf->next) { - if (hf->name.len==SECSIPID_HDR_IDENTITY_LEN - && strncasecmp(hf->name.s, SECSIPID_HDR_IDENTITY, - SECSIPID_HDR_IDENTITY_LEN)==0) - break; - } - - if(hf == NULL) { - LM_DBG("no identity header\n"); - return -1; - } - - ibody = hf->body; - if(secsipid_cache_dir.len > 0) { _secsipid_papi.SecSIPIDSetFileCacheOptions(secsipid_cache_dir.s, secsipid_cache_expire); @@ -250,12 +236,19 @@ static int ki_secsipid_check_identity(sip_msg_t *msg, str *keypath) } secsipid_libopt_list_used = 1; } - ret = _secsipid_papi.SecSIPIDCheckFull(ibody.s, ibody.len, secsipid_expire, - keypath->s, secsipid_timeout); - if(ret==0) { - LM_DBG("identity check: ok\n"); - return 1; + for (hf=msg->headers; hf; hf=hf->next) { + if (hf->name.len==SECSIPID_HDR_IDENTITY_LEN + && strncasecmp(hf->name.s, SECSIPID_HDR_IDENTITY, + SECSIPID_HDR_IDENTITY_LEN)==0) { + ibody = hf->body; + ret = _secsipid_papi.SecSIPIDCheckFull(ibody.s, ibody.len, secsipid_expire, + keypath->s, secsipid_timeout); + if(ret==0) { + LM_DBG("identity check: ok\n"); + return 1; + } + } } LM_DBG("identity check: failed\n"); @@ -282,22 +275,10 @@ static int w_secsipid_check_identity(sip_msg_t *msg, char *pkeypath, char *str2) */ static int ki_secsipid_check_identity_pubkey(sip_msg_t *msg, str *keyval) { - int ret = 1; + int ret = -1; str ibody = STR_NULL; hdr_field_t *hf; - for (hf=msg->headers; hf; hf=hf->next) { - if (hf->name.len==SECSIPID_HDR_IDENTITY_LEN - && strncasecmp(hf->name.s, SECSIPID_HDR_IDENTITY, - SECSIPID_HDR_IDENTITY_LEN)==0) - break; - } - - if(hf == NULL) { - LM_DBG("no identity header\n"); - return -1; - } - if(secsipid_libopt_list_used==0) { str_list_t *sit; for(sit=secsipid_libopt_list; sit!=NULL; sit=sit->next) { @@ -306,14 +287,18 @@ static int ki_secsipid_check_identity_pubkey(sip_msg_t *msg, str *keyval) secsipid_libopt_list_used = 1; } - ibody = hf->body; - - ret = _secsipid_papi.SecSIPIDCheckFullPubKey(ibody.s, ibody.len, - secsipid_expire, keyval->s, keyval->len); - - if(ret==0) { - LM_DBG("identity check: ok\n"); - return 1; + for (hf=msg->headers; hf; hf=hf->next) { + if (hf->name.len==SECSIPID_HDR_IDENTITY_LEN + && strncasecmp(hf->name.s, SECSIPID_HDR_IDENTITY, + SECSIPID_HDR_IDENTITY_LEN)==0) { + ibody = hf->body; + ret = _secsipid_papi.SecSIPIDCheckFullPubKey(ibody.s, ibody.len, + secsipid_expire, keyval->s, keyval->len); + if(ret==0) { + LM_DBG("identity check: ok\n"); + return 1; + } + } } LM_DBG("identity check: failed\n");

1 0

opinion on kamailio docker file extensions
by Henning Westerholt 31 Oct '22

31 Oct '22

Hello, are there any objections to extend the https://github.com/kamailio/kamailio-docker packages to support some environment variables to allow some customization? * add a run.sh script * evaluate SHM_MEMORY and PKG_MEMORY variables * set "-M" and "-m" parameters appropriately for startup The shared memory pool can be set in the kamailio.cfg, but AFAIK the private memory pool not. Additionally using environment variables would be the common way that is used also in other well-known packages. If no variable is set, the default would be used. Thanks, Henning

1 0

git:master:065a83fb: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 29 Oct '22

29 Oct '22

Module: kamailio Branch: master Commit: 065a83fbb1a8b9b1912aadecff039a485c2d46dd URL: https://github.com/kamailio/kamailio/commit/065a83fbb1a8b9b1912aadecff039a4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-10-29T09:31:37+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/065a83fbb1a8b9b1912aadecff039a4… Patch: https://github.com/kamailio/kamailio/commit/065a83fbb1a8b9b1912aadecff039a4… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 9d4287804f..abf41a6d85 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1206,7 +1206,9 @@ With congestion control the formula becomes : set is chosen. * limit - the maximum number of items to be stored in XAVP list for further fail-overs (the first selected destination and default - destination are the first to be put in the list) + destination are the first to be put in the list). This can improve + the performance especially if you are using a large list of + gateways. This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.

1 0

git:master:0dc7d711: dispatcher: small docs extensions regarding to ds_select_dst
by Henning Westerholt 29 Oct '22

29 Oct '22

Module: kamailio Branch: master Commit: 0dc7d711c4c2d16d532862344f9ccd629de38e20 URL: https://github.com/kamailio/kamailio/commit/0dc7d711c4c2d16d532862344f9ccd6… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-29T07:17:10Z dispatcher: small docs extensions regarding to ds_select_dst --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0dc7d711c4c2d16d532862344f9ccd6… Patch: https://github.com/kamailio/kamailio/commit/0dc7d711c4c2d16d532862344f9ccd6… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 1c9de29ba78..022c915e139 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1399,7 +1399,8 @@ With congestion control the formula becomes : <emphasis>limit</emphasis> - the maximum number of items to be stored in XAVP list for further fail-overs (the first selected destination and default destination are the first to be put in - the list) + the list). This can improve the performance especially if you + are using a large list of gateways. </para> </listitem> </itemizedlist>

1 0

git:master:9b4d4d05: dispatcher: small spelling fix in comment
by Henning Westerholt 29 Oct '22

29 Oct '22

Module: kamailio Branch: master Commit: 9b4d4d059e6222a64a9b9cadb0b867bea27ed0d8 URL: https://github.com/kamailio/kamailio/commit/9b4d4d059e6222a64a9b9cadb0b867b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-29T07:15:10Z dispatcher: small spelling fix in comment --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/9b4d4d059e6222a64a9b9cadb0b867b… Patch: https://github.com/kamailio/kamailio/commit/9b4d4d059e6222a64a9b9cadb0b867b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 8f06f6f5cbb..66ebd19996e 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2065,7 +2065,7 @@ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) * Set destination address from group 'set' selected with alogorithm 'alg' * - the rest of addresses in group are added as next destination in xavps, * up to the 'limit' - * - mode specify to set address in R-URI or outboud proxy + * - mode specify to set address in R-URI or outbound proxy * */ int ds_select_dst_limit(sip_msg_t *msg, int set, int alg, uint32_t limit,

1 0

git:master:e7e23666: core: small spelling fix in comment
by Henning Westerholt 29 Oct '22

29 Oct '22

Module: kamailio Branch: master Commit: e7e2366634f7b56136b11d4b196150467a18b651 URL: https://github.com/kamailio/kamailio/commit/e7e2366634f7b56136b11d4b1961504… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-29T07:14:57Z core: small spelling fix in comment --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/e7e2366634f7b56136b11d4b1961504… Patch: https://github.com/kamailio/kamailio/commit/e7e2366634f7b56136b11d4b1961504… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 595c1be8957..d582ddf7200 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -110,7 +110,7 @@ typedef enum request_method { #define FL_MSG_NOREPLY (1<<23) /*!< do not send sip reply for request */ #define FL_SIPTRACE (1<<24) /*!< message to be traced in stateless replies */ #define FL_ROUTE_ADDR (1<<25) /*!< request has Route address for next hop */ -#define FL_USE_OTCPID (1<<26) /*!< request to be routed using outboud tcp con id */ +#define FL_USE_OTCPID (1<<26) /*!< request to be routed using outbound tcp con id */ /* WARNING: Value (1 << 28) is reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */

1 0

git:master:77840e46: modules: readme files regenerated - app_python3 ... [skip ci]
by Kamailio Dev 27 Oct '22

27 Oct '22

Module: kamailio Branch: master Commit: 77840e465e1e074ede44fbc262faa850e1c4f862 URL: https://github.com/kamailio/kamailio/commit/77840e465e1e074ede44fbc262faa85… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-10-27T10:16:43+02:00 modules: readme files regenerated - app_python3 ... [skip ci] --- Modified: src/modules/app_python3/README --- Diff: https://github.com/kamailio/kamailio/commit/77840e465e1e074ede44fbc262faa85… Patch: https://github.com/kamailio/kamailio/commit/77840e465e1e074ede44fbc262faa85… --- diff --git a/src/modules/app_python3/README b/src/modules/app_python3/README index 49bc577444..f59291a078 100644 --- a/src/modules/app_python3/README +++ b/src/modules/app_python3/README @@ -87,6 +87,11 @@ Chapter 1. Admin Guide module, look at the files inside the source tree located at 'modules/app_python3/python_examples/'. + Note: if symbols exported to KEMI (module or function names) conflict + with Python's reserved keywords, use the 'getattr()' function or the + '__dict__' attribute for 'KSR' (e.g., + 'KSR.__dict__["async"].task_route("myroute")'). + 2. Dependencies 2.1. Kamailio Modules

1 0

git:master:0d6d434a: app_python3: note about kemi symbols and python reserved words
by Daniel-Constantin Mierla 27 Oct '22

27 Oct '22

Module: kamailio Branch: master Commit: 0d6d434a92ae69cf1e503f07ffa6f46a9948593e URL: https://github.com/kamailio/kamailio/commit/0d6d434a92ae69cf1e503f07ffa6f46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-27T10:07:36+02:00 app_python3: note about kemi symbols and python reserved words --- Modified: src/modules/app_python3/doc/app_python3_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0d6d434a92ae69cf1e503f07ffa6f46… Patch: https://github.com/kamailio/kamailio/commit/0d6d434a92ae69cf1e503f07ffa6f46… --- diff --git a/src/modules/app_python3/doc/app_python3_admin.xml b/src/modules/app_python3/doc/app_python3_admin.xml index c2648c48c82..0f4c63ffd04 100644 --- a/src/modules/app_python3/doc/app_python3_admin.xml +++ b/src/modules/app_python3/doc/app_python3_admin.xml @@ -34,6 +34,11 @@ this module, look at the files inside the source tree located at 'modules/app_python3/python_examples/'. </para> + <para> + Note: if symbols exported to KEMI (module or function names) conflict + with Python's reserved keywords, use the 'getattr()' function or the + '__dict__' attribute for 'KSR' (e.g., 'KSR.__dict__["async"].task_route("myroute")'). + </para> </section> <section> <title>Dependencies</title>

1 0

[kamailio/kamailio] Unable to use the KEMI Python async module (Issue #3272)
by grant-mb 26 Oct '22

26 Oct '22

### Description Using the KEMI async module in Python is not possible, since the `async` word is a reserved word in Python3. This leads to a syntax error. #### Reproduction ```python import KSR KSR.async.task_route("") ``` ### Possible Solutions The below code works, but not sure if this is a right approach to this issue. `KSR.__dict__["async"].task_route("my_route")` ### Additional Information ``` version: kamailio 5.6.1 (x86_64/linux) b36a13 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: b36a13 compiled on 10:06:47 Oct 25 2022 with gcc 10.2.1 ``` ``` Linux b0fe2a764c5e 5.10.124-linuxkit #1 SMP Thu Jun 30 08:19:10 UTC 2022 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3272 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3272(a)github.com>

2 2

[kamailio/kamailio] kamailio KEMI sipt module (Issue #3264)
by skainzwnt 26 Oct '22

26 Oct '22

Hi, maybe im wrong, but it seems the sipt module is not implemented in KEMI Framework. Is it planned? :) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3264 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3264(a)github.com>

2 2

[kamailio/kamailio] siputils: adding add_uri_param to kemi (PR #3268)
by Rodrigo Alves Silva 26 Oct '22

26 Oct '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Adding add_uri_param method to kemi You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3268 -- Commit Summary -- * siputils: adding add_uri_param to kemi -- File Changes -- M src/modules/siputils/siputils.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3268.patch https://github.com/kamailio/kamailio/pull/3268.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3268 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3268(a)github.com>

2 2

git:master:ad4faf03: siputils: export add_uri_param() to kemi
by Daniel-Constantin Mierla 26 Oct '22

26 Oct '22

Module: kamailio Branch: master Commit: ad4faf03628db45d30f27358b81afd8e0bee03c0 URL: https://github.com/kamailio/kamailio/commit/ad4faf03628db45d30f27358b81afd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-26T16:11:42+02:00 siputils: export add_uri_param() to kemi --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/ad4faf03628db45d30f27358b81afd8… Patch: https://github.com/kamailio/kamailio/commit/ad4faf03628db45d30f27358b81afd8… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index d9730ddad1..c174662d8d 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -359,17 +359,15 @@ int w_uri_param_any(struct sip_msg* _msg, char* _param, char* _str2) } /* - * Adds a new parameter to Request URI + * Adds a new parameter to Request URI - kemi export */ -int add_uri_param(struct sip_msg* _msg, char* _param, char* _s2) +int ki_add_uri_param(struct sip_msg* _msg, str* param) { - str *param, *cur_uri, new_uri; + str *cur_uri, new_uri; struct sip_uri *parsed_uri; char *at; - param = (str*)_param; - - if (param->len == 0) { + if (param==NULL || param->len == 0) { return 1; } @@ -467,6 +465,14 @@ int add_uri_param(struct sip_msg* _msg, char* _param, char* _s2) return 1; } +/* + * Adds a new parameter to Request URI - cfg export + */ +int add_uri_param(struct sip_msg* _msg, char* _param, char* _s2) +{ + return ki_add_uri_param(_msg, (str*)_param); +} + /* * Remove param from Request URI */ diff --git a/src/modules/siputils/checks.h b/src/modules/siputils/checks.h index 164f086f26..eaeaca3f81 100644 --- a/src/modules/siputils/checks.h +++ b/src/modules/siputils/checks.h @@ -65,7 +65,7 @@ int uri_param_2(struct sip_msg* _msg, char* _param, char* _value); * Adds a new parameter to Request URI */ int add_uri_param(struct sip_msg* _msg, char* _param, char* _s2); - +int ki_add_uri_param(struct sip_msg* _msg, str* param); /* * Converts URI, if it is tel URI, to SIP URI. Returns 1, if diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 91b2d370d0..5db1a67cfd 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -732,6 +732,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("add_uri_param"), + SR_KEMIP_INT, ki_add_uri_param, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

[kamailio/kamailio] Kamailio 5.4.7 crash (Issue #3052)
by Igor Olhovskiy 26 Oct '22

26 Oct '22

### Description Kamailio running with mix of TLS/WebSocket/UDP transports. ### Troubleshooting #### Reproduction Really random issues, can't really catch it #### Debugging Data ``` [root@pbxphone-0866-fe-1 kamailio_crash]# gdb kamailio core.kamailio.222460.pbxphone-0866-fe-1.company.domain.1646903834 GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-120.el7 Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... Reading symbols from /root/kamailio_crash/kamailio...done. warning: exec file is newer than core file. [New LWP 222460] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/local/sbin/kamailio -P /run/kamailio/kamailio.pid -f /usr/local/etc/kamail'. Program terminated with signal 11, Segmentation fault. #0 0x00007f04af578716 in tls_complete_init (c=0x7f042fe11c98) at tls_server.c:236 236 data->ssl = SSL_new(dom->ctx[process_no]); Missing separate debuginfos, use: debuginfo-install audit-libs-2.8.5-4.el7.x86_64 bzip2-libs-1.0.6-13.el7.x86_64 elfutils-libelf-0.176-5.el7.x86_64 glibc-2.17-325.el7_9.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-51.el7_9.x86_64 libacl-2.2.51-15.el7.x86_64 libattr-2.4.46-13.el7.x86_64 libcap-2.22-11.el7.x86_64 libcap-ng-0.7.5-4.el7.x86_64 libcom_err-1.42.9-19.el7.x86_64 libdb-5.3.21-25.el7.x86_64 libffi-3.0.13-19.el7.x86_64 libgcc-4.8.5-44.el7.x86_64 libselinux-2.5-15.el7.x86_64 libstdc++-4.8.5-44.el7.x86_64 libunistring-0.9.3-9.el7.x86_64 libuuid-2.23.2-65.el7_9.1.x86_64 libxml2-2.9.1-6.el7_9.6.x86_64 lm_sensors-libs-3.4.0-8.20160601gitf9185e5.el7.x86_64 lua-5.1.4-15.el7.x86_64 net-snmp-agent-libs-5.7.2-49.el7_9.1.x86_64 net-snmp-libs-5.7.2-49.el7_9.1.x86_64 nspr-4.32.0-1.el7_9.x86_64 nss-3.67.0-4.el7_9.x86_64 nss-softokn-freebl-3.67.0-3.el7_9.x86_64 nss-util-3.67.0-1.el7_9.x86_64 openssl-libs-1.0.2k-24.el7_9.x86_64 pcre-8.32-17.el7.x86_64 perl-libs-5.16.3-299.el7_9.x86_64 popt-1.13-16.el7.x86_64 python-libs-2.7.5-90.el7.x86_64 rpm-libs-4.11.3-48.el7_9.x86_64 tcp_wrappers-libs-7.6-77.el7.x86_64 xz-libs-5.2.2-1.el7.x86_64 zlib-1.2.7-19.el7_9.x86_64 (gdb) bt full #0 0x00007f04af578716 in tls_complete_init (c=0x7f042fe11c98) at tls_server.c:236 dom = 0x7f042fbcccf8 data = 0x7f042f96dec0 cfg = 0x7f042f96dec0 state = S_TLS_CONNECTING sname = 0x0 srvid = 0x0 __FUNCTION__ = "tls_complete_init" #1 0x00007f04af578d07 in tls_fix_connection_unsafe (c=0x7f042fe11c98) at tls_server.c:297 __FUNCTION__ = "tls_fix_connection_unsafe" #2 0x00007f04af580784 in tls_h_encode_f (c=0x7f042fe11c98, pbuf=0x7ffd8be909e0, plen=0x7ffd8be909d8, rest_buf=0x7ffd8be909e8, rest_len=0x7ffd8be909dc, send_flags=0x7ffd8be909c0) at tls_server.c:772 n = 0 offs = 0 ssl = 0x1 tls_c = 0x7f042fe11ca0 wr_buf = "\026\003\001\002\000\001\000\001\374\003\003\276,'P^\252j\027\021S\351\252\021\342(~\347\216\351\332Hh!\vb\024\361\324+\003\177\a\000\000\254\300\060\300,\300(\300$\300\024\300\n\000\245\000\243\000\241\000\237\000k\000j\000i\000h\000\071\000\070\000\067\000\066\000\210\000\207\000\206\000\205\300\062\300.\300*\300&\300\017\300\005\000\235\000=\000\065\000\204\300/\300+\300'\300#\300\023\300\t\000\244\000\242\000\240\000\236\000g\000@\000?\000>\000\063\000\062\000\061\000\060\000\232\000\231\000\230\000\227\000E\000D\000C\000B\300\061\300-\300)\300%\300\016\300\004\000\234\000<\000/\000\226\000A\300\022\300\b\000\026\000\023\000\020\000\r\300\r\300\003"... rd = {buf = 0x18 <Address 0x18 out of bounds>, pos = 22930096, used = 1771061403, size = -1947662592} wr = {buf = 0x4b6e74a40 <Address 0x4b6e74a40 out of bounds>, pos = -1226359400, used = 32516, size = -1562640382} ssl_error = 0 err_src = 0x7f04af5afc09 "TLS write:" ip_buf = "\000\000\000\000\000\000\000\000\230\034\341/\004\177\000\000\000\000\000\000\000\000\000\000\370@\347\266\001\000\000\000\340\b\351\213\375\177\000\000f\211Q\000\000\000\000\000\000\000\000\000\001\000\000\000\060\000\000\000\060\000\000" buf = 0x7ffd8be90fd0 "OPTIONS sip:73054@82.66.66.105:46050;transport=tls SIP/2.0\r\nVia: SIP/2.0/TLS tone.company.domain:5061;branch=z9hG4bKx.2854.1.0\r\nFrom: <sip:pbxphone@tone.company.domain>;tag=uloc-6228658a-43655-2c-31dd201c-6229c21a"... len = 308 x = 4 __FUNCTION__ = "tls_h_encode_f" #3 0x000000000051e729 in tcp_send (dst=0x7ffd8be90d60, from=0x0, buf=0x7ffd8be90fd0 "OPTIONS sip:73054@82.66.66.105:46050;transport=tls SIP/2.0\r\nVia: SIP/2.0/TLS tone.company.domain:5061;branch=z9hG4bKx.2854.1.0\r\nFrom: <sip:pbxphone@tone.company.domain>;tag=uloc-6228658a-43655-2c-31dd201c-6229c21a"..., len=308) at core/tcp_main.c:2093 c = 0x7f042fe11c98 ip = {af = 2, len = 4, u = {addrl = {1765950034, 4294967295}, addr32 = {1765950034, 0, 4294967295, 0}, addr16 = {16978, 26946, 0, 0, 65535, 65535, 0, 0}, addr = "RBBi\000\000\000\000\377\377\377\377\000\000\000"}} port = 46050 fd = 22 response = {139655966192064, 0} n = 0 con_lifetime = 9600 try_local_port = 5061 rest_buf = 0x0 t_buf = 0x7ffd8be90fd0 "OPTIONS sip:73054@82.66.66.105:46050;transport=tls SIP/2.0\r\nVia: SIP/2.0/TLS tone.company.domain:5061;branch=z9hG4bKx.2854.1.0\r\nFrom: <sip:pbxphone@tone.company.domain>;tag=uloc-6228658a-43655-2c-31dd201c-6229c21a"... rest_len = 0 t_len = 308 resp = 140726950756352 t_send_flags = {f = 0, blst_imask = 0} __FUNCTION__ = "tcp_send" #4 0x00007f04b2aa0ceb in ul_ka_send (kamsg=0x7ffd8be90fc0, kadst=0x7ffd8be90d60) at ul_keepalive.c:271 __FUNCTION__ = "ul_ka_send" #5 0x00007f04b2aa0b58 in ul_ka_urecord (ur=0x7f042fca3340) at ul_keepalive.c:239 ---Type <return> to continue, or q <return> to quit--- uc = 0x7f042fca3458 kabuf = "OPTIONS sip:73054@82.66.66.105:46050;transport=tls SIP/2.0\r\nVia: SIP/2.0/TLS tone.company.domain:5061;branch=z9hG4bKx.2854.1.0\r\nFrom: <sip:pbxphone@tone.company.domain>;tag=uloc-6228658a-43655-2c-31dd201c-6229c21a"... kabuf_len = 308 kamsg = { s = 0x7ffd8be90fd0 "OPTIONS sip:73054@82.66.66.105:46050;transport=tls SIP/2.0\r\nVia: SIP/2.0/TLS tone.company.domain:5061;branch=z9hG4bKx.2854.1.0\r\nFrom: <sip:pbxphone@tone.company.domain>;tag=uloc-6228658a-43655-2c-31dd201c-6229c21a"..., len = 308} vaddr = {s = 0x7f04b6e74008 "tone.company.domain", len = 12} vport = {s = 0x7f04b6e740f8 "5061", len = 4} sdst = {s = 0x7f042fca3770 "sip:82.66.66.105:46050;transport=tls", len = 36} sproto = {s = 0x81bb4b "TLS", len = 3} duri = {user = {s = 0x0, len = 0}, passwd = {s = 0x0, len = 0}, host = {s = 0x7f042fca3774 "82.66.66.105:46050;transport=tls", len = 12}, port = {s = 0x7f042fca3781 "46050;transport=tls", len = 5}, params = {s = 0x7f042fca3787 "transport=tls", len = 13}, sip_params = {s = 0x7f042fca3787 "transport=tls", len = 13}, headers = {s = 0x0, len = 0}, port_no = 46050, proto = 3, type = SIP_URI_T, flags = (unknown: 0), transport = {s = 0x7f042fca3787 "transport=tls", len = 13}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x0, len = 0}, method = {s = 0x0, len = 0}, lr = {s = 0x0, len = 0}, r2 = {s = 0x0, len = 0}, gr = {s = 0x0, len = 0}, transport_val = {s = 0x7f042fca3791 "tls", len = 3}, ttl_val = {s = 0x0, len = 0}, user_param_val = {s = 0x0, len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 0}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x0, len = 0}} dproto = 3 '\003' he = 0xb88fa0 <he.5288> ssock = 0x7f04b6e73d98 idst = {send_sock = 0x7f04b6e73d98, to = {s = {sa_family = 2, sa_data = "\263\342RBBi\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 58035, sin_addr = {s_addr = 1765950034}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 58035, sin6_flowinfo = 1765950034, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = { 0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}, sas = {ss_family = 2, __ss_padding = "\263\342RBBi", '\000' <repeats 111 times>, __ss_align = 0}}, id = 0, send_flags = {f = 0, blst_imask = 0}, proto = 3 '\003', proto_pad0 = 0 '\000', proto_pad1 = 0} bcnt = 1 aortype = 0 i = 5 tv = {tv_sec = 1646903834, tv_usec = 680904} tnow = 1646903834 __FUNCTION__ = "ul_ka_urecord" #6 0x00007f04b2a6bb99 in mem_timer_udomain (_d=0x7f042f9c5388, istart=0, istep=1) at udomain.c:1234 ptr = 0x7f042fca3340 t = 0x7f0429d60470 <str_record_route_col> i = 28 #7 0x00007f04b2a9dd0e in synchronize_all_udomains (istart=0, istep=1) at dlist.c:966 res = 0 ptr = 0x7f042f9c5288 #8 0x00007f04b2a7b019 in ul_core_timer (ticks=1791845, param=0x0) at usrloc_mod.c:527 __FUNCTION__ = "ul_core_timer" #9 0x00000000004f1e69 in compat_old_handler (ti=28669522, tl=0x7f042f82e060, data=0x7f042f82e060) at core/timer.c:980 t = 0x7f042f82e060 #10 0x00000000004f29a5 in slow_timer_main () at core/timer.c:1105 n = 12 ret = 4294967295 tl = 0x7f042f82e060 i = 308 __FUNCTION__ = "slow_timer_main" #11 0x000000000042a707 in main_loop () at main.c:1765 i = 4 pid = 0 si = 0x0 si_desc = "udp receiver child=3 sock=128.141.18.117:5060 (tone.company.domain:5060)\000\000\000\000\000\000\000\000\200S/\004\177\000\000\000\000\000\000\000\000\000\000\220Q\234/\004\177\000\000\200\034\351\213\375\177\000\000\000R\234/\004\177\000\000B\227Z\257\004\177\000\000\300\023\006\267\004\177\000" nrprocs = 4 ---Type <return> to continue, or q <return> to quit--- woneinit = 1 __FUNCTION__ = "main_loop" #12 0x000000000043423e in main (argc=9, argv=0x7ffd8be921f8) at main.c:2942 cfg_stream = 0xf6a040 c = -1 r = 0 tmp = 0x7ffd8be935cc "" tmp_len = 1472 port = 960 proto = 32516 ahost = 0x0 aport = 0 options = 0x7d7ef8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1413124693 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffd8be920b0 p = 0xf0b5ff <Address 0xf0b5ff out of bounds> st = {st_dev = 20, st_ino = 16553497, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1646819986, tv_nsec = 228520360}, st_mtim = {tv_sec = 1646903531, tv_nsec = 836398702}, st_ctim = {tv_sec = 1646903531, tv_nsec = 836398702}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7da22f "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7d56d4 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7da234 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x7da23a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7da240 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7da249 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x7da253 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7da25d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7da268 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x7da271 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7da27c "debug", has_arg = 1, flag = 0x0, val = 1032}, { name = 0x7da282 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) (gdb) info locals cfg_stream = 0xf6a040 c = -1 r = 0 tmp = 0x7ffd8be935cc "" tmp_len = 1472 port = 960 proto = 32516 ahost = 0x0 aport = 0 options = 0x7d7ef8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1413124693 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffd8be920b0 p = 0xf0b5ff <Address 0xf0b5ff out of bounds> st = {st_dev = 20, st_ino = 16553497, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1646819986, tv_nsec = 228520360}, st_mtim = {tv_sec = 1646903531, tv_nsec = 836398702}, st_ctim = {tv_sec = 1646903531, tv_nsec = 836398702}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7da22f "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7d56d4 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7da234 "alias", has_arg = 1, flag = 0x0, val = 1024}, { name = 0x7da23a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7da240 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7da249 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, { name = 0x7da253 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7da25d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7da268 "modparam", has_arg = 1, flag = 0x0, val = 1030}, { name = 0x7da271 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7da27c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7da282 "atexit", has_arg = 1, flag = 0x0, val = 1034}, { name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) cfg_stream = 0xf6a040 c = -1 r = 0 tmp = 0x7ffd8be935cc "" tmp_len = 1472 port = 960 proto = 32516 ahost = 0x0 aport = 0 options = 0x7d7ef8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1413124693 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffd8be920b0 p = 0xf0b5ff <Address 0xf0b5ff out of bounds> st = {st_dev = 20, st_ino = 16553497, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1646819986, tv_nsec = 228520360}, st_mtim = {tv_sec = 1646903531, tv_nsec = 836398702}, st_ctim = {tv_sec = 1646903531, tv_nsec = 836398702}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7da22f "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7d56d4 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7da234 "alias", has_arg = 1, flag = 0x0, val = 1024}, { name = 0x7da23a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7da240 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7da249 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, { name = 0x7da253 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7da25d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7da268 "modparam", has_arg = 1, flag = 0x0, val = 1030}, { name = 0x7da271 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7da27c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7da282 "atexit", has_arg = 1, flag = 0x0, val = 1034}, { name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) cfg_stream = 0xf6a040 c = -1 r = 0 tmp = 0x7ffd8be935cc "" tmp_len = 1472 port = 960 proto = 32516 ahost = 0x0 aport = 0 options = 0x7d7ef8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1413124693 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffd8be920b0 p = 0xf0b5ff <Address 0xf0b5ff out of bounds> st = {st_dev = 20, st_ino = 16553497, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1646819986, tv_nsec = 228520360}, st_mtim = {tv_sec = 1646903531, tv_nsec = 836398702}, st_ctim = {tv_sec = 1646903531, tv_nsec = 836398702}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7da22f "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7d56d4 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7da234 "alias", has_arg = 1, flag = 0x0, val = 1024}, { name = 0x7da23a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7da240 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7da249 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, { name = 0x7da253 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7da25d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7da268 "modparam", has_arg = 1, flag = 0x0, val = 1030}, { name = 0x7da271 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7da27c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7da282 "atexit", has_arg = 1, flag = 0x0, val = 1034}, { name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) cfg_stream = 0xf6a040 c = -1 r = 0 tmp = 0x7ffd8be935cc "" tmp_len = 1472 port = 960 proto = 32516 ahost = 0x0 aport = 0 options = 0x7d7ef8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1413124693 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffd8be920b0 p = 0xf0b5ff <Address 0xf0b5ff out of bounds> st = {st_dev = 20, st_ino = 16553497, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1646819986, tv_nsec = 228520360}, st_mtim = {tv_sec = 1646903531, tv_nsec = 836398702}, st_ctim = {tv_sec = 1646903531, tv_nsec = 836398702}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7da22f "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7d56d4 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7da234 "alias", has_arg = 1, flag = 0x0, val = 1024}, { name = 0x7da23a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7da240 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7da249 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, { name = 0x7da253 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7da25d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7da268 "modparam", has_arg = 1, flag = 0x0, val = 1030}, { name = 0x7da271 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7da27c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7da282 "atexit", has_arg = 1, flag = 0x0, val = 1034}, { name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) list ... here goes a code of tls_server.c but if I'll leave it - Comment is too long (maximum is 65536 characters) (gdb) Line number 1513 out of range; tls_server.c has 1512 lines. ``` #### Log Messages ``` 2022-03-10T10:17:16.838905+01:00 pbxphone-0866-fe-1.company.domain /usr/local/sbin/kamailio[222489]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 27 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -V version: kamailio 5.4.7 (x86_64/linux) a19fe1 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: a19fe1 compiled on 20:40:47 Nov 22 2021 with gcc 4.8.5 ``` * **Operating System**:  ``` Linux pbxphone-0866-fe-1.company.domain 3.10.0-1160.15.2.el7.x86_64 #1 SMP Wed Feb 3 15:06:38 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3052 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3052(a)github.com>

5 13

git:master:3bcef382: rtp_media_server: init global variables
by Daniel-Constantin Mierla 25 Oct '22

25 Oct '22

Module: kamailio Branch: master Commit: 3bcef382b810b4cd2a5a03b079086fee3bbbe187 URL: https://github.com/kamailio/kamailio/commit/3bcef382b810b4cd2a5a03b079086fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-25T18:45:33+02:00 rtp_media_server: init global variables --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/3bcef382b810b4cd2a5a03b079086fe… Patch: https://github.com/kamailio/kamailio/commit/3bcef382b810b4cd2a5a03b079086fe… --- diff --git a/src/modules/rtp_media_server/rms_dialog_info.c b/src/modules/rtp_media_server/rms_dialog_info.c index cbe5798518..efd4c26f68 100644 --- a/src/modules/rtp_media_server/rms_dialog_info.c +++ b/src/modules/rtp_media_server/rms_dialog_info.c @@ -23,7 +23,7 @@ extern rms_dialog_info_t *rms_dialog_list; extern int in_rms_process; -gen_lock_t *dialog_list_mutex; +gen_lock_t *dialog_list_mutex = NULL; static void rms_action_free(rms_dialog_info_t *si) { diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index cb4939f840..bc528d40a3 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -24,20 +24,22 @@ MODULE_VERSION -rms_dialog_info_t *rms_dialog_list; -static int mod_init(void); -static void mod_destroy(void); -static int child_init(int); +rms_dialog_info_t *rms_dialog_list = NULL; + str playback_fn = {0, 0}; str log_fn = {0, 0}; static char *rms_bridge_default_route = "rms:bridged"; static char *rms_answer_default_route = "rms:start"; -int in_rms_process; -rms_t *rms; +int in_rms_process = 0; +rms_t *rms = NULL; struct tm_binds tmb; +static int mod_init(void); +static void mod_destroy(void); +static int child_init(int); + static rms_dialog_info_t *rms_dialog_create_leg(rms_dialog_info_t *di, struct sip_msg *msg); static int fixup_rms_action_play(void **param, int param_no); static int fixup_rms_bridge(void **param, int param_no);

1 0

git:master:619ff95d: nats: init global variables
by Daniel-Constantin Mierla 25 Oct '22

25 Oct '22

Module: kamailio Branch: master Commit: 619ff95d760c9b98df515ddccc5aa1e39275beeb URL: https://github.com/kamailio/kamailio/commit/619ff95d760c9b98df515ddccc5aa1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-25T10:08:42+02:00 nats: init global variables --- Modified: src/modules/nats/nats_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/619ff95d760c9b98df515ddccc5aa1e… Patch: https://github.com/kamailio/kamailio/commit/619ff95d760c9b98df515ddccc5aa1e… --- diff --git a/src/modules/nats/nats_mod.c b/src/modules/nats/nats_mod.c index 6d26b621ec..344466a586 100644 --- a/src/modules/nats/nats_mod.c +++ b/src/modules/nats/nats_mod.c @@ -35,14 +35,14 @@ nats_consumer_worker_t *nats_workers = NULL; nats_pub_worker_t *nats_pub_workers = NULL; int nats_pub_workers_num = DEFAULT_NUM_PUB_WORKERS; -int _nats_proc_count; +static int _nats_proc_count = 0; char *eventData = NULL; int *nats_pub_worker_pipes_fds = NULL; int *nats_pub_worker_pipes = NULL; static str nats_event_callback = STR_NULL; -static nats_evroutes_t _nats_rts; +static nats_evroutes_t _nats_rts = {0}; static pv_export_t nats_mod_pvs[] = { {{"natsData", (sizeof("natsData") - 1)}, PVT_OTHER,

1 0

git:master:d5afbf0f: nats: formatted module exports structures
by Daniel-Constantin Mierla 25 Oct '22

25 Oct '22

Module: kamailio Branch: master Commit: d5afbf0fb2f006d38fdfe32f6d2094638ad938b0 URL: https://github.com/kamailio/kamailio/commit/d5afbf0fb2f006d38fdfe32f6d20946… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-25T10:16:07+02:00 nats: formatted module exports structures --- Modified: src/modules/nats/nats_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d5afbf0fb2f006d38fdfe32f6d20946… Patch: https://github.com/kamailio/kamailio/commit/d5afbf0fb2f006d38fdfe32f6d20946… --- diff --git a/src/modules/nats/nats_mod.c b/src/modules/nats/nats_mod.c index 344466a586..5285158ec8 100644 --- a/src/modules/nats/nats_mod.c +++ b/src/modules/nats/nats_mod.c @@ -18,8 +18,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * */ #include "defs.h" @@ -44,36 +42,40 @@ static str nats_event_callback = STR_NULL; static nats_evroutes_t _nats_rts = {0}; +/* clang-format off */ static pv_export_t nats_mod_pvs[] = { - {{"natsData", (sizeof("natsData") - 1)}, PVT_OTHER, + {{"natsData", (sizeof("natsData") - 1)}, PVT_OTHER, nats_pv_get_event_payload, 0, 0, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"nats_url", PARAM_STRING | USE_FUNC_PARAM, (void *)_init_nats_server_url_add}, - {"num_publish_workers", INT_PARAM, &nats_pub_workers_num}, - {"subject_queue_group", PARAM_STRING | USE_FUNC_PARAM, - (void *)_init_nats_sub_add}, - {"event_callback", PARAM_STR, &nats_event_callback}, - {0, 0, 0} + {"nats_url", PARAM_STRING|USE_FUNC_PARAM, (void*)_init_nats_server_url_add}, + {"num_publish_workers", INT_PARAM, &nats_pub_workers_num}, + {"subject_queue_group", PARAM_STRING|USE_FUNC_PARAM, (void*)_init_nats_sub_add}, + {"event_callback", PARAM_STR, &nats_event_callback}, + {0, 0, 0} }; -static cmd_export_t cmds[] = {{"nats_publish", (cmd_function)w_nats_publish_f, - 2, fixup_publish_get_value, - fixup_publish_get_value_free, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +static cmd_export_t cmds[] = { + {"nats_publish", (cmd_function)w_nats_publish_f, + 2, fixup_publish_get_value, fixup_publish_get_value_free, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; struct module_exports exports = { - "nats", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* Exported functions */ - params, /* Exported parameters */ - 0, /* exported MI functions */ - nats_mod_pvs, /* exported pseudo-variables */ - 0, /* response function*/ - mod_init, /* module initialization function */ - mod_child_init, /* per-child init function */ - mod_destroy /* destroy function */ + "nats", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* Exported functions */ + params, /* Exported parameters */ + 0, /* exported MI functions */ + nats_mod_pvs, /* exported pseudo-variables */ + 0, /* response function*/ + mod_init, /* module initialization function */ + mod_child_init, /* per-child init function */ + mod_destroy /* destroy function */ }; +/* clang-format on */ static void onMsg( natsConnection *nc, natsSubscription *sub, natsMsg *msg, void *closure)

1 0

git:master:51fc7673: pv: set str type for $hfl()
by Daniel-Constantin Mierla 25 Oct '22

25 Oct '22

Module: kamailio Branch: master Commit: 51fc76737319f9b06ee4aa86e8c15c3fd5b62248 URL: https://github.com/kamailio/kamailio/commit/51fc76737319f9b06ee4aa86e8c15c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-25T09:53:26+02:00 pv: set str type for $hfl() --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/51fc76737319f9b06ee4aa86e8c15c3… Patch: https://github.com/kamailio/kamailio/commit/51fc76737319f9b06ee4aa86e8c15c3… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 903389bf59..d279afccbf 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2287,6 +2287,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } + res->flags = PV_VAL_STR; if((tv.flags == 0) && (tv.ri==HDR_VIA_T)) { if(msg->h_via1==NULL) { LM_WARN("no Via header\n");

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev