sr-dev

sr-dev@lists.kamailio.org

1 participants
44977 discussions

[kamailio/kamailio] Module nghttp2 fails to compile with gcc 14 (Issue #4135)
by Ben Kaufman 05 Feb '25

05 Feb '25

### Description Compiling nghttp2 is failing for me in Alpine 3.21, which uses gcc 14 (14.2.0). It looks like the issue is that the header file `nghttp2.h` need to be explicitly included in the `nghttp2_mod.c` files. This is the error when running `make` inside of `src/modules/nghttp2` (after compiling kamailio as normal): ``` /home/builder/kamailio_src/src/modules/nghttp2 # make make: --libs: No such file or directory make: --libs: No such file or directory make: --libs: No such file or directory make: --libs: No such file or directory CC (gcc) [M nghttp2.so] nghttp2_mod.o nghttp2_mod.c: In function 'ksr_nghttp2_send_reply': nghttp2_mod.c:317:22: error: implicit declaration of function 'nghttp2_submit_response'; did you mean 'nghttp2_submit_response2'? [-Wimplicit-function-declaration] 317 | rv = nghttp2_submit_response(_ksr_nghttp2_ctx.session, | ^~~~~~~~~~~~~~~~~~~~~~~ | nghttp2_submit_response2 make: *** [../../Makefile.rules:100: nghttp2_mod.o] Error 1 ``` ### Troubleshooting Compilation works on Debian 12, so checked difference in `make` and `gcc` versions. Note that the `make: --libs: No such file or directory` appear to be from a different issue with `make` 4.4 not recursively expanding variables. From gcc's documentation it looks like implicit function declarations are no longer possible https://gcc.gnu.org/gcc-14/porting_to.html #### Reproduction Compile Kamailio 6.0.0 (with default config), then compile the nghttp2 module ### Possible Solutions Explicitly import `nghttp2.h` in `nghttp2_mod.c` and `nghttp2_server.c`. This is outside of my normal wheelhouse, but I was able to do this and successfully compile the module: ##### Diff for `nghttp2_mod.c`: ``` @@ -25,6 +25,7 @@ #include <stdlib.h> #include <string.h> #include <arpa/inet.h> +#include <nghttp2/nghttp2.h> #include "../../core/sr_module.h" #include "../../core/dprint.h" ``` ##### Diff for `nghttp2_server.c`: ``` @@ -23,6 +23,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <nghttp2/nghttp2.h> #include "nghttp2_server.h" #define OUTPUT_WOULDBLOCK_THRESHOLD (1 << 16) ```  ### Additional Information Kamailio 6.0.0 with gcc 14.2.0 * **Operating System**:  ``` /home/builder/kamailio_src/src/modules/nghttp2 # lsb_release -a No LSB modules are available. Distributor ID: Alpine Description: Alpine Linux v3.21 Release: 3.21.2 Codename: n/a /home/builder/kamailio_src/src/modules/nghttp2 # uname -a Linux 89562285153f 5.15.167.4-microsoft-standard-WSL2 #1 SMP Tue Nov 5 00:21:55 UTC 2024 x86_64 Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4135 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4135(a)github.com>

2 3

[kamailio/kamailio] nghttp2: compilation with gcc 14 (PR #4136)
by Ben Kaufman 05 Feb '25

05 Feb '25

- Explicitly include nghttp2.h file GH #4135   #### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #4135 #### Description  Explicitly include nghttp2.h file in `src/modules/nghttp2/nghttp2_mod.c` and `src/modules/nghttp2/nghttp2_server.c` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4136 -- Commit Summary -- * nghttp2: compilation with gcc 14 -- File Changes -- M src/modules/nghttp2/nghttp2_mod.c (1) M src/modules/nghttp2/nghttp2_server.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4136.patch https://github.com/kamailio/kamailio/pull/4136.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4136 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4136(a)github.com>

2 2

git:master:1e5a91be: nghttp2: compilation with gcc 14
by Daniel-Constantin Mierla 05 Feb '25

05 Feb '25

Module: kamailio Branch: master Commit: 1e5a91be57de02beedbd2b3b03031647b51eb7b6 URL: https://github.com/kamailio/kamailio/commit/1e5a91be57de02beedbd2b3b0303164… Author: Kaufman <bkaufman(a)bcmone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-05T09:27:05+01:00 nghttp2: compilation with gcc 14 - Explicitly include nghttp2.h file GH #4135 --- Modified: src/modules/nghttp2/nghttp2_mod.c Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/1e5a91be57de02beedbd2b3b0303164… Patch: https://github.com/kamailio/kamailio/commit/1e5a91be57de02beedbd2b3b0303164… --- diff --git a/src/modules/nghttp2/nghttp2_mod.c b/src/modules/nghttp2/nghttp2_mod.c index 28b80544107..cf9c70e66a4 100644 --- a/src/modules/nghttp2/nghttp2_mod.c +++ b/src/modules/nghttp2/nghttp2_mod.c @@ -25,6 +25,7 @@ #include <stdlib.h> #include <string.h> #include <arpa/inet.h> +#include <nghttp2/nghttp2.h> #include "../../core/sr_module.h" #include "../../core/dprint.h" diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index ba0290bc4ac..3b8816aca0c 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -23,6 +23,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <nghttp2/nghttp2.h> #include "nghttp2_server.h" #define OUTPUT_WOULDBLOCK_THRESHOLD (1 << 16)

1 0

[kamailio/kamailio] geoip: module relocated to archive (PR #3978)
by Victor Seva 05 Feb '25

05 Feb '25

related #3886 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3978 -- Commit Summary -- * geoip: module relocated to archive -- File Changes -- M src/Makefile.groups (8) D src/modules/geoip/Makefile (9) D src/modules/geoip/README (166) D src/modules/geoip/doc/Makefile (4) D src/modules/geoip/doc/geoip.xml (42) D src/modules/geoip/doc/geoip_admin.xml (199) D src/modules/geoip/geoip_mod.c (157) D src/modules/geoip/geoip_pv.c (421) D src/modules/geoip/geoip_pv.h (40) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3978.patch https://github.com/kamailio/kamailio/pull/3978.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3978 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3978(a)github.com>

4 6

git:master:0aedee8c: msilo: use helper function to get time as signed int
by Daniel-Constantin Mierla 05 Feb '25

05 Feb '25

Module: kamailio Branch: master Commit: 0aedee8cde7b67b531dabc8a7207b0df1cfdf6a9 URL: https://github.com/kamailio/kamailio/commit/0aedee8cde7b67b531dabc8a7207b0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-05T08:21:39+01:00 msilo: use helper function to get time as signed int --- Modified: src/modules/msilo/msfuncs.c Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/0aedee8cde7b67b531dabc8a7207b0d… Patch: https://github.com/kamailio/kamailio/commit/0aedee8cde7b67b531dabc8a7207b0d… --- diff --git a/src/modules/msilo/msfuncs.c b/src/modules/msilo/msfuncs.c index 581b30390d4..2851708e894 100644 --- a/src/modules/msilo/msfuncs.c +++ b/src/modules/msilo/msfuncs.c @@ -282,6 +282,7 @@ int m_build_body(str *body, time_t date, str msg, time_t sdate) int ms_extract_time(str *time_str, int *time_val) { struct tm stm; + time_t ttime; int i; if(time_str == NULL || time_str->s == NULL || time_str->len <= 0 @@ -394,7 +395,8 @@ int ms_extract_time(str *time_str, int *time_val) return -1; } } - *time_val = (int)mktime(&stm); + ttime = mktime(&stm); + *time_val = ksr_time_sint(&ttime, NULL); return 0; } diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index 0654eecf54f..11713279167 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -743,7 +743,7 @@ static int m_store_addrs(sip_msg_t *msg, str *owner, str *srcaddr, str *dstaddr) } /* current time */ - val = (int)(unsigned long long)time(NULL); + val = ksr_time_sint(NULL, NULL); /* add expiration time */ db_keys[nr_keys] = &sc_exp_time; @@ -1286,7 +1286,7 @@ void m_clean_silo(unsigned int ticks, void *param) db_keys[0] = &sc_exp_time; db_vals[0].type = DB1_INT; db_vals[0].nul = 0; - db_vals[0].val.int_val = (int)time(NULL); + db_vals[0].val.int_val = ksr_time_sint(NULL, NULL); if(msilo_dbf.delete(db_con, db_keys, db_ops, db_vals, 1) < 0) LM_DBG("ERROR cleaning expired messages\n"); } @@ -1383,7 +1383,7 @@ void m_send_ontimer(unsigned int ticks, void *param) db_vals[1].type = DB1_INT; db_vals[1].nul = 0; ttime = time(NULL); - db_vals[1].val.int_val = (int)ttime; + db_vals[1].val.int_val = ksr_time_sint(&ttime, NULL); if(msilo_dbf.use_table(db_con, &ms_db_table) < 0) { LM_ERR("failed to use_table\n");

1 0

git:master:a086b234: core: ut.h - function split time in two signed integers
by Daniel-Constantin Mierla 04 Feb '25

04 Feb '25

Module: kamailio Branch: master Commit: a086b23458f1019e9f3ac5d66ae6f19074ff543e URL: https://github.com/kamailio/kamailio/commit/a086b23458f1019e9f3ac5d66ae6f19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-04T19:35:52+01:00 core: ut.h - function split time in two signed integers - the lower 4 bytes are returned, the upper 4 bytes can be stored in the second parameter --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/a086b23458f1019e9f3ac5d66ae6f19… Patch: https://github.com/kamailio/kamailio/commit/a086b23458f1019e9f3ac5d66ae6f19… --- diff --git a/src/core/ut.h b/src/core/ut.h index 29faca83fc2..f1829f73ca0 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1155,6 +1155,12 @@ static inline int strno2int(str *val, unsigned int *mask) } } +/** + * split time value in two (upper and lower 4-bytes) unsigned int values + * - time value representation on 8 bytes: UUUULLLL + * - lower 4 bytes are returned (LLLL) + * - upper 4 bytes can be stored in second paramter (UUUU) + */ static inline unsigned int ksr_time_uint(time_t *tv, unsigned int *tu) { unsigned int tl; /* lower 4 bytes */ @@ -1176,6 +1182,33 @@ static inline unsigned int ksr_time_uint(time_t *tv, unsigned int *tu) return tl; } +/** + * split time value in two (upper and lower 4-bytes) signed int values + * - time value representation on 8 bytes: UUUULLLL + * - lower 4 bytes are returned (LLLL) + * - upper 4 bytes can be stored in second paramter (UUUU) + */ +static inline int ksr_time_sint(time_t *tv, int *tu) +{ + int tl; /* lower 4 bytes */ + long long v64; + time_t t; + + if(tv != NULL) { + t = *tv; + } else { + t = time(NULL); + } + v64 = (long long)t; + tl = (int)(v64 & 0xFFFFFFFFLL); + if(tu != NULL) { + /* upper 4 bytes */ + *tu = (int)((v64 >> 32) & 0xFFFFFFFFLL); + } + + return tl; +} + /* converts a username into uid:gid, * returns -1 on error & 0 on success */ int user2uid(int *uid, int *gid, char *user);

1 0

git:master:88b96d71: topos_htable: use the xtag also for base64 key
by Daniel-Constantin Mierla 04 Feb '25

04 Feb '25

Module: kamailio Branch: master Commit: 88b96d717be2a66a9351c01c861408743be40fc4 URL: https://github.com/kamailio/kamailio/commit/88b96d717be2a66a9351c01c8614087… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-04T12:04:39+01:00 topos_htable: use the xtag also for base64 key --- Modified: src/modules/topos_htable/topos_htable_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/88b96d717be2a66a9351c01c8614087… Patch: https://github.com/kamailio/kamailio/commit/88b96d717be2a66a9351c01c8614087… --- diff --git a/src/modules/topos_htable/topos_htable_storage.c b/src/modules/topos_htable/topos_htable_storage.c index 52044df8734..043652e5280 100644 --- a/src/modules/topos_htable/topos_htable_storage.c +++ b/src/modules/topos_htable/topos_htable_storage.c @@ -277,8 +277,8 @@ static int tps_htable_load_initial_method_branch(tps_data_t *md, tps_data_t *sd) TPS_BASE64_SIZE - 1); base64url_enc(md->a_callid.s, md->a_callid.len, _tps_base64_buf[1], TPS_BASE64_SIZE - 1); - base64url_enc(md->b_tag.s, md->b_tag.len, _tps_base64_buf[2], - TPS_BASE64_SIZE - 1); + base64url_enc( + xtag.s, xtag.len, _tps_base64_buf[2], TPS_BASE64_SIZE - 1); base64url_enc( xuuid.s, xuuid.len, _tps_base64_buf[3], TPS_BASE64_SIZE - 1);

1 0

git:master:5f8adb62: msrp: send failure response after referening the buffer
by Daniel-Constantin Mierla 04 Feb '25

04 Feb '25

Module: kamailio Branch: master Commit: 5f8adb625b6bae81ef44613d774106bf3a943bb0 URL: https://github.com/kamailio/kamailio/commit/5f8adb625b6bae81ef44613d774106b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-04T08:05:28+01:00 msrp: send failure response after referening the buffer --- Modified: src/modules/msrp/msrp_cmap.c --- Diff: https://github.com/kamailio/kamailio/commit/5f8adb625b6bae81ef44613d774106b… Patch: https://github.com/kamailio/kamailio/commit/5f8adb625b6bae81ef44613d774106b… --- diff --git a/src/modules/msrp/msrp_cmap.c b/src/modules/msrp/msrp_cmap.c index e1a378ee7ac..072fe5f7529 100644 --- a/src/modules/msrp/msrp_cmap.c +++ b/src/modules/msrp/msrp_cmap.c @@ -183,8 +183,8 @@ int msrp_cmap_save(msrp_frame_t *mf) LM_DBG("expires is greater than max value\n"); xhdrs.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Max-Expires: %d\r\n", msrp_auth_max_expires); - msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &xhdrs); xhdrs.s = sbuf; + msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &xhdrs); return -4; } if(msrp_frame_get_first_from_path(mf, &fpeer) < 0) {

1 0

[kamailio/kamailio] APKBUILD missing modules (Issue #4131)
by Ben Kaufman 03 Feb '25

03 Feb '25

### Description The Alpine Linux APKBUILD file is a bit old and some of the modules added over the last few years are missing. I compile my own .apk files with an updated APKBUILD file which I can provide in a pull request. These modules are: - app_python3s - app_ruby_proc - call_obj - dlgs - ims_qos_npn - jwt - kafka - keepalive - kemix - lost - lrkproxy - math - mqtt - nghttp2 - posops - presence_dfks - pv_headers - pvtpl - secfilter - slack - ss7ops - sworker - topos_htable - xhttp_prom #### Reproduction The modules simply aren't listed in the APKBUILD file ### Possible Solutions Update APKBUILD file. ### Additional Information * **Operating System**: * Alpine Linux, 3.20, 3.21 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4131 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4131(a)github.com>

2 3

git:master:b70ade3e: cmake: Generate version-create.mongo file and install it
by Xenofon Karamanos 03 Feb '25

03 Feb '25

Module: kamailio Branch: master Commit: b70ade3e636cec8c38f40c92ec6bab5e7486feee URL: https://github.com/kamailio/kamailio/commit/b70ade3e636cec8c38f40c92ec6bab5… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-02-03T08:56:59Z cmake: Generate version-create.mongo file and install it --- Added: utils/kamctl/generate_version_create_mongo.sh Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/b70ade3e636cec8c38f40c92ec6bab5… Patch: https://github.com/kamailio/kamailio/commit/b70ade3e636cec8c38f40c92ec6bab5… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index ca8a4f20660..ad7ef141090 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -306,11 +306,11 @@ else() COMMENT "Cleaning ${db_name} schema files") endfunction() - # Add targets for each database type Pi framework targets should combined into - # one + # Add targets for each database type add_custom_target(dbschema COMMENT "Generating schemas for all dbs...") add_custom_target(dbschema_clean COMMENT "Cleaning schemas for all dbs...") + # Pi framework targets should combined into one if("xhttp_pi" IN_LIST FINAL_MODULES_LIST) add_db_target(pi_framework_table "${STYLESHEETS}/pi_framework_table.xsl") add_db_target(pi_framework_mod "${STYLESHEETS}/pi_framework_mod.xsl") @@ -361,6 +361,24 @@ else() add_db_target(mongodb "${STYLESHEETS}/mongodb.xsl") add_dependencies(dbschema dbschema_mongodb) add_dependencies(dbschema_clean dbschema_mongodb_clean) + # Create the version-create.mongo script + # After processing the JSON files, create the version-create.mongo script + # Usage of generate_version_create_mongo.sh: + # 1. The first argument is the path to create the version-create.mongo script + # 2. The second argument is the path to the directory containing the JSON files + add_custom_command( + TARGET dbschema_mongodb + POST_BUILD + COMMAND + bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_version_create_mongo.sh + "${CMAKE_CURRENT_BINARY_DIR}/mongodb/kamailio/version-create.mongo" + "${CMAKE_CURRENT_BINARY_DIR}/mongodb/kamailio" + COMMENT "Creating version-create.mongo from JSON files") + + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/mongodb/kamailio/version-create.mongo + DESTINATION ${CMAKE_INSTALL_DATADIR}/${MAIN_NAME}/mongodb/${MAIN_NAME} + COMPONENT KMONGODB) endif() if("db_redis" IN_LIST FINAL_MODULES_LIST) add_db_target(db_redis "${STYLESHEETS}/db_redis.xsl") diff --git a/utils/kamctl/generate_version_create_mongo.sh b/utils/kamctl/generate_version_create_mongo.sh new file mode 100644 index 00000000000..47048cc0962 --- /dev/null +++ b/utils/kamctl/generate_version_create_mongo.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +OUTPUT_FILE="$1" +JSON_DIR="$2" + +# Create the version-create.mongo file +echo "use kamailio;" > "$OUTPUT_FILE" +echo "db.createCollection(\"version\");" >> "$OUTPUT_FILE" + +for FILE in "$JSON_DIR"/*.json; do + if [ -f "$FILE" ]; then + if [ "$FILE" != "$JSON_DIR/version.json" ]; then + VN=$(grep '"version":' "$FILE" | grep -o -E '[0-9]+') + FN=$(basename "$FILE" .json) + echo "db.getCollection(\"version\").insert({ table_name: \"$FN\", table_version: NumberInt($VN) });" >> "$OUTPUT_FILE" + fi + fi +done \ No newline at end of file

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