sr-dev December 2024

sr-dev@lists.kamailio.org

17 participants
343 discussions

git:master:684533d0: tls: update docs about thread-locals

by S-P Chan

Module: kamailio Branch: master Commit: 684533d099d304091082fd8a130619a4c5550a80 URL: https://github.com/kamailio/kamailio/commit/684533d099d304091082fd8a130619a… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-12-05T09:28:07+08:00 tls: update docs about thread-locals --- Modified: src/modules/tls/OpenSSL3-README.md --- Diff: https://github.com/kamailio/kamailio/commit/684533d099d304091082fd8a130619a… Patch: https://github.com/kamailio/kamailio/commit/684533d099d304091082fd8a130619a… --- diff --git a/src/modules/tls/OpenSSL3-README.md b/src/modules/tls/OpenSSL3-README.md index 6b6a7814129..ccc59957869 100644 --- a/src/modules/tls/OpenSSL3-README.md +++ b/src/modules/tls/OpenSSL3-README.md @@ -52,4 +52,99 @@ It is assumed that all `pthread_key_t` values at the high-water mark or greater by non-OpenSSL libraries. During fork, tls.so will clear all thread-locals up to the high-water mark. - +## Update +@meengu(github) has an alternate solution from this [issue](https://github.com/OpenSIPS/opensips/issues/3388) +The diff is included here for future reference. It may prove useful if the current +solution fails in later versions of OpenSSL. + + From 84b4df66853506ce8d4853ec0fbcb25545a67a54 Mon Sep 17 00:00:00 2001 + From: Ondrej Jirman <megi(a)xff.cz> + Date: Mon, 13 May 2024 17:34:52 +0200 + Subject: [PATCH] Fix openssl TLS data corruption in shared memory by workers + + The problem is that somet TLS state is shared among workers but should + not be. We solve this by clearing the relevant TLS data after fork in the + child process. + + We identify the data to clear by asking OPENSSL itself for the pointers, + and then searching through the first 32 TLS items. + + Signed-off-by: Ondrej Jirman <megi(a)xff.cz> + --- + modules/tls_openssl/openssl.c | 47 +++++++++++++++++++++++++++++++++++ + 1 file changed, 47 insertions(+) + + diff --git a/modules/tls_openssl/openssl.c b/modules/tls_openssl/openssl.c + index 522b68258527..067865eef20f 100644 + --- a/modules/tls_openssl/openssl.c + +++ b/modules/tls_openssl/openssl.c + @@ -29,6 +29,9 @@ + #include <openssl/opensslv.h> + #include <openssl/err.h> + #include <openssl/rand.h> + +#if OPENSSL_VERSION_NUMBER < 0x30000000L + +#include <openssl/rand_drbg.h> + +#endif + + #include "../../dprint.h" + #include "../../mem/shm_mem.h" + @@ -188,6 +191,48 @@ static int check_for_krb(void) + } + #endif + + +static void clean_openssl_locals(void) + +{ + +#if OPENSSL_VERSION_NUMBER < 0x30000000L + + ERR_STATE *es = ERR_get_state(); + + RAND_DRBG *r0 = RAND_DRBG_get0_public(); + + RAND_DRBG *r1 = RAND_DRBG_get0_private(); + + + + for(int k = 0; k < 32; k++) { + + void* p = pthread_getspecific(k); + + if (p && p == es) { + + pthread_setspecific(k, NULL); + + ERR_clear_error(); + + } else if (p && p == r0) { + + pthread_setspecific(k, NULL); + + RAND_DRBG_get0_public(); + + } else if (p && p == r1) { + + pthread_setspecific(k, NULL); + + RAND_DRBG_get0_private(); + + } + + } + +#else + + OSSL_LIB_CTX *ctx = OSSL_LIB_CTX_get0_global_default(); + + ERR_STATE *es = ERR_get_state(); + + EVP_RAND_CTX *r0 = RAND_get0_public(ctx); + + EVP_RAND_CTX *r1 = RAND_get0_private(ctx); + + + + for(int k = 0; k < 32; k++) { + + void* p = pthread_getspecific(k); + + if (p && p == es) { + + pthread_setspecific(k, NULL); + + ERR_clear_error(); + + } else if (p && p == r0) { + + pthread_setspecific(k, NULL); + + RAND_get0_public(ctx); + + } else if (p && p == r1) { + + pthread_setspecific(k, NULL); + + RAND_get0_private(ctx); + + } + + } + +#endif + +} + + + /* + * initialize ssl methods + */ + @@ -297,6 +342,8 @@ static int mod_init(void) + on_exit(openssl_on_exit, NULL); + #endif + + + pthread_atfork(NULL, NULL, clean_openssl_locals); + + + return 0; + } + + -- + 2.45.0

2 months

git:master:631bad4f: dispatcher: convert to unsigned int pv value for oc time

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 631bad4f0531af0ba44e5af99841d3b6371ee63e URL: https://github.com/kamailio/kamailio/commit/631bad4f0531af0ba44e5af99841d3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-04T15:20:51+01:00 dispatcher: convert to unsigned int pv value for oc time --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/631bad4f0531af0ba44e5af99841d3b… Patch: https://github.com/kamailio/kamailio/commit/631bad4f0531af0ba44e5af99841d3b… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index d5abb6a62ac..ff7b34931fe 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1529,9 +1529,11 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_sintval( msg, param, res, (int)((inactive * 100) / count)); case 5: /* octime_sec */ - return pv_get_sintval(msg, param, res, (long)ocdata.octime.tv_sec); + return pv_get_uintval( + msg, param, res, (unsigned long)ocdata.octime.tv_sec); case 6: /* octime_usec */ - return pv_get_sintval(msg, param, res, (long)ocdata.octime.tv_usec); + return pv_get_uintval( + msg, param, res, (unsigned long)ocdata.octime.tv_usec); case 7: /* ocseq */ return pv_get_sintval(msg, param, res, ocdata.ocseq); case 8: /* ocrate */

2 months

git:master:292e086f: mangler: reformat exported structures

by Federico Cabiddu

Module: kamailio Branch: master Commit: 292e086f3fd764584dc1c5e4deb2af61f9f6aec7 URL: https://github.com/kamailio/kamailio/commit/292e086f3fd764584dc1c5e4deb2af6… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2024-12-04T14:21:23+01:00 mangler: reformat exported structures --- Modified: src/modules/mangler/mangler.c --- Diff: https://github.com/kamailio/kamailio/commit/292e086f3fd764584dc1c5e4deb2af6… Patch: https://github.com/kamailio/kamailio/commit/292e086f3fd764584dc1c5e4deb2af6… --- diff --git a/src/modules/mangler/mangler.c b/src/modules/mangler/mangler.c index 0ce7689997c..c8fa2dcfe5b 100644 --- a/src/modules/mangler/mangler.c +++ b/src/modules/mangler/mangler.c @@ -76,38 +76,41 @@ static param_export_t params[] = { {0, 0, 0}}; /*no params exported,perhaps I should add pre-compiled expressions */ +/* clang-format off */ /* * Exported functions */ static cmd_export_t cmds[] = { - {"sdp_mangle_ip", sdp_mangle_ip, 2, 0, 0, - REQUEST_ROUTE | ONREPLY_ROUTE}, // fixup_char2str? - {"sdp_mangle_port", sdp_mangle_port, 1, 0, 0, - REQUEST_ROUTE - | ONREPLY_ROUTE}, // fixup_char2int if I use an int as offset - {"encode_contact", encode_contact, 2, 0, 0, - REQUEST_ROUTE | ONREPLY_ROUTE}, //fixup_char2str - {"decode_contact", decode_contact, 0, 0, 0, REQUEST_ROUTE}, - {"decode_contact_header", decode_contact_header, 0, 0, 0, - REQUEST_ROUTE | ONREPLY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"sdp_mangle_ip", sdp_mangle_ip, 2, 0, 0, + REQUEST_ROUTE | ONREPLY_ROUTE}, // fixup_char2str? + {"sdp_mangle_port", sdp_mangle_port, 1, 0, 0, + REQUEST_ROUTE + | ONREPLY_ROUTE}, // fixup_char2int if I use an int as offset + {"encode_contact", encode_contact, 2, 0, 0, + REQUEST_ROUTE | ONREPLY_ROUTE}, //fixup_char2str + {"decode_contact", decode_contact, 0, 0, 0, REQUEST_ROUTE}, + {"decode_contact_header", decode_contact_header, 0, 0, 0, + REQUEST_ROUTE | ONREPLY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* * Module interface */ struct module_exports exports = { - "mangler", /* 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 */ - 0, /* per-child init function */ - destroy /* module destroy function */ + "mangler", /* 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 */ + 0, /* per-child init function */ + destroy /* module destroy function */ }; +/* clang-format on */ #ifdef DEMO

2 months

CMake Initial support

by Xenofon Karamanos

Hello all, As you may have noticed, we have added CMake building support to kamailio. You can check the PR https://github.com/kamailio/kamailio/pull/4043 for details and https://github.com/kamailio/kamailio-wiki/blob/main/docs/tutorials/cmake/in… for docs on how to use it. Currently all of the modules have their corresponding CMakeLists.txt and should compile successfully (apart from the tls_wolfss). I say should as i have only being able to test them on my machine with the following: Ubuntu 20.04.6 LTS Linux 5.4.0-200-generic #220-Ubuntu SMP Fri Sep 27 13:19:16 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux cmake version 3.29.4 (min is 3.10, as defined in CMakelist.txt, found available in Ubuntu 18.04) i will also add support for more OSes but for the time being there is support for Linux-based, DragonFly (for some reason) and Darwin (MacOS). You can also introduce the files needed to in https://github.com/kamailio/kamailio/tree/master/cmake/os-specific, if you are willing to help and submit a PR. Some modules i could not compile because of missing dependencies available on the distribution or require specific OS (db_oracle) are: 1. db_oracle 2. dnssec 3. jwt 4. microhttpd 5. nats 6. nsq 7. ruxc 8. secsipid_proc 9. stirshaken 10. tls_wolfssl (compilation error, need some more time to see why) Any help on verifying whether the above modules (and of course all the rest), compile and run successfully will be awesome. Any bug fixes and PRs are obviously welcome and appreciated. Reporting issues is can be done of course on kamailio github page. Cheers, Xenofon

2 months

git:master:f7dfe8d7: nats: CMakeLists.txt - added dependency on libuv

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f7dfe8d794c0faa22978feaa60691b10b5c1651b URL: https://github.com/kamailio/kamailio/commit/f7dfe8d794c0faa22978feaa60691b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-04T11:35:08+01:00 nats: CMakeLists.txt - added dependency on libuv --- Modified: src/modules/nats/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/f7dfe8d794c0faa22978feaa60691b1… Patch: https://github.com/kamailio/kamailio/commit/f7dfe8d794c0faa22978feaa60691b1… --- diff --git a/src/modules/nats/CMakeLists.txt b/src/modules/nats/CMakeLists.txt index 2faad56bfe7..fd3c7a480ee 100644 --- a/src/modules/nats/CMakeLists.txt +++ b/src/modules/nats/CMakeLists.txt @@ -5,8 +5,10 @@ project(nats) find_package(PkgConfig REQUIRED) pkg_check_modules(nats REQUIRED IMPORTED_TARGET libnats) add_library(nats::libnats ALIAS PkgConfig::nats) +pkg_check_modules(uv REQUIRED IMPORTED_TARGET libuv) +add_library(uv::libuv ALIAS PkgConfig::uv) file(GLOB SRC_FILES "*.c") add_library(nats SHARED ${SRC_FILES}) -target_link_libraries(nats PRIVATE kamailio nats::libnats) +target_link_libraries(nats PRIVATE kamailio nats::libnats uv::libuv)

2 months

git:master:b0dee2ff: jwt: CMakeLists.txt - update for finding libjwt with pkg-config

by Daniel-Constantin Mierla

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})

2 months

IMPORTANT: Replacing old Makefiles with CMake

by Daniel-Constantin Mierla

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

2 months

git:master:9ff1bd7b: lwsc: add fixup_free* to exported functions

by Federico Cabiddu

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 */ /**

2 months

git:master:d2a0b072: lost: reformat exported structures

by Federico Cabiddu

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)

2 months

git:master:064a8849: log_systemd: add fixup_free* to exported functions

by Federico Cabiddu

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 +}

2 months

← Newer
1
...
28
29
30
31
32
33
34
35
Older →

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