sr-dev December 2024

sr-dev@lists.kamailio.org

17 participants
313 discussions

git:master:d916aa67: presence_profile: reformat exported structures

by Victor Seva

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 week, 4 days

git:master:07a47afb: presence_reginfo: reformat exported structures

by Victor Seva

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 week, 4 days

git:master:ab033f5e: presence_xml: add fixup_free* to exported functions

by Victor Seva

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 week, 4 days

git:master:64fe1638: pua: reformat exported structures

by Victor Seva

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 week, 4 days

git:master:e39420a1: pua_reginfo: reformat exported structures

by Victor Seva

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 week, 4 days

git:master:93b979aa: pua_rpc: reformat exported structures

by Victor Seva

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 week, 4 days

git:master:bbb373e2: pua_usrloc: reformat exported structures

by Victor Seva

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 week, 4 days

git:master:eaefe0f2: pua_xml: reformat exported structures

by Victor Seva

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 week, 4 days

git:master:954fa318: cmake: Use CMAKE_INSTALL_FULL_* paths where appropriate

by Xenofon Karamanos

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 week, 4 days

git:master:b540392e: cmake: support for intel 32b cpu architectures

by Daniel-Constantin Mierla

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 week, 4 days

← Newer
1
...
18
19
20
21
22
23
24
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2024