- sr-dev - kamailio.org

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev