- sr-dev - kamailio.org

git:master:0511e00f: presence: add fixup_free* to exported functions
by Victor Seva 11 Dec '24

11 Dec '24

Module: kamailio Branch: master Commit: 0511e00f9ece75a61b8a3799a3d75f08c2013afa URL: https://github.com/kamailio/kamailio/commit/0511e00f9ece75a61b8a3799a3d75f0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-11T21:35:08+01:00 presence: add fixup_free* to exported functions --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/0511e00f9ece75a61b8a3799a3d75f0… Patch: https://github.com/kamailio/kamailio/commit/0511e00f9ece75a61b8a3799a3d75f0…

1 0

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev