sr-dev

sr-dev@lists.kamailio.org

15 participants
44977 discussions

git:master:ad8f017b: nghttp2: check return for setsockopt TCP_NODELAY
by Daniel-Constantin Mierla 06 Feb '25

06 Feb '25

Module: kamailio Branch: master Commit: ad8f017b38e90746790ec9789f01abe6fab46e1b URL: https://github.com/kamailio/kamailio/commit/ad8f017b38e90746790ec9789f01abe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-06T08:26:22+01:00 nghttp2: check return for setsockopt TCP_NODELAY --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/ad8f017b38e90746790ec9789f01abe… Patch: https://github.com/kamailio/kamailio/commit/ad8f017b38e90746790ec9789f01abe… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 3b8816aca0c..79b81a20c01 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -202,7 +202,10 @@ static http2_session_data *create_http2_session_data( session_data = malloc(sizeof(http2_session_data)); memset(session_data, 0, sizeof(http2_session_data)); session_data->app_ctx = app_ctx; - setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof(val)); + if(setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof(val)) + < 0) { + LM_ERR("failed to set TCP_NODELAY socket option\n"); + } session_data->bev = bufferevent_openssl_socket_new(app_ctx->evbase, fd, ssl, BUFFEREVENT_SSL_ACCEPTING, BEV_OPT_CLOSE_ON_FREE | BEV_OPT_DEFER_CALLBACKS);

1 0

git:master:6e76452c: ims_auth: amf passed as parameter to resync local auth vector
by Daniel-Constantin Mierla 06 Feb '25

06 Feb '25

Module: kamailio Branch: master Commit: 6e76452c11189620663da84f879400575c673792 URL: https://github.com/kamailio/kamailio/commit/6e76452c11189620663da84f8794005… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-06T08:15:58+01:00 ims_auth: amf passed as parameter to resync local auth vector --- Modified: src/modules/ims_auth/auth_vector.c Modified: src/modules/ims_auth/auth_vector.h Modified: src/modules/ims_auth/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/6e76452c11189620663da84f8794005… Patch: https://github.com/kamailio/kamailio/commit/6e76452c11189620663da84f8794005… --- diff --git a/src/modules/ims_auth/auth_vector.c b/src/modules/ims_auth/auth_vector.c index c973d8acfb3..a681490f71a 100644 --- a/src/modules/ims_auth/auth_vector.c +++ b/src/modules/ims_auth/auth_vector.c @@ -80,12 +80,12 @@ auth_vector *auth_vector_make_local(uint8_t k[16], uint8_t op[16], int opIsOPc, int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, - uint8_t auts[14], uint8_t k[16], uint8_t op[16], int opIsOPc) + uint8_t auts[14], uint8_t k[16], uint8_t op[16], int opIsOPc, + uint8_t amf[2]) { uint8_t rand[16]; uint8_t op_c[16]; uint8_t ak[6]; - uint8_t amf[2]; uint8_t sqnMS[6]; uint8_t mac_s[8]; uint8_t xmac_s[8]; diff --git a/src/modules/ims_auth/auth_vector.h b/src/modules/ims_auth/auth_vector.h index 1b90cfe9f21..0b0457258b0 100644 --- a/src/modules/ims_auth/auth_vector.h +++ b/src/modules/ims_auth/auth_vector.h @@ -32,7 +32,8 @@ auth_vector *auth_vector_make_local(uint8_t k[16], uint8_t op[16], int opIsOPc, uint8_t amf[2], uint8_t sqn[6]); int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, - uint8_t auts[14], uint8_t k[16], uint8_t op[16], int opIsOPc); + uint8_t auts[14], uint8_t k[16], uint8_t op[16], int opIsOPc, + uint8_t amf[2]); void sqn_increment(uint8_t sqn[6]); #endif diff --git a/src/modules/ims_auth/authorize.c b/src/modules/ims_auth/authorize.c index 44bfbc4f91a..0d16e658893 100644 --- a/src/modules/ims_auth/authorize.c +++ b/src/modules/ims_auth/authorize.c @@ -708,10 +708,12 @@ int ims_resync_auth(struct sip_msg *msg, str *proute_name, str *prealm) int resync_result = 0; if(_ims_auth_data.flags & IMS_AUTH_FLAG_OPC_SET) { resync_result = auth_vector_resync_local(aud->sqn, av, - auts_bin, _ims_auth_data.k, _ims_auth_data.op_c, 1); + auts_bin, _ims_auth_data.k, _ims_auth_data.op_c, 1, + _ims_auth_data.amf); } else { resync_result = auth_vector_resync_local(aud->sqn, av, - auts_bin, _ims_auth_data.k, _ims_auth_data.op, 0); + auts_bin, _ims_auth_data.k, _ims_auth_data.op, 0, + _ims_auth_data.amf); } if(resync_result != 0) {

1 0

git:master:12ef4b4e: core: rand - switch to inline functions from macros
by Daniel-Constantin Mierla 06 Feb '25

06 Feb '25

Module: kamailio Branch: master Commit: 12ef4b4e64e596a3ce29775266cef571796f0850 URL: https://github.com/kamailio/kamailio/commit/12ef4b4e64e596a3ce29775266cef57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-06T08:09:20+01:00 core: rand - switch to inline functions from macros - rand/random has no parameter --- Modified: src/core/rand/kam_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/12ef4b4e64e596a3ce29775266cef57… Patch: https://github.com/kamailio/kamailio/commit/12ef4b4e64e596a3ce29775266cef57… --- diff --git a/src/core/rand/kam_rand.h b/src/core/rand/kam_rand.h index 271f61f220d..12b988a0852 100644 --- a/src/core/rand/kam_rand.h +++ b/src/core/rand/kam_rand.h @@ -24,12 +24,24 @@ #if RAND_MAX < INT_MAX #define KAM_RAND_MAX ((int)(0x7FFFFFFF)) /* (1<<31) - 1 */ -#define kam_rand(x) ((int)random(x)) -#define kam_srand(x) srandom(x) +static inline int kam_rand(void) +{ + return (int)random(); +} +static inline void kam_srand(unsigned int seed) +{ + return srandom(seed); +} #else #define KAM_RAND_MAX RAND_MAX -#define kam_rand(x) rand(x) -#define kam_srand(x) srand(x) +static inline int kam_rand(void) +{ + return rand(); +} +static inline void kam_srand(unsigned int seed) +{ + return srand(seed); +} #endif #endif

1 0

git:master:462f9730: core: socket info - use unsigned for current size in buffer for get flags
by Daniel-Constantin Mierla 06 Feb '25

06 Feb '25

Module: kamailio Branch: master Commit: 462f9730eb55a3abbd50b9170eb6318eb43eb999 URL: https://github.com/kamailio/kamailio/commit/462f9730eb55a3abbd50b9170eb6318… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-06T08:07:46+01:00 core: socket info - use unsigned for current size in buffer for get flags --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/462f9730eb55a3abbd50b9170eb6318… Patch: https://github.com/kamailio/kamailio/commit/462f9730eb55a3abbd50b9170eb6318… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 24243fea153..4fd44fec2dc 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1439,7 +1439,7 @@ static int get_flags(int family) struct ifinfomsg *ifi; char buf[NETLINK_BUFFER_SIZE]; char *p = buf; - int nll = 0; + unsigned int nll = 0; int nl_sock = -1; fill_nl_req(req, RTM_GETLINK, family); @@ -1453,7 +1453,7 @@ static int get_flags(int family) } while(1) { - if((sizeof(buf) - nll) == 0) { + if(sizeof(buf) <= nll) { LM_ERR("netlink buffer overflow in get_flags"); goto error; }

1 0

git:master:efce6e76: ims_isc: check return for parsing headers and anchor lump
by Daniel-Constantin Mierla 06 Feb '25

06 Feb '25

Module: kamailio Branch: master Commit: efce6e76ba20f7b02101fb2f44cb149b609f4bef URL: https://github.com/kamailio/kamailio/commit/efce6e76ba20f7b02101fb2f44cb149… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-05T16:44:49+01:00 ims_isc: check return for parsing headers and anchor lump --- Modified: src/modules/ims_isc/mark.c --- Diff: https://github.com/kamailio/kamailio/commit/efce6e76ba20f7b02101fb2f44cb149… Patch: https://github.com/kamailio/kamailio/commit/efce6e76ba20f7b02101fb2f44cb149… --- diff --git a/src/modules/ims_isc/mark.c b/src/modules/ims_isc/mark.c index d97e29b30a0..cbd0c17e3cd 100644 --- a/src/modules/ims_isc/mark.c +++ b/src/modules/ims_isc/mark.c @@ -147,9 +147,15 @@ int isc_mark_get_from_lumps(struct sip_msg *msg, isc_mark *mark) memset(mark, 0, sizeof(isc_mark)); - parse_headers(msg, HDR_EOH_F, 0); + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse headers\n"); + return 0; + } - anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0); + if(anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0) == NULL) { + LM_ERR("failed to create the anchor lump\n"); + return 0; + } lmp = msg->add_rm; while(lmp) {

1 0

git:master:65645c76: textops: catch return 0 when removing via param
by Daniel-Constantin Mierla 05 Feb '25

05 Feb '25

Module: kamailio Branch: master Commit: 65645c761e94cedde04f100764d5c506590cb200 URL: https://github.com/kamailio/kamailio/commit/65645c761e94cedde04f100764d5c50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-05T13:30:17+01:00 textops: catch return 0 when removing via param --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/65645c761e94cedde04f100764d5c50… Patch: https://github.com/kamailio/kamailio/commit/65645c761e94cedde04f100764d5c50… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 94fba1c32a4..db1929e0127 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -5026,11 +5026,7 @@ static int ki_via_param_rm(sip_msg_t *msg, str *name, int idx) LM_ERR("no memory for delete operation\n"); return -1; } - if(ret < 0) { - ret = 1; - } else { - ret++; - } + ret++; } } if(ret > 0) { @@ -5041,7 +5037,7 @@ static int ki_via_param_rm(sip_msg_t *msg, str *name, int idx) } } } - return ret; + return (ret == 0) ? -1 : ret; } /**

