- sr-dev - kamailio.org

git:master:0aa58fe6: devcontainer: add cmake and cmake extensions [skip ci]
by Victor Seva 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: 0aa58fe66845cb1b4fe1b6d14fbb73df1bdfb640 URL: https://github.com/kamailio/kamailio/commit/0aa58fe66845cb1b4fe1b6d14fbb73d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T21:11:03+01:00 devcontainer: add cmake and cmake extensions [skip ci] --- Modified: .devcontainer/Dockerfile Modified: .devcontainer/devcontainer.json --- Diff: https://github.com/kamailio/kamailio/commit/0aa58fe66845cb1b4fe1b6d14fbb73d… Patch: https://github.com/kamailio/kamailio/commit/0aa58fe66845cb1b4fe1b6d14fbb73d… --- diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 50a901b764a..1a493a5f72a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,7 +3,7 @@ FROM mcr.microsoft.com/devcontainers/base:bookworm RUN apt-get update && \ export DEBIAN_FRONTEND=noninteractive && \ apt-get -y install --no-install-recommends \ - apt-utils dialog clang-format clang pbuilder + apt-utils dialog clang-format clang pbuilder cmake # bookworm packaging RUN mkdir -p /usr/local/src/pkg diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2a0413eae4d..2a307c79e3e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -28,7 +28,9 @@ "ms-vscode.cpptools-extension-pack", "GitHub.vscode-github-actions", "eamodio.gitlens", - "xaver.clang-format" + "xaver.clang-format", + "cheshirekow.cmake-format", + "brobeson.vscode-cmake-lint" ] } },

1 0

git:master:c28bd510: presence_conference: reformat exported structures
by Victor Seva 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: c28bd51076b5c50836cd4946e4e93c6d445fe068 URL: https://github.com/kamailio/kamailio/commit/c28bd51076b5c50836cd4946e4e93c6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T19:37:12+01:00 presence_conference: reformat exported structures --- Modified: src/modules/presence_conference/presence_conference.c --- Diff: https://github.com/kamailio/kamailio/commit/c28bd51076b5c50836cd4946e4e93c6… Patch: https://github.com/kamailio/kamailio/commit/c28bd51076b5c50836cd4946e4e93c6… --- diff --git a/src/modules/presence_conference/presence_conference.c b/src/modules/presence_conference/presence_conference.c index c4f9ca7f56e..25fdb68dc45 100644 --- a/src/modules/presence_conference/presence_conference.c +++ b/src/modules/presence_conference/presence_conference.c @@ -51,30 +51,36 @@ add_event_t pres_add_event; int use_partial_states = 0; unsigned int pres_conf_default_expires = 3600; +/* presence api bind structure */ +presence_api_t pres; + +/* clang-format off */ /* module exported commands */ -static cmd_export_t cmds[] = {{0, 0, 0, 0, 0, 0}}; +static cmd_export_t cmds[] = { + {0, 0, 0, 0, 0, 0} +}; /* module exported parameters */ static param_export_t params[] = { - {"use_partial_states", PARAM_INT, &use_partial_states}, - {"default_expires", PARAM_INT, &pres_conf_default_expires}, {0, 0, 0}}; - -/* presence api bind structure */ -presence_api_t pres; + {"use_partial_states", PARAM_INT, &use_partial_states}, + {"default_expires", PARAM_INT, &pres_conf_default_expires}, + {0, 0, 0} +}; /* module exports */ struct module_exports exports = { - "presence_conference", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "presence_conference", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /* * init module function

1 0

git:master:0193b484: presence_dialoginfo: reformat exported structures
by Victor Seva 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: 0193b48403c7d6d43370ddcd6a2ecafaee023e07 URL: https://github.com/kamailio/kamailio/commit/0193b48403c7d6d43370ddcd6a2ecaf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T19:35:37+01:00 presence_dialoginfo: reformat exported structures --- Modified: src/modules/presence_dialoginfo/presence_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/0193b48403c7d6d43370ddcd6a2ecaf… Patch: https://github.com/kamailio/kamailio/commit/0193b48403c7d6d43370ddcd6a2ecaf… --- diff --git a/src/modules/presence_dialoginfo/presence_dialoginfo.c b/src/modules/presence_dialoginfo/presence_dialoginfo.c index 46b3212340a..2ecf56024c2 100644 --- a/src/modules/presence_dialoginfo/presence_dialoginfo.c +++ b/src/modules/presence_dialoginfo/presence_dialoginfo.c @@ -51,29 +51,34 @@ int force_single_dialog = 0; int force_dummy_dialog = 0; unsigned int pres_dlginfo_default_expires = 3600; +/* clang-format off */ /* module exported commands */ -static cmd_export_t cmds[] = {{0, 0, 0, 0, 0, 0}}; +static cmd_export_t cmds[] = { + {0, 0, 0, 0, 0, 0} +}; /* module exported parameters */ static param_export_t params[] = { - {"force_single_dialog", PARAM_INT, &force_single_dialog}, - {"force_dummy_dialog", PARAM_INT, &force_dummy_dialog}, - {"default_expires", PARAM_INT, &pres_dlginfo_default_expires}, - {0, 0, 0}}; + {"force_single_dialog", PARAM_INT, &force_single_dialog}, + {"force_dummy_dialog", PARAM_INT, &force_dummy_dialog}, + {"default_expires", PARAM_INT, &pres_dlginfo_default_expires}, + {0, 0, 0} +}; /* module exports */ struct module_exports exports = { - "presence_dialoginfo", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "presence_dialoginfo", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /* * init module function

1 0

git:master:802bee7c: presence_mwi: reformat exported structures
by Victor Seva 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: 802bee7c205d402f6bdc3ba9c4210966ea758506 URL: https://github.com/kamailio/kamailio/commit/802bee7c205d402f6bdc3ba9c421096… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T19:33:53+01:00 presence_mwi: reformat exported structures --- Modified: src/modules/presence_mwi/presence_mwi.c --- Diff: https://github.com/kamailio/kamailio/commit/802bee7c205d402f6bdc3ba9c421096… Patch: https://github.com/kamailio/kamailio/commit/802bee7c205d402f6bdc3ba9c421096… --- diff --git a/src/modules/presence_mwi/presence_mwi.c b/src/modules/presence_mwi/presence_mwi.c index 8024ad3d840..878c1a25527 100644 --- a/src/modules/presence_mwi/presence_mwi.c +++ b/src/modules/presence_mwi/presence_mwi.c @@ -62,26 +62,32 @@ add_event_t pres_add_event; /* module parameters */ unsigned int pres_mwi_default_expires = 3600; +/* clang-format off */ /* module exported commands */ -static cmd_export_t cmds[] = {{0, 0, 0, 0, 0, 0}}; +static cmd_export_t cmds[] = { + {0, 0, 0, 0, 0, 0} +}; /* module exported parameters */ static param_export_t params[] = { - {"default_expires", PARAM_INT, &pres_mwi_default_expires}, {0, 0, 0}}; + {"default_expires", PARAM_INT, &pres_mwi_default_expires}, + {0, 0, 0} +}; /* module exports */ struct module_exports exports = { "presence_mwi", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /* * init module function

1 0

git:master:d916aa67: presence_profile: reformat exported structures
by Victor Seva 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: d916aa671f10b284aff0217fdf3182256b62ec7e URL: https://github.com/kamailio/kamailio/commit/d916aa671f10b284aff0217fdf31822… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T19:28:39+01:00 presence_profile: reformat exported structures --- Modified: src/modules/presence_profile/presence_profile.c --- Diff: https://github.com/kamailio/kamailio/commit/d916aa671f10b284aff0217fdf31822… Patch: https://github.com/kamailio/kamailio/commit/d916aa671f10b284aff0217fdf31822… --- diff --git a/src/modules/presence_profile/presence_profile.c b/src/modules/presence_profile/presence_profile.c index 16205574066..100582c8d08 100644 --- a/src/modules/presence_profile/presence_profile.c +++ b/src/modules/presence_profile/presence_profile.c @@ -59,24 +59,25 @@ add_event_t pres_add_event; /* module parameters */ unsigned int pres_profile_default_expires = 3600; +/* clang-format off */ /* module exported parameters */ static param_export_t params[] = { - {"default_expires", PARAM_INT, &pres_profile_default_expires}, - {0, 0, 0}}; + {"default_expires", PARAM_INT, &pres_profile_default_expires}, + {0, 0, 0} +}; /* module exports */ -/* clang-format off */ struct module_exports exports= { "presence_profile", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - 0, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; /* clang-format on */

1 0

git:master:07a47afb: presence_reginfo: reformat exported structures
by Victor Seva 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: 07a47afb577c7958f23cd46c80f26edcb4f2995b URL: https://github.com/kamailio/kamailio/commit/07a47afb577c7958f23cd46c80f26ed… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T19:27:30+01:00 presence_reginfo: reformat exported structures --- Modified: src/modules/presence_reginfo/presence_reginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/07a47afb577c7958f23cd46c80f26ed… Patch: https://github.com/kamailio/kamailio/commit/07a47afb577c7958f23cd46c80f26ed… --- diff --git a/src/modules/presence_reginfo/presence_reginfo.c b/src/modules/presence_reginfo/presence_reginfo.c index ba5355eec65..f7ddf925b33 100644 --- a/src/modules/presence_reginfo/presence_reginfo.c +++ b/src/modules/presence_reginfo/presence_reginfo.c @@ -50,26 +50,26 @@ add_event_t pres_add_event; int pres_reginfo_aggregate_presentities = 0; unsigned int pres_reginfo_default_expires = 3600; +/* clang-format off */ /* module exported parameters */ static param_export_t params[] = { - {"default_expires", PARAM_INT, &pres_reginfo_default_expires}, - {"aggregate_presentities", PARAM_INT, - &pres_reginfo_aggregate_presentities}, - {0, 0, 0}}; + {"default_expires", PARAM_INT, &pres_reginfo_default_expires}, + {"aggregate_presentities", PARAM_INT, &pres_reginfo_aggregate_presentities}, + {0, 0, 0} +}; /* module exports */ -/* clang-format off */ struct module_exports exports= { - "presence_reginfo", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - 0, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "presence_reginfo", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; /* clang-format on */

1 0

git:master:ab033f5e: presence_xml: add fixup_free* to exported functions
by Victor Seva 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: ab033f5ed335b731a5026c9401b6bbf6d488ffe6 URL: https://github.com/kamailio/kamailio/commit/ab033f5ed335b731a5026c9401b6bbf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T19:23:39+01:00 presence_xml: add fixup_free* to exported functions --- Modified: src/modules/presence_xml/presence_xml.c --- Diff: https://github.com/kamailio/kamailio/commit/ab033f5ed335b731a5026c9401b6bbf… Patch: https://github.com/kamailio/kamailio/commit/ab033f5ed335b731a5026c9401b6bbf… --- diff --git a/src/modules/presence_xml/presence_xml.c b/src/modules/presence_xml/presence_xml.c index b854fda5187..3d2506341e3 100644 --- a/src/modules/presence_xml/presence_xml.c +++ b/src/modules/presence_xml/presence_xml.c @@ -72,6 +72,7 @@ static void free_xs_list(xcap_serv_t *xs_list, int mem_type); static int xcap_doc_updated(int doc_type, str xid, char *doc); static int fixup_presxml_check(void **param, int param_no); +static int fixup_free_presxml_check(void **param, int param_no); static int w_presxml_check_basic( sip_msg_t *msg, char *presentity_uri, char *status); static int w_presxml_check_activities( @@ -114,9 +115,9 @@ xcapGetNewDoc_t xcap_GetNewDoc; /* clang-format off */ static cmd_export_t cmds[]={ { "pres_check_basic", (cmd_function)w_presxml_check_basic, 2, - fixup_presxml_check, 0, ANY_ROUTE}, + fixup_presxml_check, fixup_free_presxml_check, ANY_ROUTE}, { "pres_check_activities", (cmd_function)w_presxml_check_activities, 2, - fixup_presxml_check, 0, ANY_ROUTE}, + fixup_presxml_check, fixup_free_presxml_check, ANY_ROUTE}, { "bind_presence_xml", (cmd_function)bind_presence_xml, 1, 0, 0, 0}, { 0, 0, 0, 0, 0, 0} @@ -465,6 +466,16 @@ static int fixup_presxml_check(void **param, int param_no) return 0; } +static int fixup_free_presxml_check(void **param, int param_no) +{ + if(param_no == 1) { + return fixup_free_spve_null(param, 1); + } else if(param_no == 2) { + return fixup_free_spve_null(param, 1); + } + return 0; +} + static int w_presxml_check_basic( sip_msg_t *msg, char *presentity_uri, char *status) {

1 0

git:master:64fe1638: pua: reformat exported structures
by Victor Seva 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: 64fe1638c08ac6c7e44daf663d24f088344a511a URL: https://github.com/kamailio/kamailio/commit/64fe1638c08ac6c7e44daf663d24f08… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T19:20:49+01:00 pua: reformat exported structures --- Modified: src/modules/pua/pua.c --- Diff: https://github.com/kamailio/kamailio/commit/64fe1638c08ac6c7e44daf663d24f08… Patch: https://github.com/kamailio/kamailio/commit/64fe1638c08ac6c7e44daf663d24f08… --- diff --git a/src/modules/pua/pua.c b/src/modules/pua/pua.c index 515abe0dc4c..638446eb39d 100644 --- a/src/modules/pua/pua.c +++ b/src/modules/pua/pua.c @@ -113,38 +113,44 @@ static void hashT_clean(unsigned int ticks, void *param); static int pua_rpc_init(void); +/* clang-format off */ static cmd_export_t cmds[] = { - {"pua_update_contact", (cmd_function)w_pua_update_contact, 0, 0, 0, - REQUEST_ROUTE}, - {"bind_libxml_api", (cmd_function)bind_libxml_api, 1, 0, 0, 0}, - {"bind_pua", (cmd_function)bind_pua, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{"hash_size", PARAM_INT, &HASH_SIZE}, - {"db_url", PARAM_STR, &db_url}, {"db_table", PARAM_STR, &db_table}, - {"min_expires", PARAM_INT, &min_expires}, - {"default_expires", PARAM_INT, &pua_default_expires}, - {"update_period", PARAM_INT, &update_period}, - {"outbound_proxy", PARAM_STR, &outbound_proxy}, - {"dlginfo_increase_version", PARAM_INT, &dlginfo_increase_version}, - {"reginfo_increase_version", PARAM_INT, &reginfo_increase_version}, - {"check_remote_contact", PARAM_INT, &check_remote_contact}, - {"db_mode", PARAM_INT, &dbmode}, - {"fetch_rows", PARAM_INT, &pua_fetch_rows}, - {"db_table_lock_write", PARAM_INT, &db_table_lock_write}, {0, 0, 0}}; + {"pua_update_contact", (cmd_function)w_pua_update_contact, 0, 0, 0, REQUEST_ROUTE}, + {"bind_libxml_api", (cmd_function)bind_libxml_api, 1, 0, 0, 0}, + {"bind_pua", (cmd_function)bind_pua, 1, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; + +static param_export_t params[] = { + {"hash_size", PARAM_INT, &HASH_SIZE}, + {"db_url", PARAM_STR, &db_url}, {"db_table", PARAM_STR, &db_table}, + {"min_expires", PARAM_INT, &min_expires}, + {"default_expires", PARAM_INT, &pua_default_expires}, + {"update_period", PARAM_INT, &update_period}, + {"outbound_proxy", PARAM_STR, &outbound_proxy}, + {"dlginfo_increase_version", PARAM_INT, &dlginfo_increase_version}, + {"reginfo_increase_version", PARAM_INT, &reginfo_increase_version}, + {"check_remote_contact", PARAM_INT, &check_remote_contact}, + {"db_mode", PARAM_INT, &dbmode}, + {"fetch_rows", PARAM_INT, &pua_fetch_rows}, + {"db_table_lock_write", PARAM_INT, &db_table_lock_write}, + {0, 0, 0} +}; /** module exports */ struct module_exports exports = { "pua", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - child_init, /* per-child init function */ - destroy /* module destroy function */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + child_init, /* per-child init function */ + destroy /* module destroy function */ }; +/* clang-format on */ /** * init module function

1 0

git:master:e39420a1: pua_reginfo: reformat exported structures
by Victor Seva 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: e39420a17a6e1bbd8f1e87d456cc7f50f97781c9 URL: https://github.com/kamailio/kamailio/commit/e39420a17a6e1bbd8f1e87d456cc7f5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T19:16:29+01:00 pua_reginfo: reformat exported structures --- Modified: src/modules/pua_reginfo/pua_reginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/e39420a17a6e1bbd8f1e87d456cc7f5… Patch: https://github.com/kamailio/kamailio/commit/e39420a17a6e1bbd8f1e87d456cc7f5… --- diff --git a/src/modules/pua_reginfo/pua_reginfo.c b/src/modules/pua_reginfo/pua_reginfo.c index d12b5ed419f..34b9617d597 100644 --- a/src/modules/pua_reginfo/pua_reginfo.c +++ b/src/modules/pua_reginfo/pua_reginfo.c @@ -54,34 +54,39 @@ static int domain_fixup(void **param, int param_no); /** module functions */ static int mod_init(void); +/* clang-format off */ /* Commands */ static cmd_export_t cmds[] = { - {"reginfo_subscribe", (cmd_function)reginfo_subscribe, 1, - fixup_subscribe, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, - {"reginfo_subscribe", (cmd_function)reginfo_subscribe2, 2, - fixup_subscribe, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, - {"reginfo_handle_notify", (cmd_function)reginfo_handle_notify, 1, - domain_fixup, 0, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"reginfo_subscribe", (cmd_function)reginfo_subscribe, 1, + fixup_subscribe, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + {"reginfo_subscribe", (cmd_function)reginfo_subscribe2, 2, + fixup_subscribe, 0, REQUEST_ROUTE | ONREPLY_ROUTE}, + {"reginfo_handle_notify", (cmd_function)reginfo_handle_notify, 1, + domain_fixup, 0, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"default_domain", PARAM_STR, &default_domain}, - {"outbound_proxy", PARAM_STR, &outbound_proxy}, - {"server_address", PARAM_STR, &server_address}, - {"publish_reginfo", PARAM_INT, &publish_reginfo}, {0, 0, 0}}; + {"default_domain", PARAM_STR, &default_domain}, + {"outbound_proxy", PARAM_STR, &outbound_proxy}, + {"server_address", PARAM_STR, &server_address}, + {"publish_reginfo", PARAM_INT, &publish_reginfo}, + {0, 0, 0} +}; struct module_exports exports = { - "pua_reginfo", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "pua_reginfo", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /** * init module function

1 0

git:master:93b979aa: pua_rpc: reformat exported structures
by Victor Seva 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: 93b979aa5b3dd6ebd18eea20752af848fc83a74b URL: https://github.com/kamailio/kamailio/commit/93b979aa5b3dd6ebd18eea20752af84… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T19:13:38+01:00 pua_rpc: reformat exported structures --- Modified: src/modules/pua_rpc/pua_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/93b979aa5b3dd6ebd18eea20752af84… Patch: https://github.com/kamailio/kamailio/commit/93b979aa5b3dd6ebd18eea20752af84… --- diff --git a/src/modules/pua_rpc/pua_rpc.c b/src/modules/pua_rpc/pua_rpc.c index b7ea2fae7f4..e1fc41f3aa0 100644 --- a/src/modules/pua_rpc/pua_rpc.c +++ b/src/modules/pua_rpc/pua_rpc.c @@ -372,27 +372,28 @@ static void pua_rpc_subscribe(rpc_t *rpc, void *ctx) static const char *pua_rpc_subscribe_doc[2] = {"Send subscribe request", 0}; - +/* clang-format off */ rpc_export_t pua_rpc_ex[] = { - {"pua.publish", pua_rpc_publish, pua_rpc_publish_doc, 0}, - {"pua.send_publish", pua_rpc_send_publish, pua_rpc_send_publish_doc, 0}, - {"pua.subscribe", pua_rpc_subscribe, pua_rpc_subscribe_doc, 0}, - {0, 0, 0, 0}}; - + {"pua.publish", pua_rpc_publish, pua_rpc_publish_doc, 0}, + {"pua.send_publish", pua_rpc_send_publish, pua_rpc_send_publish_doc, 0}, + {"pua.subscribe", pua_rpc_subscribe, pua_rpc_subscribe_doc, 0}, + {0, 0, 0, 0} +}; /** module exports */ struct module_exports exports = { - "pua_rpc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - 0, /* exported functions */ - 0, /* exported parameters */ - pua_rpc_ex, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "pua_rpc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + 0, /* exported parameters */ + pua_rpc_ex, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /** * init module function

1 0

git:master:bbb373e2: pua_usrloc: reformat exported structures
by Victor Seva 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: bbb373e2239e5e25527b708551dd5e03399f7bf3 URL: https://github.com/kamailio/kamailio/commit/bbb373e2239e5e25527b708551dd5e0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T19:13:38+01:00 pua_usrloc: reformat exported structures --- Modified: src/modules/pua_usrloc/pua_usrloc.c --- Diff: https://github.com/kamailio/kamailio/commit/bbb373e2239e5e25527b708551dd5e0… Patch: https://github.com/kamailio/kamailio/commit/bbb373e2239e5e25527b708551dd5e0… --- diff --git a/src/modules/pua_usrloc/pua_usrloc.c b/src/modules/pua_usrloc/pua_usrloc.c index bd2184a0aff..a0c154b77fc 100644 --- a/src/modules/pua_usrloc/pua_usrloc.c +++ b/src/modules/pua_usrloc/pua_usrloc.c @@ -70,29 +70,33 @@ usrloc_api_t ul; static int mod_init(void); +/* clang-format off */ static cmd_export_t cmds[] = { - {"pua_set_publish", (cmd_function)w_pua_set_publish, 0, 0, 0, - REQUEST_ROUTE}, - {"bind_pua_usrloc", (cmd_function)bind_pua_usrloc, 1, 0, 0, 0}, - {0, 0, 0, 0, 0, 0}}; + {"pua_set_publish", (cmd_function)w_pua_set_publish, 0, 0, 0, REQUEST_ROUTE}, + {"bind_pua_usrloc", (cmd_function)bind_pua_usrloc, 1, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"default_domain", PARAM_STR, &default_domain}, - {"entity_prefix", PARAM_STR, &pres_prefix}, - {"branch_flag", PARAM_INT, &pua_ul_bflag}, {0, 0, 0}}; + {"default_domain", PARAM_STR, &default_domain}, + {"entity_prefix", PARAM_STR, &pres_prefix}, + {"branch_flag", PARAM_INT, &pua_ul_bflag}, + {0, 0, 0} +}; struct module_exports exports = { - "pua_usrloc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "pua_usrloc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /*! \brief * init module function

1 0

git:master:eaefe0f2: pua_xml: reformat exported structures
by Victor Seva 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: eaefe0f2f50a7bf1bbb17c14511d7ae5a4b4deee URL: https://github.com/kamailio/kamailio/commit/eaefe0f2f50a7bf1bbb17c14511d7ae… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T19:05:59+01:00 pua_xml: reformat exported structures --- Modified: src/modules/pua_xmpp/pua_xmpp.c --- Diff: https://github.com/kamailio/kamailio/commit/eaefe0f2f50a7bf1bbb17c14511d7ae… Patch: https://github.com/kamailio/kamailio/commit/eaefe0f2f50a7bf1bbb17c14511d7ae… --- diff --git a/src/modules/pua_xmpp/pua_xmpp.c b/src/modules/pua_xmpp/pua_xmpp.c index 31c16daf21e..5f0d5dacd11 100644 --- a/src/modules/pua_xmpp/pua_xmpp.c +++ b/src/modules/pua_xmpp/pua_xmpp.c @@ -83,28 +83,32 @@ static int child_init(int); static int fixup_pua_xmpp(void **param, int param_no); +/* clang-format off */ static cmd_export_t cmds[] = { - {"pua_xmpp_notify", (cmd_function)Notify2Xmpp, 0, 0, 0, REQUEST_ROUTE}, - {"pua_xmpp_req_winfo", (cmd_function)request_winfo, 2, fixup_pua_xmpp, - 0, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"pua_xmpp_notify", (cmd_function)Notify2Xmpp, 0, 0, 0, REQUEST_ROUTE}, + {"pua_xmpp_req_winfo", (cmd_function)request_winfo, 2, fixup_pua_xmpp, 0, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"server_address", PARAM_STR, &server_address}, {0, 0, 0}}; + {"server_address", PARAM_STR, &server_address}, + {0, 0, 0} +}; /*! \brief module exports */ struct module_exports exports = { - "pua_xmpp", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - child_init, /* per-child init function */ - 0 /* module destroy function */ + "pua_xmpp", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + child_init, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /*! \brief * init module function

1 0

git:master:954fa318: cmake: Use CMAKE_INSTALL_FULL_* paths where appropriate
by Xenofon Karamanos 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: 954fa3188b3e5e18b0992667b8904a1d17430598 URL: https://github.com/kamailio/kamailio/commit/954fa3188b3e5e18b0992667b8904a1… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-11T17:27:52Z cmake: Use CMAKE_INSTALL_FULL_* paths where appropriate - include(GNUInstallDirs) from root so all CMakeLists have access to the variables -CMake formatting --- Modified: CMakeLists.txt Modified: src/CMakeLists.txt Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/954fa3188b3e5e18b0992667b8904a1… Patch: https://github.com/kamailio/kamailio/commit/954fa3188b3e5e18b0992667b8904a1…

1 0

git:master:b540392e: cmake: support for intel 32b cpu architectures
by Daniel-Constantin Mierla 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: b540392ef910a63f2bda1b78d5970298edc87308 URL: https://github.com/kamailio/kamailio/commit/b540392ef910a63f2bda1b78d597029… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-11T15:38:02+01:00 cmake: support for intel 32b cpu architectures - identified with i386, i486, i586 and i686 - target cpu arch aliased it i386, like in old-makefiles, some code depending on it --- Modified: cmake/compiler-specific.cmake Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/b540392ef910a63f2bda1b78d597029… Patch: https://github.com/kamailio/kamailio/commit/b540392ef910a63f2bda1b78d597029… --- diff --git a/cmake/compiler-specific.cmake b/cmake/compiler-specific.cmake index 58b8b9cc998..f6bd54c2655 100644 --- a/cmake/compiler-specific.cmake +++ b/cmake/compiler-specific.cmake @@ -37,6 +37,35 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") target_link_options(common INTERFACE -m64) endif() +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i486|i586|i686") + + if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_definitions(common INTERFACE CC_GCC_LIKE_ASM) + + target_compile_options( + common INTERFACE -O0 + # <$<$<BOOL:${PROFILE}>:-pg> + ) + + target_compile_options( + common + INTERFACE -Wall -funroll-loops -Wcast-align + -Werror=implicit-function-declaration -Werror=implicit-int + ) + + # If GCC version is greater than 4.2.0, enable the following flags + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.2.0) + target_compile_options( + common INTERFACE -m32 -minline-all-stringops -falign-loops + -ftree-vectorize -fno-strict-overflow -mtune=generic + ) + endif() + elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_compile_definitions(common INTERFACE CC_GCC_LIKE_ASM) + target_compile_options(common INTERFACE -m32) + target_link_options(common INTERFACE -m32) + endif() + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") if(CMAKE_C_COMPILER_ID STREQUAL "GNU") diff --git a/cmake/defs.cmake b/cmake/defs.cmake index 1d151646c05..0509cad4fca 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -12,12 +12,17 @@ message(STATUS "OS: ${OS}") set(OSREL ${CMAKE_SYSTEM_VERSION}) message(STATUS "OS version: ${OSREL}") # set(HOST_ARCH "__CPU_${CMAKE_HOST_SYSTEM_PROCESSOR}") -set(TARGET_ARCH "__CPU_${CMAKE_SYSTEM_PROCESSOR}") + +if(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i486|i586|i686") + set(TARGET_ARCH "i386") +else() + set(TARGET_ARCH "${CMAKE_SYSTEM_PROCESSOR}") +endif() message(STATUS "Host Processor: ${CMAKE_HOST_SYSTEM_PROCESSOR}") # message(STATUS "Processor compile definition: ${HOST_ARCH}") message(STATUS "Target Processor: ${CMAKE_SYSTEM_PROCESSOR}") -message(STATUS "Target Processor compile definition: ${TARGET_ARCH}") +message(STATUS "Target Processor Alias: ${TARGET_ARCH}") # TODO Check if target arch is supported if(NOT TARGET_ARCH IN_LIST # supported_archs) message(FATAL_ERROR "Target architecture not supported") @@ -138,7 +143,7 @@ option(USE_FAST_LOCK "Use fast locking if available" ON) # if(USE_FAST_LOCK) if(CMAKE_SYSTEM_PROCESSOR MATCHES - "i386|x86_64|sparc64|sparc|ppc|ppc64|alpha|mips2|mips64" + "i386|i486|i586|i686|x86_64|sparc64|sparc|ppc|ppc64|alpha|mips2|mips64" ) set(USE_FAST_LOCK YES) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") @@ -296,9 +301,9 @@ include(${CMAKE_SOURCE_DIR}/cmake/os-specific.cmake) set(COMPILER_NAME ${CMAKE_C_COMPILER_ID}) if(CMAKE_C_COMPILER_ID STREQUAL "GNU") - set(COMPILER_NAME "gcc") + set(COMPILER_NAME "gcc") elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang") - set(COMPILER_NAME "clang") + set(COMPILER_NAME "clang") endif() string(TOLOWER ${OS} OS_LOWER) @@ -307,12 +312,12 @@ target_compile_definitions( INTERFACE NAME="${MAIN_NAME}" VERSION="${RELEASE}" - ARCH="${CMAKE_HOST_SYSTEM_PROCESSOR}" + ARCH="${TARGET_ARCH}" OS=${OS} OS_QUOTED="${OS}" COMPILER="${COMPILER_NAME} ${CMAKE_C_COMPILER_VERSION}" # ${HOST_ARCH} - ${TARGET_ARCH} + __CPU_${TARGET_ARCH} __OS_${OS_LOWER} VERSIONVAL=${VERSIONVAL} CFG_DIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}/${CFG_NAME}/"

1 0

git:master:2fbea39d: github: codeql use same strategy for nightly builds [skip ci]
by Victor Seva 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: 2fbea39d4125be89f36cce161f9e6b0dbcd50595 URL: https://github.com/kamailio/kamailio/commit/2fbea39d4125be89f36cce161f9e6b0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T13:15:09+01:00 github: codeql use same strategy for nightly builds [skip ci] --- Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/2fbea39d4125be89f36cce161f9e6b0… Patch: https://github.com/kamailio/kamailio/commit/2fbea39d4125be89f36cce161f9e6b0… --- diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 84460230bba..3fe6ef06cfa 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -6,7 +6,27 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: jobs: + # is required nightly build? + # More info at https://stackoverflow.com/questions/63014786/how-to-schedule-a-github-actio… + check: + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - uses: octokit/request-action(a)v2.x + id: check_last_run + with: + route: GET /repos/{owner}/{repo}/actions/workflows/alpine.yml/runs?per_page=1&status=completed + owner: ${{ github.repository_owner }} + repo: kamailio + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - run: "echo Last daily build: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }}" + outputs: + last_sha: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} analyze: + needs: [check] + if: needs.check.outputs.last_sha != github.sha name: Analyze runs-on: [self-hosted, linux, x64, codeql] permissions:

1 0

Re: [kamailio/kamailio] cmake: added target compile option -ffile-prefix-map (28f4089)
by Daniel-Constantin Mierla 11 Dec '24

11 Dec '24

I am not yet familiar with CMake and was not sure what/where can be done. For example, afterwards, by testing I could figure out that the CMakeList.txt for (many) modules can be more or less the same, like a template. For `acc` module, I could get: ``` set(MODNAME acc) file(GLOB ${MODNAME}_SRC "*.c") add_library(${MODNAME} SHARED ${${MODNAME}_SRC}) target_compile_options(${MODNAME} PUBLIC "-ffile-prefix-map=${CMAKE_SOURCE_DIR}/src/modules/${MODNAME}/=") ``` First line is different per module, setting the module name, but there might be already available a CMake variable with the module name (in your comment you use `${MODULE_NAME}`). So, the CMakeList.txt in the module folder can include a common-template file. On the other hand, I am not sure if using too many variables will slow down compilation, because of too many times expanding the vars. Anyhow, feel free to update/optimize as you consider to be better. I am mostly trying to figure out solutions for what I see it is different, without adding more load on your shoulders. It might not be the best, so it can be updated. If I get stuck with something I will get it to you. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/28f4089efcc9c2ccf8c79fc9ecc509a… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/28f4089efcc9c2ccf8c79fc9ecc509ae29d873e5/150201533(a)github.com>

1 0

Re: [kamailio/kamailio] cmake: added target compile option -ffile-prefix-map (28f4089)
by Xenofon Karamanos 11 Dec '24

11 Dec '24

Since this was for all modules and the main, it could be done in the https://github.com/kamailio/kamailio/blob/master/cmake/defs.cmake specifically in: https://github.com/kamailio/kamailio/blob/ccadde0a6656cd78fc1b4f67ed40b5a6a… All modules are then linked with this INTERFACE target. or because it has some specific folder names in the option it may be easier in the modules CMakeLists.txt. Just add this `target_compile_definitions(${MODULE_NAME} PRIVATE|PUBLIC "-ffile-prefix-map=${CMAKE_SOURCE_DIR}/src/modules/${MODULE_NAME}/= " ) https://github.com/kamailio/kamailio/blob/ccadde0a6656cd78fc1b4f67ed40b5a6a… -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/28f4089efcc9c2ccf8c79fc9ecc509a… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/28f4089efcc9c2ccf8c79fc9ecc509ae29d873e5/150201036(a)github.com>

1 0

git:master:ccadde0a: cmake/defs.cmake: value of -DCOMPILER updated to include compiler suite name
by Daniel-Constantin Mierla 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: ccadde0a6656cd78fc1b4f67ed40b5a6ac119d9e URL: https://github.com/kamailio/kamailio/commit/ccadde0a6656cd78fc1b4f67ed40b5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-11T11:19:11+01:00 cmake/defs.cmake: value of -DCOMPILER updated to include compiler suite name - similar format like for old-makefiles, not only the version number --- Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/ccadde0a6656cd78fc1b4f67ed40b5a… Patch: https://github.com/kamailio/kamailio/commit/ccadde0a6656cd78fc1b4f67ed40b5a… --- diff --git a/cmake/defs.cmake b/cmake/defs.cmake index bb9a0b680a7..1d151646c05 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -294,6 +294,13 @@ endif() include(${CMAKE_SOURCE_DIR}/cmake/compiler-specific.cmake) include(${CMAKE_SOURCE_DIR}/cmake/os-specific.cmake) +set(COMPILER_NAME ${CMAKE_C_COMPILER_ID}) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + set(COMPILER_NAME "gcc") +elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang") + set(COMPILER_NAME "clang") +endif() + string(TOLOWER ${OS} OS_LOWER) target_compile_definitions( common @@ -303,7 +310,7 @@ target_compile_definitions( ARCH="${CMAKE_HOST_SYSTEM_PROCESSOR}" OS=${OS} OS_QUOTED="${OS}" - COMPILER="${CMAKE_C_COMPILER_VERSION}" + COMPILER="${COMPILER_NAME} ${CMAKE_C_COMPILER_VERSION}" # ${HOST_ARCH} ${TARGET_ARCH} __OS_${OS_LOWER}

1 0

git:master:6edc0396: src/CMakeLists.txt: log compiler details
by Daniel-Constantin Mierla 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: 6edc0396a04664e18ac43cbb024cde9cf2120a8c URL: https://github.com/kamailio/kamailio/commit/6edc0396a04664e18ac43cbb024cde9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-11T11:03:25+01:00 src/CMakeLists.txt: log compiler details --- Modified: src/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/6edc0396a04664e18ac43cbb024cde9… Patch: https://github.com/kamailio/kamailio/commit/6edc0396a04664e18ac43cbb024cde9… --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 929c46523dd..7b4b1d15142 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,6 +20,10 @@ message(STATUS "CMAKE_INSTALL_DATADIR: ${CMAKE_INSTALL_FULL_DATADIR}") message(STATUS "CMAKE_INSTALL_DOCDIR: ${CMAKE_INSTALL_FULL_DOCDIR}") message(STATUS "CMAKE_INSTALL_MANDIR: ${CMAKE_INSTALL_FULL_MANDIR}") +message(STATUS "CMAKE_C_COMPILER: " ${CMAKE_C_COMPILER} ) +message(STATUS "CMAKE_C_COMPILER_ID: ${CMAKE_C_COMPILER_ID}") +message(STATUS "CMAKE_C_COMPILER_VERSION: ${CMAKE_C_COMPILER_VERSION}") + find_package(Threads REQUIRED) include(${CMAKE_SOURCE_DIR}/cmake/defs.cmake)

1 0

git:5.7:e85d6e5d: http_async_client: fixed crash on curl callback
by Federico Cabiddu 11 Dec '24

11 Dec '24

Module: kamailio Branch: 5.7 Commit: e85d6e5dd499dce586e72fdca2ee7cbff6520327 URL: https://github.com/kamailio/kamailio/commit/e85d6e5dd499dce586e72fdca2ee7cb… Author: Nikolay Ivanuschak <ivanuschak.nikolay(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-12-11T07:49:52+01:00 http_async_client: fixed crash on curl callback --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/e85d6e5dd499dce586e72fdca2ee7cb… Patch: https://github.com/kamailio/kamailio/commit/e85d6e5dd499dce586e72fdca2ee7cb… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index a57aba9c951..a46b7262506 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -157,10 +157,12 @@ void event_cb(int fd, short kind, void *userp) /* CURLMOPT_SOCKETFUNCTION */ int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp) { + struct http_m_cell *cell; struct http_m_global *g = (struct http_m_global *)cbp; - struct http_m_cell *cell = (struct http_m_cell *)sockp; const char *whatstr[] = {"none", "IN", "OUT", "INOUT", "REMOVE"}; + cell = http_m_cell_lookup(e); + LM_DBG("socket callback: s=%d e=%p what=%s\n", s, e, whatstr[what]); if(what == CURL_POLL_REMOVE) { /* if cell is NULL the handle has been removed by the event callback for timeout */

1 0

git:5.8:59810599: http_async_client: fixed crash on curl callback
by Federico Cabiddu 11 Dec '24

11 Dec '24

Module: kamailio Branch: 5.8 Commit: 5981059909f6d767fcad60d639dbeff5f54bfe3f URL: https://github.com/kamailio/kamailio/commit/5981059909f6d767fcad60d639dbeff… Author: Nikolay Ivanuschak <ivanuschak.nikolay(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-12-11T07:49:35+01:00 http_async_client: fixed crash on curl callback --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/5981059909f6d767fcad60d639dbeff… Patch: https://github.com/kamailio/kamailio/commit/5981059909f6d767fcad60d639dbeff… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index a57aba9c951..a46b7262506 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -157,10 +157,12 @@ void event_cb(int fd, short kind, void *userp) /* CURLMOPT_SOCKETFUNCTION */ int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp) { + struct http_m_cell *cell; struct http_m_global *g = (struct http_m_global *)cbp; - struct http_m_cell *cell = (struct http_m_cell *)sockp; const char *whatstr[] = {"none", "IN", "OUT", "INOUT", "REMOVE"}; + cell = http_m_cell_lookup(e); + LM_DBG("socket callback: s=%d e=%p what=%s\n", s, e, whatstr[what]); if(what == CURL_POLL_REMOVE) { /* if cell is NULL the handle has been removed by the event callback for timeout */

1 0

[kamailio/kamailio] cdp: disconnect_serviced_peer Causing the service process to crash (Issue #3999)
by liangbaolin 11 Dec '24

11 Dec '24

### Description hi, I encountered a problem where the CDP module is extremely prone to process crashes. The following are screenshots of the logs and core files. I couldn't find the exception code that caused the problem, but I suspect that the TCP link was properly established, but the peer did not initialize or handle the exception properly, resulting in an exception when the packet was parsed incorrectly and disconnected later. In addition, since the socket is not a normal peer, it will constantly rebuild the chain, but the CDP does not recognize and process it properly. The socket will continue to grow, but the number of peers will not increase. <img width="1508" alt="微信图片_20241011175120" src="https://github.com/user-attachments/assets/88a0fc31-9ff6-4f46-9394-f49c7878…"> ### Troubleshooting #### Reproduction  #### Debugging Data ``` Core was generated by `/usr/sbin/kamailio -f /etc/kamailio_dra/kamailio_dra.cfg -P /var/run/kamailio_d'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f9860fae336 in cc_acc_client_stateful_sm_process (s=0x7f9861bd8980, event=21874, msg=0x55720d57c702 <qm_free+8029>) at acctstatemachine.c:304 304 } (gdb) bt #0 0x00007f9860fae336 in cc_acc_client_stateful_sm_process (s=0x7f9861bd8980, event=21874, msg=0x55720d57c702 <qm_free+8029>) at acctstatemachine.c:304 #1 0x00007f9860fae391 in atomic_get_and_set_int (var=0x776f6e6b6e752072, v=32766) at ../../core/mem/../atomic/atomic_x86.h:242 #2 0x00007f9860fb16eb in disconnect_serviced_peer (sp=0x7f98e28287d0, locked=0) at receiver.c:232 #3 0x00007f9860fbd56b in receive_loop (original_peer=0x0) at receiver.c:942 #4 0x00007f9860fb4c02 in receiver_process (p=0x0) at receiver.c:488 #5 0x00007f9860f50c80 in diameter_peer_start (blocking=0) at diameter_peer.c:278 #6 0x00007f9860f413df in cdp_child_init (rank=0) at cdp_mod.c:274 #7 0x000055720d3df6c2 in init_mod_child (m=0x7f98e279b180, rank=0) at core/sr_module.c:920 #8 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279be50, rank=0) at core/sr_module.c:912 #9 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279c2c0, rank=0) at core/sr_module.c:912 #10 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279cc40, rank=0) at core/sr_module.c:912 #11 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279d130, rank=0) at core/sr_module.c:912 #12 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279d6c0, rank=0) at core/sr_module.c:912 #13 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279db10, rank=0) at core/sr_module.c:912 #14 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279dff0, rank=0) at core/sr_module.c:912 #15 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279fae0, rank=0) at core/sr_module.c:912 #16 0x000055720d3dfff0 in init_child (rank=0) at core/sr_module.c:999 #17 0x000055720d23d70a in main_loop () at main.c:1942 #18 0x000055720d2488f5 in main (argc=16, argv=0x7ffea4fde838) at main.c:3256 (gdb) bt full #0 0x00007f9860fae336 in cc_acc_client_stateful_sm_process (s=0x7f9861bd8980, event=21874, msg=0x55720d57c702 <qm_free+8029>) at acctstatemachine.c:304 x = 0x7f9861b97000 ret = 441 rc = 1627304660 record_type = 32664 __func__ = "cc_acc_client_stateful_sm_process" #1 0x00007f9860fae391 in atomic_get_and_set_int (var=0x776f6e6b6e752072, v=32766) at ../../core/mem/../atomic/atomic_x86.h:242 No locals. #2 0x00007f9860fb16eb in disconnect_serviced_peer (sp=0x7f98e28287d0, locked=0) at receiver.c:232 __llevel = 0 __func__ = "disconnect_serviced_peer" #3 0x00007f9860fbd56b in receive_loop (original_peer=0x0) at receiver.c:942 __llevel = -1526863824 rfds = {__fds_bits = {0, 0, 0, 0, 1024, 0 <repeats 11 times>}} efds = {__fds_bits = {0 <repeats 16 times>}} tv = {tv_sec = 0, tv_usec = 883496} n = 1 max = 298 cnt = 0 msg = 0x0 sp = 0x7f98e28287d0 sp2 = 0x7f98e2827e30 p = 0x0 fd = 295 fd_exchange_pipe_local = 28 __func__ = "receive_loop" #4 0x00007f9860fb4c02 in receiver_process (p=0x0) at receiver.c:488 __llevel = -990730168 __func__ = "receiver_process" #5 0x00007f9860f50c80 in diameter_peer_start (blocking=0) at diameter_peer.c:278 pid = 0 k = 1 seed = 1112701621 p = 0x0 __func__ = "diameter_peer_start" #6 0x00007f9860f413df in cdp_child_init (rank=0) at cdp_mod.c:274 __llevel = 0 __func__ = "cdp_child_init" #7 0x000055720d3df6c2 in init_mod_child (m=0x7f98e279b180, rank=0) at core/sr_module.c:920 ret = 0 __func__ = "init_mod_child" #8 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279be50, rank=0) at core/sr_module.c:912 ret = 1 __func__ = "init_mod_child" #9 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279c2c0, rank=0) at core/sr_module.c:912 ret = 0 __func__ = "init_mod_child" #10 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279cc40, rank=0) at core/sr_module.c:912 ret = 0 __func__ = "init_mod_child" ---Type <return> to continue, or q <return> to quit--- #11 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279d130, rank=0) at core/sr_module.c:912 ret = 0 __func__ = "init_mod_child" #12 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279d6c0, rank=0) at core/sr_module.c:912 ret = 0 __func__ = "init_mod_child" #13 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279db10, rank=0) at core/sr_module.c:912 ret = 32766 __func__ = "init_mod_child" #14 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279dff0, rank=0) at core/sr_module.c:912 ret = 21874 __func__ = "init_mod_child" #15 0x000055720d3df2b5 in init_mod_child (m=0x7f98e279fae0, rank=0) at core/sr_module.c:912 ret = 12 __func__ = "init_mod_child" #16 0x000055720d3dfff0 in init_child (rank=0) at core/sr_module.c:999 ret = 0 type = 0x55720d6ece7b "PROC_MAIN" __func__ = "init_child" #17 0x000055720d23d70a in main_loop () at main.c:1942 i = 1639542784 pid = 50 si = 0x0 si_desc = "\240\233\"\rrU\000\000@\361\367a\230\177\000\000\000\343\375\244\376\177\000\000\327~2\rrU\000\000\000\343\375\244\376\177\000\000\025\t>\r\005\000\000\000\000\000\000\000\037\000\000\000\000;\213\222\213\017\r\202h\r\000\000\000\000\000\000\060\000\000\000\000\000\000\000\240\233\"\rrU\000\000\060\350\375\244\376\177", '\000' <repeats 18 times>, "\340\342\375\244\376\177\000\000 \351O\rrU\000" nrprocs = 21874 woneinit = 0 __func__ = "main_loop" #18 0x000055720d2488f5 in main (argc=16, argv=0x7ffea4fde838) at main.c:3256 cfg_stream = 0x55720ef75260 c = -1 r = 0 tmp = 0x7ffea4fdfee3 "" tmp_len = 32766 port = 5060 proto = 0 aproto = 0 ahost = 0x0 aport = 0 options = 0x55720d6b3698 ":f:cm:M:dVIhEeb:B:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 2959679812 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x0 p = 0x7f996220a3d0 "" st = {st_dev = 50, st_ino = 2995745, st_nlink = 1, st_mode = 16877, st_uid = 103, st_gid = 105, __pad0 = 0, st_rdev = 0, st_size = 4096, st_blksize = 4096, st_blocks = 8, st_atim = {tv_sec = 1726638407, tv_nsec = 558385502}, st_mtim = {tv_sec = 1727831142, tv_nsec = 822744119}, st_ctim = {tv_sec = 1727831142, tv_nsec = 822744119}, __glibc_reserved = {0, 0, 0}} ---Type <return> to continue, or q <return> to quit--- l1 = 2048 tbuf = "pQ!b\231\177\000\000\070-\000b\231\177\000\000\020\347\375\244\376\177\000\000\367\344\376a\231\177", '\000' <repeats 18 times>, "\001\000\000\000\000\000\000\000(W!b\231\177\000\000\000Q!b\231\177\000\000\001\000\000\000\000\000\000\000\300\200 b\231\177\000\000\017Q\377a\231\177\000\000\020W!b\231\177", '\000' <repeats 19 times>, "S\376\244\376\177\000\000\300\212\225\001\000\000\000\000\207\026=a\231\177\000\000`\347\375\244\376\177\000\000\220Q\376\244\376\177\000\000\002\000\000\000\231\177\000\000\000\000\000\000\000\000\000\000\300\346\375\244\376\177\000\000\003\000\000\000\000\000\000\000\260\346\375\244\376\177\000\000\000\000\000\000\000\000\000\000"... option_index = 0 long_options = {{name = 0x55720d6b59f6 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x55720d6b087c "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x55720d6b59fb "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x55720d6b5a01 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x55720d6b5a07 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x55720d6b5a10 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x55720d6b5a1a "server-id", has_arg = 1, flag = 0x0, val = 1028}, { name = 0x55720d6b5a24 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x55720d6b5a2f "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x55720d6b5a38 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x55720d6b5a43 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x55720d6b5a49 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x55720d6b5a53 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x55720d6b5a5a "all-errors", has_arg = 0, flag = 0x0, val = 1035}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) (gdb) info locals cfg_stream = 0x55720ef75260 c = -1 r = 0 tmp = 0x7ffea4fdfee3 "" tmp_len = 32766 port = 5060 proto = 0 aproto = 0 ahost = 0x0 aport = 0 options = 0x55720d6b3698 ":f:cm:M:dVIhEeb:B:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 2959679812 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x0 p = 0x7f996220a3d0 "" st = {st_dev = 50, st_ino = 2995745, st_nlink = 1, st_mode = 16877, st_uid = 103, st_gid = 105, __pad0 = 0, st_rdev = 0, st_size = 4096, st_blksize = 4096, st_blocks = 8, st_atim = {tv_sec = 1726638407, tv_nsec = 558385502}, st_mtim = {tv_sec = 1727831142, tv_nsec = 822744119}, st_ctim = {tv_sec = 1727831142, tv_nsec = 822744119}, __glibc_reserved = {0, 0, 0}} l1 = 2048 tbuf = "pQ!b\231\177\000\000\070-\000b\231\177\000\000\020\347\375\244\376\177\000\000\367\344\376a\231\177", '\000' <repeats 18 times>, "\001\000\000\000\000\000\000\000(W!b\231\177\000\000\000Q!b\231\177\000\000\001\000\000\000\000\000\000\000\300\200 b\231\177\000\000\017Q\377a\231\177\000\000\020W!b\231\177", '\000' <repeats 19 times>, "S\376\244\376\177\000\000\300\212\225\001\000\000\000\000\207\026=a\231\177\000\000`\347\375\244\376\177\000\000\220Q\376\244\376\177\000\000\002\000\000\000\231\177\000\000\000\000\000\000\000\000\000\000\300\346\375\244\376\177\000\000\003\000\000\000\000\000\000\000\260\346\375\244\376\177\000\000\000\000\000\000\000\000\000\000"... option_index = 0 long_options = {{name = 0x55720d6b59f6 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x55720d6b087c "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x55720d6b59fb "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x55720d6b5a01 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x55720d6b5a07 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x55720d6b5a10 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x55720d6b5a1a "server-id", has_arg = 1, flag = 0x0, val = 1028}, { name = 0x55720d6b5a24 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x55720d6b5a2f "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x55720d6b5a38 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x55720d6b5a43 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x55720d6b5a49 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x55720d6b5a53 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x55720d6b5a5a "all-errors", has_arg = 0, flag = 0x0, val = 1035}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) list 299 if(s) { 300 AAASessionsUnlock(s->hash); 301 } 302 303 return ret; 304 } ``` #### Log Messages  ``` 2024-10-11T08:23:20.234947572Z 21(60) ERROR: cdp [receiver.c:783]: receive_loop(): select_recv(): Bad file descriptor 2024-10-11T08:23:24.906121404Z 21(60) ERROR: cdp [receiver.c:783]: receive_loop(): select_recv(): Bad file descriptor 2024-10-11T08:23:41.857946233Z 21(60) ERROR: cdp [receiver.c:783]: receive_loop(): select_recv(): Bad file descriptor 2024-10-11T08:25:18.095639136Z 25(64) WARNING: cdp [peermanager.c:337]: peer_timer(): Inactivity on peer [scscf32.ims.mnc011.mcc460.3gppnetwork.org] and no DWA, Closing peer... 2024-10-11T08:43:38.138243609Z 31(70) CRITICAL: <core> [core/pass_fd.c:281]: receive_fd(): EOF on 34 2024-10-11T08:43:47.476315811Z 0(39) ALERT: <core> [main.c:805]: handle_sigs(): child process 60 exited by a signal 11 2024-10-11T08:43:47.476380054Z 0(39) ALERT: <core> [main.c:809]: handle_sigs(): core was generated 2024-10-11T08:43:47.503780368Z 0(39) CRITICAL: cdp [diameter_peer.c:447]: diameter_peer_destroy(): destroy_diameter_peer(): Bye Bye from C Diameter Peer test ``` * **Operating System**: version: kamailio 5.8.1 (x86_64/linux) 07b761 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 07b761 compiled on 10:00:57 Oct 9 2024 with gcc 7.5.0 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3999 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3999(a)github.com>

3 4

git:master:7f24bc09: db_unixodbc: fix incompatible-pointer-types warning
by Victor Seva 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: 7f24bc09863220b4c14e2046708c10ff0891c038 URL: https://github.com/kamailio/kamailio/commit/7f24bc09863220b4c14e2046708c10f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T00:17:23+01:00 db_unixodbc: fix incompatible-pointer-types warning > dbase.c: In function 'db_unixodbc_close_impl': > dbase.c:261:32: error: passing argument 2 of 'db_do_close' from incompatible pointer type [-Wincompatible-pointer-types] > 261 | return db_do_close(_h, db_unixodbc_free_connection); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > | | > | void (*)(struct my_con *) > In file included from val.h:34, > from dbase.c:33: > ../../lib/srdb1/db.h:495:40: note: expected 'void (*)(struct pool_con *)' but argument is of type 'void (*)(struct my_con *)' > 495 | void db_do_close(db1_con_t *_h, void (*free_connection)(struct pool_con *)); > | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > make[2]: *** [../../Makefile.rules:101: dbase.o] Error 1 related #4064 --- Modified: src/modules/db_unixodbc/connection.c Modified: src/modules/db_unixodbc/connection.h --- Diff: https://github.com/kamailio/kamailio/commit/7f24bc09863220b4c14e2046708c10f… Patch: https://github.com/kamailio/kamailio/commit/7f24bc09863220b4c14e2046708c10f… --- diff --git a/src/modules/db_unixodbc/connection.c b/src/modules/db_unixodbc/connection.c index 92b1cdb9ecb..d56f2ac37a5 100644 --- a/src/modules/db_unixodbc/connection.c +++ b/src/modules/db_unixodbc/connection.c @@ -179,14 +179,17 @@ struct my_con *db_unixodbc_new_connection(struct db_id *id) /* * Close the connection and release memory */ -void db_unixodbc_free_connection(struct my_con *con) +void db_unixodbc_free_connection(struct pool_con *con) { + struct my_con *_c; + if(!con) return; - SQLFreeHandle(SQL_HANDLE_ENV, con->env); - SQLDisconnect(con->dbc); - SQLFreeHandle(SQL_HANDLE_DBC, con->dbc); - pkg_free(con); + _c = (struct my_con *)con; + SQLFreeHandle(SQL_HANDLE_ENV, _c->env); + SQLDisconnect(_c->dbc); + SQLFreeHandle(SQL_HANDLE_DBC, _c->dbc); + pkg_free(_c); } diff --git a/src/modules/db_unixodbc/connection.h b/src/modules/db_unixodbc/connection.h index d94f0b48e07..a37bb1e3906 100644 --- a/src/modules/db_unixodbc/connection.h +++ b/src/modules/db_unixodbc/connection.h @@ -83,7 +83,7 @@ struct my_con *db_unixodbc_new_connection(struct db_id *id); /* * Close the connection and release memory */ -void db_unixodbc_free_connection(struct my_con *con); +void db_unixodbc_free_connection(struct pool_con *con); char *db_unixodbc_build_conn_str(const struct db_id *id, char *buf);

1 0

[kamailio/kamailio] alpine: build error on db_sqlite (Issue #4064)
by Victor Seva 10 Dec '24

10 Dec '24

From https://github.com/kamailio/kamailio/actions/runs/12265962282 ``` CC (gcc) [M db_sqlite.so] dbase.o dbase.c: In function 'db_sqlite_close': dbase.c:157:25: error: passing argument 2 of 'db_do_close' from incompatible pointer type [-Wincompatible-pointer-types] 157 | db_do_close(_h, db_sqlite_free_connection); | ^~~~~~~~~~~~~~~~~~~~~~~~~ | | | void (*)(struct sqlite_connection *) In file included from ../../lib/srdb1/db_ut.h:37, from dbase.c:28: ../../lib/srdb1/db.h:495:40: note: expected 'void (*)(struct pool_con *)' but argument is of type 'void (*)(struct sqlite_connection *)' 495 | void db_do_close(db1_con_t *_h, void (*free_connection)(struct pool_con *)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ make[2]: *** [../../Makefile.rules:100: dbase.o] Error 1 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4064 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4064(a)github.com>

1 2

git:master:06cc2560: db_sqlite: fix incompatible-pointer-types warning
by Victor Seva 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: 06cc2560e5358468178ef3e5c795a8a0ec67b693 URL: https://github.com/kamailio/kamailio/commit/06cc2560e5358468178ef3e5c795a8a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-10T23:58:06+01:00 db_sqlite: fix incompatible-pointer-types warning fixes #4064 --- Modified: src/modules/db_sqlite/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/06cc2560e5358468178ef3e5c795a8a… Patch: https://github.com/kamailio/kamailio/commit/06cc2560e5358468178ef3e5c795a8a… --- diff --git a/src/modules/db_sqlite/dbase.c b/src/modules/db_sqlite/dbase.c index 77b4fc3bc32..dd2030d2e43 100644 --- a/src/modules/db_sqlite/dbase.c +++ b/src/modules/db_sqlite/dbase.c @@ -142,14 +142,17 @@ db1_con_t *db_sqlite_init(const str *_url) * No function should be called after this */ -static void db_sqlite_free_connection(struct sqlite_connection *con) +static void db_sqlite_free_connection(struct pool_con *con) { + struct sqlite_connection *_c; + if(!con) return; + _c = (struct sqlite_connection *)con; - sqlite3_close(con->conn); - free_db_id(con->hdr.id); - pkg_free(con); + sqlite3_close(_c->conn); + free_db_id(_c->hdr.id); + pkg_free(_c); } void db_sqlite_close(db1_con_t *_h)

1 0

git:master:d87d950c: github: alpine improve nightly builds check [skip ci]
by Victor Seva 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: d87d950c8eb78ab97fdf0c3461b2f086edb6e0a3 URL: https://github.com/kamailio/kamailio/commit/d87d950c8eb78ab97fdf0c3461b2f08… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-10T23:36:55+01:00 github: alpine improve nightly builds check [skip ci] compare last_sha built instead of just commit date --- Modified: .github/workflows/alpine.yml --- Diff: https://github.com/kamailio/kamailio/commit/d87d950c8eb78ab97fdf0c3461b2f08… Patch: https://github.com/kamailio/kamailio/commit/d87d950c8eb78ab97fdf0c3461b2f08…

1 0

git:master:4cbcec43: github: execute codeql on pkg-kamailio-docker container [skip ci]
by Victor Seva 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: 4cbcec438c0a6a8ba4899ef4d9e9511acde33de6 URL: https://github.com/kamailio/kamailio/commit/4cbcec438c0a6a8ba4899ef4d9e9511… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-10T19:31:07+01:00 github: execute codeql on pkg-kamailio-docker container [skip ci] --- Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/4cbcec438c0a6a8ba4899ef4d9e9511… Patch: https://github.com/kamailio/kamailio/commit/4cbcec438c0a6a8ba4899ef4d9e9511… --- diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0328ba9233a..84460230bba 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -19,19 +19,20 @@ jobs: matrix: language: [ javascript, cpp, python ] + container: + image: ghcr.io/kamailio/pkg-kamailio-docker:${{ github.ref_name }}-bookworm + credentials: + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + volumes: + - ${{ github.workspace }}:/code + steps: - name: Checkout uses: actions/checkout@v4 with: submodules: recursive - - name: Install Packages (cpp) - if: ${{ matrix.language == 'cpp' }} - run: | - sudo apt-get update - sudo apt-get install --yes bison default-libmysqlclient-dev flex libcurl4-openssl-dev libjansson-dev libhiredis-dev libevent-dev liblua5.1-0-dev libpcre3-dev libncurses5-dev libpq-dev libreadline-dev libssl-dev libunistring-dev libmicrohttpd-dev libxml2-dev pkg-config python3 python3-dev uuid-dev zlib1g-dev - sudo apt-get clean - - name: Configure (cpp) if: ${{ matrix.language == 'cpp' }} run: make include_modules='app_lua app_python3 cnxcc db_mysql db_postgres db_redis dialplan http_client jansson lcr ndb_redis presence presence_xml presence_dialoginfo pua pua_dialoginfo topos_redis uuid websocket xmlops' cfg

1 0

git:master:a266e051: github: codeql.yml on self-hosted runner
by GitHub 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: a266e051fd6b45617dc8966effd96a1d08d85960 URL: https://github.com/kamailio/kamailio/commit/a266e051fd6b45617dc8966effd96a1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: GitHub <noreply(a)github.com> Date: 2024-12-10T18:41:02+01:00 github: codeql.yml on self-hosted runner --- Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/a266e051fd6b45617dc8966effd96a1… Patch: https://github.com/kamailio/kamailio/commit/a266e051fd6b45617dc8966effd96a1… --- diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index aa6d9194b07..0328ba9233a 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -8,7 +8,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64, codeql] permissions: actions: read contents: read

1 0

git:master:a08da7b3: cmake: Use evaluated full paths from cmake for correct handling of special cases
by Xenofon Karamanos 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: a08da7b34b01f4b0a579fbfdc141bf2944613736 URL: https://github.com/kamailio/kamailio/commit/a08da7b34b01f4b0a579fbfdc141bf2… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-10T14:39:03Z cmake: Use evaluated full paths from cmake for correct handling of special cases --- Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/a08da7b34b01f4b0a579fbfdc141bf2… Patch: https://github.com/kamailio/kamailio/commit/a08da7b34b01f4b0a579fbfdc141bf2… --- diff --git a/cmake/defs.cmake b/cmake/defs.cmake index 4214ef57121..bb9a0b680a7 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -6,8 +6,6 @@ cmake_minimum_required(VERSION 3.10) add_library(common INTERFACE) -message(STATUS "CMAKE_C_COMPILER_VERSION: ${CMAKE_C_COMPILER_VERSION}") - set(OS ${CMAKE_SYSTEM_NAME}) message(STATUS "OS: ${OS}") @@ -109,6 +107,10 @@ if(NOT ${LIBSSL_SET_MUTEX_SHARED}) STATUS "Checking if can enable workaround for libssl 1.1+ to set shared mutex attribute" ) + + # TODO: This can probably be reduced to a just a find_package(OpenSSL) call + # and then check the version + # If we are cross-compiling, cmake should search for library on the target or both target/host if(NOT DEFINED CMAKE_CROSSCOMPILING OR NOT ${CMAKE_CROSSCOMPILING}) message(STATUS "Checking for OpenSSL 1.1.0") find_package(OpenSSL 1.1.0) @@ -306,11 +308,11 @@ target_compile_definitions( ${TARGET_ARCH} __OS_${OS_LOWER} VERSIONVAL=${VERSIONVAL} - CFG_DIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${CFG_NAME}/" - SHARE_DIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${MAIN_NAME}/" + CFG_DIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}/${CFG_NAME}/" + SHARE_DIR="${CMAKE_INSTALL_FULL_DATADIR}/${MAIN_NAME}/" # Absolute path this run is always /var/run/kamailio either for local or # system installs - RUN_DIR="/${CMAKE_INSTALL_LOCALSTATEDIR}/run/${MAIN_NAME}" + RUN_DIR="${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/${MAIN_NAME}" ${LOCK_METHOD} # Module stuff? PIC

1 0

git:master:b6f25031: cmake: Build type set to Debug
by Xenofon Karamanos 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: b6f25031590e472f0f63b3e2a4fa61dad946a582 URL: https://github.com/kamailio/kamailio/commit/b6f25031590e472f0f63b3e2a4fa61d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-10T12:37:00Z cmake: Build type set to Debug --- Added: cmake/BuildType.cmake Modified: CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/b6f25031590e472f0f63b3e2a4fa61d… Patch: https://github.com/kamailio/kamailio/commit/b6f25031590e472f0f63b3e2a4fa61d… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index f7270f0abc3..47e7c0b2a55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,9 @@ message(STATUS "VERSIONVAL: ${VERSIONVAL}") set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD_REQUIRED True) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") + +include(${CMAKE_SOURCE_DIR}/cmake/BuildType.cmake) # ----------------------- # Main project name # ----------------------- @@ -37,8 +40,6 @@ set(CFG_NAME CACHE STRING "Config name" ) -list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") - # Add the source directory add_subdirectory(src) diff --git a/cmake/BuildType.cmake b/cmake/BuildType.cmake new file mode 100644 index 00000000000..7b15e3e052f --- /dev/null +++ b/cmake/BuildType.cmake @@ -0,0 +1,21 @@ +# Set a default build type if none was specified +set(default_build_type "Release") +if(EXISTS "${CMAKE_SOURCE_DIR}/.git") + set(default_build_type "Debug") +endif() + +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + message( + STATUS + "Setting build type to '${default_build_type}' as none was specified." + ) + set(CMAKE_BUILD_TYPE + "${default_build_type}" + CACHE STRING "Choose the type of build." FORCE + ) + # Set the possible values of build type for cmake-gui + set_property( + CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" + "RelWithDebInfo" + ) +endif()

1 0

git:master:329f95e9: cmake: Do not link to kamailio binary
by Xenofon Karamanos 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: 329f95e95f7f80e5af2495f0a4273885a5112051 URL: https://github.com/kamailio/kamailio/commit/329f95e95f7f80e5af2495f0a427388… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-10T10:34:08Z cmake: Do not link to kamailio binary --- Modified: src/modules/acc/CMakeLists.txt Modified: src/modules/acc_diameter/CMakeLists.txt Modified: src/modules/acc_json/CMakeLists.txt Modified: src/modules/acc_radius/CMakeLists.txt Modified: src/modules/alias_db/CMakeLists.txt Modified: src/modules/app_java/CMakeLists.txt Modified: src/modules/app_jsdt/CMakeLists.txt Modified: src/modules/app_lua/CMakeLists.txt Modified: src/modules/app_perl/CMakeLists.txt Modified: src/modules/app_python/CMakeLists.txt Modified: src/modules/app_python3/CMakeLists.txt Modified: src/modules/app_python3s/CMakeLists.txt Modified: src/modules/app_ruby/CMakeLists.txt Modified: src/modules/app_ruby_proc/CMakeLists.txt Modified: src/modules/async/CMakeLists.txt Modified: src/modules/auth/CMakeLists.txt Modified: src/modules/auth_db/CMakeLists.txt Modified: src/modules/auth_diameter/CMakeLists.txt Modified: src/modules/auth_ephemeral/CMakeLists.txt Modified: src/modules/auth_radius/CMakeLists.txt Modified: src/modules/auth_xkeys/CMakeLists.txt Modified: src/modules/avp/CMakeLists.txt Modified: src/modules/avpops/CMakeLists.txt Modified: src/modules/benchmark/CMakeLists.txt Modified: src/modules/blst/CMakeLists.txt Modified: src/modules/call_control/CMakeLists.txt Modified: src/modules/call_obj/CMakeLists.txt Modified: src/modules/carrierroute/CMakeLists.txt Modified: src/modules/cdp/CMakeLists.txt Modified: src/modules/cdp_avp/CMakeLists.txt Modified: src/modules/cfg_db/CMakeLists.txt Modified: src/modules/cfg_rpc/CMakeLists.txt Modified: src/modules/cfgt/CMakeLists.txt Modified: src/modules/cfgutils/CMakeLists.txt Modified: src/modules/cnxcc/CMakeLists.txt Modified: src/modules/corex/CMakeLists.txt Modified: src/modules/counters/CMakeLists.txt Modified: src/modules/cplc/CMakeLists.txt Modified: src/modules/crypto/CMakeLists.txt Modified: src/modules/ctl/CMakeLists.txt Modified: src/modules/db2_ldap/CMakeLists.txt Modified: src/modules/db2_ops/CMakeLists.txt Modified: src/modules/db_berkeley/CMakeLists.txt Modified: src/modules/db_cluster/CMakeLists.txt Modified: src/modules/db_flatstore/CMakeLists.txt Modified: src/modules/db_mongodb/CMakeLists.txt Modified: src/modules/db_mysql/CMakeLists.txt Modified: src/modules/db_oracle/CMakeLists.txt Modified: src/modules/db_perlvdb/CMakeLists.txt Modified: src/modules/db_postgres/CMakeLists.txt Modified: src/modules/db_redis/CMakeLists.txt Modified: src/modules/db_sqlite/CMakeLists.txt Modified: src/modules/db_text/CMakeLists.txt Modified: src/modules/db_unixodbc/CMakeLists.txt Modified: src/modules/debugger/CMakeLists.txt Modified: src/modules/dialog/CMakeLists.txt Modified: src/modules/dialplan/CMakeLists.txt Modified: src/modules/dispatcher/CMakeLists.txt Modified: src/modules/diversion/CMakeLists.txt Modified: src/modules/dlgs/CMakeLists.txt Modified: src/modules/dmq/CMakeLists.txt Modified: src/modules/dmq_usrloc/CMakeLists.txt Modified: src/modules/dnssec/CMakeLists.txt Modified: src/modules/domain/CMakeLists.txt Modified: src/modules/domainpolicy/CMakeLists.txt Modified: src/modules/drouting/CMakeLists.txt Modified: src/modules/enum/CMakeLists.txt Modified: src/modules/erlang/CMakeLists.txt Modified: src/modules/evapi/CMakeLists.txt Modified: src/modules/evrexec/CMakeLists.txt Modified: src/modules/exec/CMakeLists.txt Modified: src/modules/file_out/CMakeLists.txt Modified: src/modules/gcrypt/CMakeLists.txt Modified: src/modules/geoip/CMakeLists.txt Modified: src/modules/geoip2/CMakeLists.txt Modified: src/modules/group/CMakeLists.txt Modified: src/modules/gzcompress/CMakeLists.txt Modified: src/modules/h350/CMakeLists.txt Modified: src/modules/htable/CMakeLists.txt Modified: src/modules/http_async_client/CMakeLists.txt Modified: src/modules/http_client/CMakeLists.txt Modified: src/modules/imc/CMakeLists.txt Modified: src/modules/ims_auth/CMakeLists.txt Modified: src/modules/ims_charging/CMakeLists.txt Modified: src/modules/ims_dialog/CMakeLists.txt Modified: src/modules/ims_diameter_server/CMakeLists.txt Modified: src/modules/ims_icscf/CMakeLists.txt Modified: src/modules/ims_ipsec_pcscf/CMakeLists.txt Modified: src/modules/ims_isc/CMakeLists.txt Modified: src/modules/ims_ocs/CMakeLists.txt Modified: src/modules/ims_qos/CMakeLists.txt Modified: src/modules/ims_qos_npn/CMakeLists.txt Modified: src/modules/ims_registrar_pcscf/CMakeLists.txt Modified: src/modules/ims_registrar_scscf/CMakeLists.txt Modified: src/modules/ims_usrloc_pcscf/CMakeLists.txt Modified: src/modules/ims_usrloc_scscf/CMakeLists.txt Modified: src/modules/influxdbc/CMakeLists.txt Modified: src/modules/ipops/CMakeLists.txt Modified: src/modules/jansson/CMakeLists.txt Modified: src/modules/janssonrpcc/CMakeLists.txt Modified: src/modules/json/CMakeLists.txt Modified: src/modules/jsonrpcc/CMakeLists.txt Modified: src/modules/jsonrpcs/CMakeLists.txt Modified: src/modules/jwt/CMakeLists.txt Modified: src/modules/kafka/CMakeLists.txt Modified: src/modules/kazoo/CMakeLists.txt Modified: src/modules/keepalive/CMakeLists.txt Modified: src/modules/kemix/CMakeLists.txt Modified: src/modules/kex/CMakeLists.txt Modified: src/modules/lcr/CMakeLists.txt Modified: src/modules/ldap/CMakeLists.txt Modified: src/modules/log_custom/CMakeLists.txt Modified: src/modules/log_systemd/CMakeLists.txt Modified: src/modules/lost/CMakeLists.txt Modified: src/modules/lrkproxy/CMakeLists.txt Modified: src/modules/lwsc/CMakeLists.txt Modified: src/modules/mangler/CMakeLists.txt Modified: src/modules/math/CMakeLists.txt Modified: src/modules/matrix/CMakeLists.txt Modified: src/modules/maxfwd/CMakeLists.txt Modified: src/modules/mediaproxy/CMakeLists.txt Modified: src/modules/memcached/CMakeLists.txt Modified: src/modules/microhttpd/CMakeLists.txt Modified: src/modules/misc_radius/CMakeLists.txt Modified: src/modules/misctest/CMakeLists.txt Modified: src/modules/mohqueue/CMakeLists.txt Modified: src/modules/mqtt/CMakeLists.txt Modified: src/modules/mqueue/CMakeLists.txt Modified: src/modules/msilo/CMakeLists.txt Modified: src/modules/msrp/CMakeLists.txt Modified: src/modules/mtree/CMakeLists.txt Modified: src/modules/nat_traversal/CMakeLists.txt Modified: src/modules/nathelper/CMakeLists.txt Modified: src/modules/nats/CMakeLists.txt Modified: src/modules/ndb_cassandra/CMakeLists.txt Modified: src/modules/ndb_mongodb/CMakeLists.txt Modified: src/modules/ndb_redis/CMakeLists.txt Modified: src/modules/nghttp2/CMakeLists.txt Modified: src/modules/nosip/CMakeLists.txt Modified: src/modules/nsq/CMakeLists.txt Modified: src/modules/outbound/CMakeLists.txt Modified: src/modules/p_usrloc/CMakeLists.txt Modified: src/modules/path/CMakeLists.txt Modified: src/modules/pdb/CMakeLists.txt Modified: src/modules/pdt/CMakeLists.txt Modified: src/modules/peering/CMakeLists.txt Modified: src/modules/permissions/CMakeLists.txt Modified: src/modules/phonenum/CMakeLists.txt Modified: src/modules/pike/CMakeLists.txt Modified: src/modules/pipelimit/CMakeLists.txt Modified: src/modules/posops/CMakeLists.txt Modified: src/modules/prefix_route/CMakeLists.txt Modified: src/modules/presence/CMakeLists.txt Modified: src/modules/presence_conference/CMakeLists.txt Modified: src/modules/presence_dialoginfo/CMakeLists.txt Modified: src/modules/presence_mwi/CMakeLists.txt Modified: src/modules/presence_profile/CMakeLists.txt Modified: src/modules/presence_reginfo/CMakeLists.txt Modified: src/modules/presence_xml/CMakeLists.txt Modified: src/modules/pua/CMakeLists.txt Modified: src/modules/pua_bla/CMakeLists.txt Modified: src/modules/pua_dialoginfo/CMakeLists.txt Modified: src/modules/pua_json/CMakeLists.txt Modified: src/modules/pua_reginfo/CMakeLists.txt Modified: src/modules/pua_rpc/CMakeLists.txt Modified: src/modules/pua_usrloc/CMakeLists.txt Modified: src/modules/pua_xmpp/CMakeLists.txt Modified: src/modules/pv/CMakeLists.txt Modified: src/modules/pv_headers/CMakeLists.txt Modified: src/modules/pvtpl/CMakeLists.txt Modified: src/modules/qos/CMakeLists.txt Modified: src/modules/rabbitmq/CMakeLists.txt Modified: src/modules/ratelimit/CMakeLists.txt Modified: src/modules/regex/CMakeLists.txt Modified: src/modules/registrar/CMakeLists.txt Modified: src/modules/rls/CMakeLists.txt Modified: src/modules/rr/CMakeLists.txt Modified: src/modules/rtimer/CMakeLists.txt Modified: src/modules/rtjson/CMakeLists.txt Modified: src/modules/rtp_media_server/CMakeLists.txt Modified: src/modules/rtpengine/CMakeLists.txt Modified: src/modules/rtpproxy/CMakeLists.txt Modified: src/modules/ruxc/CMakeLists.txt Modified: src/modules/sanity/CMakeLists.txt Modified: src/modules/sca/CMakeLists.txt Modified: src/modules/sctp/CMakeLists.txt Modified: src/modules/sdpops/CMakeLists.txt Modified: src/modules/seas/CMakeLists.txt Modified: src/modules/secfilter/CMakeLists.txt Modified: src/modules/secsipid/CMakeLists.txt Modified: src/modules/secsipid_proc/CMakeLists.txt Modified: src/modules/sipcapture/CMakeLists.txt Modified: src/modules/sipdump/CMakeLists.txt Modified: src/modules/sipjson/CMakeLists.txt Modified: src/modules/siprepo/CMakeLists.txt Modified: src/modules/sipt/CMakeLists.txt Modified: src/modules/siptrace/CMakeLists.txt Modified: src/modules/siputils/CMakeLists.txt Modified: src/modules/sl/CMakeLists.txt Modified: src/modules/slack/CMakeLists.txt Modified: src/modules/sms/CMakeLists.txt Modified: src/modules/smsops/CMakeLists.txt Modified: src/modules/snmpstats/CMakeLists.txt Modified: src/modules/speeddial/CMakeLists.txt Modified: src/modules/sqlops/CMakeLists.txt Modified: src/modules/ss7ops/CMakeLists.txt Modified: src/modules/sst/CMakeLists.txt Modified: src/modules/statistics/CMakeLists.txt Modified: src/modules/statsc/CMakeLists.txt Modified: src/modules/statsd/CMakeLists.txt Modified: src/modules/stirshaken/CMakeLists.txt Modified: src/modules/stun/CMakeLists.txt Modified: src/modules/sworker/CMakeLists.txt Modified: src/modules/systemdops/CMakeLists.txt Modified: src/modules/tcpops/CMakeLists.txt Modified: src/modules/textops/CMakeLists.txt Modified: src/modules/textopsx/CMakeLists.txt Modified: src/modules/timer/CMakeLists.txt Modified: src/modules/tls/CMakeLists.txt Modified: src/modules/tls_wolfssl/CMakeLists.txt Modified: src/modules/tlsa/CMakeLists.txt Modified: src/modules/tm/CMakeLists.txt Modified: src/modules/tmrec/CMakeLists.txt Modified: src/modules/tmx/CMakeLists.txt Modified: src/modules/topoh/CMakeLists.txt Modified: src/modules/topos/CMakeLists.txt Modified: src/modules/topos_redis/CMakeLists.txt Modified: src/modules/tsilo/CMakeLists.txt Modified: src/modules/uac/CMakeLists.txt Modified: src/modules/uac_redirect/CMakeLists.txt Modified: src/modules/uid_auth_db/CMakeLists.txt Modified: src/modules/uid_avp_db/CMakeLists.txt Modified: src/modules/uid_domain/CMakeLists.txt Modified: src/modules/uid_gflags/CMakeLists.txt Modified: src/modules/uid_uri_db/CMakeLists.txt Modified: src/modules/uri_db/CMakeLists.txt Modified: src/modules/userblocklist/CMakeLists.txt Modified: src/modules/usrloc/CMakeLists.txt Modified: src/modules/utils/CMakeLists.txt Modified: src/modules/uuid/CMakeLists.txt Modified: src/modules/websocket/CMakeLists.txt Modified: src/modules/xcap_client/CMakeLists.txt Modified: src/modules/xcap_server/CMakeLists.txt Modified: src/modules/xhttp/CMakeLists.txt Modified: src/modules/xhttp_pi/CMakeLists.txt Modified: src/modules/xhttp_prom/CMakeLists.txt Modified: src/modules/xhttp_rpc/CMakeLists.txt Modified: src/modules/xlog/CMakeLists.txt Modified: src/modules/xmlops/CMakeLists.txt Modified: src/modules/xmlrpc/CMakeLists.txt Modified: src/modules/xmpp/CMakeLists.txt Modified: src/modules/xprint/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/329f95e95f7f80e5af2495f0a427388… Patch: https://github.com/kamailio/kamailio/commit/329f95e95f7f80e5af2495f0a427388…

1 0

[kamailio/kamailio] cmake: Link internal libraries to core and remove them from modules (PR #4059)
by Xenofon Karamanos 10 Dec '24

10 Dec '24

#### 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 - [x] Related to issue #4041 #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4059 -- Commit Summary -- * cmake: Link internal libraries to core and remove them from modules -- File Changes -- M src/CMakeLists.txt (4) M src/lib/CMakeLists.txt (2) M src/lib/ims/CMakeLists.txt (2) M src/lib/srdb1/CMakeLists.txt (2) M src/lib/srdb2/CMakeLists.txt (2) M src/lib/trie/CMakeLists.txt (2) M src/modules/acc/CMakeLists.txt (2) M src/modules/alias_db/CMakeLists.txt (2) M src/modules/auth_db/CMakeLists.txt (2) M src/modules/avpops/CMakeLists.txt (1) M src/modules/carrierroute/CMakeLists.txt (1) M src/modules/cfg_db/CMakeLists.txt (1) M src/modules/cnxcc/CMakeLists.txt (2) M src/modules/cplc/CMakeLists.txt (2) M src/modules/db2_ldap/CMakeLists.txt (1) M src/modules/db2_ops/CMakeLists.txt (1) M src/modules/db_berkeley/CMakeLists.txt (1) M src/modules/db_cluster/CMakeLists.txt (1) M src/modules/db_flatstore/CMakeLists.txt (1) M src/modules/db_mongodb/CMakeLists.txt (1) M src/modules/db_oracle/CMakeLists.txt (1) M src/modules/db_perlvdb/CMakeLists.txt (1) M src/modules/db_postgres/CMakeLists.txt (1) M src/modules/db_redis/CMakeLists.txt (1) M src/modules/db_sqlite/CMakeLists.txt (2) M src/modules/db_text/CMakeLists.txt (2) M src/modules/db_unixodbc/CMakeLists.txt (2) M src/modules/dialog/CMakeLists.txt (1) M src/modules/dialplan/CMakeLists.txt (1) M src/modules/dispatcher/CMakeLists.txt (1) M src/modules/dmq/CMakeLists.txt (1) M src/modules/domain/CMakeLists.txt (1) M src/modules/domainpolicy/CMakeLists.txt (1) M src/modules/drouting/CMakeLists.txt (1) M src/modules/group/CMakeLists.txt (1) M src/modules/htable/CMakeLists.txt (1) M src/modules/imc/CMakeLists.txt (1) M src/modules/ims_auth/CMakeLists.txt (2) M src/modules/ims_charging/CMakeLists.txt (1) M src/modules/ims_dialog/CMakeLists.txt (1) M src/modules/ims_diameter_server/CMakeLists.txt (1) M src/modules/ims_icscf/CMakeLists.txt (1) M src/modules/ims_ipsec_pcscf/CMakeLists.txt (1) M src/modules/ims_isc/CMakeLists.txt (1) M src/modules/ims_ocs/CMakeLists.txt (1) M src/modules/ims_qos/CMakeLists.txt (1) M src/modules/ims_qos_npn/CMakeLists.txt (1) M src/modules/ims_usrloc_pcscf/CMakeLists.txt (1) M src/modules/ims_usrloc_scscf/CMakeLists.txt (1) M src/modules/kazoo/CMakeLists.txt (1) M src/modules/keepalive/CMakeLists.txt (1) M src/modules/lcr/CMakeLists.txt (1) M src/modules/matrix/CMakeLists.txt (1) M src/modules/mohqueue/CMakeLists.txt (1) M src/modules/mqueue/CMakeLists.txt (1) M src/modules/msilo/CMakeLists.txt (1) M src/modules/mtree/CMakeLists.txt (1) M src/modules/p_usrloc/CMakeLists.txt (1) M src/modules/pdt/CMakeLists.txt (1) M src/modules/permissions/CMakeLists.txt (1) M src/modules/pipelimit/CMakeLists.txt (1) M src/modules/prefix_route/CMakeLists.txt (1) M src/modules/presence/CMakeLists.txt (1) M src/modules/presence_xml/CMakeLists.txt (1) M src/modules/pua/CMakeLists.txt (1) M src/modules/rls/CMakeLists.txt (1) M src/modules/rtpengine/CMakeLists.txt (1) M src/modules/rtpproxy/CMakeLists.txt (1) M src/modules/sca/CMakeLists.txt (1) M src/modules/secfilter/CMakeLists.txt (1) M src/modules/sipcapture/CMakeLists.txt (1) M src/modules/siptrace/CMakeLists.txt (1) M src/modules/siputils/CMakeLists.txt (1) M src/modules/speeddial/CMakeLists.txt (1) M src/modules/sqlops/CMakeLists.txt (1) M src/modules/topos/CMakeLists.txt (1) M src/modules/uac/CMakeLists.txt (1) M src/modules/uid_auth_db/CMakeLists.txt (1) M src/modules/uid_avp_db/CMakeLists.txt (1) M src/modules/uid_domain/CMakeLists.txt (1) M src/modules/uid_gflags/CMakeLists.txt (1) M src/modules/uid_uri_db/CMakeLists.txt (1) M src/modules/uri_db/CMakeLists.txt (1) M src/modules/userblocklist/CMakeLists.txt (1) M src/modules/usrloc/CMakeLists.txt (1) M src/modules/utils/CMakeLists.txt (1) M src/modules/xcap_client/CMakeLists.txt (1) M src/modules/xcap_server/CMakeLists.txt (1) M src/modules/xhttp/CMakeLists.txt (2) M src/modules/xhttp_pi/CMakeLists.txt (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4059.patch https://github.com/kamailio/kamailio/pull/4059.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4059 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4059(a)github.com>

3 8

git:master:9ff2bb86: cmake: Add generating parsing files dependency
by Xenofon Karamanos 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: 9ff2bb869dafca8521a0da7f112c3846f86c5f7e URL: https://github.com/kamailio/kamailio/commit/9ff2bb869dafca8521a0da7f112c384… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-10T10:31:59Z cmake: Add generating parsing files dependency --- Modified: src/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/9ff2bb869dafca8521a0da7f112c384… Patch: https://github.com/kamailio/kamailio/commit/9ff2bb869dafca8521a0da7f112c384… --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0e1ea4472d3..c68dada4f98 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -80,6 +80,7 @@ endif() # ----------------------- add_executable(kamailio ${CMAKE_CURRENT_SOURCE_DIR}/main.c) +add_dependencies(kamailio GenerateParser) # Enable ENABLE_EXPORTS property so modules can link from symbols # found in kamailio executable. set_target_properties(

1 0

[kamailio/kamailio] http_async_client: fixed crash on curl callback (PR #4020)
by Ivanuschak Nikolay 10 Dec '24

10 Dec '24

#### 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 - [x] Related to issue #4019 #### Description I assume that the crash #4019 happens, because of an issue in libcurl, namely in the `event_cb` function ([in this line](https://github.com/kamailio/kamailio/blob/master/src/modules/http_asy…) kamailio removes the pointer to the `cell` object (which was attached to this `g->multi` curl descriptor earlier), and the `cell` object memory is released [at this line](https://github.com/kamailio/kamailio/blob/master/src/modules/http_asy…. However, the crash happens when `event_cb` is called when `curl_multi_remove_handle` is called [at this line](https://github.com/kamailio/kamailio/blob/master/src/modules/http_asy…. In this fix `cell` object is retrieved from the corresponding CURL descriptor and then it's compared with the `cell` object passed to this callback. With this change when this issue happens the `cell` object, which is retrieved from the corresponding CURL descriptor, is NULL pointer, because it was removed earlier [in this line](https://github.com/kamailio/kamailio/blob/master/src/modules/http_asy…, so the crash should not appear. However it might be fixed in other way, namely we may not to pass `cell` to the `event_cb` callback and always retrieve it from CURL descriptor. I would appreciate if developers comment that. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4020 -- Commit Summary -- * http_async_client: fixed crash on curl callback -- File Changes -- M src/modules/http_async_client/http_multi.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4020.patch https://github.com/kamailio/kamailio/pull/4020.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4020 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4020(a)github.com>

3 14

git:master:909e659d: http_async_client: fixed crash on curl callback
by Federico Cabiddu 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: 909e659dc33942a92e54bed37ee1387f121c63e6 URL: https://github.com/kamailio/kamailio/commit/909e659dc33942a92e54bed37ee1387… Author: Nikolay Ivanuschak <ivanuschak.nikolay(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-12-10T09:25:37+01:00 http_async_client: fixed crash on curl callback --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/909e659dc33942a92e54bed37ee1387… Patch: https://github.com/kamailio/kamailio/commit/909e659dc33942a92e54bed37ee1387… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index daceb932ec9..30ae016d720 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -157,10 +157,12 @@ void event_cb(int fd, short kind, void *userp) /* CURLMOPT_SOCKETFUNCTION */ int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp) { + struct http_m_cell *cell; struct http_m_global *g = (struct http_m_global *)cbp; - struct http_m_cell *cell = (struct http_m_cell *)sockp; const char *whatstr[] = {"none", "IN", "OUT", "INOUT", "REMOVE"}; + cell = http_m_cell_lookup(e); + LM_DBG("socket callback: s=%d e=%p what=%s\n", s, e, whatstr[what]); if(what == CURL_POLL_REMOVE) { /* if cell is NULL the handle has been removed by the event callback for timeout */

1 0

[kamailio/kamailio] github: [skip ci]: bump threeal/cmake-action from 2.0.0 to 2.1.0 (PR #4062)
by dependabot[bot] 10 Dec '24

10 Dec '24

Bumps [threeal/cmake-action](https://github.com/threeal/cmake-action) from 2.0.0 to 2.1.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/threeal/cmake-action/releases">threea… releases</a>.</em></p> <blockquote> <h2>Version 2.1.0</h2> <h2>What's Changed</h2> <ul> <li>Added support for specifying quotations for inputs with multiple values.</li> <li>Reduced bundled action script size by removing bloated dependencies.</li> <li>Enhanced development configurations and CI workflows.</li> <li>Updated development dependencies.</li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/threeal/cmake-action/compare/v2...v2.1.0&quot… </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/threeal/cmake-action/commit/725d1314ccf9ea922… chore: bump prettier from 3.4.1 to 3.4.2 (<a href="https://redirect.github.com/threeal/cmake-action/issues/543&quot… <li><a href="https://github.com/threeal/cmake-action/commit/6954eda1e8b7fec84… chore: bump typescript-eslint from 8.16.0 to 8.17.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/542&quot… <li><a href="https://github.com/threeal/cmake-action/commit/9b2633db99477647e… chore: bump <code>@eslint/js</code> from 9.15.0 to 9.16.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/541&quot… <li><a href="https://github.com/threeal/cmake-action/commit/d08d2651e1a4410b6… chore: bump eslint from 9.15.0 to 9.16.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/540&quot… <li><a href="https://github.com/threeal/cmake-action/commit/3f767d1e2b70aca09… chore: bump rollup from 4.27.4 to 4.28.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/539&quot… <li><a href="https://github.com/threeal/cmake-action/commit/b6fc2b4c091acd09e… chore: bump Yarn to version 4.5.3 (<a href="https://redirect.github.com/threeal/cmake-action/issues/538&quot… <li><a href="https://github.com/threeal/cmake-action/commit/639d8219e822101b6… chore: bump <code>@types/node</code> from 22.10.0 to 22.10.1 (<a href="https://redirect.github.com/threeal/cmake-action/issues/537&quot… <li><a href="https://github.com/threeal/cmake-action/commit/820fc064966f53b9e… chore: bump prettier from 3.3.3 to 3.4.1 (<a href="https://redirect.github.com/threeal/cmake-action/issues/536&quot… <li><a href="https://github.com/threeal/cmake-action/commit/38835ec642f1688f1… chore: bump typescript-eslint from 8.15.0 to 8.16.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/534&quot… <li><a href="https://github.com/threeal/cmake-action/commit/4a4b9a2bb1f850992… chore: bump <code>@types/node</code> from 22.9.1 to 22.10.0 (<a href="https://redirect.github.com/threeal/cmake-action/issues/533&quot… <li>Additional commits viewable in <a href="https://github.com/threeal/cmake-action/compare/v2.0.0...v2.1.0&… view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?d… Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4062 -- Commit Summary -- * github: [skip ci]: bump threeal/cmake-action from 2.0.0 to 2.1.0 -- File Changes -- M .github/workflows/cmake_build.yml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4062.patch https://github.com/kamailio/kamailio/pull/4062.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4062 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4062(a)github.com>

2 1

git:master:e71b02a3: github: [skip ci]: bump threeal/cmake-action from 2.0.0 to 2.1.0
by Victor Seva 10 Dec '24

10 Dec '24

Module: kamailio Branch: master Commit: e71b02a326e2ce54e4bf6c6c209f79af43c54278 URL: https://github.com/kamailio/kamailio/commit/e71b02a326e2ce54e4bf6c6c209f79a… Author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-10T07:59:12+01:00 github: [skip ci]: bump threeal/cmake-action from 2.0.0 to 2.1.0 Bumps [threeal/cmake-action](https://github.com/threeal/cmake-action) from 2.0.0 to 2.1.0. - [Release notes](https://github.com/threeal/cmake-action/releases) - [Commits](https://github.com/threeal/cmake-action/compare/v2.0.0...v2.1.0) --- updated-dependencies: - dependency-name: threeal/cmake-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support(a)github.com> --- Modified: .github/workflows/cmake_build.yml --- Diff: https://github.com/kamailio/kamailio/commit/e71b02a326e2ce54e4bf6c6c209f79a… Patch: https://github.com/kamailio/kamailio/commit/e71b02a326e2ce54e4bf6c6c209f79a… --- diff --git a/.github/workflows/cmake_build.yml b/.github/workflows/cmake_build.yml index 8bab75c65bb..73ab19ef5d7 100644 --- a/.github/workflows/cmake_build.yml +++ b/.github/workflows/cmake_build.yml @@ -49,7 +49,7 @@ jobs: sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - name: Build Project natively - uses: threeal/cmake-action(a)v2.0.0 + uses: threeal/cmake-action(a)v2.1.0 # Step runs for all except this combination if: matrix.os != 'ubuntu-latest' || matrix.target_arch != 'aarch64' with: @@ -62,7 +62,7 @@ jobs: - name: Build Project with cross-compiler if: matrix.os == 'ubuntu-latest' && matrix.target_arch == 'aarch64' - uses: threeal/cmake-action(a)v2.0.0 + uses: threeal/cmake-action(a)v2.1.0 with: build-dir: ${{github.workspace}}/build build-args: -j8

1 0

git:master:8e398b86: lib/srdb1: new and free connection callbacks expect one parameter
by Daniel-Constantin Mierla 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: 8e398b8675079e1baac7c7575e70283175cdebe2 URL: https://github.com/kamailio/kamailio/commit/8e398b8675079e1baac7c7575e70283… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-09T19:04:25+01:00 lib/srdb1: new and free connection callbacks expect one parameter - new connection is executetd with a database id and free connection with a pool con - compiler warnings: src/lib/srdb1/db.c:322:23: warning: passing arguments to a function without a prototype is deprecated in all versions of C and is not supported in C2x [-Wdeprecated-non-prototype] 322 | con = new_connection(id); src/lib/srdb1/db.c:361:18: warning: passing arguments to a function without a prototype is deprecated in all versions of C and is not supported in C2x [-Wdeprecated-non-prototype] 361 | free_connection(con); --- Modified: src/lib/srdb1/db.c Modified: src/lib/srdb1/db.h --- Diff: https://github.com/kamailio/kamailio/commit/8e398b8675079e1baac7c7575e70283… Patch: https://github.com/kamailio/kamailio/commit/8e398b8675079e1baac7c7575e70283… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index b13d87c692b..77dea84df52 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -270,7 +270,7 @@ int db_bind_mod(const str *mod, db_func_t *mydbf) * Initialize database module * \note No function should be called before this */ -db1_con_t *db_do_init(const str *url, void *(*new_connection)()) +db1_con_t *db_do_init(const str *url, void *(*new_connection)(struct db_id *)) { return db_do_init2(url, *new_connection, DB_POOLING_PERMITTED); } @@ -280,8 +280,8 @@ db1_con_t *db_do_init(const str *url, void *(*new_connection)()) * Initialize database module * \note No function should be called before this */ -db1_con_t *db_do_init2( - const str *url, void *(*new_connection)(), db_pooling_t pooling) +db1_con_t *db_do_init2(const str *url, void *(*new_connection)(struct db_id *), + db_pooling_t pooling) { struct db_id *id; void *con; @@ -347,7 +347,7 @@ db1_con_t *db_do_init2( * Shut down database module * \note No function should be called after this */ -void db_do_close(db1_con_t *_h, void (*free_connection)()) +void db_do_close(db1_con_t *_h, void (*free_connection)(struct pool_con *)) { struct pool_con *con; diff --git a/src/lib/srdb1/db.h b/src/lib/srdb1/db.h index 248647ecd07..a9538f6b9ca 100644 --- a/src/lib/srdb1/db.h +++ b/src/lib/srdb1/db.h @@ -48,6 +48,8 @@ #include "db_cap.h" #include "db_con.h" #include "db_row.h" +#include "db_id.h" +#include "db_pool.h" #include "db_pooling.h" #include "db_locking.h" @@ -464,7 +466,7 @@ int db_bind_mod(const str *mod, db_func_t *dbf); * \return returns a pointer to the db1_con_t representing the connection if it was successful, otherwise 0 is returned. */ -db1_con_t *db_do_init(const str *url, void *(*new_connection)()); +db1_con_t *db_do_init(const str *url, void *(*new_connection)(struct db_id *)); /** @@ -478,8 +480,8 @@ db1_con_t *db_do_init(const str *url, void *(*new_connection)()); * \return returns a pointer to the db1_con_t representing the connection if it was successful, otherwise 0 is returned. */ -db1_con_t *db_do_init2( - const str *url, void *(*new_connection)(), db_pooling_t pooling); +db1_con_t *db_do_init2(const str *url, void *(*new_connection)(struct db_id *), + db_pooling_t pooling); /** @@ -490,7 +492,7 @@ db1_con_t *db_do_init2( * \param _h database connection handle * \param (*free_connection) Pointer to the db specific free_connection method */ -void db_do_close(db1_con_t *_h, void (*free_connection)()); +void db_do_close(db1_con_t *_h, void (*free_connection)(struct pool_con *)); /**

1 0

Updated: Online devel meeting on matrix - 15:00 UTC, Dec 9, 2024
by Daniel-Constantin Mierla 09 Dec '24

09 Dec '24

Hello, we should consider an online devel meeting sometime soon to summarize what was done at (and still needs to be done after) devel meeting in Dusseldorf and plan a bit the targets for next major release 6.0. If considered useful, I propose Dec 9, 2024 (Monday) at 15:00UTC (16:00 Berlin/Paris/Madrid/Rome), but we can also look for other dates as well. Topics to be discussed can be added at: - https://github.com/kamailio/kamailio-wiki/blob/main/docs/devel/irc-meetings… Pull requests can be made by users without git access. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 2

git:master:83e9cc03: cmake: Link internal libraries to core and remove them from modules
by Xenofon Karamanos 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: 83e9cc036147b071281ad5c444a473ece83f618e URL: https://github.com/kamailio/kamailio/commit/83e9cc036147b071281ad5c444a473e… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2024-12-09T15:19:57+02:00 cmake: Link internal libraries to core and remove them from modules --- Modified: src/CMakeLists.txt Modified: src/core/CMakeLists.txt Modified: src/lib/CMakeLists.txt Modified: src/lib/ims/CMakeLists.txt Modified: src/lib/srdb1/CMakeLists.txt Modified: src/lib/srdb2/CMakeLists.txt Modified: src/lib/trie/CMakeLists.txt Modified: src/modules/acc/CMakeLists.txt Modified: src/modules/alias_db/CMakeLists.txt Modified: src/modules/auth_db/CMakeLists.txt Modified: src/modules/avpops/CMakeLists.txt Modified: src/modules/carrierroute/CMakeLists.txt Modified: src/modules/cfg_db/CMakeLists.txt Modified: src/modules/cnxcc/CMakeLists.txt Modified: src/modules/cplc/CMakeLists.txt Modified: src/modules/db2_ldap/CMakeLists.txt Modified: src/modules/db2_ops/CMakeLists.txt Modified: src/modules/db_berkeley/CMakeLists.txt Modified: src/modules/db_cluster/CMakeLists.txt Modified: src/modules/db_flatstore/CMakeLists.txt Modified: src/modules/db_mongodb/CMakeLists.txt Modified: src/modules/db_oracle/CMakeLists.txt Modified: src/modules/db_perlvdb/CMakeLists.txt Modified: src/modules/db_postgres/CMakeLists.txt Modified: src/modules/db_redis/CMakeLists.txt Modified: src/modules/db_sqlite/CMakeLists.txt Modified: src/modules/db_text/CMakeLists.txt Modified: src/modules/db_unixodbc/CMakeLists.txt Modified: src/modules/dialog/CMakeLists.txt Modified: src/modules/dialplan/CMakeLists.txt Modified: src/modules/dispatcher/CMakeLists.txt Modified: src/modules/dmq/CMakeLists.txt Modified: src/modules/domain/CMakeLists.txt Modified: src/modules/domainpolicy/CMakeLists.txt Modified: src/modules/drouting/CMakeLists.txt Modified: src/modules/group/CMakeLists.txt Modified: src/modules/htable/CMakeLists.txt Modified: src/modules/imc/CMakeLists.txt Modified: src/modules/ims_auth/CMakeLists.txt Modified: src/modules/ims_charging/CMakeLists.txt Modified: src/modules/ims_dialog/CMakeLists.txt Modified: src/modules/ims_diameter_server/CMakeLists.txt Modified: src/modules/ims_icscf/CMakeLists.txt Modified: src/modules/ims_ipsec_pcscf/CMakeLists.txt Modified: src/modules/ims_isc/CMakeLists.txt Modified: src/modules/ims_ocs/CMakeLists.txt Modified: src/modules/ims_qos/CMakeLists.txt Modified: src/modules/ims_qos_npn/CMakeLists.txt Modified: src/modules/ims_usrloc_pcscf/CMakeLists.txt Modified: src/modules/ims_usrloc_scscf/CMakeLists.txt Modified: src/modules/kazoo/CMakeLists.txt Modified: src/modules/keepalive/CMakeLists.txt Modified: src/modules/lcr/CMakeLists.txt Modified: src/modules/matrix/CMakeLists.txt Modified: src/modules/mohqueue/CMakeLists.txt Modified: src/modules/mqueue/CMakeLists.txt Modified: src/modules/msilo/CMakeLists.txt Modified: src/modules/mtree/CMakeLists.txt Modified: src/modules/p_usrloc/CMakeLists.txt Modified: src/modules/pdt/CMakeLists.txt Modified: src/modules/permissions/CMakeLists.txt Modified: src/modules/pipelimit/CMakeLists.txt Modified: src/modules/prefix_route/CMakeLists.txt Modified: src/modules/presence/CMakeLists.txt Modified: src/modules/presence_xml/CMakeLists.txt Modified: src/modules/pua/CMakeLists.txt Modified: src/modules/rls/CMakeLists.txt Modified: src/modules/rtpengine/CMakeLists.txt Modified: src/modules/rtpproxy/CMakeLists.txt Modified: src/modules/sca/CMakeLists.txt Modified: src/modules/secfilter/CMakeLists.txt Modified: src/modules/sipcapture/CMakeLists.txt Modified: src/modules/siptrace/CMakeLists.txt Modified: src/modules/siputils/CMakeLists.txt Modified: src/modules/speeddial/CMakeLists.txt Modified: src/modules/sqlops/CMakeLists.txt Modified: src/modules/topos/CMakeLists.txt Modified: src/modules/uac/CMakeLists.txt Modified: src/modules/uid_auth_db/CMakeLists.txt Modified: src/modules/uid_avp_db/CMakeLists.txt Modified: src/modules/uid_domain/CMakeLists.txt Modified: src/modules/uid_gflags/CMakeLists.txt Modified: src/modules/uid_uri_db/CMakeLists.txt Modified: src/modules/uri_db/CMakeLists.txt Modified: src/modules/userblocklist/CMakeLists.txt Modified: src/modules/usrloc/CMakeLists.txt Modified: src/modules/utils/CMakeLists.txt Modified: src/modules/xcap_client/CMakeLists.txt Modified: src/modules/xcap_server/CMakeLists.txt Modified: src/modules/xhttp/CMakeLists.txt Modified: src/modules/xhttp_pi/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/83e9cc036147b071281ad5c444a473e… Patch: https://github.com/kamailio/kamailio/commit/83e9cc036147b071281ad5c444a473e…

1 0

[kamailio/kamailio] Python exception handling fixes (PR #4044)
by Matthias Urlichs 09 Dec '24

09 Dec '24

#### 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  Python's C interface contract states that C code must *either* raise an exception and return NULL, *or* return a Python object. Doing both will raise a `SystemError` exception which obscures the original problem. It may also cause a memory leak. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4044 -- Commit Summary -- * app_python3: fix exception handling -- File Changes -- M src/modules/app_python3/apy_kemi.c (4) M src/modules/app_python3s/apy3s_kemi.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4044.patch https://github.com/kamailio/kamailio/pull/4044.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4044 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4044(a)github.com>

3 9

git:master:ef73fb87: app_python3s: fix exception handling
by Daniel-Constantin Mierla 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: ef73fb876f527c3bde4b425e3ec70d3f613fcb87 URL: https://github.com/kamailio/kamailio/commit/ef73fb876f527c3bde4b425e3ec70d3… Author: Matthias Urlichs <matthias(a)urlichs.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-09T12:13:54+01:00 app_python3s: fix exception handling Python's C interface contract states that C code must *either* raise an exception and return NULL, *or* return a Python object. --- Modified: src/modules/app_python3s/apy3s_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/ef73fb876f527c3bde4b425e3ec70d3… Patch: https://github.com/kamailio/kamailio/commit/ef73fb876f527c3bde4b425e3ec70d3… --- diff --git a/src/modules/app_python3s/apy3s_kemi.c b/src/modules/app_python3s/apy3s_kemi.c index f28354909b7..dd23bd0f2d7 100644 --- a/src/modules/app_python3s/apy3s_kemi.c +++ b/src/modules/app_python3s/apy3s_kemi.c @@ -409,7 +409,7 @@ PyObject *sr_apy_kemi_exec_func_ex( if(pobj == NULL) { LM_ERR("null parameter - func: %.*s idx: %d argc: %d\n", fname.len, fname.s, i, (int)alen); - return sr_kemi_apy_return_false(); + return NULL; } if(ket->ptypes[i] == SR_KEMIP_STR) { if(!PyUnicode_Check(pobj)) { @@ -421,7 +421,7 @@ PyObject *sr_apy_kemi_exec_func_ex( if(vps[i].v.s.s == NULL) { LM_ERR("null-string parameter - func: %.*s idx: %d argc: %d\n", fname.len, fname.s, i, (int)alen); - return sr_kemi_apy_return_false(); + return NULL; } vps[i].v.s.len = (int)slen; vps[i].vtype = SR_KEMIP_STR;

1 0

git:master:91dc75e6: app_python3: fix exception handling
by Daniel-Constantin Mierla 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: 91dc75e65bb2a6643b8b322024416c420caf5d64 URL: https://github.com/kamailio/kamailio/commit/91dc75e65bb2a6643b8b322024416c4… Author: Matthias Urlichs <matthias(a)urlichs.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-09T12:13:54+01:00 app_python3: fix exception handling Python's C interface contract states that C code must *either* raise an exception and return NULL, *or* return a Python object. --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/91dc75e65bb2a6643b8b322024416c4… Patch: https://github.com/kamailio/kamailio/commit/91dc75e65bb2a6643b8b322024416c4… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 213a19e4703..ddc987168b6 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -281,7 +281,7 @@ PyObject *sr_apy_kemi_exec_func_ex( if(pobj == NULL) { LM_ERR("null parameter - func: %.*s idx: %d argc: %d\n", fname.len, fname.s, i, (int)alen); - return sr_kemi_apy_return_false(); + return NULL; } if(ket->ptypes[i] == SR_KEMIP_STR) { if(!PyUnicode_Check(pobj)) { @@ -293,7 +293,7 @@ PyObject *sr_apy_kemi_exec_func_ex( if(vps[i].v.s.s == NULL) { LM_ERR("null-string parameter - func: %.*s idx: %d argc: %d\n", fname.len, fname.s, i, (int)alen); - return sr_kemi_apy_return_false(); + return NULL; } vps[i].v.s.len = (int)slen; vps[i].vtype = SR_KEMIP_STR;

1 0

t_relay() ignores destination uri ($du) set by dispatcher module
by molodtsov＠ajax.systems 09 Dec '24

09 Dec '24

Help me, kamailio step-bros, i'm stuck! Im trying to build logic, where if target client was not located on this node - message is forwarded to the next node, until sip message make full circle, and it will be handled by its 'X-Visited-Nodes' header and fire 404 if no one consumed it. (I can see that check is buggy, but i will fix this later so don't pay much attention to it) Im blocked by t_relay() behaviour, which is ignore destination selected by ds_select_dst; Instead of forwarding message, it comes on the same node again and again >>>> my dispatcher config 927 route[DISPATCH] { 928 $var(destination_found) = 0; 929 $var(checked_nodes) = ""; # Keep track of locally checked nodes 930 $var(loop_behaviour) = 0; 931 932 # Initialize X-Visited-Nodes if it doesn't exist 933 if ($hdrc(X-Visited-Nodes) == 0) { 934 append_hf_value("X-Visited-Nodes", ""); # Initialize the header in the message 935 } 936 937 xlog("X-Visited-Nodes: $hdr(X-Visited-Nodes)"); 938 append_hf_value("X-Visited-Nodes", "$du"); 939 # Round-robin dispatching on gateways group '1' 940 while (ds_select_dst("1", "4") && $var(loop_behaviour) != 2) { 941 $var(loop_behaviour) = 0; 942 # Get the current proposed destination 943 $var(current_dest) = $du; 944 945 # 1. Skip if the proposed destination is self 946 if ($var(loop_behaviour) == 0 && $var(current_dest) =~ ".*" + $Ri + ".*") { 947 xlog("Skipping self destination <$var(current_dest)>\n"); 948 ds_mark_dst(); # Mark this node globally only because it's "self" 949 $var(loop_behaviour) = 1; #continue 950 } 951 952 # 2. Check if we've made a full circle 953 if ($var(loop_behaviour) == 0 && $var(checked_nodes) =~ "^" + $var(current_dest) + ".*") { 954 xlog("All nodes checked, no valid destination found\n"); 955 send_reply("404", "No user found, no new destination available"); 956 exit; 957 } 958 959 # 3. Check if the node is already in X-Visited-Nodes 960 if ($var(loop_behaviour) == 0 && $hdr(X-Visited-Nodes) =~ ".*" + $var(current_dest) + ".*") { 961 xlog("Node <$var(current_dest)> already in X-Visited-Nodes\n"); 962 $var(checked_nodes) = $var(checked_nodes) + "," + $var(current_dest); 963 $var(loop_behaviour) = 1; #continue 964 } 965 966 if($var(loop_behaviour) == 0){ 974 xlog("DISPATCHER: selected reqURI: <$ru> ; destURI: <$du> via <$var(current_dest)> (attrs: $xavp(_dsdst_=>attrs))\n"); 975 $var(destination_found) = 1; 976 $var(loop_behaviour) = 2; # Exit the loop as a valid destination is found 977 } 978 } 979 980 # If a destination is found, relay the message 981 if ($var(destination_found)) { 987 if (!t_relay()) { 988 sl_reply_error(); 989 } 990 exit; 991 } else { 992 return(-1); 993 } 994 } >>>> INVITE message trace (every line was trimmed to not garbage this message with irrelevant info like process name or timestamp) i have enabled config trace mode, so my invite message inside dispatcher route looks like this. And on my other node, there is not a trace of invite message {1 22 INV CmLZ} <script>: Lookup for 02222 failed - no such client on this node <--- Trying to call user, which is not registered on this node, so location route returns fail and message should go on another node {1 22 INV CmLZ} trace(): request_route=[LOCATION] c=[/etc/kamailio/kamailio.cfg] l=845 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[LOCATION] c=[/etc/kamailio/kamailio.cfg] l=842 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[LOCATION] c=[/etc/kamailio/kamailio.cfg] l=843 a=2 n=return {1 22 INV CmLZ} trace(): request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=653 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=650 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=645 a=5 n=route {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=928 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=929 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=930 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=937 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=934 a=26 n=append_hf_value {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=937 a=25 n=xlog {1 22 INV CmLZ} <script>: X-Visited-Nodes: <null> {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=938 a=26 n=append_hf_value {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=978 a=23 n=while {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=940 a=26 n=ds_select_dst {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=941 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=943 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=953 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=960 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=966 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=978 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=974 a=25 n=xlog {1 22 INV CmLZ} <script>: DISPATCHER: selected reqURI: <sip:02222@kamailio-nlb-test-40f4f509064551a6.elb.eu-west-1.amazonaws.com> ; destURI: <sip:10.197.200.228:5060> via <sip:10.197.200.228:5060> (attrs: <null>) <--- destination uri is correct, message should be sent to next kamailio node isn't it? {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=975 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=976 a=63 n=assign {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=940 a=26 n=ds_select_dst {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=993 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=990 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=987 a=24 n=t_relay <-- should relay to $dU destination {1 22 INV CmLZ} tm [t_lookup.c:1868]: t_newtran(): msg (0x7d0ad3775368) id=28/25950 global id=28/25950 T start=(nil) {1 22 INV CmLZ} tm [t_lookup.c:781]: t_lookup_request(): start searching: hash=9408, isACK=0 {1 22 INV CmLZ} tm [t_lookup.c:499]: matching_3261(): RFC3261 transaction matching failed - via branch [z9hG4bK.YP1EiC6qX] {1 22 INV CmLZ} tm [t_lookup.c:981]: t_lookup_request(): no transaction found {1 22 INV CmLZ} tm [h_table.c:532]: tm_xdata_swap(): copy X/AVPs from msg context to txdata {1 22 INV CmLZ} tm [t_hooks.c:301]: run_reqin_callbacks_internal(): trans=0x7d0acdbf1168, callback type 1, id 0 entered {1 22 INV CmLZ} tm [h_table.c:551]: tm_xdata_swap(): restore X/AVPs msg context from txdata {1 22 INV CmLZ} tm [h_table.c:415]: build_cell(): created new cell 0x7d0acdbf1168 {1 22 INV CmLZ} tm [t_funcs.c:339]: t_relay_to(): new INVITE {1 22 INV CmLZ} tm [t_reply.c:634]: _reply_light(): reply sent out - buf=0x7d0ad3755d98: SIP/2.0 100 trying -... shmem=0x7d0acdbf4b10: SIP/2.0 100 trying - {1 22 INV CmLZ} tm [t_reply.c:645]: _reply_light(): finished {1 22 INV CmLZ} tm [t_funcs.c:386]: t_relay_to(): new transaction forwarded {1 22 INV CmLZ} trace(): request_route=[DISPATCH] c=[/etc/kamailio/kamailio.cfg] l=990 a=2 n=exit <--- same invite appears on this node instead of being forwarded to next kamailio node {1 22 INV CmLZ} trace(): request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=585 a=5 n=route {1 22 INV CmLZ} trace(): request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=699 a=67 n=set_rpl_no_connect {1 22 INV CmLZ} trace(): request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=702 a=55 n=force_rport {1 22 INV CmLZ} trace(): request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=727 a=16 n=if {1 22 INV CmLZ} trace(): request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=732 a=16 n=if

1 0

git:master:ba0c570c: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: ba0c570ca95bff06c8ce04779371567d88a4e9f8 URL: https://github.com/kamailio/kamailio/commit/ba0c570ca95bff06c8ce04779371567… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-12-09T09:46:10+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/ba0c570ca95bff06c8ce04779371567… Patch: https://github.com/kamailio/kamailio/commit/ba0c570ca95bff06c8ce04779371567… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 06ee1beb53b..12a030cc19d 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1294,16 +1294,17 @@ Note See also: t_set_fr(), fr_timer. - In Kamailio compatibility mode (defined by #!KAMAILIO), the value of - the parameter must be the name of an AVP in pseudo-variable format: - $avp(name). In SER compatibility mode it must be just AVP name. + In Kamailio compatibility mode (defined by #!KAMAILIO, which is + default), the value of the parameter must be the name of an AVP in + pseudo-variable format: $avp(name). In SER compatibility mode (defined + by #!SER) it must be just AVP name. Example 1.28. Set fr_timer_avp parameter ... -# Kamailio mode -modparam("tm", "fr_timer_avp", "$avp(i:708)") -# Old SER mode -modparam("tm", "fr_timer_avp", "i:708") +# default Kamailio compatibility mode +modparam("tm", "fr_timer_avp", "$avp(frtimer)") +# old SER compatibility mode +modparam("tm", "fr_timer_avp", "frtimer") ... 3.28. fr_inv_timer_avp (string) @@ -1328,15 +1329,16 @@ Note See also: t_set_fr(), fr_inv_timer. - In Kamailio compatibility mode (defined by #!KAMAILIO), the value of - the parameter must be the name of an AVP in pseudo-variable format: - $avp(name). In SER compatibility mode it must by just AVP name. + In Kamailio compatibility mode (defined by #!KAMAILIO, which is + default), the value of the parameter must be the name of an AVP in + pseudo-variable format: $avp(name). In SER compatibility mode (defined + by #!SER) it must by just AVP name. Example 1.29. Set fr_inv_timer_avp parameter ... -# Kamailio mode +# Kamailio compatibility mode modparam("tm", "fr_inv_timer_avp", "$avp(my_fr_inv_timer)") -# Old SER mode +# old SER compatibility mode modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") ...

1 0

git:master:5e0bc1a5: tm: small updates about timer avp params and compatibility modes
by Daniel-Constantin Mierla 09 Dec '24

09 Dec '24

Module: kamailio Branch: master Commit: 5e0bc1a5c9764ce472354a0aa242b7469d79eb7f URL: https://github.com/kamailio/kamailio/commit/5e0bc1a5c9764ce472354a0aa242b74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-09T09:28:50+01:00 tm: small updates about timer avp params and compatibility modes --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/5e0bc1a5c9764ce472354a0aa242b74… Patch: https://github.com/kamailio/kamailio/commit/5e0bc1a5c9764ce472354a0aa242b74… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index ecff467fa06..ad1f55e2061 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -825,19 +825,19 @@ modparam("tm", "contact_flows_avp", "tm_contact_flows") <varname>fr_timer</varname>. </para> <para> - In Kamailio compatibility mode (defined by #!KAMAILIO), the value - of the parameter must be the name of an AVP in pseudo-variable - format: $avp(name). In SER compatibility mode it must be just - AVP name. + In Kamailio compatibility mode (defined by #!KAMAILIO, which is + default), the value of the parameter must be the name of an AVP + in pseudo-variable format: $avp(name). In SER compatibility mode + (defined by #!SER) it must be just AVP name. </para> <example> <title>Set <varname>fr_timer_avp</varname> parameter</title> <programlisting> ... -# Kamailio mode -modparam("tm", "fr_timer_avp", "$avp(i:708)") -# Old SER mode -modparam("tm", "fr_timer_avp", "i:708") +# default Kamailio compatibility mode +modparam("tm", "fr_timer_avp", "$avp(frtimer)") +# old SER compatibility mode +modparam("tm", "fr_timer_avp", "frtimer") ... </programlisting> </example> @@ -871,18 +871,18 @@ modparam("tm", "fr_timer_avp", "i:708") <varname>fr_inv_timer</varname>. </para> <para> - In Kamailio compatibility mode (defined by #!KAMAILIO), the value - of the parameter must be the name of an AVP in pseudo-variable - format: $avp(name). In SER compatibility mode it must by just - AVP name. + In Kamailio compatibility mode (defined by #!KAMAILIO, which is + default), the value of the parameter must be the name of an AVP + in pseudo-variable format: $avp(name). In SER compatibility mode + (defined by #!SER) it must by just AVP name. </para> <example> <title>Set <varname>fr_inv_timer_avp</varname> parameter</title> <programlisting> ... -# Kamailio mode +# Kamailio compatibility mode modparam("tm", "fr_inv_timer_avp", "$avp(my_fr_inv_timer)") -# Old SER mode +# old SER compatibility mode modparam("tm", "fr_inv_timer_avp", "my_fr_inv_timer") ... </programlisting>

1 0

[kamailio/kamailio] general protection fault in kamailio 5.5 on RHEL 8 (Issue #4057)
by pgravet 06 Dec '24

06 Dec '24

### Description Hi, I am migrating a kamailio application from RHEL 7 / KAM 5.0 to RHEL 8 / KAM 5.5 kamailio installed from repo baseurl=https://rpm.kamailio.org/centos/... Thanks for your return ### Troubleshooting general protection fault #### Reproduction Each time an INVITE is received #### Debugging Data Core was generated by `/usr/sbin/kamailio --atexit=no -DD -P /run/kamailio/kamailio.pid -f /etc/kamail'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00000000006e2be9 in qm_debug_check_frag () Missing separate debuginfos, use: yum debuginfo-install glibc-2.28-225.el8_8.6.x86_64 libblkid-2.32.1-42.el8_8.x86_64 libgcc-8.5.0-18.el8.x86_64 libmount-2.32.1-42.el8_8.x86_64 libselinux-2.9-8.el8.x86_64 libxcrypt-4.1.1-6.el8.x86_64 mariadb-connector-c-3.1.11-2.el8_3.x86_64 openssl-libs-1.1.1k-9.el8_7.x86_64 pcre2-10.32-3.el8_6.x86_64 perl-libs-5.26.3-422.el8.x86_64 systemd-libs-239-74.el8_8.5.x86_64 zlib-1.2.11-21.el8_7.x86_64 (gdb) bt #0 0x00000000006e2be9 in qm_debug_check_frag () #1 0x00000000006e6dba in qm_free () #2 0x00000000006f13c9 in qm_shm_free () #3 0x00000000005e8a2f in xavp_free () #4 0x00000000005e9ed8 in xavp_destroy_list () #5 0x00000000005e9f4f in xavp_reset_list () #6 0x00000000005ff6a1 in ksr_msg_env_reset () #7 0x00000000005fefb4 in receive_msg () #8 0x00000000004ddb1a in udp_rcv_loop () #9 0x000000000042bf00 in main_loop () #10 0x0000000000437c69 in main () (gdb) info locals No symbol table info available. (gdb) list 1 dl-call-libc-early-init.c: No such file or directory. #### Log Messages Nothing in Syslog #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information version: kamailio 5.5.7 (x86_64/linux) 43eb13 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 43eb13 compiled on 13:39:01 Jul 19 2023 with gcc 8.5.0 * **Operating System**: RHEL 8.8 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4057 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4057(a)github.com>

2 3

[kamailio/kamailio] WARNING: <script>: No transaction found for CANCEL - 54-261285 (Issue #4060)
by Muhammad Jawad Ud Din 06 Dec '24

06 Dec '24

if (is_method("CANCEL")) { xlog("L_INFO", "Received CANCEL request for $ci - Method: $rm - R-URI: $ru\n"); if (!t_check_trans()) { xlog("L_INFO", "No transaction found with t_check_trans(), trying t_lookup_cancel()\n"); # Try to find the transaction using branch and Call-ID $var(branch) = $(hdr(Via){param.value,branch}); if (!t_lookup_cancel()) { xlog("L_WARN", "No transaction found for CANCEL - $ci with branch $var(branch)\n"); sl_reply("481", "Call Leg/Transaction Does Not Exist"); exit; } xlog("L_INFO", "Found transaction using t_lookup_cancel()\n"); } # Extract destination from original request if ($ru != "") { $du = $ru; xlog("L_INFO", "Setting destination from R-URI: $du\n"); } else { xlog("L_WARN", "No R-URI found for CANCEL\n"); } # Add debugging xlog("L_INFO", "Forwarding CANCEL to $du for call $ci\n"); if (ds_is_from_list()) { ds_load_unset(); xlog("L_INFO", "Unset dispatcher load for destination\n"); } # Handle the client ID and call counting if (is_present_hf("X-VICIdial-Client-Id")) { $var(client_id) = $(hdr(X-VICIdial-Client-Id)); if ($var(client_id) =~ "^(CID_[0-9]+)-[a-z]$") { $var(parent_id) = $(var(client_id){re.subst,/^(CID_[0-9]+)-[a-z]$/\1/}); } else { $var(parent_id) = $var(client_id); } if($var(parent_id) != $null) { lock("calls_$var(parent_id)"); if($sht(clientCalls=>$var(parent_id)) > 0) { $sht(clientCalls=>$var(parent_id)) = $sht(clientCalls=>$var(parent_id)) - 1; xlog("L_INFO", "CANCEL: Decremented call count for $var(parent_id) to $sht(clientCalls=>$var(parent_id))\n"); } unlock("calls_$var(parent_id)"); } } # Send 200 OK response for the CANCEL t_reply("200", "OK"); # Force the relay of CANCEL to the destination t_relay(); exit; } "This is my cancel route. It either forwards or relays the cancel message to the destination and also provides an error." -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4060 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4060(a)github.com>

2 2

git:5.8:d01fbe59: pkg/kamailio/obs: added systemd template to start multiple kamailio services
by Sergey Safarov 06 Dec '24

06 Dec '24

Module: kamailio Branch: 5.8 Commit: d01fbe59b386ad025466bd13d71495f4c765f85d URL: https://github.com/kamailio/kamailio/commit/d01fbe59b386ad025466bd13d71495f… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2024-12-06T18:14:00+02:00 pkg/kamailio/obs: added systemd template to start multiple kamailio services GH#3904 (cherry picked from commit b4ec854c0822a61790ea4fa1bc6387cddce4cf35) --- Added: pkg/kamailio/obs/kamailio@.service Modified: pkg/kamailio/obs/kamailio.service Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/d01fbe59b386ad025466bd13d71495f… Patch: https://github.com/kamailio/kamailio/commit/d01fbe59b386ad025466bd13d71495f… --- diff --git a/pkg/kamailio/obs/kamailio.service b/pkg/kamailio/obs/kamailio.service index 14a2e580890..0c4fbc49caf 100644 --- a/pkg/kamailio/obs/kamailio.service +++ b/pkg/kamailio/obs/kamailio.service @@ -1,5 +1,6 @@ [Unit] Description=Kamailio - the Open Source SIP Server +Documentation=man:kamailio(8) Wants=network-online.target After=network-online.target diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 423f7f9f3de..e889b0df375 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1200,6 +1200,7 @@ sed -i -e 's/python3/python2/' utils/kamctl/dbtextdb/dbtextdb.py # on latest dist need to add --atexit=no for Kamailio options. More details GH #2616 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 sed -i -e 's|/usr/sbin/kamailio|/usr/sbin/kamailio --atexit=no|' pkg/kamailio/obs/kamailio.service +sed -i -e 's|/usr/sbin/kamailio|/usr/sbin/kamailio --atexit=no|' pkg/kamailio/obs/kamailio@.service %endif @@ -1449,6 +1450,7 @@ install -m755 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.init \ # systemd install -d %{buildroot}%{_unitdir} install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.service %{buildroot}%{_unitdir}/kamailio.service +install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf @@ -1680,6 +1682,7 @@ fi %dir %attr(-,kamailio,kamailio) %{_var}/run/kamailio %else %{_unitdir}/kamailio.service +%{_unitdir}/kamailio@.service %{_tmpfilesdir}/kamailio.conf %endif diff --git a/pkg/kamailio/obs/kamailio@.service b/pkg/kamailio/obs/kamailio@.service new file mode 100644 index 00000000000..44a4c02a5a1 --- /dev/null +++ b/pkg/kamailio/obs/kamailio@.service @@ -0,0 +1,28 @@ +[Unit] +Description=Kamailio - the Open Source SIP Server (instance %i) +Documentation=man:kamailio(8) +Wants=network-online.target +After=network-online.target + +[Service] +Type=simple +User=kamailio +Group=kamailio +Environment='CFGFILE=/etc/kamailio/kamailio-%i.cfg' +Environment='SHM_MEMORY=64' +Environment='PKG_MEMORY=8' +EnvironmentFile=-/etc/sysconfig/kamailio-%i +EnvironmentFile=-/etc/sysconfig/kamailio-%i.d/* +# PIDFile requires a full absolute path +PIDFile=/run/kamailio-%i/kamailio.pid +# ExecStart requires a full absolute path +ExecStart=/usr/sbin/kamailio -DD -P /run/kamailio-%i/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -Y /run/kamailio-%i +Restart=on-failure +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN +# /run/kamailio in tmpfs +RuntimeDirectory=kamailio-%i +RuntimeDirectoryMode=0770 + +[Install] +WantedBy=multi-user.target

1 0

git:master:49210190: pkg/kamailio: removed libsrdb and libkamailio_ims from packaging
by Sergey Safarov 06 Dec '24

06 Dec '24

Module: kamailio Branch: master Commit: 49210190059df309677fa97204e4c50bde290990 URL: https://github.com/kamailio/kamailio/commit/49210190059df309677fa97204e4c50… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2024-12-06T18:11:05+02:00 pkg/kamailio: removed libsrdb and libkamailio_ims from packaging --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/49210190059df309677fa97204e4c50… Patch: https://github.com/kamailio/kamailio/commit/49210190059df309677fa97204e4c50… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 927ec32d62d..fcedad3cf68 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1673,12 +1673,6 @@ fi %endif %dir %{_libdir}/kamailio -%{_libdir}/kamailio/libsrdb1.so.1 -%{_libdir}/kamailio/libsrdb1.so.1.0 -%{_libdir}/kamailio/libsrdb2.so.1 -%{_libdir}/kamailio/libsrdb2.so.1.0 -%{_libdir}/kamailio/libtrie.so.1 -%{_libdir}/kamailio/libtrie.so.1.0 %dir %{_libdir}/kamailio/modules %{_libdir}/kamailio/modules/acc.so @@ -1960,9 +1954,6 @@ fi %if %{with ims} %files ims %defattr(-,root,root) -%{_libdir}/kamailio/libkamailio_ims.so.0 -%{_libdir}/kamailio/libkamailio_ims.so.0.1 - %doc %{_docdir}/kamailio/modules/README.cdp %doc %{_docdir}/kamailio/modules/README.cdp_avp %doc %{_docdir}/kamailio/modules/README.ims_auth

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev