sr-dev December 2024

sr-dev@lists.kamailio.org

17 participants
346 discussions

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2024