1 0

git:5.8:ed3d6809: htable: do not print item name before is computed
by Victor Seva 05 Feb '25

05 Feb '25

Module: kamailio Branch: 5.8 Commit: ed3d6809dcc66ac18efb313fbf9e3f7bd130a19d URL: https://github.com/kamailio/kamailio/commit/ed3d6809dcc66ac18efb313fbf9e3f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-02-05T11:27:51+01:00 htable: do not print item name before is computed (cherry picked from commit e2193b9cd7f59377c54e0424c0d4a1628a5a60de) --- Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/ed3d6809dcc66ac18efb313fbf9e3f7… Patch: https://github.com/kamailio/kamailio/commit/ed3d6809dcc66ac18efb313fbf9e3f7… --- diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index e79c7869ee5..4d7707f958b 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -38,8 +38,8 @@ int pv_get_ht_cell(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if(hpv->ht == NULL) { hpv->ht = ht_get_table(&hpv->htname); if(hpv->ht == NULL) { - LM_ERR("htable not found for getting $sht(%.*s=>%.*s)\n", - hpv->htname.len, hpv->htname.s, htname.len, htname.s); + LM_ERR("htable not found for getting $sht(%.*s=>...)\n", + hpv->htname.len, hpv->htname.s); return pv_get_null(msg, param, res); } } @@ -77,8 +77,8 @@ int pv_set_ht_cell( if(hpv->ht == NULL) hpv->ht = ht_get_table(&hpv->htname); if(hpv->ht == NULL) { - LM_ERR("htable not found for setting $sht(%.*s=>%.*s)\n", - hpv->htname.len, hpv->htname.s, htname.len, htname.s); + LM_ERR("htable not found for setting $sht(%.*s=>...)\n", + hpv->htname.len, hpv->htname.s); return -1; }

1 0

git:master:1ed6671c: websocket: use helper function to get signed int time
by Daniel-Constantin Mierla 05 Feb '25

05 Feb '25

Module: kamailio Branch: master Commit: 1ed6671c802e525046ca56008bdc3d52f2bbd46d URL: https://github.com/kamailio/kamailio/commit/1ed6671c802e525046ca56008bdc3d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-05T09:30:55+01:00 websocket: use helper function to get signed int time --- Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/1ed6671c802e525046ca56008bdc3d5… Patch: https://github.com/kamailio/kamailio/commit/1ed6671c802e525046ca56008bdc3d5… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index b41cb2e91d9..9fa3125343c 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -28,6 +28,7 @@ #include "../../core/locking.h" #include "../../core/str.h" +#include "../../core/ut.h" #include "../../core/tcp_conn.h" #include "../../core/fmsg.h" #include "../../core/counters.h" @@ -219,7 +220,7 @@ int wsconn_add(struct receive_info *rcv, unsigned int sub_protocol) wsconn_listadd(wsconn_id_hash[wsc->id_hash], wsc, id_next, id_prev); /* Add to the end of the WebSocket used list */ - wsc->last_used = (int)time(NULL); + wsc->last_used = ksr_time_sint(NULL, NULL); if(wsconn_used_list->head == NULL) wsconn_used_list->head = wsconn_used_list->tail = wsc; else { @@ -358,7 +359,7 @@ int wsconn_update(ws_connection_t *wsc) } WSCONN_LOCK; - wsc->last_used = (int)time(NULL); + wsc->last_used = ksr_time_sint(NULL, NULL); if(wsconn_used_list->tail == wsc) /* Already at the end of the list */ goto end; @@ -742,7 +743,7 @@ static int ws_rpc_add_node( pong = wsc->awaiting_pong ? "awaiting Pong, " : ""; - interval = (int)time(NULL) - wsc->last_used; + interval = ksr_time_sint(NULL, NULL) - wsc->last_used; if(wsc->sub_protocol == SUB_PROTOCOL_SIP) sub_protocol = "sip"; else if(wsc->sub_protocol == SUB_PROTOCOL_MSRP) diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 04a4132f13d..e7e97b40ce4 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -37,6 +37,7 @@ #include "../../core/events.h" #include "../../core/receive.h" #include "../../core/str.h" +#include "../../core/ut.h" #include "../../core/tcp_conn.h" #include "../../core/tcp_read.h" #include "../../core/tcp_server.h" @@ -796,8 +797,8 @@ static int ws_send_crlf(ws_connection_t *wsc, int opcode) void ws_keepalive(unsigned int ticks, void *param) { - int check_time = - (int)time(NULL) - cfg_get(websocket, ws_cfg, keepalive_timeout); + int check_time = ksr_time_sint(NULL, NULL) + - cfg_get(websocket, ws_cfg, keepalive_timeout); ws_connection_id_t *list_head = NULL; ws_connection_t *wsc = NULL;

1 0

[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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev