- sr-dev - kamailio.org

git:5.5:19e3d173: pv-headers: ignore skip-header config on clone_branch
by Victor Seva 15 Mar '22

15 Mar '22

Module: kamailio Branch: 5.5 Commit: 19e3d173ab0bc30663c67874708c95469699d82a URL: https://github.com/kamailio/kamailio/commit/19e3d173ab0bc30663c67874708c954… Author: Sipwise Development Team <support(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-15T08:56:46+01:00 pv-headers: ignore skip-header config on clone_branch (cherry picked from commit 473e051bef688d9e78bc4c28abebbedfffd1f549) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/19e3d173ab0bc30663c67874708c954… Patch: https://github.com/kamailio/kamailio/commit/19e3d173ab0bc30663c67874708c954… --- 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)

1 0

git:master:473e051b: pv-headers: ignore skip-header config on clone_branch
by Victor Seva 15 Mar '22

15 Mar '22

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)

1 0

git:5.3:f35c7fe0: db_redis: clean previous connection before trying to reconnect
by Victor Seva 15 Mar '22

15 Mar '22

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?

1 0

git:5.4:78506f7f: db_redis: clean previous connection before trying to reconnect
by Victor Seva 15 Mar '22

15 Mar '22

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?

1 0

git:5.5:2e0537ba: db_redis: clean previous connection before trying to reconnect
by Victor Seva 15 Mar '22

15 Mar '22

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?

1 0

git:master:0c101ffe: core: parse uri - detect empty user when @ is found
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

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 '@' */

1 0

[kamailio/kamailio] Error when running kamdbctl create (Issue #3055)
by lcph 15 Mar '22

15 Mar '22

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 2

[kamailio/kamailio] Dispatcher ds_reload() function always returns error (Issue #3054)
by kdanderso 14 Mar '22

14 Mar '22

### 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 2

git:master:30079910: dispatcher: fix ds_reload() return logic
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

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;

1 0

git:master:4659d27f: core: mem - define qm_report() for compilation with debug disabled
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

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; }

1 0

git:master:9140686d: misctesc: sync-ed with fuzz function
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

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);

1 0

git:master:ae46c85a: core: fuzz - include missing headers file for last changes
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: ae46c85a3d1e829900080c2b6ee16fda1bce90d4 URL: https://github.com/kamailio/kamailio/commit/ae46c85a3d1e829900080c2b6ee16fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T12:28:55+01:00 core: fuzz - include missing headers file for last changes --- Modified: misc/fuzz/fuzz_parse_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/ae46c85a3d1e829900080c2b6ee16fd… Patch: https://github.com/kamailio/kamailio/commit/ae46c85a3d1e829900080c2b6ee16fd… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c index 6688e92389..e20c2e64f3 100644 --- a/misc/fuzz/fuzz_parse_msg.c +++ b/misc/fuzz/fuzz_parse_msg.c @@ -4,6 +4,7 @@ #include "../parser/contact/parse_contact.h" #include "../parser/parse_from.h" #include "../parser/parse_to.h" +#include "../parser/parse_rr.h" #include "../parser/parse_refer_to.h" #include "../parser/parse_ppi_pai.h" #include "../parser/parse_privacy.h"

1 0

git:master:a9e92eb9: misc: fuzz - add functions for parsing record-/route headers
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: a9e92eb9dfe4e52b45e271bcfa51c0c732dc23c4 URL: https://github.com/kamailio/kamailio/commit/a9e92eb9dfe4e52b45e271bcfa51c0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T12:20:37+01:00 misc: fuzz - add functions for parsing record-/route headers --- Modified: misc/fuzz/fuzz_parse_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/a9e92eb9dfe4e52b45e271bcfa51c0c… Patch: https://github.com/kamailio/kamailio/commit/a9e92eb9dfe4e52b45e271bcfa51c0c… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c index d832ff3d92..6688e92389 100644 --- a/misc/fuzz/fuzz_parse_msg.c +++ b/misc/fuzz/fuzz_parse_msg.c @@ -52,6 +52,10 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { parse_identityinfo_header(&orig_inv); + parse_record_route_headers(&orig_inv); + + parse_route_headers(&orig_inv); + str uri; get_src_uri(&orig_inv, 0, &uri);

1 0

git:master:22b8ecc2: core: parser - helper functions to parse all record-/route headers
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 22b8ecc24442dce775600dfb186a83bc947fd4ca URL: https://github.com/kamailio/kamailio/commit/22b8ecc24442dce775600dfb186a83b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T12:17:42+01:00 core: parser - helper functions to parse all record-/route headers --- Modified: src/core/parser/parse_rr.c Modified: src/core/parser/parse_rr.h --- Diff: https://github.com/kamailio/kamailio/commit/22b8ecc24442dce775600dfb186a83b… Patch: https://github.com/kamailio/kamailio/commit/22b8ecc24442dce775600dfb186a83b… --- diff --git a/src/core/parser/parse_rr.c b/src/core/parser/parse_rr.c index 9557bffc9b..e8854cbd4b 100644 --- a/src/core/parser/parse_rr.c +++ b/src/core/parser/parse_rr.c @@ -494,3 +494,49 @@ int get_path_dst_uri(str *_p, str *_dst) return 0; } + +/*! + * Parse all Record-Route header + */ +int parse_record_route_headers(sip_msg_t *msg) +{ + hdr_field_t *hf; + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the headers\n"); + return -1; + } + + hf = msg->record_route; + while(hf) { + if (parse_rr(hf) < 0) { + LM_ERR("failed to parse Record-Route\n"); + return -1; + } + + hf = next_sibling_hdr(hf); + } + return 0; +} + +/*! + * Parse all Route header + */ +int parse_route_headers(sip_msg_t *msg) +{ + hdr_field_t *hf; + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the headers\n"); + return -1; + } + + hf = msg->route; + while(hf) { + if (parse_rr(hf) < 0) { + LM_ERR("failed to parse Record-Route\n"); + return -1; + } + + hf = next_sibling_hdr(hf); + } + return 0; +} diff --git a/src/core/parser/parse_rr.h b/src/core/parser/parse_rr.h index f7379a6035..7c38a2d38d 100644 --- a/src/core/parser/parse_rr.h +++ b/src/core/parser/parse_rr.h @@ -180,4 +180,7 @@ int print_rr_body(struct hdr_field *iroute, str *oroute, int order, int get_path_dst_uri(str *_p, str *_dst); +int parse_record_route_headers(sip_msg_t *msg); +int parse_route_headers(sip_msg_t *msg); + #endif /* PARSE_RR_H */

1 0

git:master:8f04fd24: core: mem - expose qm_report() in header file
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 8f04fd24c8f0d9edc88b5c3ff734560bb10735ee URL: https://github.com/kamailio/kamailio/commit/8f04fd24c8f0d9edc88b5c3ff734560… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T11:30:38+01:00 core: mem - expose qm_report() in header file --- Modified: src/core/mem/q_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/8f04fd24c8f0d9edc88b5c3ff734560… Patch: https://github.com/kamailio/kamailio/commit/8f04fd24c8f0d9edc88b5c3ff734560… --- diff --git a/src/core/mem/q_malloc.h b/src/core/mem/q_malloc.h index 85d3c86e60..cfcb43eced 100644 --- a/src/core/mem/q_malloc.h +++ b/src/core/mem/q_malloc.h @@ -167,6 +167,7 @@ void qm_check(struct qm_block*); void qm_status(void*); void qm_info(void*, struct mem_info*); +void qm_report(void* qmp, mem_report_t *mrep); unsigned long qm_available(void* qm);

1 0

git:master:9f7edfbd: misc/fuzz: use parse_contact_headers() instead of parse_contact_header()
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 9f7edfbd9f3b5fdb660043048a4c3a517483016e URL: https://github.com/kamailio/kamailio/commit/9f7edfbd9f3b5fdb660043048a4c3a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T11:20:54+01:00 misc/fuzz: use parse_contact_headers() instead of parse_contact_header() --- Modified: misc/fuzz/fuzz_parse_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/9f7edfbd9f3b5fdb660043048a4c3a5… Patch: https://github.com/kamailio/kamailio/commit/9f7edfbd9f3b5fdb660043048a4c3a5… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c index 1c813fd715..d832ff3d92 100644 --- a/misc/fuzz/fuzz_parse_msg.c +++ b/misc/fuzz/fuzz_parse_msg.c @@ -38,7 +38,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { parse_to_uri(&orig_inv); - parse_contact_header(&orig_inv); + parse_contact_headers(&orig_inv); parse_refer_to_header(&orig_inv);

1 0

git:master:5c99d7f8: sanity: use dedicated functions for parsing From/To URIs
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 5c99d7f87ed94cd52c6ab74d46f511447b3db2b9 URL: https://github.com/kamailio/kamailio/commit/5c99d7f87ed94cd52c6ab74d46f5114… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T10:23:58+01:00 sanity: use dedicated functions for parsing From/To URIs - updates to parsing Contact headers --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/5c99d7f87ed94cd52c6ab74d46f5114… Patch: https://github.com/kamailio/kamailio/commit/5c99d7f87ed94cd52c6ab74d46f5114…

1 0

[kamailio/kamailio] module keepalive bug report (Issue #3028)
by 狐狐 14 Mar '22

14 Mar '22

### Description Ka servers A(172.22.247.37) and B(172.22.247.232) use the keepalive module to check if each other's status is available. When one server such as B is down, server A will still send about 16 OPTIONS messages. When A sends the 14th or 15th OPTIONS, ka on A will change B's status to down. At this point, if B restarts, B will reply 200OK to A’s OPTIONS message, and A will change B's status to alive, but A will not send OPTIONS message to B any more. Even if B dies later, B's status will be alive on A forever. ps: if B is restart at the 14th OPTIONS or earlier, A will correctly send heartbeat OPTIONS to B later. if B is restart at the 16th or later, A will not change B's status to alive, and certainly will not sends OPTIONS to B anymore, but this is correct isn't it? question is obviously B’s status is alive on A, but A sends no OPTIONS to B. ### Troubleshooting ![image](https://user-images.githubusercontent.com/26111722/154245407-93f3ac77-3c22-4129-9877-9efa317007a5.png) ![image](https://user-images.githubusercontent.com/26111722/154245553-d19c8121-27ef-448b-933d-153843c61048.png) #### Reproduction 1. set keepalive config ant A ``` loadmodule "keepalive.so" modparam("keepalive","ping_interval",3) modparam("keepalive","destination","172.22.247.232") ``` use ka_is_alive function check B's status. 2. restart A server and confirm that the OPTIONS status is correct. 3. stop the B server until the number of retran messages reaches 15. 4. restart B server, and check OPTIONS #### Log Messages ![image](https://user-images.githubusercontent.com/26111722/154245407-93f3ac77-3c22-4129-9877-9efa317007a5.png) #### SIP Traffic ![image](https://user-images.githubusercontent.com/26111722/154245553-d19c8121-27ef-448b-933d-153843c61048.png) at the time that the arrow points to, 172.22.247.232's status is 1(refers to the log above). but notice that there is no OPTIONS message to 172.22.247.232 anymore. ![image](https://user-images.githubusercontent.com/26111722/154248962-fa6efd08-361c-4be1-b3cf-3c452d6b4e36.png) ![image](https://user-images.githubusercontent.com/26111722/154249002-f1c6b80e-2880-4c6b-bfb0-4a0f3963c6b8.png) ### Possible Solutions ### Additional Information * **Operating System**: ``` Linux localhost.localdomain 3.10.0-1127.el7.x86_64 #1 SMP Tue Mar 31 23:36:51 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux kamailio 5.5.2 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3028 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3028(a)github.com>

3 4

[kamailio/kamailio] segmentation fault on kamailio 5.4.4 (Issue #3040)
by descartin 14 Mar '22

14 Mar '22

hello all we have seen a segmentation fault on a kamailio 5.4.4 ``` #0 0x00007feb664346ad in print_lists (dlg=0x7feaa5f65290) at dlg_var.c:277 277 varlist = varlist->next; Missing separate debuginfos, use: debuginfo-install bzip2-libs-1.0.6-13.el7.x86_64 cyrus-sasl-lib-2.1.26-20.el7_2.x86_64 elfutils-libelf-0.166-2.el7.x86_64 elfutils-libs-0.166-2.el7.x86_64 glibc-2.17-157.el7_3.5.x86_64 jansson-2.10-1.el7.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-8.el7.x86_64 libattr-2.4.46-12.el7.x86_64 libcap-2.22-8.el7.x86_64 libcom_err-1.42.9-9.el7.x86_64 libcurl-7.29.0-35.el7.centos.x86_64 libev-4.15-7.el7.x86_64 libevent-2.0.21-4.el7.x86_64 libgcc-4.8.5-16.el7.x86_64 libidn-1.28-4.el7.x86_64 libselinux-2.5-6.el7.x86_64 libssh2-1.4.3-10.el7_2.1.x86_64 libuuid-2.23.2-33.el7_3.2.x86_64 libxml2-2.9.1-6.el7_2.3.x86_64 nspr-4.13.1-1.0.el7_3.x86_64 nss-3.28.4-1.2.el7_3.x86_64 nss-softokn-freebl-3.16.2.3-14.4.el7.x86_64 nss-util-3.28.4-1.0.el7_3.x86_64 openldap-2.4.40-13.el7.x86_64 openssl-libs-1.0.2k-19.el7.x86_64 pcre-8.32-15.el7_2.1.x86_64 systemd-libs-219-30.el7_3.9.x86_64 xz-libs-5.2.2-1.el7.x86_64 zlib-1.2.7-17.el7.x86_64 (gdb) bt #0 0x00007feb664346ad in print_lists (dlg=0x7feaa5f65290) at dlg_var.c:277 #1 0x00007feb664367ff in pv_set_dlg_variable (msg=0x7feb6a881bd8, param=0x7feb6adc85a0, op=254, val=0x7ffea166a7a0) at dlg_var.c:443 #2 0x00000000004bbaf2 in lval_pvar_assign (h=0x7ffea166bbd0, msg=0x7feb6a881bd8, lv=0x7feb6adc8668, rv=0x7feb6adc87e8) at core/lvalue.c:352 #3 0x00000000004bc5f0 in lval_assign (h=0x7ffea166bbd0, msg=0x7feb6a881bd8, lv=0x7feb6adc8668, rve=0x7feb6adc87e0) at core/lvalue.c:400 #4 0x0000000000487ddf in do_action (h=0x7ffea166bbd0, a=0x7feb6adc8f80, msg=0x7feb6a881bd8) at core/action.c:1455 #5 0x0000000000489b1b in run_actions (h=0x7ffea166bbd0, a=0x7feb6adc8338, msg=0x7feb6a881bd8) at core/action.c:1581 #6 0x000000000047c6d7 in do_action (h=0x7ffea166bbd0, a=0x7feb6adce4c0, msg=0x7feb6a881bd8) at core/action.c:1067 #7 0x0000000000489b1b in run_actions (h=0x7ffea166bbd0, a=0x7feb6adc3190, msg=0x7feb6a881bd8) at core/action.c:1581 #8 0x000000000048a25f in run_top_route (a=0x7feb6adc3190, msg=0x7feb6a881bd8, c=0x7ffea166bbd0) at core/action.c:1666 #9 0x00007feb69eab0a2 in reply_received (p_msg=0x7feb6a881bd8) at t_reply.c:2543 #10 0x000000000059dc77 in do_forward_reply (msg=0x7feb6a881bd8, mode=0) at core/forward.c:764 #11 0x000000000059f949 in forward_reply (msg=0x7feb6a881bd8) at core/forward.c:865 #12 0x00000000005f095a in receive_msg ( buf=0xacec80 <buf.7134> "SIP/2.0 100 Trying\r\nVia: SIP/2.0/UDP 79.170.70.13;branch=z9hG4bK7837.ffc6315fbd54de1e6a00b32fa1cc0eda.1\r\nVia: SIP/2.0/UDP 79.170.66.28:5080;received=79.170.66.28;rport=5080;branch=z9hG4bK83ve3c7ty27QF"..., len=426, rcv_info=0x7ffea166c6c0) at core/receive.c:509 #13 0x00000000004e3cd7 in udp_rcv_loop () at core/udp_server.c:543 #14 0x0000000000429f56 in main_loop () at main.c:1689 #15 0x0000000000434034 in main (argc=15, argv=0x7ffea166cf58) at main.c:2876 ``` [Uploading core_kamailio_mia_osp_feb18.log…]() could you please take a look to the attached full backtrace? thanks a lot and regards david -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3040 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3040(a)github.com>

3 3

git:master:355c0210: core: parse sdp - removed redundant check
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 355c02106c95400c44833a89aeea68c61ba2f200 URL: https://github.com/kamailio/kamailio/commit/355c02106c95400c44833a89aeea68c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T21:41:06+01:00 core: parse sdp - removed redundant check --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/355c02106c95400c44833a89aeea68c… Patch: https://github.com/kamailio/kamailio/commit/355c02106c95400c44833a89aeea68c… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index d81413a0a5..404a20fee8 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -685,8 +685,7 @@ static int parse_mixed_content(str *mixed_body, str delimiter, sdp_info_t* _sdp) return -1; } d2p = find_next_sdp_line_delimiter(d1p, bodylimit, delimiter, bodylimit); - if((d1p + delimiter.len + 2 > bodylimit) - || (d2p - d1p < delimiter.len + 2)) { + if(d2p - d1p < delimiter.len + 2) { LM_ERR("invalid format [%.*s]\n", (int)(d2p-d1p), d1p); return -1; }

1 0

git:master:7076904d: core: parse sdp - detect multipart invalid format
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 7076904d0f0980d6bfa0814e3b1a8c61ee0acecc URL: https://github.com/kamailio/kamailio/commit/7076904d0f0980d6bfa0814e3b1a8c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T21:36:16+01:00 core: parse sdp - detect multipart invalid format --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/7076904d0f0980d6bfa0814e3b1a8c6… Patch: https://github.com/kamailio/kamailio/commit/7076904d0f0980d6bfa0814e3b1a8c6… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index dc584e1c8b..d81413a0a5 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -685,6 +685,11 @@ static int parse_mixed_content(str *mixed_body, str delimiter, sdp_info_t* _sdp) return -1; } d2p = find_next_sdp_line_delimiter(d1p, bodylimit, delimiter, bodylimit); + if((d1p + delimiter.len + 2 > bodylimit) + || (d2p - d1p < delimiter.len + 2)) { + LM_ERR("invalid format [%.*s]\n", (int)(d2p-d1p), d1p); + return -1; + } /* d2p is text limit for application parsing */ memset(&hf, 0, sizeof(struct hdr_field)); rest = eat_line(d1p + delimiter.len + 2, d2p - d1p - delimiter.len - 2);

1 0

git:master:11d9cf59: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 11d9cf595eb92c8eee74ab386db0c061ee1c63f0 URL: https://github.com/kamailio/kamailio/commit/11d9cf595eb92c8eee74ab386db0c06… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-11T13:31:20+01:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/11d9cf595eb92c8eee74ab386db0c06… Patch: https://github.com/kamailio/kamailio/commit/11d9cf595eb92c8eee74ab386db0c06…

1 0

git:master:70c38551: textops: remove_hf_match() returns true when a header is removed
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 70c385518829d07b2061678af4e2d7f21587e454 URL: https://github.com/kamailio/kamailio/commit/70c385518829d07b2061678af4e2d7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T13:21:48+01:00 textops: remove_hf_match() returns true when a header is removed --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/70c385518829d07b2061678af4e2d7f… Patch: https://github.com/kamailio/kamailio/commit/70c385518829d07b2061678af4e2d7f… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index e47e7b65d1..e4de8600d2 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -2243,7 +2243,7 @@ static int ki_remove_hf_match(sip_msg_t* msg, str* hname, str *op, str *expr) regex_t mre; regmatch_t pmatch; char c; - int ret = -1; + int ret = -2; memset(&mre, 0, sizeof(regex_t)); @@ -2330,9 +2330,6 @@ static int ki_remove_hf_match(sip_msg_t* msg, str* hname, str *op, str *expr) ret = 1; } } - if(ret==-1) { - ret = 2; - } done: if(vop==4) {

1 0

git:master:8b24f28e: textops: added remove_hf_match(hname, op, expr)
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 8b24f28e9949271d993a5f6cf814fe1de2ddbf6d URL: https://github.com/kamailio/kamailio/commit/8b24f28e9949271d993a5f6cf814fe1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T13:09:55+01:00 textops: added remove_hf_match(hname, op, expr) - remove headers with name hname that match the body with expr --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/8b24f28e9949271d993a5f6cf814fe1… Patch: https://github.com/kamailio/kamailio/commit/8b24f28e9949271d993a5f6cf814fe1…

1 0

git:master:5c59e96a: textops: docs for remove_hf_match()
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 5c59e96a7d0a04bff13bde8be688fae8c4d664d9 URL: https://github.com/kamailio/kamailio/commit/5c59e96a7d0a04bff13bde8be688fae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T13:20:48+01:00 textops: docs for remove_hf_match() --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5c59e96a7d0a04bff13bde8be688fae… Patch: https://github.com/kamailio/kamailio/commit/5c59e96a7d0a04bff13bde8be688fae… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 2a166f37a9..9805aac6aa 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1541,6 +1541,50 @@ remove_hf_idx("X-My-Header", "-1"); </example> </section> + <section id="textops.f.remove_hf_match"> + <title> + <function moreinfo="none">remove_hf_match(hname, op, expr)</function> + </title> + <para> + Remove from message all headers with name 'hname' matching the body + with expression <quote>expr</quote>, based on operator + <quote>op</quote>. + </para> + <para> + Returns true if at least one header is found and removed. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>hanem</emphasis> - name of the header. + </para> + </listitem> + <listitem> + <para><emphasis>op</emphasis> - operator - it can be: 'eq' - equal; + 'ne' - not equal; 'in' - include; 're' - regular expression match. + </para> + </listitem> + <listitem> + <para><emphasis>expr</emphasis> - expression to match. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>remove_hf_match</function> usage</title> + <programlisting format="linespecific"> +... +if(remove_hf_match("X-Info", "in", "^data")) { + # all headers with name "X-Info" that have the body matching regular + # expression "^data" are removed +} +... +</programlisting> + </example> + </section> + <section id="textops.f.has_body"> <title> <function moreinfo="none">has_body()</function>,

1 0

git:master:e64a1eb7: textops: reset counter for looping again in remove_hf_idx()
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: e64a1eb774284a720718878170e198147af67e50 URL: https://github.com/kamailio/kamailio/commit/e64a1eb774284a720718878170e1981… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T11:28:36+01:00 textops: reset counter for looping again in remove_hf_idx() --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/e64a1eb774284a720718878170e1981… Patch: https://github.com/kamailio/kamailio/commit/e64a1eb774284a720718878170e1981… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index bfb5a54941..a3479c06fd 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1845,6 +1845,7 @@ static int ki_remove_hf_idx(sip_msg_t* msg, str* hname, int idx) pos = idx; again: + i = 0; for (hfi=msg->headers; hfi; hfi=hfi->next) { if (hfm.type!=HDR_OTHER_T && hfm.type!=HDR_ERROR_T) { if (hfm.type!=hfi->type) {

1 0

[kamailio/kamailio] ims_registrar_scscf: use xmlParseMemory instead of xmlParseDoc (PR #3050)
by Kristiyan Peychev 11 Mar '22

11 Mar '22

Fix issues where a non-zero terminated string would get passed to `parse_user_data`.   #### 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 - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3050 -- Commit Summary -- * ims_registrar_scscf: use xmlParseMemory instead of xmlParseDoc -- File Changes -- M src/modules/ims_registrar_scscf/userdata_parser.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3050.patch https://github.com/kamailio/kamailio/pull/3050.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3050 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3050(a)github.com>

3 6

[kamailio/kamailio] ims_registrar_scscf: add a new contact state for notifications (PR #3051)
by Kristiyan Peychev 11 Mar '22

11 Mar '22

Add the `deregistered` state to IMS_Registrar_events_enum_t, allowing the registrar to distinguish between UE unregsitration, which do not require a notification to be sent, and network-originated deregistration requests.   #### 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 - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3051 -- Commit Summary -- * ims_registrar_scscf: add a new contact state for notifications -- File Changes -- M src/modules/ims_registrar_scscf/registrar_notify.c (5) M src/modules/ims_registrar_scscf/registrar_notify.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3051.patch https://github.com/kamailio/kamailio/pull/3051.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3051 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3051(a)github.com>

3 5

git:master:07b19ef0: ims_registrar_scscf: add a new contact state for notifications
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 07b19ef0604a48148f1bb14787516334820e5a3a URL: https://github.com/kamailio/kamailio/commit/07b19ef0604a48148f1bb1478751633… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T10:28:22+01:00 ims_registrar_scscf: add a new contact state for notifications Add the `deregistered` state to IMS_Registrar_events_enum_t, allowing the registrar to distinguish between UE unregsitration, which do not require a notification to be sent, and network-originated deregistration requests. --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h --- Diff: https://github.com/kamailio/kamailio/commit/07b19ef0604a48148f1bb1478751633… Patch: https://github.com/kamailio/kamailio/commit/07b19ef0604a48148f1bb1478751633… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index 761b014624..4dd6223431 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -495,6 +495,7 @@ int event_reg(udomain_t* _d, impurecord_t* r_passed, ucontact_t* c_passed, int e //richard: we only use reg unreg expired and refresh case IMS_REGISTRAR_CONTACT_UNREGISTERED: + case IMS_REGISTRAR_CONTACT_DEREGISTERED: case IMS_REGISTRAR_CONTACT_UNREGISTERED_IMPLICIT: case IMS_REGISTRAR_CONTACT_REGISTERED: case IMS_REGISTRAR_CONTACT_REFRESHED: @@ -1967,7 +1968,8 @@ str get_reginfo_partial(impurecord_t *r, ucontact_t *c, int event_type, unsigned if (//richard we only use expired and unregistered (event_type == IMS_REGISTRAR_CONTACT_EXPIRED || - event_type == IMS_REGISTRAR_CONTACT_UNREGISTERED) + event_type == IMS_REGISTRAR_CONTACT_UNREGISTERED || + event_type == IMS_REGISTRAR_CONTACT_DEREGISTERED) ) { //check if impu record has any other active contacts - if not then set this to terminated - if so then keep this active //check if asserted is present in any of the path headers @@ -2011,6 +2013,7 @@ str get_reginfo_partial(impurecord_t *r, ucontact_t *c, int event_type, unsigned event = r_expired; expires = 0; break; + case IMS_REGISTRAR_CONTACT_DEREGISTERED: case IMS_REGISTRAR_CONTACT_UNREGISTERED: state = r_terminated; event = r_unregistered; diff --git a/src/modules/ims_registrar_scscf/registrar_notify.h b/src/modules/ims_registrar_scscf/registrar_notify.h index 6bfc6d3ce3..04d4958488 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.h +++ b/src/modules/ims_registrar_scscf/registrar_notify.h @@ -116,7 +116,8 @@ typedef enum { IMS_REGISTRAR_CONTACT_EXPIRED, /**< A contact has expired and will be removed */ IMS_REGISTRAR_CONTACT_UNREGISTERED, /**< User unregistered with Expires 0 */ IMS_REGISTRAR_CONTACT_UNREGISTERED_IMPLICIT, /**< User unregistered implicitly, ie not via explicit deregister */ - IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE + IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE, + IMS_REGISTRAR_CONTACT_DEREGISTERED, /**< User's registration was terminated with RTR */ } IMS_Registrar_events_enum_t; extern IMS_Registrar_events_enum_t IMS_Registrar_events;

1 0

git:master:0e0bdbf8: ims_registrar_scscf: use xmlParseMemory instead of xmlParseDoc
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 0e0bdbf83c7f20bf1814fb58232f8c25e29dd94d URL: https://github.com/kamailio/kamailio/commit/0e0bdbf83c7f20bf1814fb58232f8c2… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T10:27:56+01:00 ims_registrar_scscf: use xmlParseMemory instead of xmlParseDoc Fix issues where a non-zero terminated string would get passed to `parse_user_data`. --- Modified: src/modules/ims_registrar_scscf/userdata_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/0e0bdbf83c7f20bf1814fb58232f8c2… Patch: https://github.com/kamailio/kamailio/commit/0e0bdbf83c7f20bf1814fb58232f8c2… --- diff --git a/src/modules/ims_registrar_scscf/userdata_parser.c b/src/modules/ims_registrar_scscf/userdata_parser.c index 4880f0289c..d8b08b5491 100644 --- a/src/modules/ims_registrar_scscf/userdata_parser.c +++ b/src/modules/ims_registrar_scscf/userdata_parser.c @@ -916,7 +916,7 @@ static ims_subscription* parse_ims_subscription(xmlDocPtr doc, xmlNodePtr root) /** * Parses the user data XML and copies data into a new ims_subscription structure. - * @param xml - the input xml (NB must be null terminated) + * @param xml - the input xml * @returns the ims_subscription* on success or NULL on error */ ims_subscription *parse_user_data(str xml) @@ -927,7 +927,7 @@ ims_subscription *parse_user_data(str xml) if (!ctxtInit) parser_init(scscf_user_data_dtd,scscf_user_data_xsd); doc=0; - doc = xmlParseDoc((unsigned char *)xml.s); + doc = xmlParseMemory((unsigned char *)xml.s, xml.len); if (!doc){ LM_ERR("This is not a valid XML <%.*s>\n", xml.len,xml.s); goto error;

1 0

[kamailio/kamailio] ims_ipsec_pcscf: fix sha1 algorithm and tcp connections for SIP Replies over TCP (PR #3048)
by riccardv 11 Mar '22

11 Mar '22

…es over TCP   #### 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3048 -- Commit Summary -- * ims_ipsec_pcscf: fix sha1 algorithm and tcp connections for SIP Replies over TCP -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (16) M src/modules/ims_ipsec_pcscf/ipsec.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3048.patch https://github.com/kamailio/kamailio/pull/3048.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3048 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3048(a)github.com>

3 5

git:master:79bb2b1c: ims_ipsec_pcscf: fix sha1 algorithm and tcp connections for SIP Replies over TCP
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 79bb2b1c4e5a446a333d837d4ccb1038303340e5 URL: https://github.com/kamailio/kamailio/commit/79bb2b1c4e5a446a333d837d4ccb103… Author: Rikyz <xxxxxx@xxxxxx> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T10:27:26+01:00 ims_ipsec_pcscf: fix sha1 algorithm and tcp connections for SIP Replies over TCP --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/ipsec.c --- Diff: https://github.com/kamailio/kamailio/commit/79bb2b1c4e5a446a333d837d4ccb103… Patch: https://github.com/kamailio/kamailio/commit/79bb2b1c4e5a446a333d837d4ccb103… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 82099367ba..f8672a592a 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -846,17 +846,15 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) // for Reply get the dest proto from the received request dst_proto = req->rcv.proto; + // for Reply and TCP sends from P-CSCF server port, for Reply and UDP sends from P-CSCF client port + src_port = dst_proto == PROTO_TCP ? s->port_ps : s->port_pc; + + // for Reply and TCP sends to UE client port, for Reply and UDP sends to UE server port + dst_port = dst_proto == PROTO_TCP ? s->port_uc : s->port_us; + // Check send socket struct socket_info * client_sock = grep_sock_info(via_host.af == AF_INET ? &ipsec_listen_addr : &ipsec_listen_addr6, src_port, dst_proto); - if(client_sock) { - // for Reply and TCP sends from P-CSCF server port, for Reply and UDP sends from P-CSCF client port - src_port = dst_proto == PROTO_TCP ? s->port_ps : s->port_pc; - - // for Reply and TCP sends to UE client port, for Reply and UDP sends to UE server port - dst_port = dst_proto == PROTO_TCP ? s->port_uc : s->port_us; - } - else - { + if(!client_sock) { src_port = s->port_pc; dst_port = s->port_us; } diff --git a/src/modules/ims_ipsec_pcscf/ipsec.c b/src/modules/ims_ipsec_pcscf/ipsec.c index e874abaa34..16dda61b8c 100644 --- a/src/modules/ims_ipsec_pcscf/ipsec.c +++ b/src/modules/ims_ipsec_pcscf/ipsec.c @@ -184,7 +184,7 @@ int add_sa(struct mnl_socket* nl_sock, const struct ip_addr *src_addr_param, con if(strncasecmp(r_alg.s, "hmac-md5-96", r_alg.len) == 0) { strcpy(l_auth_algo->alg_name,"md5"); } - else if(strncasecmp(r_alg.s, "hmac-sha1-96", r_alg.len) == 0) { + else if(strncasecmp(r_alg.s, "hmac-sha-1-96", r_alg.len) == 0) { strcpy(l_auth_algo->alg_name,"sha1"); } else { // set default algorithm to sha1

1 0

git:master:69ee44c4: corex: use ZSW() for shm report rpc output
by Daniel-Constantin Mierla 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: 69ee44c4cf83447bab2104b5d380f01af3893608 URL: https://github.com/kamailio/kamailio/commit/69ee44c4cf83447bab2104b5d380f01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T11:45:34+01:00 corex: use ZSW() for shm report rpc output --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/69ee44c4cf83447bab2104b5d380f01… Patch: https://github.com/kamailio/kamailio/commit/69ee44c4cf83447bab2104b5d380f01… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index f605ef2795..b66d6e237d 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -108,24 +108,24 @@ static void corex_rpc_shm_report(rpc_t* rpc, void* ctx) "used_frags", mrep.used_frags, "total_frags", mrep.total_frags, "max_free_frag_size", mrep.max_free_frag_size, - "max_free_frag_file", mrep.max_free_frag_file, - "max_free_frag_func", mrep.max_free_frag_func, - "max_free_frag_mname", mrep.max_free_frag_mname, + "max_free_frag_file", ZSW(mrep.max_free_frag_file), + "max_free_frag_func", ZSW(mrep.max_free_frag_func), + "max_free_frag_mname", ZSW(mrep.max_free_frag_mname), "max_free_frag_line", mrep.max_free_frag_line, "max_used_frag_size", mrep.max_used_frag_size, - "max_used_frag_file", mrep.max_used_frag_file, - "max_used_frag_func", mrep.max_used_frag_func, - "max_used_frag_mname", mrep.max_used_frag_mname, + "max_used_frag_file", ZSW(mrep.max_used_frag_file), + "max_used_frag_func", ZSW(mrep.max_used_frag_func), + "max_used_frag_mname", ZSW(mrep.max_used_frag_mname), "max_used_frag_line", mrep.max_used_frag_line, "min_free_frag_size", mrep.min_free_frag_size, - "min_free_frag_file", mrep.min_free_frag_file, - "min_free_frag_func", mrep.min_free_frag_func, - "min_free_frag_mname", mrep.min_free_frag_mname, + "min_free_frag_file", ZSW(mrep.min_free_frag_file), + "min_free_frag_func", ZSW(mrep.min_free_frag_func), + "min_free_frag_mname", ZSW(mrep.min_free_frag_mname), "min_free_frag_line", mrep.min_free_frag_line, "min_used_frag_size", mrep.min_used_frag_size, - "min_used_frag_file", mrep.min_used_frag_file, - "min_used_frag_func", mrep.min_used_frag_func, - "min_used_frag_mname", mrep.min_used_frag_mname, + "min_used_frag_file", ZSW(mrep.min_used_frag_file), + "min_used_frag_func", ZSW(mrep.min_used_frag_func), + "min_used_frag_mname", ZSW(mrep.min_used_frag_mname), "min_used_frag_line", mrep.min_used_frag_line ); }

1 0

git:master:647a734f: core: mem - use macro for setting qm report fields
by Daniel-Constantin Mierla 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: 647a734f07537272f1235415f2712f770bc3f350 URL: https://github.com/kamailio/kamailio/commit/647a734f07537272f1235415f2712f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T11:19:26+01:00 core: mem - use macro for setting qm report fields --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/647a734f07537272f1235415f2712f7… Patch: https://github.com/kamailio/kamailio/commit/647a734f07537272f1235415f2712f7… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 69de680d76..2ff295fcb1 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -1028,6 +1028,14 @@ void qm_sums(void* qmp) "-----------------------------\n"); } +#define QM_REPORT_SET(MREP, FRAG, FIELD) do { \ + MREP->FIELD ## _size = FRAG->size; \ + MREP->FIELD ## _file = FRAG->file; \ + MREP->FIELD ## _func = FRAG->func; \ + MREP->FIELD ## _mname = FRAG->mname; \ + MREP->FIELD ## _line = FRAG->line; \ + } while(0) + void qm_report(void* qmp, mem_report_t *mrep) { struct qm_block* qm; @@ -1050,67 +1058,34 @@ void qm_report(void* qmp, mem_report_t *mrep) mrep->free_frags++; mrep->free_size_m += f->size; if(mrep->max_free_frag_size==0) { - mrep->max_free_frag_size = f->size; - mrep->max_free_frag_file = f->file; - mrep->max_free_frag_func = f->func; - mrep->max_free_frag_mname = f->mname; - mrep->max_free_frag_line = f->line; + QM_REPORT_SET(mrep, f, max_free_frag); } else { if(f->size > mrep->max_free_frag_size) { - mrep->max_free_frag_size = f->size; - mrep->max_free_frag_file = f->file; - mrep->max_free_frag_func = f->func; - mrep->max_free_frag_mname = f->mname; - mrep->max_free_frag_line = f->line; + QM_REPORT_SET(mrep, f, max_free_frag); } } if(mrep->min_free_frag_size==0) { - mrep->min_free_frag_size = f->size; - mrep->min_free_frag_file = f->file; - mrep->min_free_frag_func = f->func; - mrep->min_free_frag_mname = f->mname; - mrep->min_free_frag_line = f->line; + QM_REPORT_SET(mrep, f, min_free_frag); } else { if(f->size < mrep->min_free_frag_size) { - mrep->min_free_frag_size = f->size; - mrep->min_free_frag_file = f->file; - mrep->min_free_frag_func = f->func; - mrep->min_free_frag_mname = f->mname; - mrep->min_free_frag_line = f->line; + QM_REPORT_SET(mrep, f, min_free_frag); } } } else { mrep->used_frags++; mrep->used_size_m += f->size; if(mrep->max_used_frag_size==0) { - mrep->max_used_frag_size = f->size; - mrep->max_used_frag_file = f->file; - mrep->max_used_frag_func = f->func; - mrep->max_used_frag_mname = f->mname; - mrep->max_used_frag_line = f->line; + QM_REPORT_SET(mrep, f, max_used_frag); } else { if(f->size > mrep->max_used_frag_size) { - mrep->max_used_frag_size = f->size; - mrep->max_used_frag_size = f->size; - mrep->max_used_frag_file = f->file; - mrep->max_used_frag_func = f->func; - mrep->max_used_frag_mname = f->mname; - mrep->max_used_frag_line = f->line; + QM_REPORT_SET(mrep, f, max_used_frag); } } if(mrep->min_used_frag_size==0) { - mrep->min_used_frag_size = f->size; - mrep->min_used_frag_file = f->file; - mrep->min_used_frag_func = f->func; - mrep->min_used_frag_mname = f->mname; - mrep->min_used_frag_line = f->line; + QM_REPORT_SET(mrep, f, min_used_frag); } else { if(f->size < mrep->min_used_frag_size) { - mrep->min_used_frag_size = f->size; - mrep->min_used_frag_file = f->file; - mrep->min_used_frag_func = f->func; - mrep->min_used_frag_mname = f->mname; - mrep->min_used_frag_line = f->line; + QM_REPORT_SET(mrep, f, min_used_frag); } } }

1 0

git:master:1c5b26d0: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: 1c5b26d0b6e2c43741d7b37341bfe49a78d7697a URL: https://github.com/kamailio/kamailio/commit/1c5b26d0b6e2c43741d7b37341bfe49… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-10T11:01:25+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/1c5b26d0b6e2c43741d7b37341bfe49… Patch: https://github.com/kamailio/kamailio/commit/1c5b26d0b6e2c43741d7b37341bfe49…

1 0

[kamailio/kamailio] siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring (PR #3049)
by Dennis 10 Mar '22

10 Mar '22

siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring - Added X-Siptrace headers in core callback mode for SIP URI traffic duplication, headers also available in event route for filtering purporses.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3049 -- Commit Summary -- * siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring -- File Changes -- M src/modules/siptrace/siptrace.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3049.patch https://github.com/kamailio/kamailio/pull/3049.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3049 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3049(a)github.com>

3 3

git:master:57b1d537: siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring
by Daniel-Constantin Mierla 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: 57b1d5375927b987b162fcf0e2c99a39b717bd65 URL: https://github.com/kamailio/kamailio/commit/57b1d5375927b987b162fcf0e2c99a3… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T10:48:59+01:00 siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring - Added X-Siptrace headers in core callback mode for SIP URI traffic duplication, headers also available in event route for filtering purporses. --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/57b1d5375927b987b162fcf0e2c99a3… Patch: https://github.com/kamailio/kamailio/commit/57b1d5375927b987b162fcf0e2c99a3… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index d7416506dd..2c2fc48404 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2070,6 +2070,11 @@ static int siptrace_exec_evcb_msg(siptrace_data_t *sto) return -1; } + if(_siptrace_mode & SIPTRACE_MODE_URI) { + if(sip_trace_xheaders_write(sto) != 0) + return -1; + } + memset(&msg, 0, sizeof(sip_msg_t)); msg.buf = sto->body.s; msg.len = sto->body.len;

1 0

[kamailio/kamailio] smsops: Fix ucs2-to-utf8 for Accent chars (PR #3043)
by alexyosifov 10 Mar '22

10 Mar '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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3043 -- Commit Summary -- * smsops: Fix ucs2-to-utf8 for Accent chars -- File Changes -- M src/modules/smsops/smsops_impl.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3043.patch https://github.com/kamailio/kamailio/pull/3043.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3043 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3043(a)github.com>

2 2

git:master:f9f16a6c: smsops: Fix ucs2-to-utf8 for Accent chars
by Daniel-Constantin Mierla 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: f9f16a6c700a7378fc30f6f9c0a767438fc638b9 URL: https://github.com/kamailio/kamailio/commit/f9f16a6c700a7378fc30f6f9c0a7674… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T10:46:26+01:00 smsops: Fix ucs2-to-utf8 for Accent chars --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/f9f16a6c700a7378fc30f6f9c0a7674… Patch: https://github.com/kamailio/kamailio/commit/f9f16a6c700a7378fc30f6f9c0a7674… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 909ccde4e2..9d1e19c237 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -479,7 +479,7 @@ int gsm_to_ascii(char* buffer, int buffer_length, str sms, const int fill_bits) int ucs2_to_utf8 (int ucs2, char * utf8) { if (ucs2 < 0x80) { utf8[0] = ucs2; - utf8[1] = 0; + utf8[1] = 0; return 1; } if (ucs2 >= 0x80 && ucs2 < 0x800) { @@ -888,7 +888,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { // Length is worst-case 2 * len (UCS2 is 2 Bytes, UTF8 is worst-case 4 Bytes) rp_data->pdu.payload.sm.len = 0; while (len > 0) { - j = (body.s[p] << 8) + body.s[p + 1]; + j = ((unsigned char)body.s[p] << 8) + (unsigned char)body.s[p + 1]; p += 2; rp_data->pdu.payload.sm.len += ucs2_to_utf8(j, &rp_data->pdu.payload.sm.s[rp_data->pdu.payload.sm.len]); len -= 2;

1 0

[kamailio/kamailio] Master uac (PR #3047)
by Stefan Mititelu 10 Mar '22

10 Mar '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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR adds 1 UAC module function and 1 TM module modparam. It enables "uac:reply" event route trigger on timeout or non-2xx replies. Basically it: - adds TMCB_ON_FAILURE callback for UAC - copies the TM uac content into uas; thus failure route will have the uas to work with. => this part of the code was already there, i just enabled it via (another) modparam. So far, is basically tested on our side, without any apparent issues. More testing will follow. Please have a look on this and tell me what you think about it. Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3047 -- Commit Summary -- * uac: add new function uac_req_send_fr() * tm: Add enable_uac_fr modparam -- File Changes -- M src/modules/tm/config.c (5) M src/modules/tm/config.h (1) M src/modules/tm/doc/params.xml (16) M src/modules/tm/tm.c (1) M src/modules/tm/uac.c (2) M src/modules/uac/api.h (2) M src/modules/uac/doc/uac_admin.xml (27) M src/modules/uac/uac.c (1) M src/modules/uac/uac_send.c (23) M src/modules/uac/uac_send.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3047.patch https://github.com/kamailio/kamailio/pull/3047.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3047 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3047(a)github.com>

2 6

git:master:b3c301e1: uac: trigger event route for failure and timeout
by Daniel-Constantin Mierla 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: b3c301e1c99eb90df1533724442aef7991cd36bc URL: https://github.com/kamailio/kamailio/commit/b3c301e1c99eb90df1533724442aef7… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T10:46:04+01:00 uac: trigger event route for failure and timeout ...when $uac_req(evroute) = 2 --- Modified: src/modules/uac/doc/uac_admin.xml Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/b3c301e1c99eb90df1533724442aef7… Patch: https://github.com/kamailio/kamailio/commit/b3c301e1c99eb90df1533724442aef7… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 188d1b913e..3ce59d3e11 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1241,11 +1241,20 @@ failure_route[REMOTE_AUTH] { <function moreinfo="none">event_route[uac:reply]</function> </title> <para> - Event route executed for the final reply of the branch for the - request sent with uac_req_send(). The associated $uac_req(evroute) - has to be set to 1. If the request is challenged for authentication + The associated $uac_req(evroute) can have either of the following values: + <itemizedlist> + <listitem><para> + <emphasis>1</emphasis> : event route executed for the <emphasis>final reply</emphasis> of the branch for the + request sent with uac_req_send(). If the request is challenged for authentication with 401/407, then the event_route is executed twice, first for 401/407 and second for final reply of the transaction. + </para></listitem> + <listitem><para> + <emphasis>2</emphasis> : event route executed for <emphasis>failure</emphasis> of the branch for the + request sent with uac_req_send(). event route will execute also for timeout. + In order for this to work, please also enable TM module "enable_uac_fr" modparam. + </para></listitem> + </itemizedlist> </para> <example> <title><function>event_route[uac:reply]</function> usage</title> diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index 43767c7804..887dc1b4a4 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -886,9 +886,21 @@ int uac_req_send(void) return -1; } - uac_r.cb_flags = TMCB_LOCAL_COMPLETED; - /* Callback function */ - uac_r.cb = uac_send_tm_callback; + switch (_uac_req.evroute) + { + + case 2: + uac_r.cb_flags = TMCB_ON_FAILURE; + /* Callback function */ + uac_r.cb = uac_resend_tm_callback; + break; + case 1: + default: + uac_r.cb_flags = TMCB_LOCAL_COMPLETED; + /* Callback function */ + uac_r.cb = uac_send_tm_callback; + break; + } /* Callback parameter */ uac_r.cbp = (void*)tp; }

1 0

git:master:d3f25a5d: tm: Add enable_uac_fr modparam
by Daniel-Constantin Mierla 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: d3f25a5dd0139677a66792141fff075475085a03 URL: https://github.com/kamailio/kamailio/commit/d3f25a5dd0139677a66792141fff075… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T10:46:04+01:00 tm: Add enable_uac_fr modparam --- Modified: src/modules/tm/config.c Modified: src/modules/tm/config.h Modified: src/modules/tm/doc/params.xml Modified: src/modules/tm/tm.c Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/d3f25a5dd0139677a66792141fff075… Patch: https://github.com/kamailio/kamailio/commit/d3f25a5dd0139677a66792141fff075… --- diff --git a/src/modules/tm/config.c b/src/modules/tm/config.c index 3bfd007ba0..5c5ea58590 100644 --- a/src/modules/tm/config.c +++ b/src/modules/tm/config.c @@ -95,7 +95,8 @@ struct cfg_group_tm default_tm_cfg = { CANCELs; on by default */ 1, /* e2e_cancel_reason -- copy the Reason headers from incoming CANCELs into the corresp. hop-by-hop CANCELs, on by default */ - 0 /* relay_100 -- by default, assume stateful proxy and do not relay SIP 100 */ + 0, /* relay_100 -- by default, assume stateful proxy and do not relay SIP 100 */ + 0 /* enable_uac_fr */ }; void *tm_cfg = &default_tm_cfg; @@ -206,5 +207,7 @@ cfg_def_t tm_cfg_def[] = { " the corresponding generated hop-by-hop CANCELs"}, {"relay_100", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, "if set to 1, relay SIP 100 messages as a stateless proxy"}, + {"enable_uac_fr", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "if set, enables failure route for UAC messages"}, {0, 0, 0, 0, 0, 0} }; diff --git a/src/modules/tm/config.h b/src/modules/tm/config.h index 17be5416a6..47f05e0c4c 100644 --- a/src/modules/tm/config.h +++ b/src/modules/tm/config.h @@ -130,6 +130,7 @@ struct cfg_group_tm { int local_cancel_reason; int e2e_cancel_reason; unsigned int relay_100; + int enable_uac_fr; }; extern struct cfg_group_tm default_tm_cfg; diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index ee305b891c..3f67ae3f4d 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1607,4 +1607,20 @@ modparam("tm", "reply_relay_mode", 0) </example> </section> + <section id="tm.p.enable_uac_fr"> + <title><varname>enable_uac_fr</varname> (int)</title> + <para> + Enable failure route trigger, for uac. This will copy the tm uac into uas. + Thus, failure route can be triggered even for uac messages. + </para> + <example> + <title>enable_uac_fr example</title> + <programlisting> +... +modparam("tm", "enable_uac_fr", 1) +.... + </programlisting> + </example> + </section> + </section> diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index d8fc7caa19..69defa1f26 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -486,6 +486,7 @@ static param_export_t params[]={ {"event_callback_lres_sent", PARAM_STR, &_tm_event_callback_lres_sent }, {"exec_time_check" , PARAM_INT, &tm_exec_time_check_param }, {"reply_relay_mode", PARAM_INT, &tm_reply_relay_mode }, + {"enable_uac_fr", PARAM_INT, &default_tm_cfg.enable_uac_fr }, {0,0,0} }; diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 7dfcefb6ea..b7be8e3b38 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -548,7 +548,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, #ifdef USE_DNS_FAILOVER /* Set the outgoing message as UAS, so the failover code has something to work with */ - if(cfg_get(core, core_cfg, use_dns_failover)) { + if(cfg_get(core, core_cfg, use_dns_failover) || cfg_get(tm, tm_cfg, enable_uac_fr)) { if(likely(t_build_msg_from_buf(&lreq, buf, buf_len, uac_r, &dst) == 0)) { if (parse_headers(&lreq, HDR_EOH_F, 0) == -1) { LM_ERR("failed to parse headers on uas for failover\n");

1 0

[kamailio/kamailio] topos: handle BYE sent by callee during non connected call with provi… (PR #3046)
by Frédéric Gaisnon 10 Mar '22

10 Mar '22

…tional response sent by callee (INVITE,180 and BYE from callee instead CANCEL)   #### 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] 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  topos: handle BYE sent by callee during non connected call with provitional response sent by callee (INVITE,180 and BYE from callee instead CANCEL) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3046 -- Commit Summary -- * topos: handle BYE sent by callee during non connected call with provitional response sent by callee -- File Changes -- M src/modules/topos/tps_msg.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3046.patch https://github.com/kamailio/kamailio/pull/3046.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3046 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3046(a)github.com>

2 3

git:master:e1974977: topos: handle BYE sent by callee during non connected call with provitional response sent by callee
by Daniel-Constantin Mierla 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: e1974977a3e604996b752566d187b77da5072999 URL: https://github.com/kamailio/kamailio/commit/e1974977a3e604996b752566d187b77… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T10:43:05+01:00 topos: handle BYE sent by callee during non connected call with provitional response sent by callee (INVITE,180 and BYE from callee instead CANCEL) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/e1974977a3e604996b752566d187b77… Patch: https://github.com/kamailio/kamailio/commit/e1974977a3e604996b752566d187b77… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 854d2cdbc6..c7de5e514f 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -835,8 +835,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(tps_storage_load_dialog(msg, &mtsd, &stsd) < 0) { goto error; } - if(((get_cseq(msg)->method_id) & (METHOD_BYE|METHOD_PRACK|METHOD_UPDATE)) - && stsd.b_contact.len <= 0) { + if(((((get_cseq(msg)->method_id) & (METHOD_PRACK|METHOD_UPDATE)) + && stsd.b_contact.len <= 0)) || (((get_cseq(msg)->method_id) + & (METHOD_BYE) && stsd.b_contact.len <= 0) && (0 == dialog))) { /* no B-side contact, look for INVITE transaction record */ if((get_cseq(msg)->method_id) & (METHOD_UPDATE)) { /* detect direction - via from-tag */

1 0

git:master:b559a5de: corex: shm.report to print code location for fragments
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: master Commit: b559a5de7c948b678522eca2c7a05d4491690aad URL: https://github.com/kamailio/kamailio/commit/b559a5de7c948b678522eca2c7a05d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T17:16:39+01:00 corex: shm.report to print code location for fragments --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/b559a5de7c948b678522eca2c7a05d4… Patch: https://github.com/kamailio/kamailio/commit/b559a5de7c948b678522eca2c7a05d4… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index 490aaadc83..f605ef2795 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -98,7 +98,7 @@ static void corex_rpc_shm_report(rpc_t* rpc, void* ctx) } shm_report(&mrep); rpc->add(ctx, "{", &th); - rpc->struct_add(th, "jjjjjjjjjjjj", + rpc->struct_add(th, "jjjjjjjjjsssjjsssjjsssjjsssj", "total_size", mrep.total_size, "free_size_s", mrep.free_size_s, "used_size_s", mrep.used_size_s, @@ -108,9 +108,25 @@ static void corex_rpc_shm_report(rpc_t* rpc, void* ctx) "used_frags", mrep.used_frags, "total_frags", mrep.total_frags, "max_free_frag_size", mrep.max_free_frag_size, + "max_free_frag_file", mrep.max_free_frag_file, + "max_free_frag_func", mrep.max_free_frag_func, + "max_free_frag_mname", mrep.max_free_frag_mname, + "max_free_frag_line", mrep.max_free_frag_line, "max_used_frag_size", mrep.max_used_frag_size, + "max_used_frag_file", mrep.max_used_frag_file, + "max_used_frag_func", mrep.max_used_frag_func, + "max_used_frag_mname", mrep.max_used_frag_mname, + "max_used_frag_line", mrep.max_used_frag_line, "min_free_frag_size", mrep.min_free_frag_size, - "min_used_frag_size", mrep.min_used_frag_size + "min_free_frag_file", mrep.min_free_frag_file, + "min_free_frag_func", mrep.min_free_frag_func, + "min_free_frag_mname", mrep.min_free_frag_mname, + "min_free_frag_line", mrep.min_free_frag_line, + "min_used_frag_size", mrep.min_used_frag_size, + "min_used_frag_file", mrep.min_used_frag_file, + "min_used_frag_func", mrep.min_used_frag_func, + "min_used_frag_mname", mrep.min_used_frag_mname, + "min_used_frag_line", mrep.min_used_frag_line ); }

1 0

git:master:fa0f802e: mem: store file, line, module and functions in memory reports
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: master Commit: fa0f802e9042afb9142378943397d45f727bb86a URL: https://github.com/kamailio/kamailio/commit/fa0f802e9042afb9142378943397d45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T11:46:14+01:00 mem: store file, line, module and functions in memory reports --- Modified: src/core/mem/meminfo.h Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/fa0f802e9042afb9142378943397d45… Patch: https://github.com/kamailio/kamailio/commit/fa0f802e9042afb9142378943397d45…

1 0

Kamailio v5.4.8 Released
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Hello, Kamailio SIP Server v5.4.8 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.7. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.8. Note that 5.4 is the second last stable branch, still officially maintained by Kamailio development team. The latest stable branch is 5.5, with v5.5.4 being release out of it. For more details about version 5.4.8 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2022/03/kamailio-v5-4-8-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online March 28-31, 2022 (Europe Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:5.4:b71435ad: ChangeLog: content updated for v5.4.8
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: 5.4 Commit: b71435ad2fff4ef141ef20bfff8e593165c64268 URL: https://github.com/kamailio/kamailio/commit/b71435ad2fff4ef141ef20bfff8e593… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T10:44:43+01:00 ChangeLog: content updated for v5.4.8 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/b71435ad2fff4ef141ef20bfff8e593… Patch: https://github.com/kamailio/kamailio/commit/b71435ad2fff4ef141ef20bfff8e593…

1 0

git:5.4:0d1d1bbd: Makefile.defs: version set to 5.4.8
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: 5.4 Commit: 0d1d1bbde1ca1574ebc2ed7b99df55351c368800 URL: https://github.com/kamailio/kamailio/commit/0d1d1bbde1ca1574ebc2ed7b99df553… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T09:38:47+01:00 Makefile.defs: version set to 5.4.8 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0d1d1bbde1ca1574ebc2ed7b99df553… Patch: https://github.com/kamailio/kamailio/commit/0d1d1bbde1ca1574ebc2ed7b99df553… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index dde2e6055e..546cdafa57 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 7 +SUBLEVEL = 8 EXTRAVERSION = # memory manager switcher

1 0

git:5.4:a29b9f76: pkg/kamailio/deb: version set 5.4.8
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: 5.4 Commit: a29b9f7672676104e1a63ad5bd75871e95976956 URL: https://github.com/kamailio/kamailio/commit/a29b9f7672676104e1a63ad5bd75871… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T09:31:21+01:00 pkg/kamailio/deb: version set 5.4.8 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/a29b9f7672676104e1a63ad5bd75871… Patch: https://github.com/kamailio/kamailio/commit/a29b9f7672676104e1a63ad5bd75871…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev