- sr-dev - kamailio.org

git:master:b0dee2ff: jwt: CMakeLists.txt - update for finding libjwt with pkg-config
by Daniel-Constantin Mierla 04 Dec '24

04 Dec '24

Module: kamailio Branch: master Commit: b0dee2ff21a6d81b431b9d75ba364e10e7a2d253 URL: https://github.com/kamailio/kamailio/commit/b0dee2ff21a6d81b431b9d75ba364e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-04T11:02:12+01:00 jwt: CMakeLists.txt - update for finding libjwt with pkg-config --- Modified: src/modules/jwt/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/b0dee2ff21a6d81b431b9d75ba364e1… Patch: https://github.com/kamailio/kamailio/commit/b0dee2ff21a6d81b431b9d75ba364e1… --- diff --git a/src/modules/jwt/CMakeLists.txt b/src/modules/jwt/CMakeLists.txt index 8e996e04e75..ddcba58bd66 100644 --- a/src/modules/jwt/CMakeLists.txt +++ b/src/modules/jwt/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOT libjwt_FOUND) message(STATUS "libjwt not found... looking with pkg-config") find_package(PkgConfig REQUIRED) pkg_check_modules(jwt REQUIRED IMPORTED_TARGET libjwt>=1.12) - add_library(jwt::libjwt ALIAS PkgConfig::libjwt) + add_library(jwt::libjwt ALIAS PkgConfig::jwt) endif() add_library(jwt SHARED ${SRC_FILES})

1 0

IMPORTANT: Replacing old Makefiles with CMake
by Daniel-Constantin Mierla 04 Dec '24

04 Dec '24

Hello, thanks to a significant effort/contribution done by Xenofon Karamanos, with some help from Alexandr Dubovikov during Kamailio Devel Meeting in Dusseldorf, support for using CMake (https://cmake.org/) for building Kamailio has been recently merged to git repository: - https://lists.kamailio.org/mailman3/hyperkitty/list/sr-dev@lists.kamailio.o… The old build system based on manually crafted Makefiles got quite complex during the past 20 years, discovering and managing dependencies becoming harder and harder. Right now, both old Makefiles and the new CMake-based build system are available in order to help discovering what is missing in CMake files from what people use with the old Makefiles. However, the plan is to REMOVE the old Makefiles before freezing the development for v6.0.x (like 12 days or so). The testing phase for v6.0.x will be also used for tuning what is missing in the CMake files. Of course, it not going to end up to be 100% same set of build commands, but the goal is to have the commonly used ones. Besides that, CMake should facilitate easier automate testing and packaging. Therefore it is important that you upgrade your Kamailio build/packaging process to use CMake and report if there is something that you cannot achieve with it. Docs are available in the wiki at: - https://www.kamailio.org/wikidocs/tutorials/cmake/default/ - https://www.kamailio.org/wikidocs/tutorials/cmake/custom/ You are encouraged to make pull requests to the above tutorials if you find something missing or useful to be known by the others. Another impact of the new CMake build system is to supported operating systems. CMake is widely available, however the developers have access to limited set of machines and they are also not very familiar with every OS out there. Old Makefiles (tried to) have support for very old OSes (from late 1990's early 2000's, like vax vms, sunos, ...), I haven't seen any activity related to them in the community for many years, therefore unless someone still uses such OS and contributes support for them, they will be lost by the cmake build system. Anyhow, in short, test on your favourite OS and report if something is not working. Cheers, Daniel -- Daniel-Constantin Mierla | https://www.asipto.com | SIP/Kamailio Consultancy, Training & Development Services | Berlin - Germany

1 0

git:master:9ff1bd7b: lwsc: add fixup_free* to exported functions
by Federico Cabiddu 04 Dec '24

04 Dec '24

Module: kamailio Branch: master Commit: 9ff1bd7b6f0d11788234ff6a72057e0a27ba1be9 URL: https://github.com/kamailio/kamailio/commit/9ff1bd7b6f0d11788234ff6a72057e0… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-12-04T09:29:11+01:00 lwsc: add fixup_free* to exported functions --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9ff1bd7b6f0d11788234ff6a72057e0… Patch: https://github.com/kamailio/kamailio/commit/9ff1bd7b6f0d11788234ff6a72057e0… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index 358f53e7246..b1645448276 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -59,46 +59,51 @@ static int _lwsc_timeout_init = 2000000; static str _lwsc_protocol = str_init("kmsg"); static int _lwsc_verbosity = 0; +/* clang-format off */ static cmd_export_t cmds[] = {{"lwsc_request", (cmd_function)w_lwsc_request, 2, - fixup_spve_all, 0, ANY_ROUTE}, - {"lwsc_request_proto", (cmd_function)w_lwsc_request_proto, 3, - fixup_spve_all, 0, ANY_ROUTE}, - {"lwsc_notify", (cmd_function)w_lwsc_notify, 2, fixup_spve_all, 0, - ANY_ROUTE}, - {"lwsc_notify_proto", (cmd_function)w_lwsc_notify_proto, 3, - fixup_spve_all, 0, ANY_ROUTE}, - {"bind_lwsc", (cmd_function)bind_lwsc, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}}; + fixup_spve_all, 0, ANY_ROUTE}, + {"lwsc_request_proto", (cmd_function)w_lwsc_request_proto, 3, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"lwsc_notify", (cmd_function)w_lwsc_notify, 2, fixup_spve_all, fixup_free_spve_all, + ANY_ROUTE}, + {"lwsc_notify_proto", (cmd_function)w_lwsc_notify_proto, 3, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"bind_lwsc", (cmd_function)bind_lwsc, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"timeout_connect", PARAM_INT, &_lwsc_timeout_connect}, - {"timeout_send", PARAM_INT, &_lwsc_timeout_send}, - {"timeout_read", PARAM_INT, &_lwsc_timeout_read}, - {"timeout_init", PARAM_INT, &_lwsc_timeout_init}, - {"protocol", PARAM_STR, &_lwsc_protocol}, - {"verbosity", PARAM_INT, &_lwsc_verbosity}, - - {0, 0, 0}}; + {"timeout_connect", PARAM_INT, &_lwsc_timeout_connect}, + {"timeout_send", PARAM_INT, &_lwsc_timeout_send}, + {"timeout_read", PARAM_INT, &_lwsc_timeout_read}, + {"timeout_init", PARAM_INT, &_lwsc_timeout_init}, + {"protocol", PARAM_STR, &_lwsc_protocol}, + {"verbosity", PARAM_INT, &_lwsc_verbosity}, + {0, 0, 0} +}; static int lwsc_pv_get(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int lwsc_pv_parse_name(pv_spec_t *sp, str *in); static pv_export_t mod_pvs[] = { - {{"lwsc", sizeof("lwsc") - 1}, PVT_OTHER, lwsc_pv_get, 0, - lwsc_pv_parse_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"lwsc", sizeof("lwsc") - 1}, PVT_OTHER, lwsc_pv_get, 0, + lwsc_pv_parse_name, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; struct module_exports exports = { - "lwsc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* RPC method exports */ - mod_pvs, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - mod_destroy /* module destroy function */ + "lwsc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + params, /* param exports */ + 0, /* RPC method exports */ + mod_pvs, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /**

1 0

git:master:d2a0b072: lost: reformat exported structures
by Federico Cabiddu 04 Dec '24

04 Dec '24

Module: kamailio Branch: master Commit: d2a0b0727f1efbe21a37a1f81f7bd98cc9423951 URL: https://github.com/kamailio/kamailio/commit/d2a0b0727f1efbe21a37a1f81f7bd98… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-12-04T09:25:57+01:00 lost: reformat exported structures --- Modified: src/modules/lost/lost.c --- Diff: https://github.com/kamailio/kamailio/commit/d2a0b0727f1efbe21a37a1f81f7bd98… Patch: https://github.com/kamailio/kamailio/commit/d2a0b0727f1efbe21a37a1f81f7bd98… --- diff --git a/src/modules/lost/lost.c b/src/modules/lost/lost.c index 13091d9ffc6..692ce57be7f 100644 --- a/src/modules/lost/lost.c +++ b/src/modules/lost/lost.c @@ -100,50 +100,54 @@ static int w_lost_query( static int w_lost_query_all(struct sip_msg *_m, char *_con, char *_pidf, char *_urn, char *_uri, char *_name, char *_err); +/* clang-format off */ /* Exported functions */ static cmd_export_t cmds[] = { - {"lost_held_query", (cmd_function)w_lost_held_query, 4, - fixup_lost_held_query, fixup_free_lost_held_query, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {"lost_held_query", (cmd_function)w_lost_held_query_id, 5, - fixup_lost_held_query_id, fixup_free_lost_held_query_id, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {"lost_held_dereference", (cmd_function)w_lost_held_deref, 5, - fixup_lost_held_deref, fixup_free_lost_held_deref, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {"lost_query", (cmd_function)w_lost_query, 4, fixup_lost_query, - fixup_free_lost_query, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {"lost_query", (cmd_function)w_lost_query_all, 6, fixup_lost_query_all, - fixup_free_lost_query_all, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"lost_held_query", (cmd_function)w_lost_held_query, 4, + fixup_lost_held_query, fixup_free_lost_held_query, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {"lost_held_query", (cmd_function)w_lost_held_query_id, 5, + fixup_lost_held_query_id, fixup_free_lost_held_query_id, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {"lost_held_dereference", (cmd_function)w_lost_held_deref, 5, + fixup_lost_held_deref, fixup_free_lost_held_deref, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {"lost_query", (cmd_function)w_lost_query, 4, fixup_lost_query, + fixup_free_lost_query, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {"lost_query", (cmd_function)w_lost_query_all, 6, fixup_lost_query_all, + fixup_free_lost_query_all, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* Exported parameters */ static param_export_t params[] = {{"exact_type", PARAM_INT, &held_exact_type}, - {"response_time", PARAM_INT, &held_resp_time}, - {"post_request", PARAM_INT, &held_post_req}, - {"location_type", PARAM_STR, &held_loc_type}, - {"recursion", PARAM_INT, &lost_recursion}, - {"location_profile", PARAM_INT, &lost_profile}, - {"location_3d", PARAM_INT, &lost_geoloc_3d}, - {"verbose", PARAM_INT, &lost_verbose}, - {"geoheader_type", PARAM_INT, &lost_geoloc_type}, - {"geoheader_order", PARAM_INT, &lost_geoloc_order}, {0, 0, 0}}; + {"response_time", PARAM_INT, &held_resp_time}, + {"post_request", PARAM_INT, &held_post_req}, + {"location_type", PARAM_STR, &held_loc_type}, + {"recursion", PARAM_INT, &lost_recursion}, + {"location_profile", PARAM_INT, &lost_profile}, + {"location_3d", PARAM_INT, &lost_geoloc_3d}, + {"verbose", PARAM_INT, &lost_verbose}, + {"geoheader_type", PARAM_INT, &lost_geoloc_type}, + {"geoheader_order", PARAM_INT, &lost_geoloc_order}, {0, 0, 0} +}; /* Module interface */ struct module_exports exports = { - "lost", /* 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 */ + "lost", /* 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 */ }; +/* clang-format on */ /* Module initialization function */ static int mod_init(void)

1 0

git:master:064a8849: log_systemd: add fixup_free* to exported functions
by Federico Cabiddu 04 Dec '24

04 Dec '24

Module: kamailio Branch: master Commit: 064a88492c5d908569ba9d01f2116e7795a74583 URL: https://github.com/kamailio/kamailio/commit/064a88492c5d908569ba9d01f2116e7… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-12-04T08:58:14+01:00 log_systemd: add fixup_free* to exported functions --- Modified: src/modules/log_systemd/log_systemd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/064a88492c5d908569ba9d01f2116e7… Patch: https://github.com/kamailio/kamailio/commit/064a88492c5d908569ba9d01f2116e7… --- diff --git a/src/modules/log_systemd/log_systemd_mod.c b/src/modules/log_systemd/log_systemd_mod.c index 0f6d5f460a6..1aabd135f9b 100644 --- a/src/modules/log_systemd/log_systemd_mod.c +++ b/src/modules/log_systemd/log_systemd_mod.c @@ -47,27 +47,30 @@ static int w_sd_journal_print(struct sip_msg *msg, char *lev, char *txt); static int w_sd_journal_send_xavp(struct sip_msg *msg, char *xname, char *); +/* clang-format off */ static cmd_export_t cmds[] = { - {"sd_journal_print", (cmd_function)w_sd_journal_print, 2, - fixup_spve_spve, 0, ANY_ROUTE}, - {"sd_journal_send_xavp", (cmd_function)w_sd_journal_send_xavp, 1, - fixup_spve_spve, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"sd_journal_print", (cmd_function)w_sd_journal_print, 2, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, + {"sd_journal_send_xavp", (cmd_function)w_sd_journal_send_xavp, 1, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = {{0, 0, 0}}; struct module_exports exports = { - "log_systemd", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* per-child init function */ - mod_destroy /* module destroy function */ + "log_systemd", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + params, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /** * init module function @@ -213,4 +216,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) _lc_log_systemd = 1; sr_kemi_modules_add(sr_kemi_log_systemd_exports); return 0; -} \ No newline at end of file +}

1 0

[kamailio/kamailio] misc: examples/ims/scscf/README - fix typo in .sql filename [skip ci] (PR #4051)
by Curt J. Sampson 04 Dec '24

04 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Just a minor typo fix in a README. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4051 -- Commit Summary -- * misc: examples/ims/scscf/README - fix typo in .sql filename [skip ci] -- File Changes -- M misc/examples/ims/scscf/README.md (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4051.patch https://github.com/kamailio/kamailio/pull/4051.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4051 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4051(a)github.com>

2 2

git:master:ee81e1e0: misc: examples/ims/scscf/README - fix typo in .sql filename [skip ci]
by Henning Westerholt 04 Dec '24

04 Dec '24

Module: kamailio Branch: master Commit: ee81e1e017c62063a5b1fd20ac61c5783ee4eab4 URL: https://github.com/kamailio/kamailio/commit/ee81e1e017c62063a5b1fd20ac61c57… Author: Curt J. Sampson <cjs(a)cynic.net> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-12-04T08:40:39+01:00 misc: examples/ims/scscf/README - fix typo in .sql filename [skip ci] --- Modified: misc/examples/ims/scscf/README.md --- Diff: https://github.com/kamailio/kamailio/commit/ee81e1e017c62063a5b1fd20ac61c57… Patch: https://github.com/kamailio/kamailio/commit/ee81e1e017c62063a5b1fd20ac61c57… --- diff --git a/misc/examples/ims/scscf/README.md b/misc/examples/ims/scscf/README.md index d28328cb46c..beb3c69a779 100644 --- a/misc/examples/ims/scscf/README.md +++ b/misc/examples/ims/scscf/README.md @@ -12,6 +12,6 @@ The following tables (or files) are required: * ims_charging_create.sql * ims_dialog-create.sql - * ms_usrloc_scscf-create.sql + * ims_usrloc_scscf-create.sql * presence-create.sql * standard-create.sql

1 0

git:master:4a8368e4: cmake: Allow for cross-compilation
by Xenofon Karamanos 04 Dec '24

04 Dec '24

Module: kamailio Branch: master Commit: 4a8368e419d4bb62840989446947fc41c97db939 URL: https://github.com/kamailio/kamailio/commit/4a8368e419d4bb62840989446947fc4… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-04T01:56:00Z cmake: Allow for cross-compilation --- Modified: .github/workflows/cmake_build.yml --- Diff: https://github.com/kamailio/kamailio/commit/4a8368e419d4bb62840989446947fc4… Patch: https://github.com/kamailio/kamailio/commit/4a8368e419d4bb62840989446947fc4… --- diff --git a/.github/workflows/cmake_build.yml b/.github/workflows/cmake_build.yml index feea08ab263..8bab75c65bb 100644 --- a/.github/workflows/cmake_build.yml +++ b/.github/workflows/cmake_build.yml @@ -50,6 +50,8 @@ jobs: - name: Build Project natively uses: threeal/cmake-action(a)v2.0.0 + # Step runs for all except this combination + if: matrix.os != 'ubuntu-latest' || matrix.target_arch != 'aarch64' with: build-dir: ${{github.workspace}}/build build-args: -j8

1 0

git:master:93b189a2: cmake: Add parser as a link library for kamailio
by Xenofon Karamanos 04 Dec '24

04 Dec '24

Module: kamailio Branch: master Commit: 93b189a22df772ccef6f1eb09b4be0897a467d89 URL: https://github.com/kamailio/kamailio/commit/93b189a22df772ccef6f1eb09b4be08… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-04T01:32:26Z cmake: Add parser as a link library for kamailio --- Modified: src/CMakeLists.txt Modified: src/core/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/93b189a22df772ccef6f1eb09b4be08… Patch: https://github.com/kamailio/kamailio/commit/93b189a22df772ccef6f1eb09b4be08… --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ccafefaefb2..0e9349d352a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -87,6 +87,7 @@ add_executable(kamailio ${CMAKE_CURRENT_SOURCE_DIR}/main.c ${kamailio_SRC}) target_link_libraries( kamailio PUBLIC + GenerateParser common m Threads::Threads # Pthread library diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index d3655f5deb6..139e308b693 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -45,7 +45,8 @@ add_library( GenerateParser ${CMAKE_CURRENT_SOURCE_DIR}/lex.yy.c ${CMAKE_CURRENT_SOURCE_DIR}/cfg.tab.c ) -target_link_libraries(GenerateParser PUBLIC common) +# common_modules required so -fPIC is added to the compile options +target_link_libraries(GenerateParser PUBLIC common common_modules) # -----------------------

1 0

git:master:f2c1f7ca: cmake: Modify github action for cmake auto builds
by Xenofon Karamanos 04 Dec '24

04 Dec '24

Module: kamailio Branch: master Commit: f2c1f7ca8e238c77c9757573303451894c850ac6 URL: https://github.com/kamailio/kamailio/commit/f2c1f7ca8e238c77c97575733034518… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-04T01:32:07Z cmake: Modify github action for cmake auto builds --- Modified: .github/workflows/cmake_build.yml --- Diff: https://github.com/kamailio/kamailio/commit/f2c1f7ca8e238c77c97575733034518… Patch: https://github.com/kamailio/kamailio/commit/f2c1f7ca8e238c77c97575733034518…

1 0

Jenkins build is back to normal : kamailiodev-nightly-repos » amd64,focal,master #2605
by kamailio＠sipwise.com 03 Dec '24

03 Dec '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…>

1 0

Jenkins build is back to normal : kamailiodev-nightly-repos » amd64,bullseye,master #2605
by kamailio＠sipwise.com 03 Dec '24

03 Dec '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…>

1 0

Jenkins build is back to normal : kamailiodev-nightly-repos » amd64,buster,master #2605
by kamailio＠sipwise.com 03 Dec '24

03 Dec '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…>

1 0

Jenkins build is back to normal : kamailiodev-nightly-repos » amd64,bookworm,master #2605
by kamailio＠sipwise.com 03 Dec '24

03 Dec '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…>

1 0

Jenkins build is back to normal : kamailiodev-nightly-repos » amd64,stretch,master #2605
by kamailio＠sipwise.com 03 Dec '24

03 Dec '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…>

1 0

[kamailio/kamailio] Error compiling with cmake on macos/darwin (Issue #4049)
by Daniel-Constantin Mierla 03 Dec '24

03 Dec '24

### Description Using `cmake` to compile on MacOS (Darwin) 15.1.1 (Sequoia) fails. ### Troubleshooting #### Reproduction  #### Debugging Data ``` mkdir buildmac cd buildmac/ cmake .. make VERBOSE=1 /opt/local/bin/cmake -S/tmp/kamailio -B/tmp/kamailio/buildmac --check-build-system CMakeFiles/Makefile.cmake 0 /opt/local/bin/cmake -E cmake_progress_start /tmp/kamailio/buildmac/CMakeFiles /tmp/kamailio/buildmac//CMakeFiles/progress.marks /Applications/Xcode.app/Contents/Developer/usr/bin/make -f CMakeFiles/Makefile2 all /Applications/Xcode.app/Contents/Developer/usr/bin/make -f src/core/CMakeFiles/GenerateParser.dir/build.make src/core/CMakeFiles/GenerateParser.dir/depend cd /tmp/kamailio/buildmac && /opt/local/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/kamailio /tmp/kamailio/src/core /tmp/kamailio/buildmac /tmp/kamailio/buildmac/src/core /tmp/kamailio/buildmac/src/core/CMakeFiles/GenerateParser.dir/DependInfo.cmake "--color=" Dependencies file "src/core/CMakeFiles/GenerateParser.dir/lex.yy.c.o.d" is newer than depends file "/tmp/kamailio/buildmac/src/core/CMakeFiles/GenerateParser.dir/compiler_depend.internal". Consolidate compiler generated dependencies of target GenerateParser /Applications/Xcode.app/Contents/Developer/usr/bin/make -f src/core/CMakeFiles/GenerateParser.dir/build.make src/core/CMakeFiles/GenerateParser.dir/build [ 0%] Building C object src/core/CMakeFiles/GenerateParser.dir/lex.yy.c.o cd /tmp/kamailio/buildmac/src/core && /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/cc -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DARCH=\"arm64\" -DCFG_DIR=\"/usr/local/etc/kamailio/\" -DCOMPILER=\"16.0.0.16000026\" -DDBG_SR_MEMORY -DDISABLE_NAGLE -DDNS_IP_HACK -DFAST_LOCK -DFMSTATS -DF_MALLOC -DHAVE_RESOLV_RES -DKMSTATS -DKSR_PTHREAD_MUTEX_SHARED -DMALLOC_STATS -DNAME=\"kamailio\" -DOS=Darwin -DOS_QUOTED=\"Darwin\" -DPIC -DPKG_MALLOC -DQ_MALLOC -DRAW_SOCKS -DRUN_DIR=\"/var/run/kamailio\" -DSHARE_DIR=\"/usr/local/share/kamailio/\" -DSHM_MMAP -DSTATISTICS -DTLSF_MALLOC -DTLS_HOOKS -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_FUTEX -DUSE_MCAST -DUSE_NAPTR -DUSE_SCTP -DUSE_TCP -DUSE_TLS -DVERSION=\"6.0.0-dev2\" -DVERSIONVAL=6000000 -D__CPU_arm64 -D__OS_darwin -std=gnu11 -arch arm64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.1.sdk -MD -MT src/core/CMakeFiles/GenerateParser.dir/lex.yy.c.o -MF CMakeFiles/GenerateParser.dir/lex.yy.c.o.d -o CMakeFiles/GenerateParser.dir/lex.yy.c.o -c /tmp/kamailio/src/core/lex.yy.c In file included from /tmp/kamailio/src/core/cfg.lex:33: In file included from /tmp/kamailio/src/core/globals.h:34: In file included from /tmp/kamailio/src/core/ip_addr.h:39: In file included from /tmp/kamailio/src/core/ut.h:46: In file included from /tmp/kamailio/src/core/mem/shm_mem.h:32: In file included from /tmp/kamailio/src/core/mem/shm.h:44: In file included from /tmp/kamailio/src/core/mem/../lock_ops.h:92: /tmp/kamailio/src/core/mem/../fastlock.h:130:2: error: "unknown architecture" 130 | #error "unknown architecture" | ^ /tmp/kamailio/src/core/mem/../fastlock.h:294:2: error: "unknown architecture" 294 | #error "unknown architecture" | ^ /tmp/kamailio/src/core/mem/../fastlock.h:317:2: error: call to undeclared function 'membar_getlock'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 317 | membar_getlock(); | ^ /tmp/kamailio/src/core/mem/../fastlock.h:328:2: error: call to undeclared function 'membar_getlock'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 328 | membar_getlock(); | ^ /tmp/kamailio/src/core/mem/../fastlock.h:436:2: error: "unknown architecture" 436 | #error "unknown architecture" | ^ 5 errors generated. make[2]: *** [src/core/CMakeFiles/GenerateParser.dir/lex.yy.c.o] Error 1 make[1]: *** [src/core/CMakeFiles/GenerateParser.dir/all] Error 2 make: *** [all] Error 2 ``` Compiling with the old Makefiles (just git clone and then `make Q=0`), the compile command looks like: ``` gcc -g -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wunused-variable -Wuninitialized -DNAME='"kamailio"' -DVERSION='"6.0.0-dev3"' -DARCH='"arm64"' -DOS='darwin_' -DOS_QUOTED='"darwin"' -DCOMPILER='"gcc Apple clang version 16.0.0 (clang-1600.0.26.4)"' -D__CPU_arm64 -D__OS_darwin -DVERSIONVAL=6000000 -DCFG_DIR='"/opt/local/etc/kamailio/"' -DSHARE_DIR='"/opt/local/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL -DUSE_ANON_MMAP -DNDEBUG -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM -DUSE_SIGWAIT -DHAVE_IP_MREQN -DUSE_PTHREAD_MUTEX -DUSE_SYSV_SEM -DHAVE_KQUEUE -DHAVE_SELECT -c core/lex.yy.c -o core/lex.yy.o ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` Kamailio master branch ``` * **Operating System**: ``` ❯ uname -a Darwin Mac 24.1.0 Darwin Kernel Version 24.1.0: Thu Oct 10 21:03:11 PDT 2024; root:xnu-11215.41.3~2/RELEASE_ARM64_T6020 arm64 ❯ uname -m arm64 ❯ uname -p arm ❯ cmake --version cmake version 3.29.5 CMake suite maintained and supported by Kitware (kitware.com/cmake). ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4049 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4049(a)github.com>

3 14

git:master:2d59d44d: cmake/os-specific/darwin.cmake: added compile flag HAVE_MSGHDR_MSG_CONTROL
by Daniel-Constantin Mierla 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: 2d59d44dd620c597e69f7f1b3d6a9d1b3d410ae3 URL: https://github.com/kamailio/kamailio/commit/2d59d44dd620c597e69f7f1b3d6a9d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-03T16:55:57+01:00 cmake/os-specific/darwin.cmake: added compile flag HAVE_MSGHDR_MSG_CONTROL --- Modified: cmake/os-specific/darwin.cmake --- Diff: https://github.com/kamailio/kamailio/commit/2d59d44dd620c597e69f7f1b3d6a9d1… Patch: https://github.com/kamailio/kamailio/commit/2d59d44dd620c597e69f7f1b3d6a9d1… --- diff --git a/cmake/os-specific/darwin.cmake b/cmake/os-specific/darwin.cmake index 9fcc61f628d..5af299c2681 100644 --- a/cmake/os-specific/darwin.cmake +++ b/cmake/os-specific/darwin.cmake @@ -10,6 +10,7 @@ target_compile_definitions( HAVE_UNION_SEMUN HAVE_SCHED_YIELD USE_ANON_MMAP + HAVE_MSGHDR_MSG_CONTROL NDEBUG # NDEBUG used to turn off assert (assert wants to call # eprintf which doesn't seem to be defined in any shared lib HAVE_CONNECT_ECONNRESET_BUG

1 0

git:master:d416f720: cmake/defs.cmake: reorganize condition on cpu to prevent mismatching arm64
by Daniel-Constantin Mierla 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: d416f7207a39db5ec15c0133904bfd76980a9d4b URL: https://github.com/kamailio/kamailio/commit/d416f7207a39db5ec15c0133904bfd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-03T16:55:57+01:00 cmake/defs.cmake: reorganize condition on cpu to prevent mismatching arm64 - arm64 was matched by arm6 --- Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/d416f7207a39db5ec15c0133904bfd7… Patch: https://github.com/kamailio/kamailio/commit/d416f7207a39db5ec15c0133904bfd7… --- diff --git a/cmake/defs.cmake b/cmake/defs.cmake index 10940d2030c..4214ef57121 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -136,9 +136,13 @@ option(USE_FAST_LOCK "Use fast locking if available" ON) # if(USE_FAST_LOCK) if(CMAKE_SYSTEM_PROCESSOR MATCHES - "i386|x86_64|sparc64|sparc|arm6|arm7|ppc|ppc64|alpha|mips2|mips64" + "i386|x86_64|sparc64|sparc|ppc|ppc64|alpha|mips2|mips64" ) set(USE_FAST_LOCK YES) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") + set(USE_FAST_LOCK NO) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm6|arm7") + set(USE_FAST_LOCK YES) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm|aarch64") set(USE_FAST_LOCK YES) target_compile_definitions(common INTERFACE NOSMP) # memory barriers not

1 0

git:master:4c7d99c2: cmake: Delete macos.cmake...
by Xenofon Karamanos 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: 4c7d99c2f65749dcc7aa9a7173c22c9d39ecdbe9 URL: https://github.com/kamailio/kamailio/commit/4c7d99c2f65749dcc7aa9a7173c22c9… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-03T15:49:19Z cmake: Delete macos.cmake... --- Removed: cmake/os-specific/macos.cmake --- Diff: https://github.com/kamailio/kamailio/commit/4c7d99c2f65749dcc7aa9a7173c22c9… Patch: https://github.com/kamailio/kamailio/commit/4c7d99c2f65749dcc7aa9a7173c22c9… --- diff --git a/cmake/os-specific/macos.cmake b/cmake/os-specific/macos.cmake deleted file mode 100644 index 9fcc61f628d..00000000000 --- a/cmake/os-specific/macos.cmake +++ /dev/null @@ -1,41 +0,0 @@ -message( - STATUS - "Configuring for Darwin (Apple stationary operating systems (macOS, OS X, etc.)" -) - -target_compile_definitions( - common - INTERFACE HAVE_SOCKADDR_SA_LEN - HAVE_GETHOSTBYNAME2 - HAVE_UNION_SEMUN - HAVE_SCHED_YIELD - USE_ANON_MMAP - NDEBUG # NDEBUG used to turn off assert (assert wants to call - # eprintf which doesn't seem to be defined in any shared lib - HAVE_CONNECT_ECONNRESET_BUG - HAVE_TIMEGM - USE_SIGWAIT - HAVE_IP_MREQN -) - -target_link_libraries(common INTERFACE resolv) - -message(STATUS "USE_FAST_LOCK = ${USE_FAST_LOCK}") -if(NOT ${USE_FAST_LOCK}) - target_compile_definitions(common INTERFACE USE_PTHREAD_MUTEX USE_SYSV_SEM) -endif() - -set(CMAKE_MODULE_LINKER_FLAGS - "${CMAKE_MODULE_LINKER_FLAGS} -bundle -flat_namespace -undefined suppress" -) -set(CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -dynamiclib -flat_namespace -undefined suppress" -) - -if(NOT DEFINED ${NO_SELECT}) - target_compile_definitions(common INTERFACE HAVE_SELECT) -endif() - -if(NOT DEFINED ${NO_KQUEUE}) - target_compile_definitions(common INTERFACE HAVE_KQUEUE) -endif()

1 0

git:master:d86f0526: cmake: Rename macos.cmake to darwin
by Xenofon Karamanos 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: d86f05261c386f4147bb4177b80673ae4c0f45d3 URL: https://github.com/kamailio/kamailio/commit/d86f05261c386f4147bb4177b80673a… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-03T15:19:58Z cmake: Rename macos.cmake to darwin --- Added: cmake/os-specific/darwin.cmake --- Diff: https://github.com/kamailio/kamailio/commit/d86f05261c386f4147bb4177b80673a… Patch: https://github.com/kamailio/kamailio/commit/d86f05261c386f4147bb4177b80673a… --- diff --git a/cmake/os-specific/darwin.cmake b/cmake/os-specific/darwin.cmake new file mode 100644 index 00000000000..9fcc61f628d --- /dev/null +++ b/cmake/os-specific/darwin.cmake @@ -0,0 +1,41 @@ +message( + STATUS + "Configuring for Darwin (Apple stationary operating systems (macOS, OS X, etc.)" +) + +target_compile_definitions( + common + INTERFACE HAVE_SOCKADDR_SA_LEN + HAVE_GETHOSTBYNAME2 + HAVE_UNION_SEMUN + HAVE_SCHED_YIELD + USE_ANON_MMAP + NDEBUG # NDEBUG used to turn off assert (assert wants to call + # eprintf which doesn't seem to be defined in any shared lib + HAVE_CONNECT_ECONNRESET_BUG + HAVE_TIMEGM + USE_SIGWAIT + HAVE_IP_MREQN +) + +target_link_libraries(common INTERFACE resolv) + +message(STATUS "USE_FAST_LOCK = ${USE_FAST_LOCK}") +if(NOT ${USE_FAST_LOCK}) + target_compile_definitions(common INTERFACE USE_PTHREAD_MUTEX USE_SYSV_SEM) +endif() + +set(CMAKE_MODULE_LINKER_FLAGS + "${CMAKE_MODULE_LINKER_FLAGS} -bundle -flat_namespace -undefined suppress" +) +set(CMAKE_SHARED_LINKER_FLAGS + "${CMAKE_SHARED_LINKER_FLAGS} -dynamiclib -flat_namespace -undefined suppress" +) + +if(NOT DEFINED ${NO_SELECT}) + target_compile_definitions(common INTERFACE HAVE_SELECT) +endif() + +if(NOT DEFINED ${NO_KQUEUE}) + target_compile_definitions(common INTERFACE HAVE_KQUEUE) +endif()

1 0

git:master:abb0448c: cmake: Add support for custom binary and cfg name
by Xenofon Karamanos 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: abb0448c11812d9f11529a70303348474eed19de URL: https://github.com/kamailio/kamailio/commit/abb0448c11812d9f11529a703033484… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-03T15:14:56Z cmake: Add support for custom binary and cfg name --- Modified: CMakeLists.txt Modified: src/CMakeLists.txt Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/abb0448c11812d9f11529a703033484… Patch: https://github.com/kamailio/kamailio/commit/abb0448c11812d9f11529a703033484… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 55923560477..f7270f0abc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,9 +27,15 @@ set(CMAKE_C_STANDARD_REQUIRED True) # Main project name # ----------------------- # main binary name -set(MAIN_NAME "kamailio") +set(MAIN_NAME + "kamailio" + CACHE STRING "Main binary name" +) # use kamailio config -set(CFG_NAME "kamailio") +set(CFG_NAME + "kamailio" + CACHE STRING "Config name" +) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2d236ff9200..ccafefaefb2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -100,7 +100,9 @@ add_dependencies(kamailio GenerateParser) # Enable ENABLE_EXPORTS property so modules can link from symbols found in # main.c and core/*. -set_target_properties(kamailio PROPERTIES ENABLE_EXPORTS TRUE) +set_target_properties( + kamailio PROPERTIES ENABLE_EXPORTS TRUE OUTPUT_NAME ${MAIN_NAME} +) # Add the MODS_DIR definition required by main.c --- target_compile_definitions( @@ -117,25 +119,26 @@ install( COMPONENT kamailio-core ) -# Install the configuration file (kamailio.cfg) using a CODE block to check +# Install the configuration file (kamailio.cfg) ${CFG_NAME} using a CODE block to check # existence at install time instead of configure time # If(EXISTS ..) require full path install( CODE " - if(EXISTS \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${MAIN_NAME}/kamailio.cfg\") - message(STATUS \"kamailio.cfg already exists in \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${MAIN_NAME}/kamailio.cfg. Installing as kamailio.cfg.sample\") + if(EXISTS \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${MAIN_NAME}/${CFG_NAME}.cfg\") + message(STATUS \"${CFG_NAME} already exists in \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${MAIN_NAME}/${CFG_NAME}. Installing as ${CFG_NAME}.sample\") file(INSTALL \"${CMAKE_SOURCE_DIR}/etc/kamailio.cfg\" DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${MAIN_NAME}\" - RENAME \"kamailio.cfg.sample\" + RENAME \"${CFG_NAME}.cfg.sample\" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) else() file(INSTALL \"${CMAKE_SOURCE_DIR}/etc/kamailio.cfg\" DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${MAIN_NAME}\" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + RENAME \"${CFG_NAME}.cfg\" ) endif() " - COMPONENT kamailio-cfg + COMPONENT kamailio-utils-cfg ) diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index 3d3a7fe717f..1ba5087d407 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -6,9 +6,7 @@ project(kamailio_utils) # "${basedir}") endif() set(KAMCTL_TMP_DIR "${CMAKE_BINARY_DIR}/kamctltmp") -message( - STATUS "kamctltmpdir: ${KAMCTL_TMP_DIR} BINARY_DIR: ${CMAKE_BINARY_DIR}" -) +message(STATUS "Temporary kamctl.{db} files in : ${KAMCTL_TMP_DIR}") file(MAKE_DIRECTORY ${KAMCTL_TMP_DIR}) @@ -17,9 +15,8 @@ set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SBINDIR}") set(LIB_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${MAIN_NAME}/kamctl" ) -set(CFG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/kamailio") +set(CFG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${MAIN_NAME}") set(SHARE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${MAIN_NAME}") -message(STATUS "BIN_DIR: ${BIN_DIR} LIB_DIR: ${LIB_DIR} CFG_DIR: ${CFG_DIR}") # Install kamctl add_custom_command(

1 0

git:master:394cc191: cmake: Refines uninstall script and updates CMake options
by Xenofon Karamanos 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: 394cc191e172f49525c91e3540eb590edf8bd101 URL: https://github.com/kamailio/kamailio/commit/394cc191e172f49525c91e3540eb590… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-03T15:14:15Z cmake: Refines uninstall script and updates CMake options - Modifies uninstall logic removing duplicate file entries when both .cfg and .cfg sample are installed - Remove unused SCTP and duplicate fast memory statistics options in CMake --- Modified: cmake/cmake_uninstall.cmake.in Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/394cc191e172f49525c91e3540eb590… Patch: https://github.com/kamailio/kamailio/commit/394cc191e172f49525c91e3540eb590… --- diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in index 333534f3068..1087faf024e 100644 --- a/cmake/cmake_uninstall.cmake.in +++ b/cmake/cmake_uninstall.cmake.in @@ -6,10 +6,12 @@ if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt") endif() file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files) -list(APPEND files "@CMAKE_INSTALL_PREFIX@/etc/kamailio/kamailio.cfg") -list(APPEND files "@CMAKE_INSTALL_PREFIX@/etc/kamailio/kamctlrc") - string(REGEX REPLACE "\n" ";" files "${files}") + +list(APPEND files "@CMAKE_INSTALL_PREFIX@/etc/@MAIN_NAME@/@CFG_NAME@.cfg") +list(APPEND files "@CMAKE_INSTALL_PREFIX@/etc/@MAIN_NAME@/kamctlrc") +list(REMOVE_DUPLICATES files) + foreach(file ${files}) message(STATUS "Uninstalling $ENV{DESTDIR}${file}") if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") @@ -26,7 +28,7 @@ foreach(file ${files}) if(NOT "${rm_retval}" STREQUAL 0) message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}") endif() - else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") + else() message(STATUS "File $ENV{DESTDIR}${file} does not exist.") endif() endforeach() diff --git a/cmake/defs.cmake b/cmake/defs.cmake index c3a338ec5ea..10940d2030c 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -45,7 +45,6 @@ endif() option(KMSTATS "Kamailio statistics" ON) option(FMSTATS "Fast memory statistics" ON) option(WITHAS "With Application server support" ON) -option(SCTP "SCTP support" ON) option(RAW_SOCKS "Raw sockets support" ON) option(MEMPKG "Package memory or sys " ON) @@ -80,7 +79,6 @@ option(USE_DST_BLOCKLIST "Use destination blacklist" ON) option(HAVE_RESOLV_RES "Have resolv_res" ON) option(KSR_PTHREAD_MUTEX_SHARED "Use shared mutex for TLS" ON) -option(FMSTATS "Fast memory statistics" ON) option(STATISTICS "Statistics" ON) # if(${MEMPKG}) target_compile_definitions(common INTERFACE PKG_MALLOC) else() # if(${MEMDBGSYS}) target_compile_definitions(common INTERFACE DDBG_SYS_MEMORY) @@ -271,8 +269,6 @@ if(NO_DEV_POLL) target_compile_definitions(common INTERFACE NO_DEV_POLL) endif() -# if(USE_SCTP) target_compile_definitions(common INTERFACE USE_SCTP) endif() - if(RAW_SOCKS) target_compile_definitions(common INTERFACE RAW_SOCKS) endif()

1 0

git:master:6235369e: cmake: Update platform-specific flags
by Xenofon Karamanos 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: 6235369e1deab4b87c999d5f00fb59b6609b3df6 URL: https://github.com/kamailio/kamailio/commit/6235369e1deab4b87c999d5f00fb59b… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-03T14:19:43Z cmake: Update platform-specific flags - Update the platform-specific flags in the "os-specific.cmake" file for Linux and DragonFly BSD. - Add new files "dragonfly.cmake" and "linux.cmake" in the "os-specific" directory to define the flags for DragonFly BSD and Linux, respectively. - Add a new file "macos.cmake" in the "os-specific" directory to define the flags for Mac OS X. - Update the "defs.cmake" file to print the availability of fast lock. --- Added: cmake/os-specific/dragonfly.cmake Added: cmake/os-specific/linux.cmake Added: cmake/os-specific/macos.cmake Modified: cmake/defs.cmake Modified: cmake/os-specific.cmake --- Diff: https://github.com/kamailio/kamailio/commit/6235369e1deab4b87c999d5f00fb59b… Patch: https://github.com/kamailio/kamailio/commit/6235369e1deab4b87c999d5f00fb59b…

1 0

git:master:76e18d0d: xlog: evaluate prefix for kemi functions
by Daniel-Constantin Mierla 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: 76e18d0d13a41e93094f9084ac44e0809f91b109 URL: https://github.com/kamailio/kamailio/commit/76e18d0d13a41e93094f9084ac44e08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-03T08:03:57+01:00 xlog: evaluate prefix for kemi functions --- Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/76e18d0d13a41e93094f9084ac44e08… Patch: https://github.com/kamailio/kamailio/commit/76e18d0d13a41e93094f9084ac44e08… --- diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index 98c6e49a0f9..f19d3c1467f 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -886,6 +886,7 @@ int ki_xlog_ex(sip_msg_t *msg, str *lfacility, int llevel, str *lmsg) int lf = xlog_facility; pv_elem_t *xmodel = NULL; str txt = {0, 0}; + char *_xlog_prefix_val = _xlog_prefix; if(!is_printable(llevel)) return 1; @@ -901,6 +902,18 @@ int ki_xlog_ex(sip_msg_t *msg, str *lfacility, int llevel, str *lmsg) return -1; } + if(_xlog_prefix_mode) { + str _xlog_prefix_str; + _xlog_prefix_str.s = _xlog_prefix_buf; + _xlog_prefix_str.len = buf_size; + if(pv_printf(msg, _xlog_prefix_pvs, _xlog_prefix_str.s, + &_xlog_prefix_str.len) + == 0 + && _xlog_prefix_str.len > 0) { + _xlog_prefix_val = _xlog_prefix_buf; + } + } + if(lfacility != NULL) { lfacility->s[lfacility->len] = '\0'; lf = str2facility(lfacility->s); @@ -910,8 +923,7 @@ int ki_xlog_ex(sip_msg_t *msg, str *lfacility, int llevel, str *lmsg) lf = xlog_facility; } } - LOG_FN(lf, llevel, _xlog_prefix, "%.*s", txt.len, txt.s); - ; + LOG_FN(lf, llevel, _xlog_prefix_val, "%.*s", txt.len, txt.s); pv_elem_free_all(xmodel); return 1; }

1 0

[kamailio/kamailio] "Critical" level does not work for Python3s KSR.xlog.* (Issue #4048)
by Ben Kaufman 02 Dec '24

02 Dec '24

### Description When calling inline functions using `app_python3s_exec()`, setting the level to critical using either `KSR.xlog.xcrit("foo\n")` or using `KSR.xlog.xlog("L_CRIT", "foo\n")` Do not set the level on the log line in a manner consistent with other log levels. #### Reproduction Kamailio code: ``` request_route { app_python3s_exec("log_test"); . . . } ``` Python code to contrast how info level logging and critical level logging differ: ``` def log_test(): KSR.xlog.xinfo("This line log level: xinfo = INFO\n"); KSR.xlog.xcrit("This line log level: xcrit = CRITICAL\n"); KSR.xlog.xlog("L_INFO", "This line log level: xlog = L_INFO\n"); KSR.xlog.xlog("L_CRIT", "This line log level: xlog = L_CRIT\n"); ``` #### Log Messages Log output. Note how the info level lines begin with INFO, but the critical level lines begin with an empty string: ``` 2(8) INFO: <script>: This line log level: xinfo = INFO 2(8) : <script>: This line log level: xcrit = CRITICAL 2(8) INFO: <script>: This line log level: xlog = L_INFO 2(8) : <script>: This line log level: xlog = L_CRIT ``` ### Possible Solutions The critical level lines should begin with `CRITICAL` - this is what happens if the xlog function is called in Kamailio script. The output should look like this: ``` 2(8) INFO: <script>: This line log level: xinfo = INFO 2(8) CRITICAL: <script>: This line log level: xcrit = CRITICAL 2(8) INFO: <script>: This line log level: xlog = L_INFO 2(8) CRITICAL: <script>: This line log level: xlog = L_CRIT ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.4 (x86_64/linux) 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: unknown compiled on 15:03:24 Nov 18 2024 with gcc 13.2.1 ``` * **Operating System**: Tested in docker on Windows 11 (WSL2) using alpine linux as a base. `/etc/os-releas`: ``` NAME="Alpine Linux" ID=alpine VERSION_ID=3.20.2 PRETTY_NAME="Alpine Linux v3.20" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4048 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4048(a)github.com>

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev