sr-dev

sr-dev@lists.kamailio.org

20 participants
45178 discussions

git:5.4:d0f7c705: core: strutils - trim trailing spaces when comparing hdr names
by Daniel-Constantin Mierla 16 Jul '20

16 Jul '20

Module: kamailio Branch: 5.4 Commit: d0f7c7056b32351cac0b20ce24b074d9be8459a2 URL: https://github.com/kamailio/kamailio/commit/d0f7c7056b32351cac0b20ce24b074d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-16T17:31:06+02:00 core: strutils - trim trailing spaces when comparing hdr names (cherry picked from commit 6d76b79b81bf448fa1f34753c1d000dc6c1870e0) --- Modified: src/core/strutils.c Modified: src/core/strutils.h --- Diff: https://github.com/kamailio/kamailio/commit/d0f7c7056b32351cac0b20ce24b074d… Patch: https://github.com/kamailio/kamailio/commit/d0f7c7056b32351cac0b20ce24b074d… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index e106dfe713..75d5b1ec10 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -28,6 +28,7 @@ #include "dprint.h" #include "ut.h" +#include "trim.h" #include "strutils.h" /*! \brief @@ -453,16 +454,24 @@ int cmpi_str(str *s1, str *s2) int cmp_hdrname_str(str *s1, str *s2) { + str n1, n2; + n1 = *s1; + n2 = *s2; + trim_trailing(&n1); + trim_trailing(&n2); /* todo: parse hdr name and compare with short/long alternative */ - return cmpi_str(s1, s2); + return cmpi_str(&n1, &n2); } -int cmp_hdrname_strzn(str *s1, char *s2, size_t n) +int cmp_hdrname_strzn(str *s1, char *s2, size_t len) { - str s; - s.s = s2; - s.len = n; - return cmpi_str(s1, &s); + str n1, n2; + n1 = *s1; + n2.s = s2; + n2.len = len; + trim_trailing(&n1); + trim_trailing(&n2); + return cmpi_str(&n1, &n2); } int cmp_str_params(str *s1, str *s2) diff --git a/src/core/strutils.h b/src/core/strutils.h index 4747f898fd..fbaef7ee7a 100644 --- a/src/core/strutils.h +++ b/src/core/strutils.h @@ -43,7 +43,7 @@ int cmp_str(str *s1, str *s2); int cmpi_str(str *s1, str *s2); int cmp_hdrname_str(str *s1, str *s2); -int cmp_hdrname_strzn(str *s1, char *s2, size_t n); +int cmp_hdrname_strzn(str *s1, char *s2, size_t len); int cmp_uri_str(str *s1, str *s2); int cmp_uri_light_str(str *s1, str *s2); int cmp_aor_str(str *s1, str *s2);

1 0

git:5.4:4584e17b: dispatcher: update state if sending keepalive OPTIONS fails
by Daniel-Constantin Mierla 16 Jul '20

16 Jul '20

Module: kamailio Branch: 5.4 Commit: 4584e17b98f338916cc89dac6e1700f250cdf501 URL: https://github.com/kamailio/kamailio/commit/4584e17b98f338916cc89dac6e1700f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-16T17:31:06+02:00 dispatcher: update state if sending keepalive OPTIONS fails - it can be due to DNS resolving failure, therefore needs to be counted for making it inactive, otherwise keeps failing and writting errors (cherry picked from commit 6c77c86ab8fdec51293f0d850b9b9771d6266816) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/4584e17b98f338916cc89dac6e1700f… Patch: https://github.com/kamailio/kamailio/commit/4584e17b98f338916cc89dac6e1700f… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 9903ae0eb8..b78a89fdb5 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3365,6 +3365,8 @@ void ds_ping_set(ds_set_t *node) int i, j; str ping_from; str obproxy; + int state; + ds_rctx_t rctx; if(!node) return; @@ -3427,8 +3429,25 @@ void ds_ping_set(ds_set_t *node) if(tmb.t_request(&uac_r, &node->dlist[j].uri, &node->dlist[j].uri, &ping_from, &obproxy) < 0) { - LM_ERR("unable to ping [%.*s]\n", node->dlist[j].uri.len, - node->dlist[j].uri.s); + LM_ERR("unable to ping [%.*s] in group [%d]\n", + node->dlist[j].uri.len, node->dlist[j].uri.s, + node->id); + state = DS_TRYING_DST; + if(ds_probing_mode != DS_PROBE_NONE) { + state |= DS_PROBING_DST; + } + memset(&rctx, 0, sizeof(ds_rctx_t)); + rctx.code = 500; + rctx.reason.s = "Sending keepalive failed"; + rctx.reason.len = 24; + /* check if meantime someone disabled the target via RPC */ + if(!(node->dlist[j].flags & DS_DISABLED_DST) + && ds_update_state(NULL, node->id, &node->dlist[j].uri, + state, &rctx) != 0) { + LM_ERR("Setting the probing state failed (%.*s, group %d)\n", + node->dlist[j].uri.len, node->dlist[j].uri.s, + node->id); + } } } }

1 0

git:5.4:afc66f39: misc/examples: kemi lua - added debug callback function
by Daniel-Constantin Mierla 16 Jul '20

16 Jul '20

Module: kamailio Branch: 5.4 Commit: afc66f390e135f091dfa7abcc058175817350589 URL: https://github.com/kamailio/kamailio/commit/afc66f390e135f091dfa7abcc058175… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-16T17:31:06+02:00 misc/examples: kemi lua - added debug callback function - commented - can be enabled to track the execution trace of the lua script (cherry picked from commit 491a8327933cb4471260fdd09ff93296a7a0ccfd) --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/afc66f390e135f091dfa7abcc058175… Patch: https://github.com/kamailio/kamailio/commit/afc66f390e135f091dfa7abcc058175… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index f5906d0bde..a896529965 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -12,6 +12,43 @@ -- the execution of the script. Use KSR.x.exit() after it or KSR.x.drop() -- +-- debug callback function to print details of execution trace +--[[ +local ksr_exec_level=0 + +local function ksr_exec_hook(event) + local s = ""; + local t = debug.getinfo(3) + s = s .. ksr_exec_level .. ">>> " .. string.rep(" ", ksr_exec_level); + if t~=nil and t.currentline>=0 then + s = s .. t.short_src .. ":" .. t.currentline .. " "; + end + t=debug.getinfo(2) + if event=="call" then + ksr_exec_level = ksr_exec_level + 1; + else + ksr_exec_level = ksr_exec_level - 1; + if ksr_exec_level < 0 then + ksr_exec_level = 0; + end + end + if t.what=="main" then + if event=="call" then + s = s .. "begin " .. t.short_src; + else + s = s .. "end " .. t.short_src; + end + elseif t.what=="Lua" then + s = s .. event .. " " .. t.name or "(Lua)" .. " <" .. t.linedefined .. ":" .. t.short_src .. ">"; + else + s = s .. event .. " " .. t.name or "(C)" .. " [" .. t.what .. "] "; + end + KSR.info(s .. "\n"); +end + +debug.sethook(ksr_exec_hook, "cr") +ksr_exec_level=0 +]]-- -- global variables corresponding to defined values (e.g., flags) in kamailio.cfg FLT_ACC=1

1 0

git:5.4:0cf30ae1: core: don't close tcp connection for dropped non sip messages
by Daniel-Constantin Mierla 16 Jul '20

16 Jul '20

Module: kamailio Branch: 5.4 Commit: 0cf30ae1c4128bca8882109ec34c34a2dd2b4cef URL: https://github.com/kamailio/kamailio/commit/0cf30ae1c4128bca8882109ec34c34a… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-16T17:31:06+02:00 core: don't close tcp connection for dropped non sip messages (cherry picked from commit 007f98692bb6f7cb35adbb86ec6fb06f034614cc) --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/0cf30ae1c4128bca8882109ec34c34a… Patch: https://github.com/kamailio/kamailio/commit/0cf30ae1c4128bca8882109ec34c34a… --- diff --git a/src/core/receive.c b/src/core/receive.c index a76fd14519..42f5382bbe 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -300,7 +300,7 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) LM_DBG("attempt of nonsip message processing failed\n"); } else if(ret == NONSIP_MSG_DROP) { LM_DBG("nonsip message processing completed\n"); - goto error02; + goto end; } } if(errsipmsg==1) {

1 0

git:5.4:ef819eb3: sipdump: if drop executed in event route, skip writing to file
by Daniel-Constantin Mierla 16 Jul '20

16 Jul '20

