sr-dev April 2019

sr-dev@lists.kamailio.org

23 participants
318 discussions

git:5.2:cbef48a1: app_python: use system time to compute execution duration
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.2 Commit: cbef48a15d023ae602bb88bafdcf69d4e1b42e27 URL: https://github.com/kamailio/kamailio/commit/cbef48a15d023ae602bb88bafdcf69d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T11:44:11+02:00 app_python: use system time to compute execution duration (cherry picked from commit a300cf008b86dec22a1006328ab73c3ce399c6c3) --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/cbef48a15d023ae602bb88bafdcf69d… Patch: https://github.com/kamailio/kamailio/commit/cbef48a15d023ae602bb88bafdcf69d… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 2bb60b9948..5f2b4b3f8f 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -677,24 +677,29 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) { sr_kemi_t *ket = NULL; PyObject *ret = NULL; - unsigned int ms = 0; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; ket = sr_apy_kemi_export_get(idx); if(ket==NULL) { return sr_kemi_apy_return_false(); } - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()); + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); } ret = sr_apy_kemi_exec_func_ex(ket, self, args, idx); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action) - && is_printable(cfg_get(core, core_cfg, latency_log))) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { pstate = PyThreadState_GET(); if (pstate != NULL && pstate->frame != NULL) { pframe = pstate->frame; @@ -702,9 +707,9 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" - " took too long [%u ms] (file:%s func:%s line:%d)\n", + " took too long [%u us] (file:%s func:%s line:%d)\n", (ket->mname.len>0)?ket->mname.s:"", - (ket->mname.len>0)?".":"", ket->fname.s, ms, + (ket->mname.len>0)?".":"", ket->fname.s, tdiff, (pframe)?PyString_AsString(pframe->f_code->co_filename):"", (pframe)?PyString_AsString(pframe->f_code->co_name):"", (pframe)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0);

1 0

git:5.2:c06fb117: app_ruby: proper check for param types
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.2 Commit: c06fb117baeaed51b488a9e9adceaaf5b1413f90 URL: https://github.com/kamailio/kamailio/commit/c06fb117baeaed51b488a9e9adceaaf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T11:44:00+02:00 app_ruby: proper check for param types (cherry picked from commit 6d43eacd6d5b78fe857267e70b7fa85519a7d5b6) --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/c06fb117baeaed51b488a9e9adceaaf… Patch: https://github.com/kamailio/kamailio/commit/c06fb117baeaed51b488a9e9adceaaf… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index ff944ca20e..12f539f364 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -353,7 +353,7 @@ static VALUE app_ruby_pv_seti(int argc, VALUE* argv, VALUE self) return Qfalse; } - if(!RB_TYPE_P(argv[2], T_FIXNUM)) { + if(!RB_TYPE_P(argv[1], T_FIXNUM)) { LM_ERR("invalid pv val parameter type\n"); return Qfalse; } @@ -410,7 +410,7 @@ static VALUE app_ruby_pv_sets(int argc, VALUE* argv, VALUE self) return Qfalse; } - if(!RB_TYPE_P(argv[2], T_FIXNUM)) { + if(!RB_TYPE_P(argv[1], T_STRING)) { LM_ERR("invalid pv val parameter type\n"); return Qfalse; } @@ -600,11 +600,11 @@ static VALUE app_ruby_sr_modf(int argc, VALUE* argv, VALUE self) } /* first is function name, then parameters */ for(i=0; i<argc; i++) { - if(!RB_TYPE_P(argv[0], T_STRING)) { + if(!RB_TYPE_P(argv[i], T_STRING)) { LM_ERR("invalid parameter type (%d)\n", i); return INT2NUM(-1); } - rbv[i] = (char*)StringValuePtr(argv[0]); + rbv[i] = (char*)StringValuePtr(argv[i]); } LM_ERR("request to execute cfg function '%s'\n", rbv[0]); /* pkg copy only parameters */

1 0

git:5.2:eb5f2096: tcpops: set tcp keepalive values when available per option
by Daniel-Constantin Mierla 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.2 Commit: eb5f2096282e93b14fecfc64f22aba0db467dec5 URL: https://github.com/kamailio/kamailio/commit/eb5f2096282e93b14fecfc64f22aba0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-03T11:43:39+02:00 tcpops: set tcp keepalive values when available per option - cover macos and *bsd for couple of options (cherry picked from commit 278fd5a892c14f23e9f2b8d1f3fd3232c1d319f3) --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/eb5f2096282e93b14fecfc64f22aba0… Patch: https://github.com/kamailio/kamailio/commit/eb5f2096282e93b14fecfc64f22aba0… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index cab215365c..1c70eb3409 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -130,8 +130,13 @@ int tcpops_acquire_fd_from_tcpmain(int conid, int *fd) return 0; } -#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPIDLE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL) - #warning "TCP keepalive is not fully supported by your platform" +#if !defined(HAVE_SO_KEEPALIVE) || !defined(HAVE_TCP_KEEPCNT) || !defined(HAVE_TCP_KEEPINTVL) + #define KSR_TCPOPS_NOKEEPALIVE +#endif + +#ifdef KSR_TCPOPS_NOKEEPALIVE + +#warning "TCP keepalive options not supported by this platform" int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd) { @@ -144,6 +149,7 @@ int tcpops_keepalive_disable(int fd, int closefd) LM_ERR("tcp_keepalive_disable() failed: this module does not support your platform\n"); return -1; } + #else int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd) @@ -156,11 +162,15 @@ int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int close LM_ERR("failed to enable SO_KEEPALIVE: %s\n", strerror(errno)); return -1; } else { - +#ifdef HAVE_TCP_KEEPIDLE if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &idle, sizeof(idle))<0){ LM_ERR("failed to set keepalive idle interval: %s\n", strerror(errno)); } +#else + #warning "TCP_KEEPIDLE option not supported by this platform" + LM_DBG("TCP_KEEPIDLE option not available - ignoring\n"); +#endif if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &count, sizeof(count))<0){

1 0

git:master:c5278237: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 03 Apr '19

03 Apr '19

Module: kamailio Branch: master Commit: c5278237a53f232991843a91f8d8e93e1de4de7f URL: https://github.com/kamailio/kamailio/commit/c5278237a53f232991843a91f8d8e93… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-03T09:17:50+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/c5278237a53f232991843a91f8d8e93… Patch: https://github.com/kamailio/kamailio/commit/c5278237a53f232991843a91f8d8e93… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index e7cc136dd2..1add3075d2 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -223,6 +223,13 @@ Chapter 1. Admin Guide * The “uac_replace_*” functions can only be run once on the same SIP request. Try to save needed changes in a pseudovariable and apply them once. + There is also a limitation regarding the use of the + “msg_apply_changes()” function together with the “uac_replace_*” + functions for messages that are loose-routed (e.g. Re-INVITE + requests). In this case you need to call the “loose_route()” + function after the replace and msg_apply_changes. Otherwise + Kamailio can create replies with wrong From/To headers (e.g. for + the 100 - Trying reply in the Re-INVITE example). 2. Dependencies

1 0

git:5.2:3e78f6d0: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.2 Commit: 3e78f6d060466363f0d61c69f6196f4d09e35ae9 URL: https://github.com/kamailio/kamailio/commit/3e78f6d060466363f0d61c69f6196f4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-03T09:17:20+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/3e78f6d060466363f0d61c69f6196f4… Patch: https://github.com/kamailio/kamailio/commit/3e78f6d060466363f0d61c69f6196f4… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index e7cc136dd2..1add3075d2 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -223,6 +223,13 @@ Chapter 1. Admin Guide * The “uac_replace_*” functions can only be run once on the same SIP request. Try to save needed changes in a pseudovariable and apply them once. + There is also a limitation regarding the use of the + “msg_apply_changes()” function together with the “uac_replace_*” + functions for messages that are loose-routed (e.g. Re-INVITE + requests). In this case you need to call the “loose_route()” + function after the replace and msg_apply_changes. Otherwise + Kamailio can create replies with wrong From/To headers (e.g. for + the 100 - Trying reply in the Re-INVITE example). 2. Dependencies

1 0

git:5.1:d57e47ea: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.1 Commit: d57e47ea5e6ab26258ca596ff85c3fa7e5b0ded6 URL: https://github.com/kamailio/kamailio/commit/d57e47ea5e6ab26258ca596ff85c3fa… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-03T09:16:45+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/d57e47ea5e6ab26258ca596ff85c3fa… Patch: https://github.com/kamailio/kamailio/commit/d57e47ea5e6ab26258ca596ff85c3fa… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index ba1c3d1bb7..34d11daab0 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -208,6 +208,13 @@ Chapter 1. Admin Guide * The “uac_replace_*” functions can only be run once on the same SIP request. Try to save needed changes in a pseudovariable and apply them once. + There is also a limitation regarding the use of the + “msg_apply_changes()” function together with the “uac_replace_*” + functions for messages that are loose-routed (e.g. Re-INVITE + requests). In this case you need to call the “loose_route()” + function after the replace and msg_apply_changes. Otherwise + Kamailio can create replies with wrong From/To headers (e.g. for + the 100 - Trying reply in the Re-INVITE example). 2. Dependencies

1 0

git:5.2:ecb15d3f: uac: document limitation regarding uac_replace_* with loose_route and msg_apply_changes
by Henning Westerholt 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.2 Commit: ecb15d3f84185c00450e8ab68df52ffbb9003d83 URL: https://github.com/kamailio/kamailio/commit/ecb15d3f84185c00450e8ab68df52ff… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-04-03T09:06:38+02:00 uac: document limitation regarding uac_replace_* with loose_route and msg_apply_changes (cherry picked from commit 05696125b775d3c275b2516ae34e73b91ce51c9a) --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ecb15d3f84185c00450e8ab68df52ff… Patch: https://github.com/kamailio/kamailio/commit/ecb15d3f84185c00450e8ab68df52ff… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index fe4046a733..6e514eeea1 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -54,6 +54,16 @@ SIP request. Try to save needed changes in a pseudovariable and apply them once. </para> + <para> + There is also a limitation regarding the use of the + <quote>msg_apply_changes()</quote> function together with the + <quote>uac_replace_*</quote> functions for messages that are + loose-routed (e.g. Re-INVITE requests). In this case you need + to call the <quote>loose_route()</quote> function after the + replace and msg_apply_changes. Otherwise Kamailio can create + replies with wrong From/To headers (e.g. for the 100 - Trying + reply in the Re-INVITE example). + </para> </listitem> </itemizedlist> </section>

1 0

git:5.1:b0a9b150: uac: document limitation regarding uac_replace_* with loose_route and msg_apply_changes
by Henning Westerholt 03 Apr '19

03 Apr '19

Module: kamailio Branch: 5.1 Commit: b0a9b1509c08af68e13ee5cef1214ae416d4c542 URL: https://github.com/kamailio/kamailio/commit/b0a9b1509c08af68e13ee5cef1214ae… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-04-03T09:06:45+02:00 uac: document limitation regarding uac_replace_* with loose_route and msg_apply_changes (cherry picked from commit 05696125b775d3c275b2516ae34e73b91ce51c9a) --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b0a9b1509c08af68e13ee5cef1214ae… Patch: https://github.com/kamailio/kamailio/commit/b0a9b1509c08af68e13ee5cef1214ae… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 78b8f5615b..94a703218f 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -54,6 +54,16 @@ SIP request. Try to save needed changes in a pseudovariable and apply them once. </para> + <para> + There is also a limitation regarding the use of the + <quote>msg_apply_changes()</quote> function together with the + <quote>uac_replace_*</quote> functions for messages that are + loose-routed (e.g. Re-INVITE requests). In this case you need + to call the <quote>loose_route()</quote> function after the + replace and msg_apply_changes. Otherwise Kamailio can create + replies with wrong From/To headers (e.g. for the 100 - Trying + reply in the Re-INVITE example). + </para> </listitem> </itemizedlist> </section>

1 0

git:master:05696125: uac: document limitation regarding uac_replace_* with loose_route and msg_apply_changes
by Henning Westerholt 03 Apr '19

03 Apr '19

Module: kamailio Branch: master Commit: 05696125b775d3c275b2516ae34e73b91ce51c9a URL: https://github.com/kamailio/kamailio/commit/05696125b775d3c275b2516ae34e73b… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-04-03T09:05:32+02:00 uac: document limitation regarding uac_replace_* with loose_route and msg_apply_changes --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/05696125b775d3c275b2516ae34e73b… Patch: https://github.com/kamailio/kamailio/commit/05696125b775d3c275b2516ae34e73b… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index fe4046a733..6e514eeea1 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -54,6 +54,16 @@ SIP request. Try to save needed changes in a pseudovariable and apply them once. </para> + <para> + There is also a limitation regarding the use of the + <quote>msg_apply_changes()</quote> function together with the + <quote>uac_replace_*</quote> functions for messages that are + loose-routed (e.g. Re-INVITE requests). In this case you need + to call the <quote>loose_route()</quote> function after the + replace and msg_apply_changes. Otherwise Kamailio can create + replies with wrong From/To headers (e.g. for the 100 - Trying + reply in the Re-INVITE example). + </para> </listitem> </itemizedlist> </section>

1 0

[kamailio/kamailio] How to add timestamp when kamailio dumps? (#1920)
by aleczmw 03 Apr '19

03 Apr '19

here is the current kamailio log example. ### 0(20) INFO: sipcapture [sipcapture.c:459]: parse_table_names(): INFO: table name:sip_capture 0(20) ERROR: db_mysql [km_my_con.c:129]: db_mysql_new_connection(): driver error: Lost connection to MySQL server at 'waiting for initial communication packet', system error: 110 "Connection timed out" could we add timestamp for printing log? example: 0(20) **### Y/M/D/H/M/S** INFO: sipcapture [sipcapture.c:459]: parse_table_names(): INFO: table name:sip_capture 0(20) ERROR: db_mysql [km_my_con.c:129]: db_mysql_new_connection(): driver error: Lost connection to MySQL server at 'waiting for initial communication packet', system error: 110 "Connection timed out" -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1920

2 6

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2019