sr-dev March 2022

sr-dev@lists.kamailio.org

10 participants
244 discussions

git:master:473e051b: pv-headers: ignore skip-header config on clone_branch

by Victor Seva

Module: kamailio Branch: master Commit: 473e051bef688d9e78bc4c28abebbedfffd1f549 URL: https://github.com/kamailio/kamailio/commit/473e051bef688d9e78bc4c28abebbed… Author: Sipwise Development Team <support(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-15T08:54:47+01:00 pv-headers: ignore skip-header config on clone_branch --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/473e051bef688d9e78bc4c28abebbed… Patch: https://github.com/kamailio/kamailio/commit/473e051bef688d9e78bc4c28abebbed… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index b8e4f92e61..8b2acbf08b 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -515,8 +515,6 @@ int pvh_clone_branch_xavi(struct sip_msg *msg, str *xname) } do { - if(pvh_skip_header(&sub->name)) - continue; if(sub->val.type == SR_XTYPE_DATA) continue; if(pvh_xavi_append_value(&sub->name, &sub->val, &br_xavi->val.v.xavp)

2 years, 11 months

git:5.3:f35c7fe0: db_redis: clean previous connection before trying to reconnect

by Victor Seva

Module: kamailio Branch: 5.3 Commit: f35c7fe0016fea44bbfa4d686f985cf5db4a3372 URL: https://github.com/kamailio/kamailio/commit/f35c7fe0016fea44bbfa4d686f985cf… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-15T08:50:54+01:00 db_redis: clean previous connection before trying to reconnect (cherry picked from commit 78c8d084e30373aacc456fd41062b68e6e82ea6f) (cherry picked from commit 2e0537ba306219df0ce71605848e811027c69a57) (cherry picked from commit 78506f7f2dfcdbf2bc9e21168929437516a368bd) --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/f35c7fe0016fea44bbfa4d686f985cf… Patch: https://github.com/kamailio/kamailio/commit/f35c7fe0016fea44bbfa4d686f985cf… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index 5a5887d658..bb7423fcbd 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -111,6 +111,11 @@ int db_redis_connect(km_redis_con_t *con) { db = atoi(con->id->database); reply = NULL; + if(con->con) { + LM_DBG("free old connection first\n"); + redisFree(con->con); + } + // TODO: introduce require_master mod-param and check if we're indeed master // TODO: on carrier, if we have db fail-over, the currently connected // redis server will become slave without dropping connections?

2 years, 11 months

git:5.4:78506f7f: db_redis: clean previous connection before trying to reconnect

by Victor Seva

Module: kamailio Branch: 5.4 Commit: 78506f7f2dfcdbf2bc9e21168929437516a368bd URL: https://github.com/kamailio/kamailio/commit/78506f7f2dfcdbf2bc9e21168929437… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-15T08:50:01+01:00 db_redis: clean previous connection before trying to reconnect (cherry picked from commit 78c8d084e30373aacc456fd41062b68e6e82ea6f) (cherry picked from commit 2e0537ba306219df0ce71605848e811027c69a57) --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/78506f7f2dfcdbf2bc9e21168929437… Patch: https://github.com/kamailio/kamailio/commit/78506f7f2dfcdbf2bc9e21168929437… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index dd421a7844..d6c24163b1 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -112,6 +112,11 @@ int db_redis_connect(km_redis_con_t *con) { db = atoi(con->id->database); reply = NULL; + if(con->con) { + LM_DBG("free old connection first\n"); + redisFree(con->con); + } + // TODO: introduce require_master mod-param and check if we're indeed master // TODO: on carrier, if we have db fail-over, the currently connected // redis server will become slave without dropping connections?

2 years, 11 months

git:5.5:2e0537ba: db_redis: clean previous connection before trying to reconnect

by Victor Seva

Module: kamailio Branch: 5.5 Commit: 2e0537ba306219df0ce71605848e811027c69a57 URL: https://github.com/kamailio/kamailio/commit/2e0537ba306219df0ce71605848e811… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-15T08:49:14+01:00 db_redis: clean previous connection before trying to reconnect (cherry picked from commit 78c8d084e30373aacc456fd41062b68e6e82ea6f) --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/2e0537ba306219df0ce71605848e811… Patch: https://github.com/kamailio/kamailio/commit/2e0537ba306219df0ce71605848e811… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index dd421a7844..d6c24163b1 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -112,6 +112,11 @@ int db_redis_connect(km_redis_con_t *con) { db = atoi(con->id->database); reply = NULL; + if(con->con) { + LM_DBG("free old connection first\n"); + redisFree(con->con); + } + // TODO: introduce require_master mod-param and check if we're indeed master // TODO: on carrier, if we have db fail-over, the currently connected // redis server will become slave without dropping connections?

2 years, 11 months

git:master:0c101ffe: core: parse uri - detect empty user when @ is found

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0c101ffe713603e812759da6d396e0451cf13ba1 URL: https://github.com/kamailio/kamailio/commit/0c101ffe713603e812759da6d396e04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T08:18:03+01:00 core: parse uri - detect empty user when @ is found --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/0c101ffe713603e812759da6d396e04… Patch: https://github.com/kamailio/kamailio/commit/0c101ffe713603e812759da6d396e04… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 19f6f2e02a..6cbf22a7c7 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -434,6 +434,10 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) /* found the user*/ uri->user.s=s; uri->user.len=p-s; + if(uri->user.len<=0) { + /* at '@' and no user part */ + goto error_bad_char; + } state=URI_HOST; found_user=1; s=p+1; /* skip '@' */