Module: kamailio Branch: 5.4 Commit: ef819eb33cdaa8e143148915296c60e03179e819 URL: https://github.com/kamailio/kamailio/commit/ef819eb33cdaa8e143148915296c60e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-16T17:31:06+02:00 sipdump: if drop executed in event route, skip writing to file (cherry picked from commit 1672a9b356cc864310d0ade139d7c8bb6c4c4b11) --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ef819eb33cdaa8e143148915296c60e… Patch: https://github.com/kamailio/kamailio/commit/ef819eb33cdaa8e143148915296c60e… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index a9868462e7..41550e78f2 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -323,7 +323,7 @@ static sipdump_info_t* sipdump_event_info = NULL; /** * */ -void sipdump_event_route(sipdump_info_t* sdi) +int sipdump_event_route(sipdump_info_t* sdi) { int backup_rt; run_act_ctx_t ctx; @@ -352,6 +352,10 @@ void sipdump_event_route(sipdump_info_t* sdi) } sipdump_event_info = NULL; set_route_type(backup_rt); + if(ctx.run_flags & DROP_R_F) { + return DROP_R_F; + } + return RETURN_R_F; } /** @@ -396,7 +400,10 @@ int sipdump_msg_received(sr_event_param_t *evp) get_valid_proto_string(evp->rcv->proto, 0, 0, &sdi.proto); if(sipdump_mode & SIPDUMP_MODE_EVROUTE) { - sipdump_event_route(&sdi); + if(sipdump_event_route(&sdi) == DROP_R_F) { + /* drop() used in event_route - all done */ + return 0; + } } if(!(sipdump_mode & SIPDUMP_MODE_WFILE)) {

1 0

git:5.4:4f3c6467: sipdump: docs - note about use of drop() in event route
by Daniel-Constantin Mierla 16 Jul '20

16 Jul '20

Module: kamailio Branch: 5.4 Commit: 4f3c646772e3a6c769e8ff58bb42cf19186c39f4 URL: https://github.com/kamailio/kamailio/commit/4f3c646772e3a6c769e8ff58bb42cf1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-16T17:31:06+02:00 sipdump: docs - note about use of drop() in event route (cherry picked from commit f984505b3ed41b7faf0fca5ab978c52240cd60a0) --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4f3c646772e3a6c769e8ff58bb42cf1… Patch: https://github.com/kamailio/kamailio/commit/4f3c646772e3a6c769e8ff58bb42cf1… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index f783cb957f..0a603c2803 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -284,6 +284,10 @@ sipdump_send("cfg"); Executed when sipdump handles messages and mode parameter has flag 2 set. The variable $sipdump(...) is available inside the event route. </para> + <para> + If drop() is used in event_route, then writing to file is no longer + done when mode parameter has also the flag 1 set. + </para> <programlisting format="linespecific"> ... event_route[sipdump:msg] {

1 0

git:5.2:f2a987a8: db_redis: fix unfiltered table deletion
by Richard Fuchs 16 Jul '20

16 Jul '20

Module: kamailio Branch: 5.2 Commit: f2a987a8c4aacb1538f44b890f922d495ef103f6 URL: https://github.com/kamailio/kamailio/commit/f2a987a8c4aacb1538f44b890f922d4… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2020-07-16T11:26:39-04:00 db_redis: fix unfiltered table deletion --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/f2a987a8c4aacb1538f44b890f922d4… Patch: https://github.com/kamailio/kamailio/commit/f2a987a8c4aacb1538f44b890f922d4… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index acddbdfd5b..82054a9b51 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -1329,12 +1329,6 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con if (tmp) db_redis_key_free(&tmp); - // skip if delete all rows - if (!*manual_keys_count) { - db_redis_key_free (&query_v); - goto skipkeys; - } - if (db_redis_key_prepend_string(&query_v, "HMGET", 5) != 0) { LM_ERR("Failed to set hmget command to pre-delete query\n"); goto error; @@ -1426,7 +1420,6 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con db_vals = NULL; db_redis_free_reply(&reply); - skipkeys: if (db_redis_key_add_string(&query_v, "DEL", 3) != 0) { LM_ERR("Failed to add del command to delete query\n"); goto error; @@ -2064,6 +2057,7 @@ int db_redis_delete(const db1_con_t* _h, const db_key_t* _k, } else { LM_DBG("no columns given to build query keys, falling back to full table scan\n"); keys_count = 0; + do_table_scan = 1; } if (db_redis_perform_delete(_h, con, _k, _v, query_ops, _n,

1 0

git:5.3:3bc06fdb: db_redis: fix unfiltered table deletion
by Richard Fuchs 16 Jul '20

16 Jul '20

Module: kamailio Branch: 5.3 Commit: 3bc06fdb87d86d3269f7774f52b8040be1c1f76c URL: https://github.com/kamailio/kamailio/commit/3bc06fdb87d86d3269f7774f52b8040… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2020-07-16T11:26:20-04:00 db_redis: fix unfiltered table deletion --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/3bc06fdb87d86d3269f7774f52b8040… Patch: https://github.com/kamailio/kamailio/commit/3bc06fdb87d86d3269f7774f52b8040… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 97fd19ee01..8965f7d65a 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -1325,12 +1325,6 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con if (tmp) db_redis_key_free(&tmp); - // skip if delete all rows - if (!*manual_keys_count) { - db_redis_key_free (&query_v); - goto skipkeys; - } - if (db_redis_key_prepend_string(&query_v, "HMGET", 5) != 0) { LM_ERR("Failed to set hmget command to pre-delete query\n"); goto error; @@ -1422,7 +1416,6 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con db_vals = NULL; db_redis_free_reply(&reply); - skipkeys: if (db_redis_key_add_string(&query_v, "DEL", 3) != 0) { LM_ERR("Failed to add del command to delete query\n"); goto error; @@ -2060,6 +2053,7 @@ int db_redis_delete(const db1_con_t* _h, const db_key_t* _k, } else { LM_DBG("no columns given to build query keys, falling back to full table scan\n"); keys_count = 0; + do_table_scan = 1; } if (db_redis_perform_delete(_h, con, _k, _v, query_ops, _n,

1 0

git:5.4:a472aaae: db_redis: fix unfiltered table deletion
by Richard Fuchs 16 Jul '20

16 Jul '20

Module: kamailio Branch: 5.4 Commit: a472aaae69f7bd483c232cc5c9f59078bad1e938 URL: https://github.com/kamailio/kamailio/commit/a472aaae69f7bd483c232cc5c9f5907… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2020-07-16T11:26:05-04:00 db_redis: fix unfiltered table deletion --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/a472aaae69f7bd483c232cc5c9f5907… Patch: https://github.com/kamailio/kamailio/commit/a472aaae69f7bd483c232cc5c9f5907… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 9c81385a39..c9a25adf36 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -1698,12 +1698,6 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con if (tmp) db_redis_key_free(&tmp); - // skip if delete all rows - if (!*manual_keys_count) { - db_redis_key_free (&query_v); - goto skipkeys; - } - if (db_redis_key_prepend_string(&query_v, "HMGET", 5) != 0) { LM_ERR("Failed to set hmget command to pre-delete query\n"); goto error; @@ -1795,7 +1789,6 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con db_vals = NULL; db_redis_free_reply(&reply); - skipkeys: if (db_redis_key_add_string(&query_v, "DEL", 3) != 0) { LM_ERR("Failed to add del command to delete query\n"); goto error; @@ -2655,6 +2648,7 @@ int db_redis_delete(const db1_con_t* _h, const db_key_t* _k, } else { LM_DBG("no columns given to build query keys, falling back to full table scan\n"); keys_count = 0; + do_table_scan = 1; } if (db_redis_perform_delete(_h, con, _k, _v, query_ops, _n,

1 0

git:master:8e9b8fc4: db_redis: fix unfiltered table deletion
by Richard Fuchs 16 Jul '20

16 Jul '20

Module: kamailio Branch: master Commit: 8e9b8fc4f384eac90c94beffdc5c87a04506d2b4 URL: https://github.com/kamailio/kamailio/commit/8e9b8fc4f384eac90c94beffdc5c87a… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2020-07-16T11:25:04-04:00 db_redis: fix unfiltered table deletion --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/8e9b8fc4f384eac90c94beffdc5c87a… Patch: https://github.com/kamailio/kamailio/commit/8e9b8fc4f384eac90c94beffdc5c87a… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 9c81385a39..c9a25adf36 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -1698,12 +1698,6 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con if (tmp) db_redis_key_free(&tmp); - // skip if delete all rows - if (!*manual_keys_count) { - db_redis_key_free (&query_v); - goto skipkeys; - } - if (db_redis_key_prepend_string(&query_v, "HMGET", 5) != 0) { LM_ERR("Failed to set hmget command to pre-delete query\n"); goto error; @@ -1795,7 +1789,6 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con db_vals = NULL; db_redis_free_reply(&reply); - skipkeys: if (db_redis_key_add_string(&query_v, "DEL", 3) != 0) { LM_ERR("Failed to add del command to delete query\n"); goto error; @@ -2655,6 +2648,7 @@ int db_redis_delete(const db1_con_t* _h, const db_key_t* _k, } else { LM_DBG("no columns given to build query keys, falling back to full table scan\n"); keys_count = 0; + do_table_scan = 1; } if (db_redis_perform_delete(_h, con, _k, _v, query_ops, _n,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev