December 2024 - sr-dev - kamailio.org

git:master:bdae2469: lib/print: relocated to archive
by Daniel-Constantin Mierla 05 Dec '24

05 Dec '24

Module: kamailio Branch: master Commit: bdae2469ab839ce87f3fca2a5fee6e7b1f9be9c5 URL: https://github.com/kamailio/kamailio/commit/bdae2469ab839ce87f3fca2a5fee6e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T17:03:22+01:00 lib/print: relocated to archive --- Removed: src/lib/print/.cvsignore Removed: src/lib/print/CMakeLists.txt Removed: src/lib/print/Makefile Removed: src/lib/print/README Removed: src/lib/print/print.c Removed: src/lib/print/print.h --- Diff: https://github.com/kamailio/kamailio/commit/bdae2469ab839ce87f3fca2a5fee6e7… Patch: https://github.com/kamailio/kamailio/commit/bdae2469ab839ce87f3fca2a5fee6e7… --- diff --git a/src/lib/print/.cvsignore b/src/lib/print/.cvsignore deleted file mode 100644 index ba8401cbc92..00000000000 --- a/src/lib/print/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -libprint.so.* - diff --git a/src/lib/print/CMakeLists.txt b/src/lib/print/CMakeLists.txt deleted file mode 100644 index 25b8dcb2c86..00000000000 --- a/src/lib/print/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -project(kamailio_lib_print VERSION 1.2.1) - -file(GLOB SRC_FILES "*.c") - -# Original target to be named as folder, so when included from lib/CMakeLists.txt -# it will be named as lib/ims.so -add_library(lib_print SHARED ${SRC_FILES}) - -target_link_libraries(lib_print common kamailio) - -# TODO: do we need version control? -set_target_properties( - lib_print PROPERTIES VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} - OUTPUT_NAME print -) -set_target_properties(lib_print PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR}) diff --git a/src/lib/print/Makefile b/src/lib/print/Makefile deleted file mode 100644 index 731ffea2e5b..00000000000 --- a/src/lib/print/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# -# example library makefile -# - -include ../../Makefile.defs -auto_gen= -NAME:=print -MAJOR_VER=1 -MINOR_VER=2 -BUGFIX_VER=1 -LIBS= - -include ../../Makefile.libs - diff --git a/src/lib/print/README b/src/lib/print/README deleted file mode 100644 index 0d1a5f496d6..00000000000 --- a/src/lib/print/README +++ /dev/null @@ -1,11 +0,0 @@ -example print library --------------- - - -Description: ------------- - -This library is an example on how to implement a ser specific library -(see the Makefile). -See also modules/print_lib for a library usage example. - diff --git a/src/lib/print/print.c b/src/lib/print/print.c deleted file mode 100644 index c2783d096f9..00000000000 --- a/src/lib/print/print.c +++ /dev/null @@ -1,12 +0,0 @@ -/* - * example library - */ - - -#include <stdio.h> - -int stderr_println(char *text) -{ - fprintf(stderr, "%s\n", text); - return 0; -} diff --git a/src/lib/print/print.h b/src/lib/print/print.h deleted file mode 100644 index 4fd823c5002..00000000000 --- a/src/lib/print/print.h +++ /dev/null @@ -1,7 +0,0 @@ - -#ifndef _print_h -#define _print_h - -int stderr_println(char *text); - -#endif

1 0

git:master:593e3ec3: modules: readme files regenerated - ims_auth ... [skip ci]
by Kamailio Dev 05 Dec '24

05 Dec '24

Module: kamailio Branch: master Commit: 593e3ec3546b645e0224d0dc633a263a56356f9e URL: https://github.com/kamailio/kamailio/commit/593e3ec3546b645e0224d0dc633a263… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-12-05T11:46:10+01:00 modules: readme files regenerated - ims_auth ... [skip ci] --- Modified: src/modules/ims_auth/README --- Diff: https://github.com/kamailio/kamailio/commit/593e3ec3546b645e0224d0dc633a263… Patch: https://github.com/kamailio/kamailio/commit/593e3ec3546b645e0224d0dc633a263… --- diff --git a/src/modules/ims_auth/README b/src/modules/ims_auth/README index 322bf3fe604..44ab1b76c12 100644 --- a/src/modules/ims_auth/README +++ b/src/modules/ims_auth/README @@ -55,6 +55,7 @@ Carsten Bock 3.13. add_authinfo_hdr (integer) 3.14. ignore_failed_auth (integer) 3.15. av_check_only_impu (integer) + 3.16. av_mode (integer) 4. Functions @@ -87,10 +88,11 @@ Carsten Bock 1.13. add_authinfo_hdr parameter usage 1.14. ignore_failed_auth parameter usage 1.15. av_check_only_impu parameter usage - 1.16. www_authorize usage - 1.17. ims_www_challenge usage + 1.16. av_mode parameter usage + 1.17. www_authorize usage 1.18. ims_www_challenge usage - 1.19. proxy_authorize usage + 1.19. ims_www_challenge usage + 1.20. proxy_authorize usage Chapter 1. Admin Guide @@ -119,6 +121,7 @@ Chapter 1. Admin Guide 3.13. add_authinfo_hdr (integer) 3.14. ignore_failed_auth (integer) 3.15. av_check_only_impu (integer) + 3.16. av_mode (integer) 4. Functions @@ -151,8 +154,9 @@ Chapter 1. Admin Guide The Following modules must be loaded before this module: * TM - Transaction Manager - * CDP - C Diameter Peer - * CDP_AVP - CDP AVP Applications + * CDP - C Diameter Peer (for av_mode=0) + * CDP_AVP - CDP AVP Applications (for av_mode=0) + * GCRYPT - GNU Crypto functions (for av_mode=1) 2.2. External Libraries or Applications @@ -175,6 +179,7 @@ Chapter 1. Admin Guide 3.13. add_authinfo_hdr (integer) 3.14. ignore_failed_auth (integer) 3.15. av_check_only_impu (integer) + 3.16. av_mode (integer) 3.1. name (string) @@ -363,6 +368,16 @@ modparam("ims_auth", "ignore_failed_auth", 1) modparam("ims_auth", "av_check_only_impu", 1) ... +3.16. av_mode (integer) + + Control how authentication vector is generated: 0 - get it from HSS via + DIAMETER; 1 - generate it locally. Default is 0. + + Example 1.16. av_mode parameter usage +... +modparam("ims_auth", "av_mode", 1) +... + 4. Functions 4.1. ims_www_authorize(realm, table) @@ -401,7 +416,7 @@ modparam("ims_auth", "av_check_only_impu", 1) This function can be used from REQUEST_ROUTE. - Example 1.16. www_authorize usage + Example 1.17. www_authorize usage ... if (!www_authorize("kamailio.org", "subscriber")) { www_challenge(""REG_MAR_REPLY"", "kamailio.org", "1"); @@ -440,7 +455,7 @@ if (!www_authorize("kamailio.org", "subscriber")) { This function can be used from REQUEST_ROUTE. - Example 1.17. ims_www_challenge usage + Example 1.18. ims_www_challenge usage ... if (!proxy_authorize("$fd", "subscriber)) { proxy_challenge(""REG_MAR_REPLY","$fd"); # Realm will be autogenerated @@ -485,7 +500,7 @@ e\n"); This function can be used from REQUEST_ROUTE. - Example 1.18. ims_www_challenge usage + Example 1.19. ims_www_challenge usage ... if (!ims_www_authenticate(NETWORKNAME)) { #user has not been authenticated. Lets send a challenge via 401 @@ -535,7 +550,7 @@ Unauthorized This function can be used from REQUEST_ROUTE. - Example 1.19. proxy_authorize usage + Example 1.20. proxy_authorize usage ... if (!proxy_authorize("$fd", "subscriber)) { proxy_challenge("REG_MAR_REPLY","$fd", "1"); # Realm will be autogenera

1 0

git: new commits in branch master
by Daniel-Constantin Mierla 05 Dec '24

05 Dec '24

- URL: https://github.com/kamailio/kamailio/commit/f08e98a39a2e18502f70108fea159e5… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: added Milenage, AES-128 (Rijndael) and auth_vector local generation - URL: https://github.com/kamailio/kamailio/commit/e31f48b4658ae4f41bc5d9e1fe979d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: new av_mode parameter - to control how AV are managed - URL: https://github.com/kamailio/kamailio/commit/2559363525f49c65c822806ab50c95b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: synced functions with number of parameters - renamed some parameters to be suggestive - split wrapper functions that execute evaluation of fixed-up parameters - URL: https://github.com/kamailio/kamailio/commit/6e48bfd66b0730b2e5ae3458a0fe5d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: function to set ims auth data - k, op, op_c and amf - URL: https://github.com/kamailio/kamailio/commit/9ccaec9f065d02f71b275eadc1e1f19… Author: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-12-05T11:43:55+01:00 ims_auth: reworked the local AV API - URL: https://github.com/kamailio/kamailio/commit/24548be94ac9d291f4693c55e20c5fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: generate local auth vector when none is found for challenge - URL: https://github.com/kamailio/kamailio/commit/c3c9ae6c5f3c3537f0dd7c7d3b715c8… Author: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-12-05T11:43:55+01:00 ims_auth: fixed compilation and moved back auth_vector to authorize.h - URL: https://github.com/kamailio/kamailio/commit/08ff3b46223f7208d8adb23a70dced4… Author: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-12-05T11:43:55+01:00 ims_auth: integrated local resync - URL: https://github.com/kamailio/kamailio/commit/391474c43a3a0a77ab03044e3606ef7… Author: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-12-05T11:43:55+01:00 ims_auth: dropped all old vectors on local resync - URL: https://github.com/kamailio/kamailio/commit/5fc56046351aeff88cb2788f3b75cd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: docs for av_mode parameter - URL: https://github.com/kamailio/kamailio/commit/3c8ae737f2c3d67f36045d235b27bdf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: relocated aes128.{c,h} to gcrypt module - they use libgcrypt - URL: https://github.com/kamailio/kamailio/commit/c206d4093c15582283ce492891f003c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 gcrypt: exported api for aes128 functions - URL: https://github.com/kamailio/kamailio/commit/bbb4047583495bd26e5fd5b61b6dc03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 gcrypt: include file for binding module exports - URL: https://github.com/kamailio/kamailio/commit/7c3a23867fe107b82c6860751fb7018… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: use gcrypt api for aes128 functions - URL: https://github.com/kamailio/kamailio/commit/5fc21d897235f0155f061962aa342ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: don't bind or use cdp when av_mode is 1 - URL: https://github.com/kamailio/kamailio/commit/22c9e3a11796d56b99550956987b661… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: docs updated with gcrypt dependency

1 0

[kamailio/kamailio] After modifying the tag value in the To header field of the SIP 408 response using the app_python3 module, Kamailio reported an error: BUG: bad pointer 0x7f60c10a88a0 (out of memory block!). (Issue #4050)
by xianchuhan 05 Dec '24

05 Dec '24

### Description Upon interfacing with a specific carrier’s cloud relay service, upon the termination of the call by the called party after the phone rings, the tag value within the To header of the 408 response from the cloud relay side is altered. When Kamailio relays this 408 response to FreeSwitch, the sofia-sip protocol stack employed by FreeSwitch perceives it as a distinct dialog and does not promptly conclude the call. Given that the carrier’s personnel may lack the capability or the inclination to effect changes, we are looking to accommodate this scenario on the Kamailio side. Upon receipt of the 408 response from the carrier, we will determine if there has been a modification to the tag value in the To header. If such a change is detected, prior to forwarding the 408 response to FreeSwitch, we will rectify the tag value in the To header of the 408 response to correspond with the tag value from the 18x signaling messages. Our system : OS: Rocky Linux release 9.3 (Blue Onyx) Kamailo vesion 5.7.3 ### Troubleshooting #### Reproduction In the kamailio.cfg, invoke a Python script within the onreply_route[MANAGE_REPLY] block The following two scenarios both result in content-related errors: 1. First, the ‘To’ header field is removed using msg.call_function(‘remove_hf’, ‘To’), and then the modified ‘To’ header field is added using msg.call_function(‘append_hf’, sip_to). 2. The tag value in the ‘To’ header field is changed back to the original value using msg.call_function(‘replace_hdrs’, toTag, originalToTag). #### Log Messages Dec 4 13:45:00 sipp102 ./kamailio[391888]: INFO: {2 92091734 INVITE a18e6868-2ca5-123e-a394-00163e347028} app_python3 [mod_Logger.c:172]: logger_LM_INFO(): recv 408, sip_to_field_val = <sip:130679333xx@39.106.31.1xx:5060>;tag=3b47-eb967d112cba8f7d5eb856259e056294 toUri = <sip:130679333xx@39.106.31.1xx:5060> toTag = tag=3b47-eb967d112cba8f7d5eb856259e056294 originalToTag = tag=as73409c31 Dec 4 13:45:00 sipp102 ./kamailio[391888]: CRITICAL: {2 92091734 INVITE a18e6868-2ca5-123e-a394-00163e347028} <core> [core/mem/q_malloc.c:515]: qm_free(): BUG: bad pointer 0x7f60c10a88a0 (out of memory block!) called from app_python3: python_msgobj.c: msg_call_function(258) - ignoring #### SIP Traffic Received 408： Forwarded 408: ![image](https://github.com/user-attachments/assets/4497efd6-23ec-4529-8388-593e0fa838c8) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4050 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4050(a)github.com>

3 5

git:master:684533d0: tls: update docs about thread-locals
by S-P Chan 05 Dec '24

05 Dec '24

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

1 0

git:master:631bad4f: dispatcher: convert to unsigned int pv value for oc time
by Daniel-Constantin Mierla 04 Dec '24

04 Dec '24

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

1 0

git:master:292e086f: mangler: reformat exported structures
by Federico Cabiddu 04 Dec '24

04 Dec '24

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

1 0

CMake Initial support
by Xenofon Karamanos 04 Dec '24

04 Dec '24

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 2

git:master:f7dfe8d7: nats: CMakeLists.txt - added dependency on libuv
by Daniel-Constantin Mierla 04 Dec '24

04 Dec '24

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)

1 0

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2024