2 years, 11 months

[kamailio/kamailio] Error when running kamdbctl create (Issue #3055)

by lcph

When running kamdbctl create, it fails. The error is as show below. Can someone with knowledge please help me solve this. /usr/share/kamailio/mysql$ kamdbctl create MySQL password for root: -e database engine 'mysql' loaded -e \E[37;33mINFO: test server charset mysql: [Warning] Using a password on the command line interface can be insecure. ERROR 1682 (HY000) at line 1: Native table 'performance_schema'.'session_variables' has the wrong structure mysql: [Warning] Using a password on the command line interface can be insecure. Usage: grep [OPTION]... PATTERN [FILE]... Try 'grep --help' for more information. /usr/sbin/kamdbctl: 117: [: =: unexpected operator -e \E[37;33mINFO: creating database kamailio ... mysql: [Warning] Using a password on the command line interface can be insecure. ERROR 1064 (42000) at line 1: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 -e \E[37;31mERROR: Creatin -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3055 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3055(a)github.com>

2 years, 11 months

[kamailio/kamailio] Dispatcher ds_reload() function always returns error (Issue #3054)

by kdanderso

### Description The ds_reload() function in dispatcher.c always returns -1, even when successful. ### Possible Solutions I think a patch like the following would resolve the issue. ``` diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 059df89123..83d6b45ee9 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -963,13 +963,15 @@ static int ds_reload(sip_msg_t *msg) *ds_rpc_reload_time = time(NULL); if(!ds_db_url.s) { - if(ds_load_list(dslistfile) != 0) + if(ds_load_list(dslistfile) != 0) { LM_ERR("Error reloading from list\n"); - return -1; + return -1; + } } else { - if(ds_reload_db() < 0) + if(ds_reload_db() < 0) { LM_ERR("Error reloading from db\n"); - return -1; + return -1; + } } LM_DBG("reloaded dispatcher\n"); return 1; ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.5.3 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3054 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3054(a)github.com>

2 years, 11 months

git:master:30079910: dispatcher: fix ds_reload() return logic

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 30079910bbb33b430621f188beae40c71592bcba URL: https://github.com/kamailio/kamailio/commit/30079910bbb33b430621f188beae40c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T17:07:42+01:00 dispatcher: fix ds_reload() return logic - GH #3054 --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/30079910bbb33b430621f188beae40c… Patch: https://github.com/kamailio/kamailio/commit/30079910bbb33b430621f188beae40c… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 059df89123..83d6b45ee9 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -963,13 +963,15 @@ static int ds_reload(sip_msg_t *msg) *ds_rpc_reload_time = time(NULL); if(!ds_db_url.s) { - if(ds_load_list(dslistfile) != 0) + if(ds_load_list(dslistfile) != 0) { LM_ERR("Error reloading from list\n"); - return -1; + return -1; + } } else { - if(ds_reload_db() < 0) + if(ds_reload_db() < 0) { LM_ERR("Error reloading from db\n"); - return -1; + return -1; + } } LM_DBG("reloaded dispatcher\n"); return 1;

2 years, 11 months

git:master:4659d27f: core: mem - define qm_report() for compilation with debug disabled

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4659d27f73f4e4d840e04a20d9b65a76280954e8 URL: https://github.com/kamailio/kamailio/commit/4659d27f73f4e4d840e04a20d9b65a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T13:01:24+01:00 core: mem - define qm_report() for compilation with debug disabled --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/4659d27f73f4e4d840e04a20d9b65a7… Patch: https://github.com/kamailio/kamailio/commit/4659d27f73f4e4d840e04a20d9b65a7… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 2ff295fcb1..ba64f00854 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -1145,6 +1145,14 @@ void qm_mod_free_stats(void *qm_rootp) void qm_sums(void *qmp) { + LM_WARN("Enable DBG_QM_MALLOC for getting the status summary\n"); + return; +} + +void qm_report(void* qmp, mem_report_t *mrep) +{ + LM_WARN("Enable DBG_QM_MALLOC for getting the report\n"); + memset(mrep, 0, sizeof(mem_report_t)); return; }

2 years, 11 months

git:master:9140686d: misctesc: sync-ed with fuzz function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9140686dcd4c32712e46f3e6e824ab090545a03e URL: https://github.com/kamailio/kamailio/commit/9140686dcd4c32712e46f3e6e824ab0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T12:53:56+01:00 misctesc: sync-ed with fuzz function --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9140686dcd4c32712e46f3e6e824ab0… Patch: https://github.com/kamailio/kamailio/commit/9140686dcd4c32712e46f3e6e824ab0… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index 0867c1ae46..c00a8b9c5c 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -40,6 +40,7 @@ #include "../../core/parser/parse_hname2.h" #include "../../core/parser/contact/parse_contact.h" #include "../../core/parser/parse_to.h" +#include "../../core/parser/parse_rr.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_refer_to.h" #include "../../core/parser/parse_ppi_pai.h" @@ -341,7 +342,7 @@ static int misctest_message_init(void) parse_to_uri(&tmsg); - parse_contact_header(&tmsg); + parse_contact_headers(&tmsg); parse_refer_to_header(&tmsg); @@ -355,6 +356,10 @@ static int misctest_message_init(void) parse_identityinfo_header(&tmsg); + parse_record_route_headers(&tmsg); + + parse_route_headers(&tmsg); + str uri; get_src_uri(&tmsg, 0, &uri);

2 years, 11 months

← Newer
1
...
13
14
15
16
17
18
19
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2022