sr-dev

sr-dev@lists.kamailio.org

3 participants
45199 discussions

[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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev