- sr-dev - kamailio.org

Problems Compiling 5.8.5
by Christian Berger 06 Feb '25

06 Feb '25

Hi, building 5.8.5 fails for us. In src/core/mem/f_malloc.c, there is a call to sr_event_exec using the define "SREV_PKG_UPDATE_STAT" which is only defined if "MALLOC_STATS" is defined. However in the use there is no check for the define, so it fails with the default debian bookworm build. This might be a bug. Regards Christian -- Christian Berger - berger(a)sipgate.de Telefon: +49 (0)211-63 55 55-0 Telefax: +49 (0)211-63 55 55-22 sipgate GmbH - Gladbacher Str. 74 - 40219 Düsseldorf HRB Düsseldorf 39841 - Geschäftsführer: Thilo Salmon, Tim Mois Steuernummer: 106/5724/7147, Umsatzsteuer-ID: DE219349391 www.sipgate.de - www.sipgate.co.uk

1 1

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

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

git:master:e5f90cfc: dialog: use ksr_time_uint() for getting unsigned int time values
by Daniel-Constantin Mierla 02 Feb '25

02 Feb '25

Module: kamailio Branch: master Commit: e5f90cfce9d3ce13eada38cd1e058824d56b99df URL: https://github.com/kamailio/kamailio/commit/e5f90cfce9d3ce13eada38cd1e05882… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-02T17:10:37+01:00 dialog: use ksr_time_uint() for getting unsigned int time values --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_db_handler.c Modified: src/modules/dialog/dlg_dmq.c Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/e5f90cfce9d3ce13eada38cd1e05882… Patch: https://github.com/kamailio/kamailio/commit/e5f90cfce9d3ce13eada38cd1e05882… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 6e6bd93aabf..6871cc960e3 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -3323,8 +3323,8 @@ static void rpc_dlg_set_state(rpc_t *rpc, void *c) /* updates for terminated dialogs */ if(ostate == DLG_STATE_CONFIRMED && sval == DLG_STATE_DELETED) { /* updating timestamps, flags, dialog stats */ - dlg->init_ts = (unsigned int)(time(0)); - dlg->end_ts = (unsigned int)(time(0)); + dlg->init_ts = ksr_time_uint(NULL, NULL); + dlg->end_ts = ksr_time_uint(NULL, NULL); } dlg->dflags |= DLG_FLAG_CHANGED; diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 18ecdcaa6c9..0f18be6e81d 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -437,13 +437,13 @@ int load_dialog_info_from_db( dlg->tl.timeout = (unsigned int)(VAL_INT(values + 9)); LM_DBG("db dialog timeout is %u (%u/%u)\n", dlg->tl.timeout, - get_ticks(), (unsigned int)time(0)); - if(dlg->tl.timeout <= (unsigned int)time(0)) { + get_ticks(), ksr_time_uint(NULL, NULL)); + if(dlg->tl.timeout <= ksr_time_uint(NULL, NULL)) { dlg->tl.timeout = 0; dlg->lifetime = 0; } else { dlg->lifetime = dlg->tl.timeout - dlg->start_ts; - dlg->tl.timeout -= (unsigned int)time(0); + dlg->tl.timeout -= ksr_time_uint(NULL, NULL); } GET_STR_VALUE(cseq1, values, 10, 1, 1); @@ -492,7 +492,7 @@ int load_dialog_info_from_db( if(dlg->state == DLG_STATE_DELETED) { /* end_ts used for force clean up not stored - set it to now */ - dlg->end_ts = (unsigned int)time(0); + dlg->end_ts = ksr_time_uint(NULL, NULL); } /*restore the timer values */ if(0 != insert_dlg_timer(&(dlg->tl), (int)dlg->tl.timeout)) { @@ -898,7 +898,7 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell *cell) VAL_INT(values + 1) = cell->h_id; VAL_INT(values + 9) = cell->start_ts; VAL_INT(values + 10) = cell->state; - VAL_INT(values + 11) = (unsigned int)((unsigned int)time(0) + VAL_INT(values + 11) = (unsigned int)(ksr_time_uint(NULL, NULL) + cell->tl.timeout - get_ticks()); SET_STR_VALUE(values + 2, cell->callid); @@ -980,7 +980,7 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell *cell) VAL_INT(values) = cell->h_entry; VAL_INT(values + 1) = cell->h_id; VAL_INT(values + 10) = cell->state; - VAL_INT(values + 11) = (unsigned int)((unsigned int)time(0) + VAL_INT(values + 11) = (unsigned int)(ksr_time_uint(NULL, NULL) + cell->tl.timeout - get_ticks()); SET_STR_VALUE(values + 12, cell->cseq[DLG_CALLER_LEG]); diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index bb8a69cffd6..6cd8d898762 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -349,7 +349,7 @@ int dlg_dmq_handle_msg( dlg->dflags |= DLG_FLAG_NEW; /* keep dialog around for a bit, to prevent out-of-order * syncs to reestablish the dlg */ - dlg->init_ts = time(NULL); + dlg->init_ts = ksr_time_uint(NULL, NULL); break; default: LM_ERR("unhandled state update to state %u\n", state); diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index a37adee49d2..58b0311bece 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -225,7 +225,7 @@ int dlg_clean_run(ticks_t ti) dlg_cell_t *dlg; dlg_cell_t *tdlg; - tm = (unsigned int)time(NULL); + tm = ksr_time_uint(NULL, NULL); for(i = 0; i < d_table->size; i++) { dlg_lock(d_table, &d_table->entries[i]); dlg = d_table->entries[i].first; @@ -474,7 +474,7 @@ struct dlg_cell *build_new_dlg( memset(dlg, 0, len); dlg->state = DLG_STATE_UNCONFIRMED; - dlg->init_ts = (unsigned int)time(NULL); + dlg->init_ts = ksr_time_uint(NULL, NULL); dlg->h_entry = core_hash(callid, 0, d_table->size); LM_DBG("new dialog on hash %u\n", dlg->h_entry);

1 0

git:master:7a73e08b: msrp: variable for extra headers used in local replies
by Daniel-Constantin Mierla 01 Feb '25

01 Feb '25

Module: kamailio Branch: master Commit: 7a73e08b0e5b4c3fbeb4f097c1f891d06c74651d URL: https://github.com/kamailio/kamailio/commit/7a73e08b0e5b4c3fbeb4f097c1f891d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-01T07:40:11+01:00 msrp: variable for extra headers used in local replies --- Modified: src/modules/msrp/msrp_cmap.c --- Diff: https://github.com/kamailio/kamailio/commit/7a73e08b0e5b4c3fbeb4f097c1f891d… Patch: https://github.com/kamailio/kamailio/commit/7a73e08b0e5b4c3fbeb4f097c1f891d… --- diff --git a/src/modules/msrp/msrp_cmap.c b/src/modules/msrp/msrp_cmap.c index a1e79e84447..e1a378ee7ac 100644 --- a/src/modules/msrp/msrp_cmap.c +++ b/src/modules/msrp/msrp_cmap.c @@ -156,6 +156,7 @@ int msrp_cmap_save(msrp_frame_t *mf) char sbuf[MSRP_SBUF_SIZE]; str srcaddr; str srcsock; + str xhdrs; int msize; int expires; msrp_citem_t *it; @@ -172,16 +173,18 @@ int msrp_cmap_save(msrp_frame_t *mf) expires = msrp_auth_max_expires; if(expires < msrp_auth_min_expires) { LM_DBG("expires is lower than min value\n"); - srcaddr.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Min-Expires: %d\r\n", + xhdrs.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Min-Expires: %d\r\n", msrp_auth_min_expires); - msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &srcaddr); + xhdrs.s = sbuf; + msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &xhdrs); return -3; } if(expires > msrp_auth_max_expires) { LM_DBG("expires is greater than max value\n"); - srcaddr.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Max-Expires: %d\r\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, &srcaddr); + msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &xhdrs); + xhdrs.s = sbuf; return -4; } if(msrp_frame_get_first_from_path(mf, &fpeer) < 0) {

1 0

git:master:833bb437: dialog: use internal function to get 4-byte time value
by Daniel-Constantin Mierla 31 Jan '25

31 Jan '25

Module: kamailio Branch: master Commit: 833bb437750ee3c9403f91eb13a607ceede0be5d URL: https://github.com/kamailio/kamailio/commit/833bb437750ee3c9403f91eb13a607c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-31T20:23:11+01:00 dialog: use internal function to get 4-byte time value --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/833bb437750ee3c9403f91eb13a607c… Patch: https://github.com/kamailio/kamailio/commit/833bb437750ee3c9403f91eb13a607c… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index c05da0378fb..822175eb829 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -494,7 +494,7 @@ static void dlg_onreply(struct cell *t, int type, struct tmcb_params *param) next_state_dlg(dlg, event, &old_state, &new_state, &unref); if(new_state == DLG_STATE_DELETED && old_state != DLG_STATE_DELETED) { /* set end time */ - dlg->end_ts = (unsigned int)(time(0)); + dlg->end_ts = ksr_time_uint(NULL, NULL); } if(dlg_run_event_route( dlg, (rpl == FAKED_REPLY) ? NULL : rpl, old_state, new_state) @@ -540,7 +540,7 @@ static void dlg_onreply(struct cell *t, int type, struct tmcb_params *param) } /* set start time */ - dlg->start_ts = (unsigned int)(time(0)); + dlg->start_ts = ksr_time_uint(NULL, NULL); /* save the settings to the database, * if realtime saving mode configured- save dialog now @@ -1431,7 +1431,7 @@ void dlg_onroute(struct sip_msg *req, str *route_params, void *param) next_state_dlg(dlg, event, &old_state, &new_state, &unref); CURR_DLG_ID = req->id; - CURR_DLG_LIFETIME = (unsigned int)(time(0)) - dlg->start_ts; + CURR_DLG_LIFETIME = ksr_time_uint(NULL, NULL) - dlg->start_ts; CURR_DLG_STATUS = new_state; if(dlg_run_event_route(dlg, req, old_state, new_state) < 0) { @@ -1443,7 +1443,7 @@ void dlg_onroute(struct sip_msg *req, str *route_params, void *param) * to absorb in-air messages */ if(new_state == DLG_STATE_DELETED && old_state != DLG_STATE_DELETED) { /* set end time */ - dlg->end_ts = (unsigned int)(time(0)); + dlg->end_ts = ksr_time_uint(NULL, NULL); iuid = dlg_get_iuid_shm_clone(dlg); if(iuid != NULL) { if(d_tmb.register_tmcb(req, NULL, TMCB_DESTROY, unref_dlg_from_cb, @@ -1681,7 +1681,7 @@ void dlg_ontimeout(struct dlg_tl *tl) dlg->tag[DLG_CALLEE_LEG].s, old_state); /* set end time */ - dlg->end_ts = (unsigned int)(time(0)); + dlg->end_ts = ksr_time_uint(NULL, NULL); /* dialog timeout */ run_dlg_callbacks( @@ -1923,8 +1923,8 @@ int dlg_set_state(sip_msg_t *msg, int istate) /* updates for terminated dialogs */ if(ostate == DLG_STATE_CONFIRMED && istate == DLG_STATE_DELETED) { /* updating timestamps, flags, dialog stats */ - dlg->init_ts = (unsigned int)(time(0)); - dlg->end_ts = (unsigned int)(time(0)); + dlg->init_ts = ksr_time_uint(NULL, NULL); + dlg->end_ts = ksr_time_uint(NULL, NULL); } dlg->dflags |= DLG_FLAG_CHANGED; dlg_release(dlg);

1 0

git:master:5283bf62: core: ut.h - function to split time_t in lower and upper 4 bytes
by Daniel-Constantin Mierla 31 Jan '25

31 Jan '25

Module: kamailio Branch: master Commit: 5283bf6288a6b86bdc405883d6995f03cc373256 URL: https://github.com/kamailio/kamailio/commit/5283bf6288a6b86bdc405883d6995f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-31T20:23:11+01:00 core: ut.h - function to split time_t in lower and upper 4 bytes - lower 4 bytes are returned, upper 4 bytes can be stored in output parameter - if pointer to time value is not give, time(0) is used --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/5283bf6288a6b86bdc405883d6995f0… Patch: https://github.com/kamailio/kamailio/commit/5283bf6288a6b86bdc405883d6995f0… --- diff --git a/src/core/ut.h b/src/core/ut.h index 31b45fe5b4d..29faca83fc2 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1155,6 +1155,27 @@ static inline int strno2int(str *val, unsigned int *mask) } } +static inline unsigned int ksr_time_uint(time_t *tv, unsigned int *tu) +{ + unsigned int tl; /* lower 4 bytes */ + unsigned long long v64; + time_t t; + + if(tv != NULL) { + t = *tv; + } else { + t = time(NULL); + } + v64 = (unsigned long long)t; + tl = (unsigned int)(v64 & 0xFFFFFFFFULL); + if(tu != NULL) { + /* upper 4 bytes */ + *tu = (unsigned int)((v64 >> 32) & 0xFFFFFFFFULL); + } + + 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:478310c5: pv: small reworking of pointer conditions
by Daniel-Constantin Mierla 31 Jan '25

31 Jan '25

Module: kamailio Branch: master Commit: 478310c56f0eb060c5f31b2ee8febbb6204d37e7 URL: https://github.com/kamailio/kamailio/commit/478310c56f0eb060c5f31b2ee8febbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-31T20:23:11+01:00 pv: small reworking of pointer conditions --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/478310c56f0eb060c5f31b2ee8febbb… Patch: https://github.com/kamailio/kamailio/commit/478310c56f0eb060c5f31b2ee8febbb… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 3963ead97f9..38d46c01dba 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3654,7 +3654,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, } buf.s = pkg_malloc(val->rs.len); - if(buf.s == 0) { + if(buf.s == NULL) { LM_ERR("no more pkg mem\n"); goto error; } @@ -3681,7 +3681,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return -1; } buf.s = pkg_malloc(val->rs.len + 1); - if(buf.s == 0) { + if(buf.s == NULL) { LM_ERR("no more pkg mem\n"); goto error; } @@ -3708,7 +3708,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return -1; } buf.s = pkg_malloc(val->rs.len); - if(buf.s == 0) { + if(buf.s == NULL) { PKG_MEM_ERROR; goto error; } @@ -3735,7 +3735,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return -1; } buf.s = pkg_malloc(val->rs.len + 1); - if(buf.s == 0) { + if(buf.s == NULL) { LM_ERR("no more pkg mem\n"); goto error; } @@ -3790,7 +3790,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, goto error; } } else { - if(buf.s != 0) { + if(buf.s != NULL) { pkg_free(buf.s); buf.s = NULL; } @@ -3817,8 +3817,9 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return 0; error: - if(buf.s != 0) + if(buf.s != NULL) { pkg_free(buf.s); + } return -1; }

1 0

[kamailio/kamailio] pkg/kamailio/alpine: Add new modules (PR #4132)
by Ben Kaufman 31 Jan '25

31 Jan '25

- Add missing modules to alpine packages as listed in GH #4131   #### 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 #4131 Changes should be backported to 6.0 branch, not 5.8 branch since it contains modules that don't exist in 5.8 #### Description Update `/pkg/kamailio/alpine/APKBUILD` file to add modules that have been added to Kamailio in the last few years. This also includes updating the dependency list for the modules. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4132 -- Commit Summary -- * pkg/kamailio/alpine: Add new modules -- File Changes -- M pkg/kamailio/alpine/APKBUILD (146) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4132.patch https://github.com/kamailio/kamailio/pull/4132.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4132 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4132(a)github.com>

2 3

Kamailio 6.0 presentation at FOSDEM 2025
by Henning Westerholt 31 Jan '25

31 Jan '25

Hello, just a quick announcement, that tomorrow afternoon will be a presentation about Kamailio 6.0 at the FOSDEM conference in Brussels, Belgium [1]. Usually all the talks in this room are streamed online as well. I am happy also to meet during the conference to chat about Kamailio or other topics, just send me a (direct) message. Best regards, Henning [1] https://fosdem.org/2025/schedule/event/fosdem-2025-5978-kamailio-6-0-develo… -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 0

[kamailio/kamailio] db_oracle: fix db_oracle cmake build for oracle 18.3.0.0.0 (PR #4128)
by Ovidiu Sas 31 Jan '25

31 Jan '25

This pull request enables db_oracle to be built against oracle 18.3.0.0.0 dev libraries using cmake. It requires the following env variables to be set: ``` declare -x ORACLE_HOME="/usr/lib/oracle/18.3/client64/" declare -x ORACLE_INCLUDE_DIR="/usr/include/oracle/18.3/client64" ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4128 -- Commit Summary -- * db_oracle: fix db_oracle build for oracle 18.3.0.0.0 -- File Changes -- M cmake/modules/FindOracle.cmake (3) M src/modules/db_oracle/CMakeLists.txt (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4128.patch https://github.com/kamailio/kamailio/pull/4128.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4128 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4128(a)github.com>

3 2

git:master:77ce71fc: db_oracle: fix db_oracle build for oracle 18.3.0.0.0
by Victor Seva 31 Jan '25

31 Jan '25

Module: kamailio Branch: master Commit: 77ce71fcd4cfb6f0f86313d95341e4abd0031b2c URL: https://github.com/kamailio/kamailio/commit/77ce71fcd4cfb6f0f86313d95341e4a… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-31T12:55:48+01:00 db_oracle: fix db_oracle build for oracle 18.3.0.0.0 --- Modified: cmake/modules/FindOracle.cmake Modified: src/modules/db_oracle/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/77ce71fcd4cfb6f0f86313d95341e4a… Patch: https://github.com/kamailio/kamailio/commit/77ce71fcd4cfb6f0f86313d95341e4a… --- diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake index bc6f64a9bd5..1b88fe4ee04 100644 --- a/cmake/modules/FindOracle.cmake +++ b/cmake/modules/FindOracle.cmake @@ -29,6 +29,9 @@ if(NOT ORACLE_HOME) if(EXISTS $ENV{ORACLE_HOME}) set(ORACLE_HOME $ENV{ORACLE_HOME}) endif() + if(EXISTS $ENV{ORACLE_INCLUDE_DIR}) + set(ORACLE_INCLUDE_DIR $ENV{ORACLE_INCLUDE_DIR}) + endif() endif() message(STATUS "ORACLE_HOME=${ORACLE_HOME}") diff --git a/src/modules/db_oracle/CMakeLists.txt b/src/modules/db_oracle/CMakeLists.txt index 758e78e8b25..66a4ab5ebea 100644 --- a/src/modules/db_oracle/CMakeLists.txt +++ b/src/modules/db_oracle/CMakeLists.txt @@ -6,5 +6,5 @@ add_library(${module_name} SHARED ${MODULE_SOURCES}) find_package(Oracle REQUIRED) # /usr/include/oracle/18.3/client64) -target_include_directories(${module_name} PRIVATE ${Oracle_INCLUDE_DIRS}) -target_link_libraries(${module_name} PRIVATE occi clntsh) +target_include_directories(${module_name} PRIVATE ${ORACLE_INCLUDE_DIR}) +target_link_libraries(${module_name} PRIVATE ${ORACLE_LIBRARIES})

1 0

git:master:f07d8ea5: pkg/kamailio/alpine: Add new modules
by Victor Seva 30 Jan '25

30 Jan '25

Module: kamailio Branch: master Commit: f07d8ea527883009fece7fd2a1c61d0a90a0c660 URL: https://github.com/kamailio/kamailio/commit/f07d8ea527883009fece7fd2a1c61d0… Author: Kaufman <bkaufman(a)bcmone.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-30T22:32:16+01:00 pkg/kamailio/alpine: Add new modules - Add missing modules to alpine packages as listed in GH #4131 --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/f07d8ea527883009fece7fd2a1c61d0… Patch: https://github.com/kamailio/kamailio/commit/f07d8ea527883009fece7fd2a1c61d0…

1 0

Branching 6.0 series
by Daniel-Constantin Mierla 30 Jan '25

30 Jan '25

Hello, I am trying to figure out what would be the best date to branch 6.0 in the git repo. To allow a bit of time after returning from the winter holidays to tune more the cmake and packaging, I would think that January 15, 2025 could be a good choice. If nobody comes with other opinions/suggestions, then we will go for it. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

5 13

git:master:ab1b0327: seas: remove redundant check
by Daniel-Constantin Mierla 30 Jan '25

30 Jan '25

Module: kamailio Branch: master Commit: ab1b032771be9adbb1d643cd44beac0e09a31553 URL: https://github.com/kamailio/kamailio/commit/ab1b032771be9adbb1d643cd44beac0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-30T11:32:53+01:00 seas: remove redundant check --- Modified: src/modules/seas/ha.c --- Diff: https://github.com/kamailio/kamailio/commit/ab1b032771be9adbb1d643cd44beac0… Patch: https://github.com/kamailio/kamailio/commit/ab1b032771be9adbb1d643cd44beac0… --- diff --git a/src/modules/seas/ha.c b/src/modules/seas/ha.c index 5eb1bbe6ff5..74f3d9a5e6a 100644 --- a/src/modules/seas/ha.c +++ b/src/modules/seas/ha.c @@ -156,7 +156,7 @@ static inline int parse_ping( } string++; } - if(!(ping_period_s && pings_lost_s && ping_timeout_s)) { + if(!(pings_lost_s && ping_timeout_s)) { LM_ERR("malformed ping config string. Unparseable :[%s]\n", string); return -1; }

1 0

Kamailio v6.0.0 Released - new major version is out
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Kamailio v6.0.0 is out – it comes with 5 new modules and important updates to the core components and existing modules. The increment of the first version number reflects several important updates, among them: multi-threaded option for UDP receiving, option for specifying a range of ports to listen to, support for expressions with variables for most of the module functions parameters, internal libraries are directly inked to the core, support to use cmake to compile and install Kamailio. You can read a bit more detailed release notes at: * https://www.kamailio.org/w/kamailio-v6.0-0-release-notes/ Many thanks to all developers and community members that made possible this release. v6.0.0 brings more flexibility and optimizations across many existing components and modules, new parameters, functions, variables and transformations. Enjoy Kamailio v6.0.0! Thank you for flying Kamailio! Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio World Conference, May 12-13, 2025, Berlin -- kamailioworld.com

2 2

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,bookworm #2917
by kamailio＠sipwise.com 29 Jan '25

29 Jan '25

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> Changes: ------------------------------------------ [...truncated 147.54 KiB...] rm -f TAGS tags *.dbg .*.swp rm -f rtp_media_server.d rtp_media_server.d rtp_media_server.d *~ rm -f TAGS tags *.dbg .*.swp rm -f rtpengine.d rtpengine.d rtpengine.d *~ rm -f TAGS tags *.dbg .*.swp rm -f rtpproxy.d rtpproxy.d rtpproxy.d *~ rm -f TAGS tags *.dbg .*.swp rm -f ruxc.d ruxc.d ruxc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sanity.d sanity.d sanity.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sca.d sca.d sca.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sctp.d sctp.d sctp.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sdpops.d sdpops.d sdpops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f seas.d seas.d seas.d *~ rm -f TAGS tags *.dbg .*.swp rm -f secfilter.d secfilter.d secfilter.d *~ rm -f TAGS tags *.dbg .*.swp rm -f secsipid.d secsipid.d secsipid.d *~ rm -f TAGS tags *.dbg .*.swp rm -f secsipid_proc.d secsipid_proc.d secsipid_proc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipcapture.d sipcapture.d sipcapture.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipdump.d sipdump.d sipdump.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipjson.d sipjson.d sipjson.d *~ rm -f TAGS tags *.dbg .*.swp rm -f siprepo.d siprepo.d siprepo.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sipt.d sipt.d sipt.d *~ rm -f TAGS tags *.dbg .*.swp rm -f siptrace.d siptrace.d siptrace.d *~ rm -f TAGS tags *.dbg .*.swp rm -f siputils.d siputils.d siputils.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sl.d sl.d sl.d *~ rm -f TAGS tags *.dbg .*.swp rm -f slack.d slack.d slack.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sms.d sms.d sms.d *~ rm -f TAGS tags *.dbg .*.swp rm -f smsops.d smsops.d smsops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f snmpstats.d snmpstats.d snmpstats.d *~ rm -f TAGS tags *.dbg .*.swp rm -f speeddial.d speeddial.d speeddial.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sqlops.d sqlops.d sqlops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f ss7ops.d ss7ops.d ss7ops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sst.d sst.d sst.d *~ rm -f TAGS tags *.dbg .*.swp rm -f statistics.d statistics.d statistics.d *~ rm -f TAGS tags *.dbg .*.swp rm -f statsc.d statsc.d statsc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f statsd.d statsd.d statsd.d *~ rm -f TAGS tags *.dbg .*.swp rm -f stirshaken.d stirshaken.d stirshaken.d *~ rm -f TAGS tags *.dbg .*.swp rm -f stun.d stun.d stun.d *~ rm -f TAGS tags *.dbg .*.swp rm -f sworker.d sworker.d sworker.d *~ rm -f TAGS tags *.dbg .*.swp rm -f systemdops.d systemdops.d systemdops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tcpops.d tcpops.d tcpops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f textops.d textops.d textops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f textopsx.d textopsx.d textopsx.d *~ rm -f TAGS tags *.dbg .*.swp rm -f timer.d timer.d timer.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tls.d tls.d tls.d *~ sources = tls_cfg.c tls_config.c tls_ct_wrq.c tls_domain.c tls_init.c tls_rpc.c tls_select.c tls_server.c tls_util.c tls_verify.c tls_wolfssl_mod.c , auto_gen = , objs = tls_cfg.o tls_config.o tls_ct_wrq.o tls_domain.o tls_init.o tls_rpc.o tls_select.o tls_server.o tls_util.o tls_verify.o tls_wolfssl_mod.o rm -f TAGS tags *.dbg .*.swp rm -f tls_wolfssl.d tls_wolfssl.d tls_wolfssl.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tlsa.d tlsa.d tlsa.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tm.d tm.d tm.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tmrec.d tmrec.d tmrec.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tmx.d tmx.d tmx.d *~ rm -f TAGS tags *.dbg .*.swp rm -f topoh.d topoh.d topoh.d *~ rm -f TAGS tags *.dbg .*.swp rm -f topos.d topos.d topos.d *~ rm -f TAGS tags *.dbg .*.swp rm -f topos_htable.d topos_htable.d topos_htable.d *~ rm -f TAGS tags *.dbg .*.swp rm -f topos_redis.d topos_redis.d topos_redis.d *~ rm -f TAGS tags *.dbg .*.swp rm -f tsilo.d tsilo.d tsilo.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uac.d uac.d uac.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uac_redirect.d uac_redirect.d uac_redirect.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_auth_db.d uid_auth_db.d uid_auth_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_avp_db.d uid_avp_db.d uid_avp_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_domain.d uid_domain.d uid_domain.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_gflags.d uid_gflags.d uid_gflags.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uid_uri_db.d uid_uri_db.d uid_uri_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uri_db.d uri_db.d uri_db.d *~ rm -f TAGS tags *.dbg .*.swp rm -f userblocklist.d userblocklist.d userblocklist.d *~ rm -f TAGS tags *.dbg .*.swp rm -f usrloc.d usrloc.d usrloc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f utils.d utils.d utils.d *~ rm -f TAGS tags *.dbg .*.swp rm -f uuid.d uuid.d uuid.d *~ rm -f TAGS tags *.dbg .*.swp rm -f websocket.d websocket.d websocket.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xcap_client.d xcap_client.d xcap_client.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xcap_server.d xcap_server.d xcap_server.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp.d xhttp.d xhttp.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp_pi.d xhttp_pi.d xhttp_pi.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp_prom.d xhttp_prom.d xhttp_prom.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xhttp_rpc.d xhttp_rpc.d xhttp_rpc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xlog.d xlog.d xlog.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xmlops.d xmlops.d xmlops.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xmlrpc.d xmlrpc.d xmlrpc.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xmpp.d xmpp.d xmpp.d *~ rm -f TAGS tags *.dbg .*.swp rm -f xprint.d xprint.d xprint.d *~ make[2]: Leaving directory '/build/kamailio-6.1.0~dev0+bpo12.20250129005718.2870/src' make[1]: Leaving directory '/build/kamailio-6.1.0~dev0+bpo12.20250129005718.2870' dh_clean dh_clean: warning: Compatibility levels before 10 are deprecated (level 9 in use) dpkg-source -b . dpkg-source: info: using source format '3.0 (native)' dpkg-source: info: building kamailio in kamailio_6.1.0~dev0+bpo12.20250129005718.2870.tar.xz dpkg-source: info: building kamailio in kamailio_6.1.0~dev0+bpo12.20250129005718.2870.dsc debian/rules binary dh_testdir # Add here commands to configure the package. /usr/bin/make FLAVOUR=kamailio cfg prefix=/usr cfg_prefix=/build/kamailio-6.1.0~dev0+bpo12.20250129005718.2870/debian/kamailio \ cfg_target=/etc/kamailio/ \ BASEDIR=/build/kamailio-6.1.0~dev0+bpo12.20250129005718.2870/debian/kamailio \ skip_modules="mono geoip bdb dbtext oracle pa iptrtpproxy dnssec java python" \ CC_EXTRA_OPTS="-Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/build/kamailio-6.1.0~dev0+bpo12.20250129005718.2870=. -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE" \ LD_EXTRA_OPTS="-Wl,-z,relro" \ group_include="kstandard" quiet=verbose make[1]: Entering directory '/build/kamailio-6.1.0~dev0+bpo12.20250129005718.2870' /usr/bin/make -C src/ cfg make[2]: Entering directory '/build/kamailio-6.1.0~dev0+bpo12.20250129005718.2870/src' normal Makefile.defs exec target architecture <x86_64>, host architecture <x86_64> rm -f modules.lst /usr/bin/make --no-print-directory modules.lst config.mak loaded making config... Makefile.defs defs skipped /usr/bin/make --no-print-directory -wC . cfg-defs normal Makefile.defs exec target architecture <x86_64>, host architecture <x86_64> make[4]: Nothing to be done for 'cfg-defs'. config.mak loaded Makefile.defs defs skipped saving modules list... make[2]: Leaving directory '/build/kamailio-6.1.0~dev0+bpo12.20250129005718.2870/src' make[1]: Leaving directory '/build/kamailio-6.1.0~dev0+bpo12.20250129005718.2870' touch configure-stamp dh_testdir /usr/bin/make all quiet=verbose make[1]: Entering directory '/build/kamailio-6.1.0~dev0+bpo12.20250129005718.2870' /usr/bin/make -C src/ all make[2]: Entering directory '/build/kamailio-6.1.0~dev0+bpo12.20250129005718.2870/src' config.mak loaded Makefile:116: *** "bad config.mak, try re-running make cfg". Stop. make[2]: Leaving directory '/build/kamailio-6.1.0~dev0+bpo12.20250129005718.2870/src' make[1]: *** [Makefile:34: all] Error 2 make[1]: Leaving directory '/build/kamailio-6.1.0~dev0+bpo12.20250129005718.2870' make: *** [debian/rules:131: test_build_all] Error 2 dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 I: copying local configuration E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.14005/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.14005/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_DKtayw filesystem I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: Cleaning COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.14005 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /run/lock/bookworm-amd64.building.13578 + '[' -r /run/lock/bookworm-amd64.update.13578 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.D80cvTavdM ']' + rm -rf /tmp/tmp.D80cvTavdM + '[' -n /tmp/apt-jdg_DKtayw ']' + sudo rm -rf /tmp/apt-jdg_DKtayw + '[' -n 413 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=72 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Wed Jan 29 01:06:12 UTC 2025 [running 72 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Wed Jan 29 01:06:12 UTC 2025 [running 72 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 1

git:5.7:634aa6f2: outbound: Fix flow_token_secret bug
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 5.7 Commit: 634aa6f2843b468a69ba63fe312a068c6562db2c URL: https://github.com/kamailio/kamailio/commit/634aa6f2843b468a69ba63fe312a068… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T11:53:20Z outbound: Fix flow_token_secret bug - flow_token_secret is of type str and not char* - check the length of the string instead of memory for initialization (cherry picked from commit 046ba41e431fec7fad0c82a9091ea9e27d9f677d) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/634aa6f2843b468a69ba63fe312a068… Patch: https://github.com/kamailio/kamailio/commit/634aa6f2843b468a69ba63fe312a068… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index 687fc5480d7..2e1251e3ad1 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -68,7 +68,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"force_outbound_flag", PARAM_INT, &ob_force_flag}, {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, - {"flow_token_secret", PARAM_STRING, &flow_token_secret}, + {"flow_token_secret", PARAM_STR, &flow_token_secret}, {0, 0, 0} }; @@ -88,7 +88,7 @@ struct module_exports exports = { static void mod_init_openssl(void) { - if(flow_token_secret.s) { + if(flow_token_secret.s && flow_token_secret.len > 0) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); #if OPENSSL_VERSION_NUMBER < 0x030000000L

1 0

git:5.7:95465330: outbound: reformat exported structures
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 5.7 Commit: 95465330fbc8916e3798122083cb895030171e00 URL: https://github.com/kamailio/kamailio/commit/95465330fbc8916e3798122083cb895… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T11:53:16Z outbound: reformat exported structures (cherry picked from commit 793a494f5b23f2ef5e82664924c3bed3893105bb) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/95465330fbc8916e3798122083cb895… Patch: https://github.com/kamailio/kamailio/commit/95465330fbc8916e3798122083cb895… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index e5ed1712607..687fc5480d7 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -59,25 +59,32 @@ static unsigned int ob_force_no_flag = (unsigned int)-1; static str ob_key = {0, 0}; static str flow_token_secret = {0, 0}; +/* clang-format off */ static cmd_export_t cmds[] = { - {"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0}}; + {"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"force_outbound_flag", PARAM_INT, &ob_force_flag}, - {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, - {"flow_token_secret", PARAM_STRING, &flow_token_secret}, {0, 0, 0}}; + {"force_outbound_flag", PARAM_INT, &ob_force_flag}, + {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, + {"flow_token_secret", PARAM_STRING, &flow_token_secret}, + {0, 0, 0} +}; struct module_exports exports = { - "outbound", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported��RPC��methods */ - 0, /* exported pseudo-variables */ - 0, /* response��function */ - mod_init, /* module initialization function */ - 0, /* per-child initialization function */ - destroy /* destroy function */ + "outbound", + 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 */ + 0, /* per-child init function */ + destroy /* module destroy function */ }; +/* clang-format on */ static void mod_init_openssl(void) {

1 0

git:5.8:fddfbdcc: outbound: Fix flow_token_secret bug
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 5.8 Commit: fddfbdcce2587e9b40f6c2fe77334d3b3b1dbb6c URL: https://github.com/kamailio/kamailio/commit/fddfbdcce2587e9b40f6c2fe77334d3… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T11:48:26Z outbound: Fix flow_token_secret bug - flow_token_secret is of type str and not char* - check the length of the string instead of memory for initialization (cherry picked from commit 046ba41e431fec7fad0c82a9091ea9e27d9f677d) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fddfbdcce2587e9b40f6c2fe77334d3… Patch: https://github.com/kamailio/kamailio/commit/fddfbdcce2587e9b40f6c2fe77334d3… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index 687fc5480d7..2e1251e3ad1 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -68,7 +68,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"force_outbound_flag", PARAM_INT, &ob_force_flag}, {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, - {"flow_token_secret", PARAM_STRING, &flow_token_secret}, + {"flow_token_secret", PARAM_STR, &flow_token_secret}, {0, 0, 0} }; @@ -88,7 +88,7 @@ struct module_exports exports = { static void mod_init_openssl(void) { - if(flow_token_secret.s) { + if(flow_token_secret.s && flow_token_secret.len > 0) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); #if OPENSSL_VERSION_NUMBER < 0x030000000L

1 0

git:5.8:95feca55: outbound: reformat exported structures
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 5.8 Commit: 95feca55b38991e045d57ab8cdb9b75bcdb7070e URL: https://github.com/kamailio/kamailio/commit/95feca55b38991e045d57ab8cdb9b75… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T11:48:18Z outbound: reformat exported structures (cherry picked from commit 793a494f5b23f2ef5e82664924c3bed3893105bb) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/95feca55b38991e045d57ab8cdb9b75… Patch: https://github.com/kamailio/kamailio/commit/95feca55b38991e045d57ab8cdb9b75… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index e5ed1712607..687fc5480d7 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -59,25 +59,32 @@ static unsigned int ob_force_no_flag = (unsigned int)-1; static str ob_key = {0, 0}; static str flow_token_secret = {0, 0}; +/* clang-format off */ static cmd_export_t cmds[] = { - {"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0}}; + {"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"force_outbound_flag", PARAM_INT, &ob_force_flag}, - {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, - {"flow_token_secret", PARAM_STRING, &flow_token_secret}, {0, 0, 0}}; + {"force_outbound_flag", PARAM_INT, &ob_force_flag}, + {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, + {"flow_token_secret", PARAM_STRING, &flow_token_secret}, + {0, 0, 0} +}; struct module_exports exports = { - "outbound", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported��RPC��methods */ - 0, /* exported pseudo-variables */ - 0, /* response��function */ - mod_init, /* module initialization function */ - 0, /* per-child initialization function */ - destroy /* destroy function */ + "outbound", + 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 */ + 0, /* per-child init function */ + destroy /* module destroy function */ }; +/* clang-format on */ static void mod_init_openssl(void) {

1 0

git:6.0:94a546d5: ChangeLog: content updated for v6.0.0
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 94a546d5e68a484daf64373c047ff5f3c8a927b7 URL: https://github.com/kamailio/kamailio/commit/94a546d5e68a484daf64373c047ff5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T12:05:25+01:00 ChangeLog: content updated for v6.0.0 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/94a546d5e68a484daf64373c047ff5f… Patch: https://github.com/kamailio/kamailio/commit/94a546d5e68a484daf64373c047ff5f…

1 0

git:6.0:77330f92: Makefile.defs: version set to 6.0.0
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 77330f92899cf11878a20ea0d0cd80c90ebd8f5b URL: https://github.com/kamailio/kamailio/commit/77330f92899cf11878a20ea0d0cd80c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T12:05:25+01:00 Makefile.defs: version set to 6.0.0 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/77330f92899cf11878a20ea0d0cd80c… Patch: https://github.com/kamailio/kamailio/commit/77330f92899cf11878a20ea0d0cd80c… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5946eb600fa..8c35d66c5dc 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,8 +106,8 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 6 PATCHLEVEL = 0 -SUBLEVEL = 0 -EXTRAVERSION = -rc0 +SUBLEVEL = 0 +EXTRAVERSION = # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:6.0:17aa4df3: pkg/kamailio: version set 6.0.0 for rpms and alpine
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 17aa4df3a0ffd10405d74b864665d383ba43eeca URL: https://github.com/kamailio/kamailio/commit/17aa4df3a0ffd10405d74b864665d38… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T12:05:25+01:00 pkg/kamailio: version set 6.0.0 for rpms and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/17aa4df3a0ffd10405d74b864665d38… Patch: https://github.com/kamailio/kamailio/commit/17aa4df3a0ffd10405d74b864665d38… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 585705a7fd9..0516493d47b 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.1.0 +pkgver=6.0.0 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index de909ffd85b..7c27f98a0b6 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.0 +%define ver 6.0.0 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:6.0:1953e241: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 1953e241862466120b8ca98319f3d24be5c42c5c URL: https://github.com/kamailio/kamailio/commit/1953e241862466120b8ca98319f3d24… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-01-29T11:46:20+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_qos_npn/README --- Diff: https://github.com/kamailio/kamailio/commit/1953e241862466120b8ca98319f3d24… Patch: https://github.com/kamailio/kamailio/commit/1953e241862466120b8ca98319f3d24… --- diff --git a/src/modules/ims_qos_npn/README b/src/modules/ims_qos_npn/README index 3a85244f6bd..fd4aaec3823 100644 --- a/src/modules/ims_qos_npn/README +++ b/src/modules/ims_qos_npn/README @@ -1,4 +1,4 @@ -The IMS QoS Module - Neat Path Networks "branch" +The IMS QoS NPN Module Dragos Vingarzan @@ -192,7 +192,7 @@ Chapter 1. Admin Guide control functions performed by an Application Function (e.g. P-CSCF) over the Rx interface. This module is dependent on the CDP (C Diameter Peer) modules for communicating with PCRF as specified in 3GPP - specification TS 29.214. + specification TS 29.214. It is an enhaced variant of ims_qos. 2. Dependencies

1 0

git:master:389ef7a6: modules: readme files regenerated - ims_qos_npn ... [skip ci]
by Kamailio Dev 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 389ef7a67fc7860dc5ac7fe01810b17b5374818c URL: https://github.com/kamailio/kamailio/commit/389ef7a67fc7860dc5ac7fe01810b17… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-01-29T11:46:10+01:00 modules: readme files regenerated - ims_qos_npn ... [skip ci] --- Modified: src/modules/ims_qos_npn/README --- Diff: https://github.com/kamailio/kamailio/commit/389ef7a67fc7860dc5ac7fe01810b17… Patch: https://github.com/kamailio/kamailio/commit/389ef7a67fc7860dc5ac7fe01810b17… --- diff --git a/src/modules/ims_qos_npn/README b/src/modules/ims_qos_npn/README index 3a85244f6bd..fd4aaec3823 100644 --- a/src/modules/ims_qos_npn/README +++ b/src/modules/ims_qos_npn/README @@ -1,4 +1,4 @@ -The IMS QoS Module - Neat Path Networks "branch" +The IMS QoS NPN Module Dragos Vingarzan @@ -192,7 +192,7 @@ Chapter 1. Admin Guide control functions performed by an Application Function (e.g. P-CSCF) over the Rx interface. This module is dependent on the CDP (C Diameter Peer) modules for communicating with PCRF as specified in 3GPP - specification TS 29.214. + specification TS 29.214. It is an enhaced variant of ims_qos. 2. Dependencies

1 0

git:6.0:8d482b1a: pua: added breaks to event type matching switch
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 8d482b1a4a01dca834928795b0e789ae135b8224 URL: https://github.com/kamailio/kamailio/commit/8d482b1a4a01dca834928795b0e789a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T11:43:53+01:00 pua: added breaks to event type matching switch (cherry picked from commit a2ae4fe607125a05debeb40c0ecf1ce05d69ff5f) --- Modified: src/modules/pua/hash.h --- Diff: https://github.com/kamailio/kamailio/commit/8d482b1a4a01dca834928795b0e789a… Patch: https://github.com/kamailio/kamailio/commit/8d482b1a4a01dca834928795b0e789a… --- diff --git a/src/modules/pua/hash.h b/src/modules/pua/hash.h index 36f0335cc79..ae19357fe17 100644 --- a/src/modules/pua/hash.h +++ b/src/modules/pua/hash.h @@ -178,9 +178,11 @@ static inline int get_event_flag(str *event) case 15: if(strncmp(event->s, "message-summary", 15) == 0) return MSGSUM_EVENT; + break; case 16: if(strncmp(event->s, "as-feature-event", 16) == 0) return DFKS_EVENT; + break; } LM_ERR("Unknown event string\n");

1 0

git:6.0:f540d97e: ims_qos_npn: small docs updates
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: f540d97e3f0be21cb6abc61ac701c8fd437b4371 URL: https://github.com/kamailio/kamailio/commit/f540d97e3f0be21cb6abc61ac701c8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T11:34:17+01:00 ims_qos_npn: small docs updates (cherry picked from commit dcdcee0d9f2326e079f905632af9db3b898330ab) --- Modified: src/modules/ims_qos_npn/doc/ims_qos_npn.xml Modified: src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f540d97e3f0be21cb6abc61ac701c8f… Patch: https://github.com/kamailio/kamailio/commit/f540d97e3f0be21cb6abc61ac701c8f… --- diff --git a/src/modules/ims_qos_npn/doc/ims_qos_npn.xml b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml index 0cd99dcd0c7..fa9d03eb003 100644 --- a/src/modules/ims_qos_npn/doc/ims_qos_npn.xml +++ b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml @@ -7,7 +7,7 @@ ]> <book> <bookinfo> - <title>The IMS QoS Module - Neat Path Networks "branch"</title> + <title>The IMS QoS NPN Module</title> <authorgroup> <author> diff --git a/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml b/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml index dfb6ea9ed15..70459b65801 100644 --- a/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml +++ b/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml @@ -16,7 +16,7 @@ charging control functions performed by an Application Function (e.g. P-CSCF) over the Rx interface. This module is dependent on the CDP (C Diameter Peer) modules for communicating with PCRF as specified in 3GPP - specification TS 29.214.</para> + specification TS 29.214. It is an enhaced variant of ims_qos.</para> </section> <section> @@ -548,7 +548,7 @@ modparam("ims_qos", "dialog_direction", 1) If set to 1 it will trust the bottom Via as the UE IP/port/transport when doing client identification. </para> <para> - Normally, the UE identification should be done on IPsec SPIs and source IP/port of the packets. + Normally, the UE identification should be done on IPsec SPIs and source IP/port of the packets. In some cases the ims_* modules trust the top Via on requests and the bottom Via on responses. In some (better) cases this trusts the received-from IP (or the alias in the Contact header). </para> @@ -707,7 +707,7 @@ modparam("ims_qos", "af_signaling_port_ps", "5063") <para><emphasis>Note:</emphasis> this is executed asynchronously. See example on how to retrieve return value</para> - <para><emphasis>Note:</emphasis> this authorization session triggers + <para><emphasis>Note:</emphasis> this authorization session triggers event_route[qos:asr_registration], event_route[qos:rar_access_network] and event_route[qos:terminate_dialog].</para> <example> @@ -785,7 +785,7 @@ route[REGISTER_AAR_REPLY] <para><emphasis>Note:</emphasis> this is executed asynchronously. See example on how to retrieve return value</para> - <para><emphasis>Note:</emphasis> this authorization session triggers + <para><emphasis>Note:</emphasis> this authorization session triggers event_route[qos:asr_call], event_route[qos:rar_access_network] and event_route[qos:terminate_dialog].</para>

1 0

git:master:a2ae4fe6: pua: added breaks to event type matching switch
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: a2ae4fe607125a05debeb40c0ecf1ce05d69ff5f URL: https://github.com/kamailio/kamailio/commit/a2ae4fe607125a05debeb40c0ecf1ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T11:42:49+01:00 pua: added breaks to event type matching switch --- Modified: src/modules/pua/hash.h --- Diff: https://github.com/kamailio/kamailio/commit/a2ae4fe607125a05debeb40c0ecf1ce… Patch: https://github.com/kamailio/kamailio/commit/a2ae4fe607125a05debeb40c0ecf1ce… --- diff --git a/src/modules/pua/hash.h b/src/modules/pua/hash.h index 36f0335cc79..ae19357fe17 100644 --- a/src/modules/pua/hash.h +++ b/src/modules/pua/hash.h @@ -178,9 +178,11 @@ static inline int get_event_flag(str *event) case 15: if(strncmp(event->s, "message-summary", 15) == 0) return MSGSUM_EVENT; + break; case 16: if(strncmp(event->s, "as-feature-event", 16) == 0) return DFKS_EVENT; + break; } LM_ERR("Unknown event string\n");

1 0

git:master:dcdcee0d: ims_qos_npn: small docs updates
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: dcdcee0d9f2326e079f905632af9db3b898330ab URL: https://github.com/kamailio/kamailio/commit/dcdcee0d9f2326e079f905632af9db3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T11:34:01+01:00 ims_qos_npn: small docs updates --- Modified: src/modules/ims_qos_npn/doc/ims_qos_npn.xml Modified: src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dcdcee0d9f2326e079f905632af9db3… Patch: https://github.com/kamailio/kamailio/commit/dcdcee0d9f2326e079f905632af9db3… --- diff --git a/src/modules/ims_qos_npn/doc/ims_qos_npn.xml b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml index 0cd99dcd0c7..fa9d03eb003 100644 --- a/src/modules/ims_qos_npn/doc/ims_qos_npn.xml +++ b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml @@ -7,7 +7,7 @@ ]> <book> <bookinfo> - <title>The IMS QoS Module - Neat Path Networks "branch"</title> + <title>The IMS QoS NPN Module</title> <authorgroup> <author> diff --git a/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml b/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml index dfb6ea9ed15..70459b65801 100644 --- a/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml +++ b/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml @@ -16,7 +16,7 @@ charging control functions performed by an Application Function (e.g. P-CSCF) over the Rx interface. This module is dependent on the CDP (C Diameter Peer) modules for communicating with PCRF as specified in 3GPP - specification TS 29.214.</para> + specification TS 29.214. It is an enhaced variant of ims_qos.</para> </section> <section> @@ -548,7 +548,7 @@ modparam("ims_qos", "dialog_direction", 1) If set to 1 it will trust the bottom Via as the UE IP/port/transport when doing client identification. </para> <para> - Normally, the UE identification should be done on IPsec SPIs and source IP/port of the packets. + Normally, the UE identification should be done on IPsec SPIs and source IP/port of the packets. In some cases the ims_* modules trust the top Via on requests and the bottom Via on responses. In some (better) cases this trusts the received-from IP (or the alias in the Contact header). </para> @@ -707,7 +707,7 @@ modparam("ims_qos", "af_signaling_port_ps", "5063") <para><emphasis>Note:</emphasis> this is executed asynchronously. See example on how to retrieve return value</para> - <para><emphasis>Note:</emphasis> this authorization session triggers + <para><emphasis>Note:</emphasis> this authorization session triggers event_route[qos:asr_registration], event_route[qos:rar_access_network] and event_route[qos:terminate_dialog].</para> <example> @@ -785,7 +785,7 @@ route[REGISTER_AAR_REPLY] <para><emphasis>Note:</emphasis> this is executed asynchronously. See example on how to retrieve return value</para> - <para><emphasis>Note:</emphasis> this authorization session triggers + <para><emphasis>Note:</emphasis> this authorization session triggers event_route[qos:asr_call], event_route[qos:rar_access_network] and event_route[qos:terminate_dialog].</para>

1 0

git:6.0:1efa1332: cmake: Use pkg-config instead for json-c dev package.
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 1efa133244bbca0c9c35b76f936cce2b0a5864d3 URL: https://github.com/kamailio/kamailio/commit/1efa133244bbca0c9c35b76f936cce2… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:28:40Z cmake: Use pkg-config instead for json-c dev package. (cherry picked from commit 8ebae54cff261b95fcece3be3719da511cc35084) --- Modified: src/modules/nsq/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/1efa133244bbca0c9c35b76f936cce2… Patch: https://github.com/kamailio/kamailio/commit/1efa133244bbca0c9c35b76f936cce2… --- diff --git a/src/modules/nsq/CMakeLists.txt b/src/modules/nsq/CMakeLists.txt index b4a482c2a47..e6acfa9a2f7 100644 --- a/src/modules/nsq/CMakeLists.txt +++ b/src/modules/nsq/CMakeLists.txt @@ -4,13 +4,19 @@ add_library(${module_name} SHARED ${MODULE_SOURCES}) find_package(Libev REQUIRED) -find_package(json-c QUIET) -if(NOT json-c_FOUND) - message(STATUS "json-c not found. looking with pkg-config") - find_package(PkgConfig REQUIRED) - pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) - add_library(json-c::json-c ALIAS PkgConfig::json-c) -endif() +# TODO: When we have a proper cmake config file for json-c for most OS, we can +# use that instead of pkg-config. +# json-c v 0.14 and 0.15 have wrong include directories in their cmake config +# files. uncomment the following line when we have a proper cmake config file +# for json-c for most OS. +# find_package(json-c 0.16 CONFIG) + +# if(NOT json-c_FOUND) +# message(STATUS "json-c not found. looking with pkg-config") +find_package(PkgConfig REQUIRED) +pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) +add_library(json-c::json-c ALIAS PkgConfig::json-c) +# endif() find_package(CURL REQUIRED)

1 0

git:6.0:2496ccd1: cmake: Use pkg-config instead for json-c dev package.
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 2496ccd1d1878e275a8797a286de6edc4aff4805 URL: https://github.com/kamailio/kamailio/commit/2496ccd1d1878e275a8797a286de6ed… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:28:26Z cmake: Use pkg-config instead for json-c dev package. (cherry picked from commit e7f9531adc6f319b6889d5644eb55a9cccfdd27d) --- Modified: src/modules/json/CMakeLists.txt Modified: src/modules/jsonrpcc/CMakeLists.txt Modified: src/modules/kazoo/CMakeLists.txt Modified: src/modules/pua_json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/2496ccd1d1878e275a8797a286de6ed… Patch: https://github.com/kamailio/kamailio/commit/2496ccd1d1878e275a8797a286de6ed…

1 0

git:6.0:d0360fbb: cmake/json: Remove find_package call. Use pkg-config instead.
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: d0360fbb8e622c786f3d8791b67f06d1eb6e0ae4 URL: https://github.com/kamailio/kamailio/commit/d0360fbb8e622c786f3d8791b67f06d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:28:03Z cmake/json: Remove find_package call. Use pkg-config instead. (cherry picked from commit 99d36df0a15bbb960b2d7ee5916d65a55b9b26cd) --- Modified: src/modules/json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/d0360fbb8e622c786f3d8791b67f06d… Patch: https://github.com/kamailio/kamailio/commit/d0360fbb8e622c786f3d8791b67f06d… --- diff --git a/src/modules/json/CMakeLists.txt b/src/modules/json/CMakeLists.txt index 72df4d390f5..5d791dbd03d 100644 --- a/src/modules/json/CMakeLists.txt +++ b/src/modules/json/CMakeLists.txt @@ -2,13 +2,18 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(json-c CONFIG) - -if(NOT json-c_FOUND) - message(STATUS "json-c not found. looking with pkg-config") - find_package(PkgConfig REQUIRED) - pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) - add_library(json-c::json-c ALIAS PkgConfig::json-c) -endif() +# TODO: When we have a proper cmake config file for json-c for most OS, we can +# use that instead of pkg-config. +# json-c v 0.14 and 0.15 have wrong include directories in their cmake config +# files. uncomment the following line when we have a proper cmake config file +# for json-c for most OS. +# find_package(json-c 0.16 CONFIG) + +# if(NOT json-c_FOUND) +message(STATUS "json-c not found. looking with pkg-config") +find_package(PkgConfig REQUIRED) +pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) +add_library(json-c::json-c ALIAS PkgConfig::json-c) +# endif() target_link_libraries(${module_name} PRIVATE json-c::json-c)

1 0

git:6.0:f08adc56: cmake/json: Use CONFIG mode
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: f08adc567b19721b1bf515a2b1595fed28152177 URL: https://github.com/kamailio/kamailio/commit/f08adc567b19721b1bf515a2b1595fe… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:27:05Z cmake/json: Use CONFIG mode (cherry picked from commit 532744eebf1014939c4ccd9a6aa4e7d6fbb454ac) --- Modified: src/modules/json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/f08adc567b19721b1bf515a2b1595fe… Patch: https://github.com/kamailio/kamailio/commit/f08adc567b19721b1bf515a2b1595fe… --- diff --git a/src/modules/json/CMakeLists.txt b/src/modules/json/CMakeLists.txt index c4cbf81440c..72df4d390f5 100644 --- a/src/modules/json/CMakeLists.txt +++ b/src/modules/json/CMakeLists.txt @@ -2,7 +2,8 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(json-c QUIET) +find_package(json-c CONFIG) + if(NOT json-c_FOUND) message(STATUS "json-c not found. looking with pkg-config") find_package(PkgConfig REQUIRED)

1 0

git:6.0:5da84593: cmake: fix CPL definition
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 5da8459301f0a9d74b9c9b0f8e6e5890c194a8c2 URL: https://github.com/kamailio/kamailio/commit/5da8459301f0a9d74b9c9b0f8e6e589… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:21:36Z cmake: fix CPL definition (cherry picked from commit feb371852ea9b53a1dd95fec0db0943c5fb160ad) --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/5da8459301f0a9d74b9c9b0f8e6e589… Patch: https://github.com/kamailio/kamailio/commit/5da8459301f0a9d74b9c9b0f8e6e589… --- diff --git a/cmake/groups.cmake b/cmake/groups.cmake index 9cd7ddf77dc..73ef6d632dd 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -167,7 +167,7 @@ set(MOD_LIST_POSTGRES db_postgres) set(MOD_LIST_UNIXODBC db_unixodbc) # * modules depending on xml2 library -set(MOD_LIST_CPLC cplc) +set(MOD_LIST_CPL cplc) # * modules depending on xml2 library set(MOD_LIST_XMLDEPS xhttp_pi xmlrpc xmlops) @@ -385,7 +385,7 @@ set(MOD_LIST_ALL ${MOD_LIST_UNIXODBC} ${MOD_LIST_XMLDEPS} ${MOD_LIST_PERLDEPS} - ${MOD_LIST_CPLC} + ${MOD_LIST_CPL} ${MOD_LIST_XMPP} ${MOD_LIST_BERKELEY} ${MOD_LIST_UTILS}

1 0

git:6.0:7a174649: cmake/perl: Install files / Add perl user link and def options
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 7a17464946f8027e9d66497a44357d7f0eac64a2 URL: https://github.com/kamailio/kamailio/commit/7a17464946f8027e9d66497a44357d7… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:21:26Z cmake/perl: Install files / Add perl user link and def options - Fix perl extra_c_flags parsing by using SHELL: - Add user option PERL_LDOPTS to define extra ldopts - Add user option PERL_CCOPTS to define extra defs - Add new generated file to compilation - Add new target for sgml docs - Add install directives for perl libraries (cherry picked from commit f4d7e298bb351be5f12652083bd5e37109748169) --- Modified: src/modules/app_perl/CMakeLists.txt Modified: src/modules/db_perlvdb/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/7a17464946f8027e9d66497a44357d7… Patch: https://github.com/kamailio/kamailio/commit/7a17464946f8027e9d66497a44357d7…

1 0

git:6.0:3adaab6c: cmake: Install snmpstats files
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 3adaab6c56657bc73cd83e0b7bbcd158efb070c1 URL: https://github.com/kamailio/kamailio/commit/3adaab6c56657bc73cd83e0b7bbcd15… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:21:15Z cmake: Install snmpstats files (cherry picked from commit f69b22ce3cdc2c06739c11f19c9ebeb5eb1727f3) --- Modified: src/modules/snmpstats/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/3adaab6c56657bc73cd83e0b7bbcd15… Patch: https://github.com/kamailio/kamailio/commit/3adaab6c56657bc73cd83e0b7bbcd15… --- diff --git a/src/modules/snmpstats/CMakeLists.txt b/src/modules/snmpstats/CMakeLists.txt index fa3980030db..ac416979da7 100644 --- a/src/modules/snmpstats/CMakeLists.txt +++ b/src/modules/snmpstats/CMakeLists.txt @@ -7,3 +7,8 @@ find_package(NETSNMP REQUIRED) # TODO: Compiles fine but need to do some more verifcation target_link_libraries(${module_name} PRIVATE NETSNMP::NETSNMP) + +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mibs + DESTINATION ${CMAKE_INSTALL_DATADIR}/snmp/ + OPTIONAL)

1 0

git:6.0:e4e66928: cmake: Fix naming to be clear we want the CLIENT version
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: e4e669286264cc7e7ce6aab92c68a486311de708 URL: https://github.com/kamailio/kamailio/commit/e4e669286264cc7e7ce6aab92c68a48… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:21:04Z cmake: Fix naming to be clear we want the CLIENT version (cherry picked from commit 640bd4fb7529ad8b0a9415775679dca5e64c52be) --- Added: cmake/modules/FindLibfreeradiusClient.cmake Modified: cmake/modules/FindRadius.cmake Removed: cmake/modules/FindLibfreeradius.cmake --- Diff: https://github.com/kamailio/kamailio/commit/e4e669286264cc7e7ce6aab92c68a48… Patch: https://github.com/kamailio/kamailio/commit/e4e669286264cc7e7ce6aab92c68a48…

1 0

git:6.0:5ce31280: cmake: Fix typo
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 5ce31280e1c4988408b4b77833947ae0cece4c83 URL: https://github.com/kamailio/kamailio/commit/5ce31280e1c4988408b4b77833947ae… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:20:56Z cmake: Fix typo (cherry picked from commit 8d1b60bc7f21fe9d0fadd1df926fee931966f34e) --- Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/5ce31280e1c4988408b4b77833947ae… Patch: https://github.com/kamailio/kamailio/commit/5ce31280e1c4988408b4b77833947ae… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index 10ef2cf9db8..ca8a4f20660 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -264,7 +264,7 @@ else() dbschema_${db_name} COMMAND ${CMAKE_COMMAND} -E make_directory "${db_name_folder}" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Creating scehmas for ${db_name}") + COMMENT "Creating schemas for ${db_name}") # Loop through each table and add a command for xsltproc foreach(table ${EXTRACTED_TABLES})

1 0

git:6.0:ff20204c: cmake/sctp: Search for libsctp and error if not found
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: ff20204c0163d56964036bdfba5d9325cd74c90e URL: https://github.com/kamailio/kamailio/commit/ff20204c0163d56964036bdfba5d932… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:20:22Z cmake/sctp: Search for libsctp and error if not found (cherry picked from commit 9b7719a61ab02c93939e3681cb90e9fa04f3ac5d) --- Modified: src/modules/sctp/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/ff20204c0163d56964036bdfba5d932… Patch: https://github.com/kamailio/kamailio/commit/ff20204c0163d56964036bdfba5d932… --- diff --git a/src/modules/sctp/CMakeLists.txt b/src/modules/sctp/CMakeLists.txt index 5d8cb523a49..22e51fd7c08 100644 --- a/src/modules/sctp/CMakeLists.txt +++ b/src/modules/sctp/CMakeLists.txt @@ -2,6 +2,23 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) +# TODO: find include file required +find_path( + SCTP_INCLUDE_DIR + NAMES sctp.h + PATHS /usr/include /usr/local/include /usr/include/netinet) + +if(NOT SCTP_INCLUDE_DIR) + message(FATAL_ERROR "sctp.h not found. maybe missing libsctp-dev?") +endif() + +target_include_directories(${module_name} PRIVATE ${SCTP_INCLUDE_DIR}) + +find_library( + SCTP_LIBRARY + NAMES sctp + PATHS /usr/lib /usr/local/lib) + if(UNIX) - target_link_libraries(${module_name} PRIVATE -lsctp) + target_link_libraries(${module_name} PRIVATE ${SCTP_LIBRARY}) endif()

1 0

git:6.0:aef5f6c4: cmake: Link with correct Erlang target
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: aef5f6c422981a36a1eac3d93079d8aa930c3810 URL: https://github.com/kamailio/kamailio/commit/aef5f6c422981a36a1eac3d93079d8a… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:20:12Z cmake: Link with correct Erlang target (cherry picked from commit 2dbd3d47cdbd55365fcb37b48a30c3224b8af810) --- Modified: src/modules/erlang/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/aef5f6c422981a36a1eac3d93079d8a… Patch: https://github.com/kamailio/kamailio/commit/aef5f6c422981a36a1eac3d93079d8a… --- diff --git a/src/modules/erlang/CMakeLists.txt b/src/modules/erlang/CMakeLists.txt index 16c4be64bfd..db92655b497 100644 --- a/src/modules/erlang/CMakeLists.txt +++ b/src/modules/erlang/CMakeLists.txt @@ -5,4 +5,6 @@ add_library(${module_name} SHARED ${MODULE_SOURCES}) # erlang-dev find_package(Erlang REQUIRED) -target_link_libraries(${module_name} PRIVATE Erlang::EI) +target_link_libraries(${module_name} PRIVATE Erlang::Erlang) +target_include_directories(${module_name} PRIVATE ${Erlang_INCLUDE_DIRS}) +target_compile_definitions(${module_name} PRIVATE _REENTRANT)

1 0

git:6.0:fa54a06f: cmake/Radius: Add libfreeradius support
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: fa54a06f165f7d6a0c49a8653f2ed71fe775dbc4 URL: https://github.com/kamailio/kamailio/commit/fa54a06f165f7d6a0c49a8653f2ed71… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:19:58Z cmake/Radius: Add libfreeradius support - Add libfreeradius.cmake to search for libfreeradius-client - Link modules with correct libraries paths - Fix description (cherry picked from commit 53bd567dd7444a8145aa876d82db2c6b579a7e19) --- Added: cmake/modules/FindLibfreeradius.cmake Modified: cmake/modules/FindRadius.cmake Modified: src/modules/acc_radius/CMakeLists.txt Modified: src/modules/auth_radius/CMakeLists.txt Modified: src/modules/misc_radius/CMakeLists.txt Modified: src/modules/peering/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/fa54a06f165f7d6a0c49a8653f2ed71… Patch: https://github.com/kamailio/kamailio/commit/fa54a06f165f7d6a0c49a8653f2ed71…

1 0

git:master:8ebae54c: cmake: Use pkg-config instead for json-c dev package.
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 8ebae54cff261b95fcece3be3719da511cc35084 URL: https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da5… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-29T10:07:24Z cmake: Use pkg-config instead for json-c dev package. --- Modified: src/modules/nsq/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da5… Patch: https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da5… --- diff --git a/src/modules/nsq/CMakeLists.txt b/src/modules/nsq/CMakeLists.txt index b4a482c2a47..e6acfa9a2f7 100644 --- a/src/modules/nsq/CMakeLists.txt +++ b/src/modules/nsq/CMakeLists.txt @@ -4,13 +4,19 @@ add_library(${module_name} SHARED ${MODULE_SOURCES}) find_package(Libev REQUIRED) -find_package(json-c QUIET) -if(NOT json-c_FOUND) - message(STATUS "json-c not found. looking with pkg-config") - find_package(PkgConfig REQUIRED) - pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) - add_library(json-c::json-c ALIAS PkgConfig::json-c) -endif() +# TODO: When we have a proper cmake config file for json-c for most OS, we can +# use that instead of pkg-config. +# json-c v 0.14 and 0.15 have wrong include directories in their cmake config +# files. uncomment the following line when we have a proper cmake config file +# for json-c for most OS. +# find_package(json-c 0.16 CONFIG) + +# if(NOT json-c_FOUND) +# message(STATUS "json-c not found. looking with pkg-config") +find_package(PkgConfig REQUIRED) +pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) +add_library(json-c::json-c ALIAS PkgConfig::json-c) +# endif() find_package(CURL REQUIRED)

1 0

git:master:e7f9531a: cmake: Use pkg-config instead for json-c dev package.
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: e7f9531adc6f319b6889d5644eb55a9cccfdd27d URL: https://github.com/kamailio/kamailio/commit/e7f9531adc6f319b6889d5644eb55a9… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-29T10:03:55Z cmake: Use pkg-config instead for json-c dev package. --- Modified: src/modules/json/CMakeLists.txt Modified: src/modules/jsonrpcc/CMakeLists.txt Modified: src/modules/kazoo/CMakeLists.txt Modified: src/modules/pua_json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/e7f9531adc6f319b6889d5644eb55a9… Patch: https://github.com/kamailio/kamailio/commit/e7f9531adc6f319b6889d5644eb55a9…

1 0

git:6.0:620eb2f0: kamctl: regenerated db creation files
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 620eb2f029c74006200d19dae1450e7735e3ec2e URL: https://github.com/kamailio/kamailio/commit/620eb2f029c74006200d19dae1450e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:34:25+01:00 kamctl: regenerated db creation files --- Modified: utils/kamctl/db_berkeley/kamailio/contact Modified: utils/kamctl/db_berkeley/kamailio/impu Modified: utils/kamctl/db_berkeley/kamailio/impu_contact Modified: utils/kamctl/db_berkeley/kamailio/impu_subscriber Modified: utils/kamctl/db_berkeley/kamailio/ro_session Modified: utils/kamctl/db_berkeley/kamailio/subscriber_scscf Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/ims_charging-create.sql Modified: utils/kamctl/db_sqlite/ims_usrloc_scscf-create.sql Modified: utils/kamctl/dbtext/kamailio/contact Modified: utils/kamctl/dbtext/kamailio/impu Modified: utils/kamctl/dbtext/kamailio/impu_contact Modified: utils/kamctl/dbtext/kamailio/impu_subscriber Modified: utils/kamctl/dbtext/kamailio/pcscf_location Modified: utils/kamctl/dbtext/kamailio/ro_session Modified: utils/kamctl/dbtext/kamailio/subscriber_scscf Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/contact.json Modified: utils/kamctl/mongodb/kamailio/impu.json Modified: utils/kamctl/mongodb/kamailio/impu_contact.json Modified: utils/kamctl/mongodb/kamailio/impu_subscriber.json Modified: utils/kamctl/mongodb/kamailio/ro_session.json Modified: utils/kamctl/mongodb/kamailio/subscriber_scscf.json Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/ims_charging-create.sql Modified: utils/kamctl/mysql/ims_usrloc_scscf-create.sql Modified: utils/kamctl/oracle/ims_charging-create.sql Modified: utils/kamctl/oracle/ims_usrloc_scscf-create.sql Modified: utils/kamctl/postgres/ims_charging-create.sql Modified: utils/kamctl/postgres/ims_usrloc_scscf-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/620eb2f029c74006200d19dae1450e7… Patch: https://github.com/kamailio/kamailio/commit/620eb2f029c74006200d19dae1450e7…

1 0

git:6.0:ddd98b09: janssonrpcc: fixed warning var may be used uninitialized
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: ddd98b09c80dc0d15af080e37961b59ecde17689 URL: https://github.com/kamailio/kamailio/commit/ddd98b09c80dc0d15af080e37961b59… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:32:01+01:00 janssonrpcc: fixed warning var may be used uninitialized (cherry picked from commit 3039c02404e05da05a031f6ccf68913a8c1c80eb) --- Modified: src/modules/janssonrpcc/janssonrpc_server.c --- Diff: https://github.com/kamailio/kamailio/commit/ddd98b09c80dc0d15af080e37961b59… Patch: https://github.com/kamailio/kamailio/commit/ddd98b09c80dc0d15af080e37961b59… --- diff --git a/src/modules/janssonrpcc/janssonrpc_server.c b/src/modules/janssonrpcc/janssonrpc_server.c index 3fb4d7c624f..5a98a6fc1f9 100644 --- a/src/modules/janssonrpcc/janssonrpc_server.c +++ b/src/modules/janssonrpcc/janssonrpc_server.c @@ -130,6 +130,7 @@ int jsonrpc_parse_server(char *server_s, jsonrpc_server_group_t **group_ptr) param_t *pit = NULL; param_t *freeme = NULL; str conn; + conn.s = NULL; str addr; addr.s = NULL; str srv;

1 0

git:6.0:01429a85: core: tcp_main - include local dst port in conn lookup when using haproxy
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 01429a85381a1d9ad96ce678285358b0ecfe48a1 URL: https://github.com/kamailio/kamailio/commit/01429a85381a1d9ad96ce678285358b… Author: Alexander Bakker <ab(a)alexbakker.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:54+01:00 core: tcp_main - include local dst port in conn lookup when using haproxy (cherry picked from commit 9c109f3a371445e03defde279912fbb4179244bd) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/01429a85381a1d9ad96ce678285358b… Patch: https://github.com/kamailio/kamailio/commit/01429a85381a1d9ad96ce678285358b… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e0238fe090b..391255cab9d 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1745,7 +1745,8 @@ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, print_ip("ip=", &a->parent->rcv.src_ip, "\n"); #endif if((a->parent->state != S_CONN_BAD) && (port == a->port) - && ((l_port == 0) || (l_port == a->parent->rcv.dst_port)) + && ((l_port == 0) || (l_port == a->parent->rcv.dst_port) + || (l_port == a->parent->cinfo.dst_port)) && (ip_addr_cmp(ip, &a->parent->rcv.src_ip)) && (is_local_ip_any || ip_addr_cmp(l_ip, &a->parent->rcv.dst_ip)

1 0

git:6.0:60c9bafc: outbound: encode bind address into flow token as destination
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 60c9bafc287bfabe7860b389197e8801e26a6bfb URL: https://github.com/kamailio/kamailio/commit/60c9bafc287bfabe7860b389197e880… Author: Alexander Bakker <ab(a)alexbakker.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:48+01:00 outbound: encode bind address into flow token as destination This is an attempt to fix the combination of the outbound/rr modules and ``tcp_accept_haproxy=yes``. This combination is currently broken, as previously reported on the mailing list: https://www.mail-archive.com/sr-users@lists.kamailio.org/msg21854.html The issue is that the destination address/port combo of the haproxy side is encoded into the flow token. When the rr module decodes the flow token and tries to look up the listening socket using ``find_si``, it cannot be found, because it is given the destination address/port combo of the connection of the haproxy side, not the address/port combo that Kamailio is actually listening on. This patch fixes the issue by encoding the ``bind_address`` of the socket the connection was received on into the flow token as the destination address. The source address remains unchanged, as it *can* be used to look up the TCP connection (with a minor patch to ``_tcpconn_find`` in ``tcp_main.c``) (cherry picked from commit b918e09e9c3e06bddfd7a205f64abb603d589f1c) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/60c9bafc287bfabe7860b389197e880… Patch: https://github.com/kamailio/kamailio/commit/60c9bafc287bfabe7860b389197e880… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index f2e0c7dbc3d..a5f17e4ef99 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -180,15 +180,25 @@ int encode_flow_token(str *flow_token, struct receive_info *rcv) return -1; } + /* By encoding the bind address into the flow token as the destination + address, we make sure that we'll still be able to find the socket when + decoding it even if there's an haproxy in front */ + struct ip_addr dst_ip = rcv->dst_ip; + unsigned short dst_port = rcv->dst_port; + if(rcv->bind_address) { + dst_ip = rcv->bind_address->address; + dst_port = rcv->bind_address->port_no; + } + /* Encode protocol information */ unenc_flow_token[pos++] = - (rcv->dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv->proto; + (dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv->proto; /* Encode destination address */ - for(i = 0; i < (rcv->dst_ip.af == AF_INET6 ? 16 : 4); i++) - unenc_flow_token[pos++] = rcv->dst_ip.u.addr[i]; - unenc_flow_token[pos++] = (rcv->dst_port >> 8) & 0xff; - unenc_flow_token[pos++] = rcv->dst_port & 0xff; + for(i = 0; i < (dst_ip.af == AF_INET6 ? 16 : 4); i++) + unenc_flow_token[pos++] = dst_ip.u.addr[i]; + unenc_flow_token[pos++] = (dst_port >> 8) & 0xff; + unenc_flow_token[pos++] = dst_port & 0xff; /* Encode source address */ for(i = 0; i < (rcv->src_ip.af == AF_INET6 ? 16 : 4); i++)

1 0

git:6.0:af3d036f: main: Print open file limits
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: af3d036fbc6ca41be61b79bb6e22ac72266234ea URL: https://github.com/kamailio/kamailio/commit/af3d036fbc6ca41be61b79bb6e22ac7… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:42+01:00 main: Print open file limits (cherry picked from commit 4a335848f1b2b1e685891258803d1acd5540710d) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/af3d036fbc6ca41be61b79bb6e22ac7… Patch: https://github.com/kamailio/kamailio/commit/af3d036fbc6ca41be61b79bb6e22ac7… --- diff --git a/src/main.c b/src/main.c index 9e315285998..a29857757bc 100644 --- a/src/main.c +++ b/src/main.c @@ -59,6 +59,7 @@ #include <sys/utsname.h> #include <sys/stat.h> #include <sys/mman.h> +#include <sys/resource.h> /* getrlimit */ #include <fcntl.h> #include <sys/time.h> #include <sys/wait.h> @@ -2209,6 +2210,7 @@ int main(int argc, char **argv) char *tbuf_tmp; struct stat st = {0}; long l1 = 0; + struct rlimit lim; int option_index = 0; @@ -3310,7 +3312,16 @@ int main(int argc, char **argv) fprintf(stderr, "ERROR: error could not increase file limits\n"); goto error; } + } else { + if(getrlimit(RLIMIT_NOFILE, &lim) < 0) { + LM_CRIT("cannot get the maximum number of file descriptors: %s\n", + strerror(errno)); + goto error; + } + LM_INFO("current open file limits [soft/hard]: [%lu/%lu]\n", + (unsigned long)lim.rlim_cur, (unsigned long)lim.rlim_max); } + if(mlock_pages) mem_lock_pages();

1 0

git:6.0:5f2c7c7a: ims_registrar_scscf: set contact to presentity URI in 200OK for SUBSCRIBE to reg events
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 5f2c7c7a958d010afd303a4feb95241aefd31dca URL: https://github.com/kamailio/kamailio/commit/5f2c7c7a958d010afd303a4feb95241… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:33+01:00 ims_registrar_scscf: set contact to presentity URI in 200OK for SUBSCRIBE to reg events (cherry picked from commit 75af5c3d8b14a0b17d34c416f2dfc0df6c3ff6f8) --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/5f2c7c7a958d010afd303a4feb95241… Patch: https://github.com/kamailio/kamailio/commit/5f2c7c7a958d010afd303a4feb95241… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index bcddbf17cc2..b1af5189a8d 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -1376,7 +1376,7 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) ret = CSCF_RETURN_TRUE; LM_DBG("Sending 200 OK to subscribing user\n"); subscribe_reply( - msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, &scscf_name_str); + msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, &presentity_uri); if(event_type == IMS_REGISTRAR_SUBSCRIBE || event_type == IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE) { @@ -1427,7 +1427,7 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) ret = CSCF_RETURN_TRUE; LM_DBG("Sending 200 OK to subscribing user\n"); subscribe_reply( - msg, 200, MSG_REG_UNSUBSCRIBE_OK, &expires, &scscf_name_str); + msg, 200, MSG_REG_UNSUBSCRIBE_OK, &expires, &presentity_uri); } doneorerror:

1 0

git:6.0:225f23a0: ims_registrar_scscf: send NOTIFY in case of subsequent SUBSCRIBE as per RFC 3265
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 225f23a03a2941d44cbb1b56d0d95adcc3f78004 URL: https://github.com/kamailio/kamailio/commit/225f23a03a2941d44cbb1b56d0d95ad… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:27+01:00 ims_registrar_scscf: send NOTIFY in case of subsequent SUBSCRIBE as per RFC 3265 (cherry picked from commit 7de4f84f08e4ce910c007aad3fa2cadbe4b11dd2) --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/225f23a03a2941d44cbb1b56d0d95ad… Patch: https://github.com/kamailio/kamailio/commit/225f23a03a2941d44cbb1b56d0d95ad… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index aade763a09a..bcddbf17cc2 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -497,13 +497,15 @@ int event_reg(udomain_t *_d, impurecord_t *r_passed, ucontact_t *c_passed, case IMS_REGISTRAR_NONE: return 0; case IMS_REGISTRAR_SUBSCRIBE: + case IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE: if(r_passed || !presentity_uri || !watcher_contact || !_d) { LM_ERR("this is a subscribe called from cfg file: r_passed be " "zero and presentity_uri, watcher_contact and _d should " "be valid for a subscribe"); return 0; } - LM_DBG("Event type is IMS REGISTRAR SUBSCRIBE about to get " + LM_DBG("Event type is IMS REGISTRAR SUBSCRIBE/RE-SUBSCRIBE about " + "to get " "reginfo_full\n"); //lets get IMPU list for presentity as well as register for callbacks (IFF it is a new SUBSCRIBE) @@ -1376,8 +1378,8 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) subscribe_reply( msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, &scscf_name_str); - if(event_type == IMS_REGISTRAR_SUBSCRIBE) { - //do reg event only for the initial subscribe + if(event_type == IMS_REGISTRAR_SUBSCRIBE + || event_type == IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE) { if(event_reg(domain, 0, 0, event_type, &presentity_uri, &watcher_contact, 0, 0, 0) != 0) { @@ -1723,7 +1725,8 @@ void create_notifications(udomain_t *_t, impurecord_t *r_passed, } //This is a fix to ensure that when a user subscribes a full reg info is only sent to that UE - if(event_type == IMS_REGISTRAR_SUBSCRIBE) { + if(event_type == IMS_REGISTRAR_SUBSCRIBE + || event_type == IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE) { if(contact_match(watcher_contact, &s->watcher_contact) && (presentity_uri->len == s->presentity_uri.len) && (memcmp(s->presentity_uri.s, presentity_uri->s,

1 0

git:6.0:1e362f2b: tcp: fix for local TCP/TLS socket matching with 'tcp_reuse_port' enabled
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 1e362f2ba51c6ee9a9e005675a30202e42ceb3a7 URL: https://github.com/kamailio/kamailio/commit/1e362f2ba51c6ee9a9e005675a30202… Author: pinacolada1610 <starinchikova(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T10:31:19+01:00 tcp: fix for local TCP/TLS socket matching with 'tcp_reuse_port' enabled - Changed the logic for matching a listening TCP/TLS-socket in tcp_reuse_port scenario, now it considers local port as well. With 'tcp_reuse_port' option enabled, the local port is meaningful and helps to differenciate between sockets on the same IP but different ports. (cherry picked from commit 0cb6e35d581398d2c5a7086a0d98b113fbb16138) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/1e362f2ba51c6ee9a9e005675a30202… Patch: https://github.com/kamailio/kamailio/commit/1e362f2ba51c6ee9a9e005675a30202… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index bc1327204e8..e0238fe090b 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1332,6 +1332,7 @@ inline static int tcp_do_connect(union sockaddr_union *server, union sockaddr_union my_name; socklen_t my_name_len; struct ip_addr ip; + unsigned short port; #ifdef TCP_ASYNC int n; #endif /* TCP_ASYNC */ @@ -1437,14 +1438,19 @@ inline static int tcp_do_connect(union sockaddr_union *server, from = &my_name; /* update from with the real "from" address */ su2ip_addr(&ip, &my_name); find_socket: +#ifdef SO_REUSEPORT + port = cfg_get(tcp, tcp_cfg, reuse_port) ? su_getport(from) : 0; +#else + port = 0; +#endif #ifdef USE_TLS if(unlikely(type == PROTO_TLS)) { - *res_si = find_si(&ip, 0, PROTO_TLS); + *res_si = find_si(&ip, port, PROTO_TLS); } else { - *res_si = find_si(&ip, 0, PROTO_TCP); + *res_si = find_si(&ip, port, PROTO_TCP); } #else - *res_si = find_si(&ip, 0, PROTO_TCP); + *res_si = find_si(&ip, port, PROTO_TCP); #endif if(unlikely(*res_si == 0)) {

1 0

git:6.0:dec19b9d: github: set 6.0 for devcontainer [skip ci]
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: dec19b9d4a2f4cedf31b0f8661add77761d85036 URL: https://github.com/kamailio/kamailio/commit/dec19b9d4a2f4cedf31b0f8661add77… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T10:14:52+01:00 github: set 6.0 for devcontainer [skip ci] --- Modified: .devcontainer/devcontainer.json --- Diff: https://github.com/kamailio/kamailio/commit/dec19b9d4a2f4cedf31b0f8661add77… Patch: https://github.com/kamailio/kamailio/commit/dec19b9d4a2f4cedf31b0f8661add77… --- diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2a307c79e3e..947a7ec9a5e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,7 +4,7 @@ */ "name": "Debian", "build": { - "cacheFrom": "ghcr.io/kamailio/kamailio-master-devcontainer", + "cacheFrom": "ghcr.io/kamailio/kamailio-6.0-devcontainer", "context": "../pkg/kamailio/deb", "dockerfile": "Dockerfile" },

1 0

[kamailio/kamailio] outbound: encode bind address into flow token as destination (PR #4105)
by Alexander Bakker 29 Jan '25

29 Jan '25

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This is an attempt to fix the combination of the outbound/rr modules and ``tcp_accept_haproxy=yes``. This combination is currently broken, as previously reported on the mailing list: https://www.mail-archive.com/sr-users@lists.kamailio.org/msg21854.html The issue is that the destination address/port combo of the haproxy side is encoded into the flow token. When the rr module decodes the flow token and tries to look up the listening socket using ``find_si``, it cannot be found, because it is given the destination address/port combo of the connection of the haproxy side, not the address/port combo that Kamailio is actually listening on. This patch fixes the issue by encoding the ``bind_address`` of the socket the connection was received on into the flow token as the destination address. The source address remains unchanged, as it *can* be used to look up the TCP connection (with a minor patch to ``_tcpconn_find`` in ``tcp_main.c``) While I've done quite a bit of testing with this patchset, I find it difficult to oversee the full impact of this change in Kamailio's large codebase. Any feedback is welcome. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4105 -- Commit Summary -- * outbound: encode bind address into flow token as destination * core: tcp_main - include local dst port in conn lookup when using haproxy -- File Changes -- M src/core/tcp_main.c (3) M src/modules/outbound/outbound_mod.c (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4105.patch https://github.com/kamailio/kamailio/pull/4105.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4105 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4105(a)github.com>

3 5

[kamailio/kamailio] janssonrpcc: fixed warning var may be used uninitialized (PR #4129)
by sergey-safarov 29 Jan '25

29 Jan '25

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description On CentOS, the present build error var may be used uninitialized. This fixes this. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4129 -- Commit Summary -- * janssonrpcc: fixed warning var may be used uninitialized -- File Changes -- M src/modules/janssonrpcc/janssonrpc_server.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4129.patch https://github.com/kamailio/kamailio/pull/4129.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4129 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4129(a)github.com>

2 1

git:master:3039c024: janssonrpcc: fixed warning var may be used uninitialized
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 3039c02404e05da05a031f6ccf68913a8c1c80eb URL: https://github.com/kamailio/kamailio/commit/3039c02404e05da05a031f6ccf68913… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T09:15:04+01:00 janssonrpcc: fixed warning var may be used uninitialized --- Modified: src/modules/janssonrpcc/janssonrpc_server.c --- Diff: https://github.com/kamailio/kamailio/commit/3039c02404e05da05a031f6ccf68913… Patch: https://github.com/kamailio/kamailio/commit/3039c02404e05da05a031f6ccf68913… --- diff --git a/src/modules/janssonrpcc/janssonrpc_server.c b/src/modules/janssonrpcc/janssonrpc_server.c index 3fb4d7c624f..5a98a6fc1f9 100644 --- a/src/modules/janssonrpcc/janssonrpc_server.c +++ b/src/modules/janssonrpcc/janssonrpc_server.c @@ -130,6 +130,7 @@ int jsonrpc_parse_server(char *server_s, jsonrpc_server_group_t **group_ptr) param_t *pit = NULL; param_t *freeme = NULL; str conn; + conn.s = NULL; str addr; addr.s = NULL; str srv;

1 0

[kamailio/kamailio] UB: Kamailio 5.8.2 - Transformations + Psuedo Variables + Topos (Issue #4127)
by Brandon Armstead 29 Jan '25

29 Jan '25

### Description Unexpected Behavior from transformations, psuedo variables, and topos. Topos is in use for topology hiding I'm not sure if this is part of the problem as I can't easily test this in the current environment, although I do know indexes should work with $hdr() psuedo variables. *Issue 1* ``` Record-Route: <sip:a@a.com>,<sip:b@b.com>,<sip:c@c.com> $(hdr(Record-Route)[0]) results in "<sip:a@a.com>,<sip:b@b.com>,<sip:c@c.com>" ``` Expected result would be <sip:a@a.com> I've also tested using index 1 incase 0 was equivalent to *, same results. Which lead me to the second issue. *issue 2* ``` Correct: $(hdr(Record-Route)[*]) results in <sip:a@a.com>,<sip:b@b.com>,<sip:c@c.com> Correct: $(hdr(Record-Route)[*]{re.subst,/,/|/g}) results in <sip:a@a.com>|<sip:b@b.com>|<sip:c@c.com> Incorrect: $(hdr(Record-Route)[*]{re.subst,/,/|/g}{param.valueat,0,|}) results in some random string pulled from part of the Record-Route header ``` Expected result would be <sip:a@a.com> ### Possible Solutions TBD ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 10.2.1 ``` * **Operating System**: ``` Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4127 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4127(a)github.com>

2 2

git:6.0:489b46bd: pkg/kamailio/deb: version set 6.0.0
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 489b46bd9ffaa8a9e6fed5281f7df250cf1ad777 URL: https://github.com/kamailio/kamailio/commit/489b46bd9ffaa8a9e6fed5281f7df25… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T09:07:06+01:00 pkg/kamailio/deb: version set 6.0.0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/noble/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/489b46bd9ffaa8a9e6fed5281f7df25… Patch: https://github.com/kamailio/kamailio/commit/489b46bd9ffaa8a9e6fed5281f7df25…

1 0

Releasing v5.8.5
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Hello, I am considering to release Kamailio v5.8.5 (out of branch 5.8) on Thursday, Jan 23, 2025. If anyone is aware of issues not yet on the bug tracker, report them there asap in order to have a better chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

1 2

git:6.0:ce5cbf12: kamctl: regenerated db creation files
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: ce5cbf1263e38e51973d2515b047f2213a8f6039 URL: https://github.com/kamailio/kamailio/commit/ce5cbf1263e38e51973d2515b047f22… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T09:01:46+01:00 kamctl: regenerated db creation files --- Added: utils/kamctl/db_berkeley/kamailio/contact Added: utils/kamctl/db_berkeley/kamailio/impu Added: utils/kamctl/db_berkeley/kamailio/impu_contact Added: utils/kamctl/db_berkeley/kamailio/impu_subscriber Added: utils/kamctl/db_berkeley/kamailio/ro_session Added: utils/kamctl/db_berkeley/kamailio/subscriber_scscf Added: utils/kamctl/db_redis/kamailio/contact Added: utils/kamctl/db_redis/kamailio/impu Added: utils/kamctl/db_redis/kamailio/impu_contact Added: utils/kamctl/db_redis/kamailio/impu_subscriber Added: utils/kamctl/db_redis/kamailio/ro_session Added: utils/kamctl/db_redis/kamailio/subscriber_scscf Added: utils/kamctl/db_sqlite/ims_charging-create.sql Added: utils/kamctl/db_sqlite/ims_usrloc_scscf-create.sql Added: utils/kamctl/dbtext/kamailio/contact Added: utils/kamctl/dbtext/kamailio/impu Added: utils/kamctl/dbtext/kamailio/impu_contact Added: utils/kamctl/dbtext/kamailio/impu_subscriber Added: utils/kamctl/dbtext/kamailio/ro_session Added: utils/kamctl/dbtext/kamailio/subscriber_scscf Added: utils/kamctl/mongodb/kamailio/contact.json Added: utils/kamctl/mongodb/kamailio/impu.json Added: utils/kamctl/mongodb/kamailio/impu_contact.json Added: utils/kamctl/mongodb/kamailio/impu_subscriber.json Added: utils/kamctl/mongodb/kamailio/ro_session.json Added: utils/kamctl/mongodb/kamailio/subscriber_scscf.json Added: utils/kamctl/oracle/ims_charging-create.sql Added: utils/kamctl/oracle/ims_usrloc_scscf-create.sql Added: utils/kamctl/postgres/ims_charging-create.sql Added: utils/kamctl/postgres/ims_usrloc_scscf-create.sql Added: utils/kamctl/xhttp_pi/ims_charging-mod Added: utils/kamctl/xhttp_pi/ims_charging-table Added: utils/kamctl/xhttp_pi/ims_usrloc_scscf-mod Added: utils/kamctl/xhttp_pi/ims_usrloc_scscf-table Modified: utils/kamctl/db_berkeley/kamailio/pcscf_location Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/dbtext/kamailio/pcscf_location Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/ims_charging-create.sql Modified: utils/kamctl/mysql/ims_usrloc_scscf-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/ce5cbf1263e38e51973d2515b047f22… Patch: https://github.com/kamailio/kamailio/commit/ce5cbf1263e38e51973d2515b047f22…

1 0

git:6.0:d407132a: lib/srdb1/schema: ims_usrloc_scscf definitions
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: d407132aa0accd93f58b7da1b6fdc2cf91b340db URL: https://github.com/kamailio/kamailio/commit/d407132aa0accd93f58b7da1b6fdc2c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T09:00:53+01:00 lib/srdb1/schema: ims_usrloc_scscf definitions related #4100 (cherry picked from commit 283a77887c88c38a240567a7b165478775662d81) --- Added: src/lib/srdb1/schema/contact.xml Added: src/lib/srdb1/schema/impu.xml Added: src/lib/srdb1/schema/impu_contact.xml Added: src/lib/srdb1/schema/impu_subscriber.xml Added: src/lib/srdb1/schema/kamailio-ims_usrloc_scscf.xml Added: src/lib/srdb1/schema/subscriber_scscf.xml --- Diff: https://github.com/kamailio/kamailio/commit/d407132aa0accd93f58b7da1b6fdc2c… Patch: https://github.com/kamailio/kamailio/commit/d407132aa0accd93f58b7da1b6fdc2c…

1 0

git:6.0:0fbaf456: lib/srdb1/schema: ims_charging definitions
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 0fbaf4567973f84721b7e25074b61374e657b34a URL: https://github.com/kamailio/kamailio/commit/0fbaf4567973f84721b7e25074b6137… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T09:00:53+01:00 lib/srdb1/schema: ims_charging definitions related #4100 (cherry picked from commit 48683f3798683a508fc456bcde11a8e59a8a64de) --- Added: src/lib/srdb1/schema/kamailio-ims_charging.xml Added: src/lib/srdb1/schema/ro_session.xml --- Diff: https://github.com/kamailio/kamailio/commit/0fbaf4567973f84721b7e25074b6137… Patch: https://github.com/kamailio/kamailio/commit/0fbaf4567973f84721b7e25074b6137…

1 0

git:master:d9b5f9e0: kamctl: regenerated db creation files
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: d9b5f9e0873092c2dcb59670513a9f69a7b40d15 URL: https://github.com/kamailio/kamailio/commit/d9b5f9e0873092c2dcb59670513a9f6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T08:52:15+01:00 kamctl: regenerated db creation files --- Added: utils/kamctl/db_berkeley/kamailio/contact Added: utils/kamctl/db_berkeley/kamailio/impu Added: utils/kamctl/db_berkeley/kamailio/impu_contact Added: utils/kamctl/db_berkeley/kamailio/impu_subscriber Added: utils/kamctl/db_berkeley/kamailio/ro_session Added: utils/kamctl/db_berkeley/kamailio/subscriber_scscf Added: utils/kamctl/db_redis/kamailio/contact Added: utils/kamctl/db_redis/kamailio/impu Added: utils/kamctl/db_redis/kamailio/impu_contact Added: utils/kamctl/db_redis/kamailio/impu_subscriber Added: utils/kamctl/db_redis/kamailio/ro_session Added: utils/kamctl/db_redis/kamailio/subscriber_scscf Added: utils/kamctl/db_sqlite/ims_charging-create.sql Added: utils/kamctl/db_sqlite/ims_usrloc_scscf-create.sql Added: utils/kamctl/dbtext/kamailio/contact Added: utils/kamctl/dbtext/kamailio/impu Added: utils/kamctl/dbtext/kamailio/impu_contact Added: utils/kamctl/dbtext/kamailio/impu_subscriber Added: utils/kamctl/dbtext/kamailio/ro_session Added: utils/kamctl/dbtext/kamailio/subscriber_scscf Added: utils/kamctl/mongodb/kamailio/contact.json Added: utils/kamctl/mongodb/kamailio/impu.json Added: utils/kamctl/mongodb/kamailio/impu_contact.json Added: utils/kamctl/mongodb/kamailio/impu_subscriber.json Added: utils/kamctl/mongodb/kamailio/ro_session.json Added: utils/kamctl/mongodb/kamailio/subscriber_scscf.json Added: utils/kamctl/oracle/ims_charging-create.sql Added: utils/kamctl/oracle/ims_usrloc_scscf-create.sql Added: utils/kamctl/postgres/ims_charging-create.sql Added: utils/kamctl/postgres/ims_usrloc_scscf-create.sql Added: utils/kamctl/xhttp_pi/ims_charging-mod Added: utils/kamctl/xhttp_pi/ims_charging-table Added: utils/kamctl/xhttp_pi/ims_usrloc_scscf-mod Added: utils/kamctl/xhttp_pi/ims_usrloc_scscf-table Modified: utils/kamctl/db_berkeley/kamailio/pcscf_location Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/dbtext/kamailio/pcscf_location Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/ims_charging-create.sql Modified: utils/kamctl/mysql/ims_usrloc_scscf-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/d9b5f9e0873092c2dcb59670513a9f6… Patch: https://github.com/kamailio/kamailio/commit/d9b5f9e0873092c2dcb59670513a9f6…

1 0

[kamailio/kamailio] lib/srdb1/schema: ims_usrloc_scscf definitions (PR #4110)
by Victor Seva 29 Jan '25

29 Jan '25

#### 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 - [x] Related to issue #4100 #### Description add ims_usrloc_scscf definitions You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4110 -- Commit Summary -- * lib/srdb1/schema: ims_usrloc_scscf definitions -- File Changes -- A src/lib/srdb1/schema/contact.xml (100) A src/lib/srdb1/schema/impu.xml (99) A src/lib/srdb1/schema/impu_contact.xml (52) A src/lib/srdb1/schema/impu_subscriber.xml (52) A src/lib/srdb1/schema/kamailio-ims_usrloc_scscf.xml (16) A src/lib/srdb1/schema/subscriber_scscf.xml (123) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4110.patch https://github.com/kamailio/kamailio/pull/4110.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4110 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4110(a)github.com>

2 6

git:master:283a7788: lib/srdb1/schema: ims_usrloc_scscf definitions
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 283a77887c88c38a240567a7b165478775662d81 URL: https://github.com/kamailio/kamailio/commit/283a77887c88c38a240567a7b165478… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T08:44:44+01:00 lib/srdb1/schema: ims_usrloc_scscf definitions related #4100 --- Added: src/lib/srdb1/schema/contact.xml Added: src/lib/srdb1/schema/impu.xml Added: src/lib/srdb1/schema/impu_contact.xml Added: src/lib/srdb1/schema/impu_subscriber.xml Added: src/lib/srdb1/schema/kamailio-ims_usrloc_scscf.xml Added: src/lib/srdb1/schema/subscriber_scscf.xml --- Diff: https://github.com/kamailio/kamailio/commit/283a77887c88c38a240567a7b165478… Patch: https://github.com/kamailio/kamailio/commit/283a77887c88c38a240567a7b165478…

1 0

[kamailio/kamailio] lib/srdb1/schema: ims_charging definitions (PR #4111)
by Victor Seva 29 Jan '25

29 Jan '25

#### 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 - [x] Related to issue #4100 #### Description add ims_charging definitions You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4111 -- Commit Summary -- * lib/srdb1/schema: ims_charging definitions -- File Changes -- A src/lib/srdb1/schema/kamailio-ims_charging.xml (12) A src/lib/srdb1/schema/ro_session.xml (209) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4111.patch https://github.com/kamailio/kamailio/pull/4111.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4111 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4111(a)github.com>

2 5

git:master:48683f37: lib/srdb1/schema: ims_charging definitions
by Victor Seva 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 48683f3798683a508fc456bcde11a8e59a8a64de URL: https://github.com/kamailio/kamailio/commit/48683f3798683a508fc456bcde11a8e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-29T08:39:09+01:00 lib/srdb1/schema: ims_charging definitions related #4100 --- Added: src/lib/srdb1/schema/kamailio-ims_charging.xml Added: src/lib/srdb1/schema/ro_session.xml --- Diff: https://github.com/kamailio/kamailio/commit/48683f3798683a508fc456bcde11a8e… Patch: https://github.com/kamailio/kamailio/commit/48683f3798683a508fc456bcde11a8e…

1 0

git:master:9c109f3a: core: tcp_main - include local dst port in conn lookup when using haproxy
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 9c109f3a371445e03defde279912fbb4179244bd URL: https://github.com/kamailio/kamailio/commit/9c109f3a371445e03defde279912fbb… Author: Alexander Bakker <ab(a)alexbakker.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:19:45+01:00 core: tcp_main - include local dst port in conn lookup when using haproxy --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/9c109f3a371445e03defde279912fbb… Patch: https://github.com/kamailio/kamailio/commit/9c109f3a371445e03defde279912fbb… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e0238fe090b..391255cab9d 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1745,7 +1745,8 @@ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, print_ip("ip=", &a->parent->rcv.src_ip, "\n"); #endif if((a->parent->state != S_CONN_BAD) && (port == a->port) - && ((l_port == 0) || (l_port == a->parent->rcv.dst_port)) + && ((l_port == 0) || (l_port == a->parent->rcv.dst_port) + || (l_port == a->parent->cinfo.dst_port)) && (ip_addr_cmp(ip, &a->parent->rcv.src_ip)) && (is_local_ip_any || ip_addr_cmp(l_ip, &a->parent->rcv.dst_ip)

1 0

git:master:b918e09e: outbound: encode bind address into flow token as destination
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: b918e09e9c3e06bddfd7a205f64abb603d589f1c URL: https://github.com/kamailio/kamailio/commit/b918e09e9c3e06bddfd7a205f64abb6… Author: Alexander Bakker <ab(a)alexbakker.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:19:45+01:00 outbound: encode bind address into flow token as destination This is an attempt to fix the combination of the outbound/rr modules and ``tcp_accept_haproxy=yes``. This combination is currently broken, as previously reported on the mailing list: https://www.mail-archive.com/sr-users@lists.kamailio.org/msg21854.html The issue is that the destination address/port combo of the haproxy side is encoded into the flow token. When the rr module decodes the flow token and tries to look up the listening socket using ``find_si``, it cannot be found, because it is given the destination address/port combo of the connection of the haproxy side, not the address/port combo that Kamailio is actually listening on. This patch fixes the issue by encoding the ``bind_address`` of the socket the connection was received on into the flow token as the destination address. The source address remains unchanged, as it *can* be used to look up the TCP connection (with a minor patch to ``_tcpconn_find`` in ``tcp_main.c``) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b918e09e9c3e06bddfd7a205f64abb6… Patch: https://github.com/kamailio/kamailio/commit/b918e09e9c3e06bddfd7a205f64abb6… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index f2e0c7dbc3d..a5f17e4ef99 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -180,15 +180,25 @@ int encode_flow_token(str *flow_token, struct receive_info *rcv) return -1; } + /* By encoding the bind address into the flow token as the destination + address, we make sure that we'll still be able to find the socket when + decoding it even if there's an haproxy in front */ + struct ip_addr dst_ip = rcv->dst_ip; + unsigned short dst_port = rcv->dst_port; + if(rcv->bind_address) { + dst_ip = rcv->bind_address->address; + dst_port = rcv->bind_address->port_no; + } + /* Encode protocol information */ unenc_flow_token[pos++] = - (rcv->dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv->proto; + (dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv->proto; /* Encode destination address */ - for(i = 0; i < (rcv->dst_ip.af == AF_INET6 ? 16 : 4); i++) - unenc_flow_token[pos++] = rcv->dst_ip.u.addr[i]; - unenc_flow_token[pos++] = (rcv->dst_port >> 8) & 0xff; - unenc_flow_token[pos++] = rcv->dst_port & 0xff; + for(i = 0; i < (dst_ip.af == AF_INET6 ? 16 : 4); i++) + unenc_flow_token[pos++] = dst_ip.u.addr[i]; + unenc_flow_token[pos++] = (dst_port >> 8) & 0xff; + unenc_flow_token[pos++] = dst_port & 0xff; /* Encode source address */ for(i = 0; i < (rcv->src_ip.af == AF_INET6 ? 16 : 4); i++)

1 0

[kamailio/kamailio] main: Print open file limits (PR #4117)
by Xenofon Karamanos 29 Jan '25

29 Jan '25

#### 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR adds some start-up information for soft and hard limits of open files. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4117 -- Commit Summary -- * main: Print open file limits -- File Changes -- M src/main.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4117.patch https://github.com/kamailio/kamailio/pull/4117.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4117 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4117(a)github.com>

3 8

git:master:4a335848: main: Print open file limits
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 4a335848f1b2b1e685891258803d1acd5540710d URL: https://github.com/kamailio/kamailio/commit/4a335848f1b2b1e685891258803d1ac… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:17:17+01:00 main: Print open file limits --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/4a335848f1b2b1e685891258803d1ac… Patch: https://github.com/kamailio/kamailio/commit/4a335848f1b2b1e685891258803d1ac… --- diff --git a/src/main.c b/src/main.c index 9e315285998..a29857757bc 100644 --- a/src/main.c +++ b/src/main.c @@ -59,6 +59,7 @@ #include <sys/utsname.h> #include <sys/stat.h> #include <sys/mman.h> +#include <sys/resource.h> /* getrlimit */ #include <fcntl.h> #include <sys/time.h> #include <sys/wait.h> @@ -2209,6 +2210,7 @@ int main(int argc, char **argv) char *tbuf_tmp; struct stat st = {0}; long l1 = 0; + struct rlimit lim; int option_index = 0; @@ -3310,7 +3312,16 @@ int main(int argc, char **argv) fprintf(stderr, "ERROR: error could not increase file limits\n"); goto error; } + } else { + if(getrlimit(RLIMIT_NOFILE, &lim) < 0) { + LM_CRIT("cannot get the maximum number of file descriptors: %s\n", + strerror(errno)); + goto error; + } + LM_INFO("current open file limits [soft/hard]: [%lu/%lu]\n", + (unsigned long)lim.rlim_cur, (unsigned long)lim.rlim_max); } + if(mlock_pages) mem_lock_pages();

1 0

[kamailio/kamailio] Fixes SUBSCRIBE and NOTIFY mechanism in case of registration refresh (PR #4123)
by Supreeth Herle 29 Jan '25

29 Jan '25

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4123 -- Commit Summary -- * ims_registrar_scscf: send NOTIFY in case of subsequent SUBSCRIBE as per RFC 3265 * ims_registrar_scscf: set contact to presentity URI in 200OK for SUBSCRIBE to reg events -- File Changes -- M src/modules/ims_registrar_scscf/registrar_notify.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4123.patch https://github.com/kamailio/kamailio/pull/4123.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4123 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4123(a)github.com>

2 3

[kamailio/kamailio] tcp: fix for local TCP/TLS socket matching with 'tcp_reuse_port' enabled (PR #4120)
by pinacolada1610 29 Jan '25

29 Jan '25

- Changed the logic for matching a listening TCP/TLS-socket in tcp_reuse_port scenario, now it considers local port as well. With 'tcp_reuse_port' option enabled, the local port is meaningful and helps to differentiate between sockets on the same IP but different ports.   #### 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 In our installation Kamailio runs multiple SIP-trunks, including TCP/TLS, which may be bound to the same local IP address but different local ports, and it's crucial for us to know exactly which trunk, i.e. local socket/port, was used to receive a SIP message. Additionally, the option "tcp_reuse_port" is also enabled in our environment to start outbound connections from the same TCP/TLS ports that we are listening at. The problem we hit is that identifying a trunk receiving a SIP message by $Rn(Received socket name) $Rp(Received port), which works perfectly fine for UDP trunks, not working for TCP/TLS with "tcp_reuse_port": wrong port and sockname are reported in preudovars. Investigation showed that it always reports the first listening socket (in the order defined in config file) which matches IP and transport protocol. Port is being ignored here e.g. if kamailio is listening on: listen=tcp:192.168.0.11:5060 name "int_tcp_5060" listen=tcp:192.168.0.11:5062 name "int_tcp_5062" listen=tcp:192.168.0.11:5063 name "int_tcp_5063" it will always report $Rn: int_tcp_5060 and $Rp: 5060 for incoming SIP-messages regardless of the actual socket/port being used, even if it's 5062 or 5063 This applies for both TCP and TLS. Additionally we noticed that the issue happens only in case if an incoming SIP message from remote SBC is coming via the tcp-connection which was initially opened as outbound with well-known ports (rather than via a new incoming tcp-connection with ephemeral src/remote port) This pointed us to the function core/tcp_main.c:tcp_do_connect() which handles outbound connections. While opening a new outbound connection to remote SBC, it ignores local/src port while matching it to a listening socket and saves that incorrect info for future use. This behavior makes sense if tcp_reuse_port is disabled as matching ephemeral port would not give any result. But with tcp_reuse_port enabled, we need to take the port into consideration as well. With suggested changes applied we get correct values in $Rn(Received socket name) $Rp(Received port) for inbound messages via all sockets. Tests with tcp_reuse_port disabled show no change in behavior, as expected. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4120 -- Commit Summary -- * tcp: fix for local TCP/TLS socket matching with 'tcp_reuse_port' enabled -- File Changes -- M src/core/tcp_main.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4120.patch https://github.com/kamailio/kamailio/pull/4120.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4120 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4120(a)github.com>

2 3

git:master:75af5c3d: ims_registrar_scscf: set contact to presentity URI in 200OK for SUBSCRIBE to reg events
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 75af5c3d8b14a0b17d34c416f2dfc0df6c3ff6f8 URL: https://github.com/kamailio/kamailio/commit/75af5c3d8b14a0b17d34c416f2dfc0d… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:16:08+01:00 ims_registrar_scscf: set contact to presentity URI in 200OK for SUBSCRIBE to reg events --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/75af5c3d8b14a0b17d34c416f2dfc0d… Patch: https://github.com/kamailio/kamailio/commit/75af5c3d8b14a0b17d34c416f2dfc0d… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index bcddbf17cc2..b1af5189a8d 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -1376,7 +1376,7 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) ret = CSCF_RETURN_TRUE; LM_DBG("Sending 200 OK to subscribing user\n"); subscribe_reply( - msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, &scscf_name_str); + msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, &presentity_uri); if(event_type == IMS_REGISTRAR_SUBSCRIBE || event_type == IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE) { @@ -1427,7 +1427,7 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) ret = CSCF_RETURN_TRUE; LM_DBG("Sending 200 OK to subscribing user\n"); subscribe_reply( - msg, 200, MSG_REG_UNSUBSCRIBE_OK, &expires, &scscf_name_str); + msg, 200, MSG_REG_UNSUBSCRIBE_OK, &expires, &presentity_uri); } doneorerror:

1 0

git:master:7de4f84f: ims_registrar_scscf: send NOTIFY in case of subsequent SUBSCRIBE as per RFC 3265
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 7de4f84f08e4ce910c007aad3fa2cadbe4b11dd2 URL: https://github.com/kamailio/kamailio/commit/7de4f84f08e4ce910c007aad3fa2cad… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:16:08+01:00 ims_registrar_scscf: send NOTIFY in case of subsequent SUBSCRIBE as per RFC 3265 --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/7de4f84f08e4ce910c007aad3fa2cad… Patch: https://github.com/kamailio/kamailio/commit/7de4f84f08e4ce910c007aad3fa2cad… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index aade763a09a..bcddbf17cc2 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -497,13 +497,15 @@ int event_reg(udomain_t *_d, impurecord_t *r_passed, ucontact_t *c_passed, case IMS_REGISTRAR_NONE: return 0; case IMS_REGISTRAR_SUBSCRIBE: + case IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE: if(r_passed || !presentity_uri || !watcher_contact || !_d) { LM_ERR("this is a subscribe called from cfg file: r_passed be " "zero and presentity_uri, watcher_contact and _d should " "be valid for a subscribe"); return 0; } - LM_DBG("Event type is IMS REGISTRAR SUBSCRIBE about to get " + LM_DBG("Event type is IMS REGISTRAR SUBSCRIBE/RE-SUBSCRIBE about " + "to get " "reginfo_full\n"); //lets get IMPU list for presentity as well as register for callbacks (IFF it is a new SUBSCRIBE) @@ -1376,8 +1378,8 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) subscribe_reply( msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, &scscf_name_str); - if(event_type == IMS_REGISTRAR_SUBSCRIBE) { - //do reg event only for the initial subscribe + if(event_type == IMS_REGISTRAR_SUBSCRIBE + || event_type == IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE) { if(event_reg(domain, 0, 0, event_type, &presentity_uri, &watcher_contact, 0, 0, 0) != 0) { @@ -1723,7 +1725,8 @@ void create_notifications(udomain_t *_t, impurecord_t *r_passed, } //This is a fix to ensure that when a user subscribes a full reg info is only sent to that UE - if(event_type == IMS_REGISTRAR_SUBSCRIBE) { + if(event_type == IMS_REGISTRAR_SUBSCRIBE + || event_type == IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE) { if(contact_match(watcher_contact, &s->watcher_contact) && (presentity_uri->len == s->presentity_uri.len) && (memcmp(s->presentity_uri.s, presentity_uri->s,

1 0

git:master:0cb6e35d: tcp: fix for local TCP/TLS socket matching with 'tcp_reuse_port' enabled
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 0cb6e35d581398d2c5a7086a0d98b113fbb16138 URL: https://github.com/kamailio/kamailio/commit/0cb6e35d581398d2c5a7086a0d98b11… Author: pinacolada1610 <starinchikova(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:15:47+01:00 tcp: fix for local TCP/TLS socket matching with 'tcp_reuse_port' enabled - Changed the logic for matching a listening TCP/TLS-socket in tcp_reuse_port scenario, now it considers local port as well. With 'tcp_reuse_port' option enabled, the local port is meaningful and helps to differenciate between sockets on the same IP but different ports. --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/0cb6e35d581398d2c5a7086a0d98b11… Patch: https://github.com/kamailio/kamailio/commit/0cb6e35d581398d2c5a7086a0d98b11… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index bc1327204e8..e0238fe090b 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1332,6 +1332,7 @@ inline static int tcp_do_connect(union sockaddr_union *server, union sockaddr_union my_name; socklen_t my_name_len; struct ip_addr ip; + unsigned short port; #ifdef TCP_ASYNC int n; #endif /* TCP_ASYNC */ @@ -1437,14 +1438,19 @@ inline static int tcp_do_connect(union sockaddr_union *server, from = &my_name; /* update from with the real "from" address */ su2ip_addr(&ip, &my_name); find_socket: +#ifdef SO_REUSEPORT + port = cfg_get(tcp, tcp_cfg, reuse_port) ? su_getport(from) : 0; +#else + port = 0; +#endif #ifdef USE_TLS if(unlikely(type == PROTO_TLS)) { - *res_si = find_si(&ip, 0, PROTO_TLS); + *res_si = find_si(&ip, port, PROTO_TLS); } else { - *res_si = find_si(&ip, 0, PROTO_TCP); + *res_si = find_si(&ip, port, PROTO_TCP); } #else - *res_si = find_si(&ip, 0, PROTO_TCP); + *res_si = find_si(&ip, port, PROTO_TCP); #endif if(unlikely(*res_si == 0)) {

1 0

git:6.0:022940de: db_oracle: fix warning: passing argument 2 of âdb_do_closeâ from incompatible pointer type [-Wincompatible-pointer-types]
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 022940dec70272a19c86604d2fa9af83d8790bb1 URL: https://github.com/kamailio/kamailio/commit/022940dec70272a19c86604d2fa9af8… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:07:27+01:00 db_oracle: fix warning: passing argument 2 of ��db_do_close�� from incompatible pointer type [-Wincompatible-pointer-types] (cherry picked from commit 577a87861a8566e00f2700dfb227dcc8b26393b4) --- Modified: src/modules/db_oracle/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/022940dec70272a19c86604d2fa9af8… Patch: https://github.com/kamailio/kamailio/commit/022940dec70272a19c86604d2fa9af8… --- diff --git a/src/modules/db_oracle/dbase.c b/src/modules/db_oracle/dbase.c index d4c5f05bb06..70a65af31f3 100644 --- a/src/modules/db_oracle/dbase.c +++ b/src/modules/db_oracle/dbase.c @@ -176,7 +176,7 @@ db1_con_t *db_oracle_init(const str *_url) */ void db_oracle_close(db1_con_t *_h) { - db_do_close(_h, db_oracle_free_connection); + db_do_close(_h, (void *)db_oracle_free_connection); }

1 0

git:6.0:ded36e28: dispatcher: copy over the ocdata structure for records kept by rpc add/remove record
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: ded36e28198cb518bfb64ffb0e2cc659a35af9ac URL: https://github.com/kamailio/kamailio/commit/ded36e28198cb518bfb64ffb0e2cc65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:07:19+01:00 dispatcher: copy over the ocdata structure for records kept by rpc add/remove record (cherry picked from commit 77eaba17916109ef5656a276e3f469b29415d6f5) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/ded36e28198cb518bfb64ffb0e2cc65… Patch: https://github.com/kamailio/kamailio/commit/ded36e28198cb518bfb64ffb0e2cc65… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b404ede384b..ca1636edbd2 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2866,14 +2866,16 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) void ds_add_dest_cb(ds_set_t *node, int i, void *arg) { int setn; + ds_dest_t *ndst = NULL; - if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, - node->dlist[i].priority, &node->dlist[i].attrs.body, - *ds_next_idx, &setn, node->dlist[i].dload, - &node->dlist[i].latency_stats) - == NULL) { + ndst = add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, + node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, + &setn, node->dlist[i].dload, &node->dlist[i].latency_stats); + if(ndst == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); + } else { + memcpy(&ndst->ocdata, &node->dlist[i].ocdata, sizeof(ds_ocdata_t)); } return; } @@ -2922,7 +2924,10 @@ int ds_add_dst(int group, str *address, int flags, int priority, str *attrs) /* callback for removing nodes based on setid & address */ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg) { - struct ds_filter_dest_cb_arg *filter_arg = (typeof(filter_arg))arg; + ds_dest_t *ndst = NULL; + struct ds_filter_dest_cb_arg *filter_arg; + + filter_arg = (typeof(filter_arg))arg; if(node->id == filter_arg->setid && node->dlist[i].uri.len == filter_arg->dest->uri.len @@ -2931,13 +2936,16 @@ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg) == 0) return; - if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, - node->dlist[i].priority, &node->dlist[i].attrs.body, - *ds_next_idx, filter_arg->setn, node->dlist[i].dload, - &node->dlist[i].latency_stats) - == NULL) { + ndst = add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, + node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, + filter_arg->setn, node->dlist[i].dload, + &node->dlist[i].latency_stats); + + if(ndst == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); + } else { + memcpy(&ndst->ocdata, &node->dlist[i].ocdata, sizeof(ds_ocdata_t)); } return; }

1 0

git:6.0:ccd5708c: dspatcher: return the new ds dest for add_dest2list()
by Daniel-Constantin Mierla 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: ccd5708cb02cdc3e6cf76224417c7d04ba30f6e9 URL: https://github.com/kamailio/kamailio/commit/ccd5708cb02cdc3e6cf76224417c7d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-29T08:07:12+01:00 dspatcher: return the new ds dest for add_dest2list() - easier to access the fields of the new record afterwards (cherry picked from commit cff6f9fd7051f4b8ac6e4fc59257c239cb32f21d) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/ccd5708cb02cdc3e6cf76224417c7d0… Patch: https://github.com/kamailio/kamailio/commit/ccd5708cb02cdc3e6cf76224417c7d0… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 1d85c34203e..b404ede384b 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -713,7 +713,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) /** * */ -int add_dest2list(int id, str uri, int flags, int priority, str *attrs, +ds_dest_t *add_dest2list(int id, str uri, int flags, int priority, str *attrs, int list_idx, int *setn, int dload, ds_latency_stats_t *latency_stats) { ds_dest_t *dp = NULL; @@ -722,8 +722,9 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, ds_dest_t *dp1 = NULL; dp = pack_dest(uri, flags, priority, attrs, dload); - if(!dp) - goto err; + if(!dp) { + goto error; + } if(latency_stats != NULL) { dp->latency_stats.stdev = latency_stats->stdev; @@ -739,7 +740,7 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, sp = ds_avl_insert(&ds_lists[list_idx], id, setn); if(!sp) { LM_ERR("no more memory.\n"); - goto err; + goto error; } sp->nr++; @@ -766,8 +767,8 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, LM_DBG("dest [%d/%d] <%.*s>\n", sp->id, sp->nr, dp->uri.len, dp->uri.s); - return 0; -err: + return dp; +error: if(dp != NULL) { if(dp->uri.s != NULL) shm_free(dp->uri.s); @@ -776,7 +777,7 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, shm_free(dp); } - return -1; + return NULL; } @@ -1112,7 +1113,7 @@ int ds_load_list(char *lfile) } if(add_dest2list(id, uri, flags, priority, &attrs, *ds_next_idx, &setn, 0, latency_stats) - != 0) { + == NULL) { LM_WARN("unable to add destination %.*s to set %d -- skipping\n", uri.len, uri.s, id); if(ds_load_mode == 1) { @@ -1372,7 +1373,7 @@ int ds_load_db(void) } if(add_dest2list(id, uri, flags, priority, &attrs, *ds_next_idx, &setn, 0, latency_stats) - != 0) { + == NULL) { dest_errs++; LM_WARN("unable to add destination %.*s to set %d -- skipping\n", uri.len, uri.s, id); @@ -2870,7 +2871,7 @@ void ds_add_dest_cb(ds_set_t *node, int i, void *arg) node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, &setn, node->dlist[i].dload, &node->dlist[i].latency_stats) - != 0) { + == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); } @@ -2893,7 +2894,7 @@ int ds_add_dst(int group, str *address, int flags, int priority, str *attrs) // add new destination if(add_dest2list(group, *address, flags, priority, attrs, *ds_next_idx, &setn, 0, NULL) - != 0) { + == NULL) { LM_WARN("unable to add destination %.*s to set %d", address->len, address->s, group); if(ds_load_mode == 1) { @@ -2934,7 +2935,7 @@ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg) node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, filter_arg->setn, node->dlist[i].dload, &node->dlist[i].latency_stats) - != 0) { + == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); }

1 0

git:master:577a8786: db_oracle: fix warning: passing argument 2 of âdb_do_closeâ from incompatible pointer type [-Wincompatible-pointer-types]
by Ovidiu Sas 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 577a87861a8566e00f2700dfb227dcc8b26393b4 URL: https://github.com/kamailio/kamailio/commit/577a87861a8566e00f2700dfb227dcc… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2025-01-29T01:40:24Z db_oracle: fix warning: passing argument 2 of ��db_do_close�� from incompatible pointer type [-Wincompatible-pointer-types] --- Modified: src/modules/db_oracle/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/577a87861a8566e00f2700dfb227dcc… Patch: https://github.com/kamailio/kamailio/commit/577a87861a8566e00f2700dfb227dcc… --- diff --git a/src/modules/db_oracle/dbase.c b/src/modules/db_oracle/dbase.c index d4c5f05bb06..70a65af31f3 100644 --- a/src/modules/db_oracle/dbase.c +++ b/src/modules/db_oracle/dbase.c @@ -176,7 +176,7 @@ db1_con_t *db_oracle_init(const str *_url) */ void db_oracle_close(db1_con_t *_h) { - db_do_close(_h, db_oracle_free_connection); + db_do_close(_h, (void *)db_oracle_free_connection); }

1 0

git:master:77eaba17: dispatcher: copy over the ocdata structure for records kept by rpc add/remove record
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 77eaba17916109ef5656a276e3f469b29415d6f5 URL: https://github.com/kamailio/kamailio/commit/77eaba17916109ef5656a276e3f469b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T18:39:12+01:00 dispatcher: copy over the ocdata structure for records kept by rpc add/remove record --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/77eaba17916109ef5656a276e3f469b… Patch: https://github.com/kamailio/kamailio/commit/77eaba17916109ef5656a276e3f469b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b404ede384b..ca1636edbd2 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2866,14 +2866,16 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) void ds_add_dest_cb(ds_set_t *node, int i, void *arg) { int setn; + ds_dest_t *ndst = NULL; - if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, - node->dlist[i].priority, &node->dlist[i].attrs.body, - *ds_next_idx, &setn, node->dlist[i].dload, - &node->dlist[i].latency_stats) - == NULL) { + ndst = add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, + node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, + &setn, node->dlist[i].dload, &node->dlist[i].latency_stats); + if(ndst == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); + } else { + memcpy(&ndst->ocdata, &node->dlist[i].ocdata, sizeof(ds_ocdata_t)); } return; } @@ -2922,7 +2924,10 @@ int ds_add_dst(int group, str *address, int flags, int priority, str *attrs) /* callback for removing nodes based on setid & address */ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg) { - struct ds_filter_dest_cb_arg *filter_arg = (typeof(filter_arg))arg; + ds_dest_t *ndst = NULL; + struct ds_filter_dest_cb_arg *filter_arg; + + filter_arg = (typeof(filter_arg))arg; if(node->id == filter_arg->setid && node->dlist[i].uri.len == filter_arg->dest->uri.len @@ -2931,13 +2936,16 @@ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg) == 0) return; - if(add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, - node->dlist[i].priority, &node->dlist[i].attrs.body, - *ds_next_idx, filter_arg->setn, node->dlist[i].dload, - &node->dlist[i].latency_stats) - == NULL) { + ndst = add_dest2list(node->id, node->dlist[i].uri, node->dlist[i].flags, + node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, + filter_arg->setn, node->dlist[i].dload, + &node->dlist[i].latency_stats); + + if(ndst == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); + } else { + memcpy(&ndst->ocdata, &node->dlist[i].ocdata, sizeof(ds_ocdata_t)); } return; }

1 0

git:master:cff6f9fd: dspatcher: return the new ds dest for add_dest2list()
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: cff6f9fd7051f4b8ac6e4fc59257c239cb32f21d URL: https://github.com/kamailio/kamailio/commit/cff6f9fd7051f4b8ac6e4fc59257c23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T18:39:12+01:00 dspatcher: return the new ds dest for add_dest2list() - easier to access the fields of the new record afterwards --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/cff6f9fd7051f4b8ac6e4fc59257c23… Patch: https://github.com/kamailio/kamailio/commit/cff6f9fd7051f4b8ac6e4fc59257c23… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 1d85c34203e..b404ede384b 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -713,7 +713,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) /** * */ -int add_dest2list(int id, str uri, int flags, int priority, str *attrs, +ds_dest_t *add_dest2list(int id, str uri, int flags, int priority, str *attrs, int list_idx, int *setn, int dload, ds_latency_stats_t *latency_stats) { ds_dest_t *dp = NULL; @@ -722,8 +722,9 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, ds_dest_t *dp1 = NULL; dp = pack_dest(uri, flags, priority, attrs, dload); - if(!dp) - goto err; + if(!dp) { + goto error; + } if(latency_stats != NULL) { dp->latency_stats.stdev = latency_stats->stdev; @@ -739,7 +740,7 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, sp = ds_avl_insert(&ds_lists[list_idx], id, setn); if(!sp) { LM_ERR("no more memory.\n"); - goto err; + goto error; } sp->nr++; @@ -766,8 +767,8 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, LM_DBG("dest [%d/%d] <%.*s>\n", sp->id, sp->nr, dp->uri.len, dp->uri.s); - return 0; -err: + return dp; +error: if(dp != NULL) { if(dp->uri.s != NULL) shm_free(dp->uri.s); @@ -776,7 +777,7 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, shm_free(dp); } - return -1; + return NULL; } @@ -1112,7 +1113,7 @@ int ds_load_list(char *lfile) } if(add_dest2list(id, uri, flags, priority, &attrs, *ds_next_idx, &setn, 0, latency_stats) - != 0) { + == NULL) { LM_WARN("unable to add destination %.*s to set %d -- skipping\n", uri.len, uri.s, id); if(ds_load_mode == 1) { @@ -1372,7 +1373,7 @@ int ds_load_db(void) } if(add_dest2list(id, uri, flags, priority, &attrs, *ds_next_idx, &setn, 0, latency_stats) - != 0) { + == NULL) { dest_errs++; LM_WARN("unable to add destination %.*s to set %d -- skipping\n", uri.len, uri.s, id); @@ -2870,7 +2871,7 @@ void ds_add_dest_cb(ds_set_t *node, int i, void *arg) node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, &setn, node->dlist[i].dload, &node->dlist[i].latency_stats) - != 0) { + == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); } @@ -2893,7 +2894,7 @@ int ds_add_dst(int group, str *address, int flags, int priority, str *attrs) // add new destination if(add_dest2list(group, *address, flags, priority, attrs, *ds_next_idx, &setn, 0, NULL) - != 0) { + == NULL) { LM_WARN("unable to add destination %.*s to set %d", address->len, address->s, group); if(ds_load_mode == 1) { @@ -2934,7 +2935,7 @@ void ds_filter_dest_cb(ds_set_t *node, int i, void *arg) node->dlist[i].priority, &node->dlist[i].attrs.body, *ds_next_idx, filter_arg->setn, node->dlist[i].dload, &node->dlist[i].latency_stats) - != 0) { + == NULL) { LM_WARN("failed to add destination in group %d - %.*s\n", node->id, node->dlist[i].uri.len, node->dlist[i].uri.s); }

1 0

git:6.0:db1ddc0d: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: db1ddc0dd2d663887ecfd24b9d74322518e8e98f URL: https://github.com/kamailio/kamailio/commit/db1ddc0dd2d663887ecfd24b9d74322… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-01-28T18:19:54+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/file_out/README --- Diff: https://github.com/kamailio/kamailio/commit/db1ddc0dd2d663887ecfd24b9d74322… Patch: https://github.com/kamailio/kamailio/commit/db1ddc0dd2d663887ecfd24b9d74322… --- diff --git a/src/modules/file_out/README b/src/modules/file_out/README index 88a49eed0c2..89ca58147c1 100644 --- a/src/modules/file_out/README +++ b/src/modules/file_out/README @@ -103,18 +103,19 @@ Chapter 1. Admin Guide Absolute path to the folder where log files should be saved. - Default value is ��/var/log/kamailio/file_out/��. + Default value is ��/var/log/kamailio/file_out��. Example 1.1. Set base_folder parameter ... -modparam("file_out", "base_folder", "/tmp/file_out/") +modparam("file_out", "base_folder", "/tmp/file_out") # trailing slash will be ad +ded. ... 3.2. file (string) The definition of a file and its properties. The value of the parameter may have the following format: - * "name=accounting;extension=.out;interval=20" + * "name=accounting;extension=.out;interval=20;prefix=accounting:" The parameter can be set multiple times to define more files in same configuration file. @@ -124,6 +125,8 @@ modparam("file_out", "base_folder", "/tmp/file_out/") Default value is ��.out��. * interval (Optional) - the interval in seconds of the file rotation Default value is ��600�� (10min). + * prefix (Optional) - the prefix for log messages + Default value is ��""�� (empty string). Example 1.2. Set file parameter ...

1 0

file_out module README is not up to date
by Henning Westerholt 28 Jan '25

28 Jan '25

Hello, the file_out module README is not up to date. Should I just fix it manually, or could somebody trigger the automatic auto-build job for it? Maybe it was not included so far? Thanks, Henning henning@app01:~/repositories/kamailio$ git diff diff --git a/src/modules/file_out/README b/src/modules/file_out/README index 88a49eed0c..89ca58147c 100644 --- a/src/modules/file_out/README +++ b/src/modules/file_out/README @@ -103,18 +103,19 @@ Chapter 1. Admin Guide Absolute path to the folder where log files should be saved. - Default value is "/var/log/kamailio/file_out/". + Default value is "/var/log/kamailio/file_out". Example 1.1. Set base_folder parameter ... -modparam("file_out", "base_folder", "/tmp/file_out/") +modparam("file_out", "base_folder", "/tmp/file_out") # trailing slash will be ad +ded. ... 3.2. file (string) The definition of a file and its properties. The value of the parameter may have the following format: - * "name=accounting;extension=.out;interval=20" + * "name=accounting;extension=.out;interval=20;prefix=accounting:" The parameter can be set multiple times to define more files in same configuration file. @@ -124,6 +125,8 @@ modparam("file_out", "base_folder", "/tmp/file_out/") Default value is ".out". * interval (Optional) - the interval in seconds of the file rotation Default value is "600" (10min). + * prefix (Optional) - the prefix for log messages + Default value is """" (empty string). Example 1.2. Set file parameter ...

2 1

git:master:1dabcc6c: modules: readme files regenerated - file_out ... [skip ci]
by Kamailio Dev 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 1dabcc6c863a3f2da5834b0a9773ffb744c6d62e URL: https://github.com/kamailio/kamailio/commit/1dabcc6c863a3f2da5834b0a9773ffb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-01-28T18:11:49+01:00 modules: readme files regenerated - file_out ... [skip ci] --- Modified: src/modules/file_out/README --- Diff: https://github.com/kamailio/kamailio/commit/1dabcc6c863a3f2da5834b0a9773ffb… Patch: https://github.com/kamailio/kamailio/commit/1dabcc6c863a3f2da5834b0a9773ffb… --- diff --git a/src/modules/file_out/README b/src/modules/file_out/README index 88a49eed0c2..89ca58147c1 100644 --- a/src/modules/file_out/README +++ b/src/modules/file_out/README @@ -103,18 +103,19 @@ Chapter 1. Admin Guide Absolute path to the folder where log files should be saved. - Default value is ��/var/log/kamailio/file_out/��. + Default value is ��/var/log/kamailio/file_out��. Example 1.1. Set base_folder parameter ... -modparam("file_out", "base_folder", "/tmp/file_out/") +modparam("file_out", "base_folder", "/tmp/file_out") # trailing slash will be ad +ded. ... 3.2. file (string) The definition of a file and its properties. The value of the parameter may have the following format: - * "name=accounting;extension=.out;interval=20" + * "name=accounting;extension=.out;interval=20;prefix=accounting:" The parameter can be set multiple times to define more files in same configuration file. @@ -124,6 +125,8 @@ modparam("file_out", "base_folder", "/tmp/file_out/") Default value is ��.out��. * interval (Optional) - the interval in seconds of the file rotation Default value is ��600�� (10min). + * prefix (Optional) - the prefix for log messages + Default value is ��""�� (empty string). Example 1.2. Set file parameter ...

1 0

git:6.0:374b7e46: kamctl: refresh db creation files
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 374b7e46881bbf591fd56305d3572ab3c12d1979 URL: https://github.com/kamailio/kamailio/commit/374b7e46881bbf591fd56305d3572ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T18:03:47+01:00 kamctl: refresh db creation files --- Added: utils/kamctl/db_berkeley/kamailio/pcscf_location Added: utils/kamctl/db_redis/kamailio/pcscf_location Added: utils/kamctl/dbtext/kamailio/pcscf_location Added: utils/kamctl/mongodb/kamailio/pcscf_location.json Modified: utils/kamctl/db_berkeley/kamailio/dialog_out Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/htable-create.sql Modified: utils/kamctl/db_sqlite/ims_dialog-create.sql Modified: utils/kamctl/db_sqlite/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/dbtext/kamailio/dialog_in Modified: utils/kamctl/dbtext/kamailio/dialog_out Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/dialog_in.json Modified: utils/kamctl/mongodb/kamailio/dialog_out.json Modified: utils/kamctl/mysql/htable-create.sql Modified: utils/kamctl/mysql/ims_dialog-create.sql Modified: utils/kamctl/mysql/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/oracle/htable-create.sql Modified: utils/kamctl/oracle/ims_dialog-create.sql Modified: utils/kamctl/oracle/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/postgres/htable-create.sql Modified: utils/kamctl/postgres/ims_dialog-create.sql Modified: utils/kamctl/postgres/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-mod Modified: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-table Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/374b7e46881bbf591fd56305d3572ab… Patch: https://github.com/kamailio/kamailio/commit/374b7e46881bbf591fd56305d3572ab…

1 0

git:6.0:c1f8cb4d: ims_qos_npn/doc/Makefile: proper xml file name
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: c1f8cb4de71ec11d669484db8b67484caf96b288 URL: https://github.com/kamailio/kamailio/commit/c1f8cb4de71ec11d669484db8b67484… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T18:03:22+01:00 ims_qos_npn/doc/Makefile: proper xml file name (cherry picked from commit 9daea6c00dc5b613d9e4b7ffd711ee7999e31ad5) --- Modified: src/modules/ims_qos_npn/doc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/c1f8cb4de71ec11d669484db8b67484… Patch: https://github.com/kamailio/kamailio/commit/c1f8cb4de71ec11d669484db8b67484… --- diff --git a/src/modules/ims_qos_npn/doc/Makefile b/src/modules/ims_qos_npn/doc/Makefile index 4ab9c620042..6517aef6b72 100644 --- a/src/modules/ims_qos_npn/doc/Makefile +++ b/src/modules/ims_qos_npn/doc/Makefile @@ -1,4 +1,4 @@ -docs = ims_qos.xml +docs = ims_qos_npn.xml docbook_dir = ../../../../doc/docbook include $(docbook_dir)/Makefile.module

1 0

git:6.0:4fe03b9e: srdb1/schema/location_pcscf.xml: table location renamed to pcscf_location
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 4fe03b9e59e0e4598419818cf1770312eeada86a URL: https://github.com/kamailio/kamailio/commit/4fe03b9e59e0e4598419818cf177031… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T18:03:14+01:00 srdb1/schema/location_pcscf.xml: table location renamed to pcscf_location - fix conflict with default table for registrar/usrloc - GH #4124 (cherry picked from commit fc02c3ca46bd96e50cbb6903a2efe48cb134377b) --- Modified: src/lib/srdb1/schema/location_pcscf.xml --- Diff: https://github.com/kamailio/kamailio/commit/4fe03b9e59e0e4598419818cf177031… Patch: https://github.com/kamailio/kamailio/commit/4fe03b9e59e0e4598419818cf177031… --- diff --git a/src/lib/srdb1/schema/location_pcscf.xml b/src/lib/srdb1/schema/location_pcscf.xml index a85f07bf75b..8538bf72ed6 100644 --- a/src/lib/srdb1/schema/location_pcscf.xml +++ b/src/lib/srdb1/schema/location_pcscf.xml @@ -7,8 +7,8 @@ ]> -<table id="location" xmlns:db="http://docbook.org/ns/docbook"> - <name>location</name> +<table id="pcscf_location" xmlns:db="http://docbook.org/ns/docbook"> + <name>pcscf_location</name> <version>7</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description>

1 0

git:master:9daea6c0: ims_qos_npn/doc/Makefile: proper xml file name
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 9daea6c00dc5b613d9e4b7ffd711ee7999e31ad5 URL: https://github.com/kamailio/kamailio/commit/9daea6c00dc5b613d9e4b7ffd711ee7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T17:58:46+01:00 ims_qos_npn/doc/Makefile: proper xml file name --- Modified: src/modules/ims_qos_npn/doc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/9daea6c00dc5b613d9e4b7ffd711ee7… Patch: https://github.com/kamailio/kamailio/commit/9daea6c00dc5b613d9e4b7ffd711ee7… --- diff --git a/src/modules/ims_qos_npn/doc/Makefile b/src/modules/ims_qos_npn/doc/Makefile index 4ab9c620042..6517aef6b72 100644 --- a/src/modules/ims_qos_npn/doc/Makefile +++ b/src/modules/ims_qos_npn/doc/Makefile @@ -1,4 +1,4 @@ -docs = ims_qos.xml +docs = ims_qos_npn.xml docbook_dir = ../../../../doc/docbook include $(docbook_dir)/Makefile.module

1 0

[kamailio/kamailio] ERROR: Creating extra tables failed at ims_icscf! (Issue #4124)
by Luke Escudé 28 Jan '25

28 Jan '25

### Description Installing Kamailio 5.8.5 on Debian 12, running kamdbctl create kamailio continually fails with error "ERROR: Creating extra tables failed at ims_icscf!" ### Troubleshooting #### Reproduction Create a brand new VM with Debian 12, clone Kamailio from git tag 5.8.5, and follow the steps: make include_modules="db_mysql crypto http_async_client http_client jansson janssonrpcc json jsonrpcc lcr presence presence_dialoginfo presence_mwi presence_reginfo presence_xml tls utils uuid xmlops" cfg make all make install # Installs Kamailio in /usr/local/sbin make install-systemd-debian sed -i 's/^# DBENGINE/DBENGINE/' /usr/local/etc/kamailio/kamctlrc kamdbctl create kamailio Will result in the error occurring. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4124 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4124(a)github.com>

2 2

git:5.8:1b4aa300: kamctl: renegenerate db creation files
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 5.8 Commit: 1b4aa300292dd6bdd64e174111939293fbbd76ed URL: https://github.com/kamailio/kamailio/commit/1b4aa300292dd6bdd64e17411193929… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T17:47:11+01:00 kamctl: renegenerate db creation files - GH #4124 --- Added: utils/kamctl/db_berkeley/kamailio/nds_trusted_domains Added: utils/kamctl/db_berkeley/kamailio/s_cscf Added: utils/kamctl/db_berkeley/kamailio/s_cscf_capabilities Added: utils/kamctl/db_redis/kamailio/nds_trusted_domains Added: utils/kamctl/db_redis/kamailio/s_cscf Added: utils/kamctl/db_redis/kamailio/s_cscf_capabilities Added: utils/kamctl/db_sqlite/ims_icscf-create.sql Added: utils/kamctl/dbtext/kamailio/nds_trusted_domains Added: utils/kamctl/dbtext/kamailio/s_cscf Added: utils/kamctl/dbtext/kamailio/s_cscf_capabilities Added: utils/kamctl/mongodb/kamailio/nds_trusted_domains.json Added: utils/kamctl/mongodb/kamailio/s_cscf.json Added: utils/kamctl/mongodb/kamailio/s_cscf_capabilities.json Added: utils/kamctl/mysql/ims_icscf-create.sql Added: utils/kamctl/oracle/ims_icscf-create.sql Added: utils/kamctl/postgres/ims_icscf-create.sql Added: utils/kamctl/xhttp_pi/ims_icscf-mod Added: utils/kamctl/xhttp_pi/ims_icscf-table Modified: utils/kamctl/xhttp_pi/acc-mod Modified: utils/kamctl/xhttp_pi/alias_db-mod Modified: utils/kamctl/xhttp_pi/auth_db-mod Modified: utils/kamctl/xhttp_pi/avpops-mod Modified: utils/kamctl/xhttp_pi/carrierroute-mod Modified: utils/kamctl/xhttp_pi/cpl-mod Modified: utils/kamctl/xhttp_pi/dialog-mod Modified: utils/kamctl/xhttp_pi/dialplan-mod Modified: utils/kamctl/xhttp_pi/dispatcher-mod Modified: utils/kamctl/xhttp_pi/domain-mod Modified: utils/kamctl/xhttp_pi/domainpolicy-mod Modified: utils/kamctl/xhttp_pi/drouting-mod Modified: utils/kamctl/xhttp_pi/group-mod Modified: utils/kamctl/xhttp_pi/htable-mod Modified: utils/kamctl/xhttp_pi/imc-mod Modified: utils/kamctl/xhttp_pi/lcr-mod Modified: utils/kamctl/xhttp_pi/matrix-mod Modified: utils/kamctl/xhttp_pi/mohqueue-mod Modified: utils/kamctl/xhttp_pi/msilo-mod Modified: utils/kamctl/xhttp_pi/mtree-mod Modified: utils/kamctl/xhttp_pi/pdt-mod Modified: utils/kamctl/xhttp_pi/permissions-mod Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/pipelimit-mod Modified: utils/kamctl/xhttp_pi/presence-mod Modified: utils/kamctl/xhttp_pi/purple-mod Modified: utils/kamctl/xhttp_pi/registrar-mod Modified: utils/kamctl/xhttp_pi/rls-mod Modified: utils/kamctl/xhttp_pi/rtpengine-mod Modified: utils/kamctl/xhttp_pi/rtpproxy-mod Modified: utils/kamctl/xhttp_pi/sca-mod Modified: utils/kamctl/xhttp_pi/secfilter-mod Modified: utils/kamctl/xhttp_pi/siptrace-mod Modified: utils/kamctl/xhttp_pi/speeddial-mod Modified: utils/kamctl/xhttp_pi/standard-mod Modified: utils/kamctl/xhttp_pi/topos-mod Modified: utils/kamctl/xhttp_pi/uac-mod Modified: utils/kamctl/xhttp_pi/uid_auth_db-mod Modified: utils/kamctl/xhttp_pi/uid_avp_db-mod Modified: utils/kamctl/xhttp_pi/uid_domain-mod Modified: utils/kamctl/xhttp_pi/uid_gflags-mod Modified: utils/kamctl/xhttp_pi/uid_uri_db-mod Modified: utils/kamctl/xhttp_pi/uri_db-mod Modified: utils/kamctl/xhttp_pi/userblocklist-mod Modified: utils/kamctl/xhttp_pi/usrloc-mod --- Diff: https://github.com/kamailio/kamailio/commit/1b4aa300292dd6bdd64e17411193929… Patch: https://github.com/kamailio/kamailio/commit/1b4aa300292dd6bdd64e17411193929…

1 0

git:6.0:be2c68f8: outbound: Fix flow_token_secret bug
by Henning Westerholt 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: be2c68f86fcf84dac24501a6b24a6573917894aa URL: https://github.com/kamailio/kamailio/commit/be2c68f86fcf84dac24501a6b24a657… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-28T16:33:55Z outbound: Fix flow_token_secret bug - flow_token_secret is of type str and not char* - check the length of the string instead of memory for initialization (cherry picked from commit 046ba41e431fec7fad0c82a9091ea9e27d9f677d) --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/be2c68f86fcf84dac24501a6b24a657… Patch: https://github.com/kamailio/kamailio/commit/be2c68f86fcf84dac24501a6b24a657… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index f3c80f18c15..f2e0c7dbc3d 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -66,7 +66,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"force_outbound_flag", PARAM_INT, &ob_force_flag}, {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, - {"flow_token_secret", PARAM_STRING, &flow_token_secret}, + {"flow_token_secret", PARAM_STR, &flow_token_secret}, {0, 0, 0} }; @@ -86,7 +86,7 @@ struct module_exports exports = { static void mod_init_openssl(void) { - if(flow_token_secret.s) { + if(flow_token_secret.s && flow_token_secret.len > 0) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); #if OPENSSL_VERSION_NUMBER < 0x030000000L

1 0

git:master:360bccbc: kamctl: regenerated db creation files
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 360bccbca1fe7515384065651034374be303bab3 URL: https://github.com/kamailio/kamailio/commit/360bccbca1fe7515384065651034374… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T17:28:19+01:00 kamctl: regenerated db creation files --- Added: utils/kamctl/db_berkeley/kamailio/pcscf_location Added: utils/kamctl/db_redis/kamailio/pcscf_location Added: utils/kamctl/dbtext/kamailio/pcscf_location Added: utils/kamctl/mongodb/kamailio/pcscf_location.json Modified: utils/kamctl/db_sqlite/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/mysql/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/oracle/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/postgres/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-mod Modified: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-table Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/360bccbca1fe7515384065651034374… Patch: https://github.com/kamailio/kamailio/commit/360bccbca1fe7515384065651034374…

1 0

git:master:fc02c3ca: srdb1/schema/location_pcscf.xml: table location renamed to pcscf_location
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: fc02c3ca46bd96e50cbb6903a2efe48cb134377b URL: https://github.com/kamailio/kamailio/commit/fc02c3ca46bd96e50cbb6903a2efe48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T17:28:19+01:00 srdb1/schema/location_pcscf.xml: table location renamed to pcscf_location - fix conflict with default table for registrar/usrloc - GH #4124 --- Modified: src/lib/srdb1/schema/location_pcscf.xml --- Diff: https://github.com/kamailio/kamailio/commit/fc02c3ca46bd96e50cbb6903a2efe48… Patch: https://github.com/kamailio/kamailio/commit/fc02c3ca46bd96e50cbb6903a2efe48… --- diff --git a/src/lib/srdb1/schema/location_pcscf.xml b/src/lib/srdb1/schema/location_pcscf.xml index a85f07bf75b..8538bf72ed6 100644 --- a/src/lib/srdb1/schema/location_pcscf.xml +++ b/src/lib/srdb1/schema/location_pcscf.xml @@ -7,8 +7,8 @@ ]> -<table id="location" xmlns:db="http://docbook.org/ns/docbook"> - <name>location</name> +<table id="pcscf_location" xmlns:db="http://docbook.org/ns/docbook"> + <name>pcscf_location</name> <version>7</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description>

1 0

[kamailio/kamailio] cmake: should we use >= 3.13, i.e., "more modern cmake" generation? (Issue #4078)
by space88man 28 Jan '25

28 Jan '25

### Description From the cmake timeline 3.0(2014) is called "modern cmake" and ~3.12/3.13(2018) is "more modern cmake" : https://www.youtube.com/watch?v=y7ndUhdQuU8 Since we are doing a major renovation on the kamailio build system should we target the "more modern" generation (that is already > 5 years old). This will encourage the project to follow cmake best practices. Ping @xkaraman @miconda Versions in debian: buster(3.13) bullseye(3.25) bookworm/trixie(3.30) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4078 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4078(a)github.com>

8 25

[kamailio/kamailio] outbound: Fix flow_token_secret bug (PR #4125)
by Xenofon Karamanos 28 Jan '25

28 Jan '25

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR fixes a bug where when `flow_token_secret` was provided, it was not initialized properly and always set to an empty string. - flow_token_secret is of type str and not char* - check the length of the string instead of memory for initialization You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4125 -- Commit Summary -- * outbound: Fix flow_token_secret bug -- File Changes -- M src/modules/outbound/outbound_mod.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4125.patch https://github.com/kamailio/kamailio/pull/4125.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4125 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4125(a)github.com>

3 4

git:master:046ba41e: outbound: Fix flow_token_secret bug
by Henning Westerholt 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 046ba41e431fec7fad0c82a9091ea9e27d9f677d URL: https://github.com/kamailio/kamailio/commit/046ba41e431fec7fad0c82a9091ea9e… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-28T17:11:49+01:00 outbound: Fix flow_token_secret bug - flow_token_secret is of type str and not char* - check the length of the string instead of memory for initialization --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/046ba41e431fec7fad0c82a9091ea9e… Patch: https://github.com/kamailio/kamailio/commit/046ba41e431fec7fad0c82a9091ea9e… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index f3c80f18c15..f2e0c7dbc3d 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -66,7 +66,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"force_outbound_flag", PARAM_INT, &ob_force_flag}, {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, - {"flow_token_secret", PARAM_STRING, &flow_token_secret}, + {"flow_token_secret", PARAM_STR, &flow_token_secret}, {0, 0, 0} }; @@ -86,7 +86,7 @@ struct module_exports exports = { static void mod_init_openssl(void) { - if(flow_token_secret.s) { + if(flow_token_secret.s && flow_token_secret.len > 0) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); #if OPENSSL_VERSION_NUMBER < 0x030000000L

1 0

git:master:99d36df0: cmake/json: Remove find_package call. Use pkg-config instead.
by Xenofon Karamanos 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 99d36df0a15bbb960b2d7ee5916d65a55b9b26cd URL: https://github.com/kamailio/kamailio/commit/99d36df0a15bbb960b2d7ee5916d65a… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-28T14:05:25Z cmake/json: Remove find_package call. Use pkg-config instead. --- Modified: src/modules/json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/99d36df0a15bbb960b2d7ee5916d65a… Patch: https://github.com/kamailio/kamailio/commit/99d36df0a15bbb960b2d7ee5916d65a… --- diff --git a/src/modules/json/CMakeLists.txt b/src/modules/json/CMakeLists.txt index 72df4d390f5..5d791dbd03d 100644 --- a/src/modules/json/CMakeLists.txt +++ b/src/modules/json/CMakeLists.txt @@ -2,13 +2,18 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(json-c CONFIG) - -if(NOT json-c_FOUND) - message(STATUS "json-c not found. looking with pkg-config") - find_package(PkgConfig REQUIRED) - pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) - add_library(json-c::json-c ALIAS PkgConfig::json-c) -endif() +# TODO: When we have a proper cmake config file for json-c for most OS, we can +# use that instead of pkg-config. +# json-c v 0.14 and 0.15 have wrong include directories in their cmake config +# files. uncomment the following line when we have a proper cmake config file +# for json-c for most OS. +# find_package(json-c 0.16 CONFIG) + +# if(NOT json-c_FOUND) +message(STATUS "json-c not found. looking with pkg-config") +find_package(PkgConfig REQUIRED) +pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) +add_library(json-c::json-c ALIAS PkgConfig::json-c) +# endif() target_link_libraries(${module_name} PRIVATE json-c::json-c)

1 0

git:master:532744ee: cmake/json: Use CONFIG mode
by Xenofon Karamanos 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: 532744eebf1014939c4ccd9a6aa4e7d6fbb454ac URL: https://github.com/kamailio/kamailio/commit/532744eebf1014939c4ccd9a6aa4e7d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-28T11:18:24Z cmake/json: Use CONFIG mode --- Modified: src/modules/json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/532744eebf1014939c4ccd9a6aa4e7d… Patch: https://github.com/kamailio/kamailio/commit/532744eebf1014939c4ccd9a6aa4e7d… --- diff --git a/src/modules/json/CMakeLists.txt b/src/modules/json/CMakeLists.txt index c4cbf81440c..72df4d390f5 100644 --- a/src/modules/json/CMakeLists.txt +++ b/src/modules/json/CMakeLists.txt @@ -2,7 +2,8 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(json-c QUIET) +find_package(json-c CONFIG) + if(NOT json-c_FOUND) message(STATUS "json-c not found. looking with pkg-config") find_package(PkgConfig REQUIRED)

1 0

git:6.0:3a480f03: etc/kamailio.cfg: close comment for tls_threads_mode
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 3a480f03fa54855059b72db8304f47cca7ee753e URL: https://github.com/kamailio/kamailio/commit/3a480f03fa54855059b72db8304f47c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:14:00+01:00 etc/kamailio.cfg: close comment for tls_threads_mode (cherry picked from commit d8d627eff7de268a487d7f91cc52e7ba8a6c708e) --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/3a480f03fa54855059b72db8304f47c… Patch: https://github.com/kamailio/kamailio/commit/3a480f03fa54855059b72db8304f47c… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index a61227d4173..a06e09fdc77 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -234,9 +234,10 @@ tls_max_connections=2048 /* For OpenSSL 3 integration * functions calling libssl3 can be invoked in a transient thread * 0: disable threaded calls - * 1: use thread executors for process#0 only - * 2: no thread executors, but use atfork handler to reset thread-locals to NULL + * 1: use thread executors for process #0 only + * 2: no thread executors, but use atfork handler to reset thread-locals to NULL */ tls_threads_mode=2 + #!endif /* set it to yes to enable sctp and load sctp.so module */

1 0

git:6.0:b4718cd7: http_async_client: check returned cell inside check_multi_info()
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: b4718cd7dca8e037664dbc49a1cfac684906ecea URL: https://github.com/kamailio/kamailio/commit/b4718cd7dca8e037664dbc49a1cfac6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:50+01:00 http_async_client: check returned cell inside check_multi_info() (cherry picked from commit b16550fa72d23084b4221769fe74b1f3c357c9fd) --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/b4718cd7dca8e037664dbc49a1cfac6… Patch: https://github.com/kamailio/kamailio/commit/b4718cd7dca8e037664dbc49a1cfac6… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index 30ae016d720..7edc0ddc1a0 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -604,7 +604,7 @@ void check_multi_info(struct http_m_global *g) CURL *easy; CURLcode res; - struct http_m_cell *cell; + struct http_m_cell *cell = NULL; double tmp_time; LM_DBG("REMAINING: %d\n", g->still_running); @@ -616,9 +616,15 @@ void check_multi_info(struct http_m_global *g) curl_easy_getinfo(easy, CURLINFO_EFFECTIVE_URL, &eff_url); - LM_DBG("DONE: %s => (%d) %s\n", eff_url, res, cell->error); + LM_DBG("DONE: %s => (%d)\n", eff_url, res); cell = http_m_cell_lookup(easy); + if(cell == NULL) { + LM_ERR("failed to get the cell\n"); + curl_multi_remove_handle(g->multi, easy); + curl_easy_cleanup(easy); + continue; + } if(msg->data.result != 0) { LM_ERR("handle %p returned error %d: %s\n", easy, res, cell->error);

1 0

git:6.0:dfa9239c: htable: wrapped maco code in do {} while(0)
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: dfa9239cf6df7644e9fe6b83cfc33aff518a19c6 URL: https://github.com/kamailio/kamailio/commit/dfa9239cf6df7644e9fe6b83cfc33af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:39+01:00 htable: wrapped maco code in do {} while(0) (cherry picked from commit 65a296b3478503ed3519ea9156d8f46f5cb9ce2a) --- Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/dfa9239cf6df7644e9fe6b83cfc33af… Patch: https://github.com/kamailio/kamailio/commit/dfa9239cf6df7644e9fe6b83cfc33af… --- diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 4e0757f237b..d9fc187e722 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -144,10 +144,19 @@ ht_cell_t *ht_iterator_get_current(str *iname); void ht_slot_lock(ht_t *ht, int idx); void ht_slot_unlock(ht_t *ht, int idx); -#define HT_UPDATE_EXPIRE(ht, it, now) \ - if(ht->updateexpire || (now && it->expire && it->expire < now)) \ - it->expire = now + ht->htexpire -#define HT_COPY_EXPIRE(ht, it, now, src) \ - HT_UPDATE_EXPIRE(ht, it, now); \ - else it->expire = src->expire +#define HT_UPDATE_EXPIRE(ht, it, now) \ + do { \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) { \ + it->expire = now + ht->htexpire; \ + } \ + } while(0) +#define HT_COPY_EXPIRE(ht, it, now, src) \ + do { \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) { \ + it->expire = now + ht->htexpire; \ + } else { \ + it->expire = src->expire; \ + } \ + } while(0) + #endif

1 0

git:6.0:b38925b0: htable: Fix expiry on assignment
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: b38925b0b3628539840de2b6240da75b9f9f3cc6 URL: https://github.com/kamailio/kamailio/commit/b38925b0b3628539840de2b6240da75… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:31+01:00 htable: Fix expiry on assignment Update cell expiry on assignment for htables w/o updateexpiry (analogue to #4079). (cherry picked from commit 75994f40c99ffa2c7c33e5fce5e3d3cd8db7d780) --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/b38925b0b3628539840de2b6240da75… Patch: https://github.com/kamailio/kamailio/commit/b38925b0b3628539840de2b6240da75… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 9190dd310ff..47b4b975194 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -496,9 +496,7 @@ int ht_set_cell_ex( it->value.s.s[it->value.s.len] = '\0'; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } @@ -514,11 +512,7 @@ int ht_set_cell_ex( cell->next = it->next; cell->prev = it->prev; if(exv <= 0) { - if(ht->updateexpire) { - cell->expire = now + ht->htexpire; - } else { - cell->expire = it->expire; - } + HT_COPY_EXPIRE(ht, cell, now, it); } else { it->expire = now + exv; } @@ -535,9 +529,7 @@ int ht_set_cell_ex( it->value.n = val->n; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } @@ -556,11 +548,7 @@ int ht_set_cell_ex( return -1; } if(exv <= 0) { - if(ht->updateexpire) { - cell->expire = now + ht->htexpire; - } else { - cell->expire = it->expire; - } + HT_COPY_EXPIRE(ht, cell, now, it); } else { it->expire = now + exv; } @@ -578,9 +566,7 @@ int ht_set_cell_ex( it->value.n = val->n; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 5ac11b9bb00..4e0757f237b 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -143,4 +143,11 @@ ht_cell_t *ht_iterator_get_current(str *iname); void ht_slot_lock(ht_t *ht, int idx); void ht_slot_unlock(ht_t *ht, int idx); + +#define HT_UPDATE_EXPIRE(ht, it, now) \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) \ + it->expire = now + ht->htexpire +#define HT_COPY_EXPIRE(ht, it, now, src) \ + HT_UPDATE_EXPIRE(ht, it, now); \ + else it->expire = src->expire #endif

1 0

git:6.0:9c44aec6: core/parser/sdp: proper test for media ip separator
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 9c44aec667fc3c088612dd31935bce2eb082812d URL: https://github.com/kamailio/kamailio/commit/9c44aec667fc3c088612dd31935bce2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:23+01:00 core/parser/sdp: proper test for media ip separator (cherry picked from commit 200cdb318569191cd012dfe99b252f98fe9623b9) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/9c44aec667fc3c088612dd31935bce2… Patch: https://github.com/kamailio/kamailio/commit/9c44aec667fc3c088612dd31935bce2… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 61022b6148f..893ef0e58a4 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -561,7 +561,7 @@ int extract_mediaip(str *body, str *mediaip, int *pf, char *line) * - for length, at least 6: ' IP[4|6] x...' * - white space after */ - if(cp + 6 > mediaip->s + mediaip->len && cp[4] != ' ') { + if(cp + 6 > mediaip->s + mediaip->len || cp[4] != ' ') { LM_ERR("invalid content for `%s' line\n", line); return -1; }

1 0

git:6.0:9e21ce85: presence: do not break on one notify sending failure
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 9e21ce85d0c97679f9e14f9c31108f2dcdad772e URL: https://github.com/kamailio/kamailio/commit/9e21ce85d0c97679f9e14f9c31108f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:13:11+01:00 presence: do not break on one notify sending failure - try all of them, debug message with successful and failure counters - GH #4118 (cherry picked from commit 65e51b776290a1981e9ac27fbe6b47813516bc8b) --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/9e21ce85d0c97679f9e14f9c31108f2… Patch: https://github.com/kamailio/kamailio/commit/9e21ce85d0c97679f9e14f9c31108f2… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 47a11b23183..191cac0d04b 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1557,6 +1557,8 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) subs_t *subs_array = NULL, *s = NULL; str *notify_body = NULL, *aux_body = NULL; int ret_code = -1; + int retOK = 0; + int retErr = 0; subs_array = get_subs_dialog(pres_uri, event, NULL); if(subs_array == NULL) { @@ -1586,7 +1588,9 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) < 0) { LM_ERR("Could not send notify for [event]=%.*s\n", event->name.len, event->name.s); - goto done; + retErr++; + } else { + retOK++; } if(aux_body != NULL) { @@ -1599,7 +1603,10 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) } } - ret_code = 1; + LM_DBG("sent ok: %d - err: %d\n", retOK, retErr); + if(retOK > 0) { + ret_code = 1; + } done: free_subs_list(subs_array, PKG_MEM_TYPE, 0);

1 0

git:6.0:a5ac9e04: core: more checks for extract_candidate()
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: a5ac9e04b91971da44256373904450501f9a4493 URL: https://github.com/kamailio/kamailio/commit/a5ac9e04b91971da442563739044505… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:12:47+01:00 core: more checks for extract_candidate() (cherry picked from commit 3198b66aa5dbda1c6a03f46a610073671cbd5157) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/a5ac9e04b91971da442563739044505… Patch: https://github.com/kamailio/kamailio/commit/a5ac9e04b91971da442563739044505… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 483cfdec70e..61022b6148f 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -314,7 +314,7 @@ int extract_candidate(str *body, sdp_stream_cell_t *stream) int len, fl; sdp_ice_attr_t *ice_attr; - if((body->len < 12) || (strncasecmp(body->s, "a=candidate:", 12) != 0)) { + if((body->len <= 12) || (strncasecmp(body->s, "a=candidate:", 12) != 0)) { /*LM_DBG("We are not pointing to an a=candidate: attribute =>`%.*s'\n", body->len, body->s); */ return -1; } @@ -332,6 +332,10 @@ int extract_candidate(str *body, sdp_stream_cell_t *stream) start = space + 1; len = len - (space - start + 1); + if(start + len > body->s + body->len) { + LM_ERR("no component in `a=candidate'\n"); + return -1; + } space = memchr(start, 32, len); if(space == NULL) { LM_ERR("no component in `a=candidate'\n");

1 0

git:6.0:6e2a37c4: core: extended logs for subst lumps
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: 6.0 Commit: 6e2a37c449a14c03f9c086ae9fb61729d8fce393 URL: https://github.com/kamailio/kamailio/commit/6e2a37c449a14c03f9c086ae9fb6172… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:12:31+01:00 core: extended logs for subst lumps (cherry picked from commit d307fee57b7a8a7e0b5ccf0956464a159e156b73) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/6e2a37c449a14c03f9c086ae9fb6172… Patch: https://github.com/kamailio/kamailio/commit/6e2a37c449a14c03f9c086ae9fb6172…

1 0

git:master:d8d627ef: etc/kamailio.cfg: close comment for tls_threads_mode
by Daniel-Constantin Mierla 28 Jan '25

28 Jan '25

Module: kamailio Branch: master Commit: d8d627eff7de268a487d7f91cc52e7ba8a6c708e URL: https://github.com/kamailio/kamailio/commit/d8d627eff7de268a487d7f91cc52e7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-28T10:10:33+01:00 etc/kamailio.cfg: close comment for tls_threads_mode --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/d8d627eff7de268a487d7f91cc52e7b… Patch: https://github.com/kamailio/kamailio/commit/d8d627eff7de268a487d7f91cc52e7b… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index a61227d4173..a06e09fdc77 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -234,9 +234,10 @@ tls_max_connections=2048 /* For OpenSSL 3 integration * functions calling libssl3 can be invoked in a transient thread * 0: disable threaded calls - * 1: use thread executors for process#0 only - * 2: no thread executors, but use atfork handler to reset thread-locals to NULL + * 1: use thread executors for process #0 only + * 2: no thread executors, but use atfork handler to reset thread-locals to NULL */ tls_threads_mode=2 + #!endif /* set it to yes to enable sctp and load sctp.so module */

1 0

git:master:feb37185: cmake: fix CPL definition
by Victor Seva 27 Jan '25

27 Jan '25

Module: kamailio Branch: master Commit: feb371852ea9b53a1dd95fec0db0943c5fb160ad URL: https://github.com/kamailio/kamailio/commit/feb371852ea9b53a1dd95fec0db0943… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-27T19:41:30+01:00 cmake: fix CPL definition --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/feb371852ea9b53a1dd95fec0db0943… Patch: https://github.com/kamailio/kamailio/commit/feb371852ea9b53a1dd95fec0db0943… --- diff --git a/cmake/groups.cmake b/cmake/groups.cmake index 9cd7ddf77dc..73ef6d632dd 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -167,7 +167,7 @@ set(MOD_LIST_POSTGRES db_postgres) set(MOD_LIST_UNIXODBC db_unixodbc) # * modules depending on xml2 library -set(MOD_LIST_CPLC cplc) +set(MOD_LIST_CPL cplc) # * modules depending on xml2 library set(MOD_LIST_XMLDEPS xhttp_pi xmlrpc xmlops) @@ -385,7 +385,7 @@ set(MOD_LIST_ALL ${MOD_LIST_UNIXODBC} ${MOD_LIST_XMLDEPS} ${MOD_LIST_PERLDEPS} - ${MOD_LIST_CPLC} + ${MOD_LIST_CPL} ${MOD_LIST_XMPP} ${MOD_LIST_BERKELEY} ${MOD_LIST_UTILS}

1 0

git:master:b16550fa: http_async_client: check returned cell inside check_multi_info()
by Daniel-Constantin Mierla 27 Jan '25

27 Jan '25

Module: kamailio Branch: master Commit: b16550fa72d23084b4221769fe74b1f3c357c9fd URL: https://github.com/kamailio/kamailio/commit/b16550fa72d23084b4221769fe74b1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-27T16:06:49+01:00 http_async_client: check returned cell inside check_multi_info() --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/b16550fa72d23084b4221769fe74b1f… Patch: https://github.com/kamailio/kamailio/commit/b16550fa72d23084b4221769fe74b1f… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index 30ae016d720..7edc0ddc1a0 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -604,7 +604,7 @@ void check_multi_info(struct http_m_global *g) CURL *easy; CURLcode res; - struct http_m_cell *cell; + struct http_m_cell *cell = NULL; double tmp_time; LM_DBG("REMAINING: %d\n", g->still_running); @@ -616,9 +616,15 @@ void check_multi_info(struct http_m_global *g) curl_easy_getinfo(easy, CURLINFO_EFFECTIVE_URL, &eff_url); - LM_DBG("DONE: %s => (%d) %s\n", eff_url, res, cell->error); + LM_DBG("DONE: %s => (%d)\n", eff_url, res); cell = http_m_cell_lookup(easy); + if(cell == NULL) { + LM_ERR("failed to get the cell\n"); + curl_multi_remove_handle(g->multi, easy); + curl_easy_cleanup(easy); + continue; + } if(msg->data.result != 0) { LM_ERR("handle %p returned error %d: %s\n", easy, res, cell->error);

1 0

Unable to build json module on Amazon Linux 2023 using cmake
by Ovidiu Sas 27 Jan '25

27 Jan '25

Trying to build kamailio on Amazon Linux 2023. The json-c-devel package was installed, Unlike older versions of json, the json.h is located here: /usr/include/json-c/json.h This is correctly identified by pkg-config: # pkg-config --cflags json-c -I/usr/include/json-c Kamailio source code was installed under: /usr/local/src/kamailio Build directory: /usr/local/src/kamailio_build Configure the build: # cmake -S /usr/local/src/kamailio -B /usr/local/src/kamailio_build -DINCLUDE_MODULES="json" -DEXCLUDE_MODULES="async auth benchmark blst cfg_rpc cfgutils corex counters ctl debugger diversion enum exec ipops kex mangler maxfwd mediaproxy mqueue nat_traversal nathelper path pike pv ratelimit rr rtimer rtpproxy sanity sdpops siputils sl statistics textops textopsx tm tmx topoh xlog rtpengine stun sipt tcpops auth_xkeys smsops tsilo cfgt statsc topos topos_htable sipdump pv_headers kemix avp auth_diameter call_control call_obj dmq domainpolicy msrp carrierroute pdb qos sca seas sms sst timer tmrec uac_redirect xhttp xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson log_custom keepalive ss7ops acc_diameter evrexec file_out sipjson lrkproxy math posops xhttp_prom dlgs sworker influxdbc acc alias_db auth_db avpops cfg_db db_text db_flatstore db_cluster dialog dispatcher domain drouting group htable imc matrix mohqueue msilo mtree p_usrloc pdt permissions pipelimit prefix_route registrar sipcapture siptrace speeddial sqlops uac uri_db userblocklist usrloc secfilter db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags uid_uri_db misctest app_jsdt" -DVERBOSE=ON -- The C compiler identification is GNU 11.4.1 -- The CXX compiler identification is GNU 11.4.1 -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working C compiler: /usr/bin/cc - skipped -- Detecting C compile features -- Detecting C compile features - done -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Check for working CXX compiler: /usr/bin/c++ - skipped -- Detecting CXX compile features -- Detecting CXX compile features - done -- PROJECT_VERSION: 6.0.0 -- RELEASE: 6.0.0-pre0 -- VERSIONVAL: 6000000 -- Setting build type to 'Debug' as none was specified. -- OS: Linux -- OS version: 6.1.119-129.201.amzn2023.x86_64 -- Host Processor: x86_64 -- Target Processor: x86_64 -- Target Processor Alias: x86_64 -- Fast lock available: YES -- Configuring for Linux -- Cross compile: FALSE -- CMAKE_INSTALL_PREFIX: /usr/local -- CMAKE_INSTALL_LIBDIR: /usr/local/lib64 -- CMAKE_INSTALL_BINDIR: /usr/local/bin -- CMAKE_INSTALL_SBINDIR: /usr/local/sbin -- CMAKE_INSTALL_SYSCONFDIR: /usr/local/etc -- CMAKE_INSTALL_LOCALSTATEDIR:/usr/local/var/run/kamailio -- CMAKE_INSTALL_DATADIR: /usr/local/share -- CMAKE_INSTALL_DOCDIR: /usr/local/share/doc/kamailio -- CMAKE_INSTALL_MANDIR: /usr/local/share/man -- CMAKE_C_COMPILER: /usr/bin/cc -- CMAKE_C_COMPILER_ID: GNU -- CMAKE_C_COMPILER_VERSION: 11.4.1 -- Looking for pthread.h -- Looking for pthread.h - found -- Performing Test CMAKE_HAVE_LIBC_PTHREAD -- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Success -- Found Threads: TRUE -- Compile definitions for common: FAST_LOCK;ADAPTIVE_WAIT;ADAPTIVE_WAIT_LOOPS=1024;USE_TCP;USE_TLS;TLS_HOOKS;USE_NAPTR;USE_DNS_CACHE;F_MALLOC;Q_MALLOC;TLSF_MALLOC;MALLOC_STATS;DBG_SR_MEMORY;USE_DNS_FAILOVER;USE_DST_BLOCKLIST;HAVE_RESOLV_RES;USE_MCAST;DISABLE_NAGLE;DNS_IP_HACK;SHM_MMAP;PKG_MALLOC;RAW_SOCKS;KSR_PTHREAD_MUTEX_SHARED;FMSTATS;KMSTATS;HAVE_GETHOSTBYNAME2;HAVE_UNION_SEMUN;HAVE_SCHED_YIELD;HAVE_MSG_NOSIGNAL;HAVE_MSGHDR_MSG_CONTROL;HAVE_ALLOCA_H;HAVE_TIMEGM;HAVE_SCHED_SETSCHEDULER;HAVE_IP_MREQN;USE_RAW_SOCKS;HAVE_SELECT;HAVE_EPOLL;HAVE_SIGIO_RT;SIGINFO64_WORKAROUND;NAME="kamailio";VERSION="6.0.0-pre0";ARCH="x86_64";OS=Linux;OS_QUOTED="Linux";COMPILER="gcc 11.4.1";__CPU_x86_64;__OS_linux;VERSIONVAL=6000000;CFG_DIR="/usr/local/etc/kamailio/";SHARE_DIR="/usr/local/share/kamailio/";RUN_DIR="/run/kamailio";$<$<BOOL:ON>:USE_SCTP>;$<$<BOOL:ON>:STATISTICS> -- Compile options for common: MY_INTERFACE_OPTIONS-NOTFOUND -- Found FLEX: /usr/bin/flex (found version "2.6.4") -- Found BISON: /usr/bin/bison (found version "3.7.4") -- Found LibXml2: /usr/lib64/libxml2.so (found version "2.10.4") -- Building groups: DEFAULT -- xsltproc or lynx not found but required for doc generation. -- DOCS_XSL_VAIDATION=OFFDisabling xsl validation when generating documentation -- Extra modules (if module already included already from group is ignored): json -- Excluded modules (exlcude even if in included modules): async;auth;benchmark;blst;cfg_rpc;cfgutils;corex;counters;ctl;debugger;diversion;enum;exec;ipops;kex;mangler;maxfwd;mediaproxy;mqueue;nat_traversal;nathelper;path;pike;pv;ratelimit;rr;rtimer;rtpproxy;sanity;sdpops;siputils;sl;statistics;textops;textopsx;tm;tmx;topoh;xlog;rtpengine;stun;sipt;tcpops;auth_xkeys;smsops;tsilo;cfgt;statsc;topos;topos_htable;sipdump;pv_headers;kemix;avp;auth_diameter;call_control;call_obj;dmq;domainpolicy;msrp;carrierroute;pdb;qos;sca;seas;sms;sst;timer;tmrec;uac_redirect;xhttp;xhttp_rpc;xprint;jsonrpcs;nosip;dmq_usrloc;statsd;rtjson;log_custom;keepalive;ss7ops;acc_diameter;evrexec;file_out;sipjson;lrkproxy;math;posops;xhttp_prom;dlgs;sworker;influxdbc;acc;alias_db;auth_db;avpops;cfg_db;db_text;db_flatstore;db_cluster;dialog;dispatcher;domain;drouting;group;htable;imc;matrix;mohqueue;msilo;mtree;p_usrloc;pdt;permissions;pipelimit;prefix_route;registrar;sipcapture;siptrace;speeddial;sqlops;uac;uri_db;userblocklist;usrloc;secfilter;db2_ops;uid_auth_db;uid_avp_db;uid_domain;uid_gflags;uid_uri_db;misctest;app_jsdt -- Modules in MODULE_GROUP_DEFAULT: async;auth;benchmark;blst;cfg_rpc;cfgutils;corex;counters;ctl;debugger;diversion;enum;exec;ipops;kex;mangler;maxfwd;mediaproxy;mqueue;nat_traversal;nathelper;path;pike;pv;ratelimit;rr;rtimer;rtpproxy;sanity;sdpops;siputils;sl;statistics;textops;textopsx;tm;tmx;topoh;xlog;rtpengine;stun;sipt;tcpops;auth_xkeys;smsops;tsilo;cfgt;statsc;topos;topos_htable;sipdump;pv_headers;kemix;avp;auth_diameter;call_control;call_obj;dmq;domainpolicy;msrp;carrierroute;pdb;qos;sca;seas;sms;sst;timer;tmrec;uac_redirect;xhttp;xhttp_rpc;xprint;jsonrpcs;nosip;dmq_usrloc;statsd;rtjson;log_custom;keepalive;ss7ops;acc_diameter;evrexec;file_out;sipjson;lrkproxy;math;posops;xhttp_prom;dlgs;sworker;influxdbc;acc;alias_db;auth_db;avpops;cfg_db;db_text;db_flatstore;db_cluster;dialog;dispatcher;domain;drouting;group;htable;imc;matrix;mohqueue;msilo;mtree;p_usrloc;pdt;permissions;pipelimit;prefix_route;registrar;sipcapture;siptrace;speeddial;sqlops;uac;uri_db;userblocklist;usrloc;secfilter;db2_ops;uid_auth_db;uid_avp_db;uid_domain;uid_gflags;uid_uri_db;misctest;app_jsdt -- Module async is excluded. Skipping... -- Module auth is excluded. Skipping... -- Module benchmark is excluded. Skipping... -- Module blst is excluded. Skipping... -- Module cfg_rpc is excluded. Skipping... -- Module cfgutils is excluded. Skipping... -- Module corex is excluded. Skipping... -- Module counters is excluded. Skipping... -- Module ctl is excluded. Skipping... -- Module debugger is excluded. Skipping... -- Module diversion is excluded. Skipping... -- Module enum is excluded. Skipping... -- Module exec is excluded. Skipping... -- Module ipops is excluded. Skipping... -- Module kex is excluded. Skipping... -- Module mangler is excluded. Skipping... -- Module maxfwd is excluded. Skipping... -- Module mediaproxy is excluded. Skipping... -- Module mqueue is excluded. Skipping... -- Module nat_traversal is excluded. Skipping... -- Module nathelper is excluded. Skipping... -- Module path is excluded. Skipping... -- Module pike is excluded. Skipping... -- Module pv is excluded. Skipping... -- Module ratelimit is excluded. Skipping... -- Module rr is excluded. Skipping... -- Module rtimer is excluded. Skipping... -- Module rtpproxy is excluded. Skipping... -- Module sanity is excluded. Skipping... -- Module sdpops is excluded. Skipping... -- Module siputils is excluded. Skipping... -- Module sl is excluded. Skipping... -- Module statistics is excluded. Skipping... -- Module textops is excluded. Skipping... -- Module textopsx is excluded. Skipping... -- Module tm is excluded. Skipping... -- Module tmx is excluded. Skipping... -- Module topoh is excluded. Skipping... -- Module xlog is excluded. Skipping... -- Module rtpengine is excluded. Skipping... -- Module stun is excluded. Skipping... -- Module sipt is excluded. Skipping... -- Module tcpops is excluded. Skipping... -- Module auth_xkeys is excluded. Skipping... -- Module smsops is excluded. Skipping... -- Module tsilo is excluded. Skipping... -- Module cfgt is excluded. Skipping... -- Module statsc is excluded. Skipping... -- Module topos is excluded. Skipping... -- Module topos_htable is excluded. Skipping... -- Module sipdump is excluded. Skipping... -- Module pv_headers is excluded. Skipping... -- Module kemix is excluded. Skipping... -- Module avp is excluded. Skipping... -- Module auth_diameter is excluded. Skipping... -- Module call_control is excluded. Skipping... -- Module call_obj is excluded. Skipping... -- Module dmq is excluded. Skipping... -- Module domainpolicy is excluded. Skipping... -- Module msrp is excluded. Skipping... -- Module carrierroute is excluded. Skipping... -- Module pdb is excluded. Skipping... -- Module qos is excluded. Skipping... -- Module sca is excluded. Skipping... -- Module seas is excluded. Skipping... -- Module sms is excluded. Skipping... -- Module sst is excluded. Skipping... -- Module timer is excluded. Skipping... -- Module tmrec is excluded. Skipping... -- Module uac_redirect is excluded. Skipping... -- Module xhttp is excluded. Skipping... -- Module xhttp_rpc is excluded. Skipping... -- Module xprint is excluded. Skipping... -- Module jsonrpcs is excluded. Skipping... -- Module nosip is excluded. Skipping... -- Module dmq_usrloc is excluded. Skipping... -- Module statsd is excluded. Skipping... -- Module rtjson is excluded. Skipping... -- Module log_custom is excluded. Skipping... -- Module keepalive is excluded. Skipping... -- Module ss7ops is excluded. Skipping... -- Module acc_diameter is excluded. Skipping... -- Module evrexec is excluded. Skipping... -- Module file_out is excluded. Skipping... -- Module sipjson is excluded. Skipping... -- Module lrkproxy is excluded. Skipping... -- Module math is excluded. Skipping... -- Module posops is excluded. Skipping... -- Module xhttp_prom is excluded. Skipping... -- Module dlgs is excluded. Skipping... -- Module sworker is excluded. Skipping... -- Module influxdbc is excluded. Skipping... -- Module acc is excluded. Skipping... -- Module alias_db is excluded. Skipping... -- Module auth_db is excluded. Skipping... -- Module avpops is excluded. Skipping... -- Module cfg_db is excluded. Skipping... -- Module db_text is excluded. Skipping... -- Module db_flatstore is excluded. Skipping... -- Module db_cluster is excluded. Skipping... -- Module dialog is excluded. Skipping... -- Module dispatcher is excluded. Skipping... -- Module domain is excluded. Skipping... -- Module drouting is excluded. Skipping... -- Module group is excluded. Skipping... -- Module htable is excluded. Skipping... -- Module imc is excluded. Skipping... -- Module matrix is excluded. Skipping... -- Module mohqueue is excluded. Skipping... -- Module msilo is excluded. Skipping... -- Module mtree is excluded. Skipping... -- Module p_usrloc is excluded. Skipping... -- Module pdt is excluded. Skipping... -- Module permissions is excluded. Skipping... -- Module pipelimit is excluded. Skipping... -- Module prefix_route is excluded. Skipping... -- Module registrar is excluded. Skipping... -- Module sipcapture is excluded. Skipping... -- Module siptrace is excluded. Skipping... -- Module speeddial is excluded. Skipping... -- Module sqlops is excluded. Skipping... -- Module uac is excluded. Skipping... -- Module uri_db is excluded. Skipping... -- Module userblocklist is excluded. Skipping... -- Module usrloc is excluded. Skipping... -- Module secfilter is excluded. Skipping... -- Module db2_ops is excluded. Skipping... -- Module uid_auth_db is excluded. Skipping... -- Module uid_avp_db is excluded. Skipping... -- Module uid_domain is excluded. Skipping... -- Module uid_gflags is excluded. Skipping... -- Module uid_uri_db is excluded. Skipping... -- Module misctest is excluded. Skipping... -- Module app_jsdt is excluded. Skipping... -- Modules to be built: json -- xsltproc is not found. Skip dbschema target. -- Found PkgConfig: /usr/bin/pkg-config (found version "1.8.0") -- Checking for module 'readline' -- Found readline, version 8.1 -- Configuring done -- Generating done -- Build files have been written to: /usr/local/src/kamailio_build Building: # cmake --build /usr/local/src/kamailio_build /usr/bin/cmake -S/usr/local/src/kamailio -B/usr/local/src/kamailio_build --check-build-system CMakeFiles/Makefile.cmake 0 /usr/bin/cmake -E cmake_progress_start /usr/local/src/kamailio_build/CMakeFiles /usr/local/src/kamailio_build//CMakeFiles/progress.marks /usr/bin/gmake -f CMakeFiles/Makefile2 all gmake[1]: Entering directory '/usr/local/src/kamailio_build' /usr/bin/gmake -f src/core/CMakeFiles/GenerateParser.dir/build.make src/core/CMakeFiles/GenerateParser.dir/depend gmake[2]: Entering directory '/usr/local/src/kamailio_build' cd /usr/local/src/kamailio_build && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /usr/local/src/kamailio /usr/local/src/kamailio/src/core /usr/local/src/kamailio_build /usr/local/src/kamailio_build/src/core /usr/local/src/kamailio_build/src/core/CMakeFiles/GenerateParser.dir/DependInfo.cmake --color= gmake[2]: Leaving directory '/usr/local/src/kamailio_build' /usr/bin/gmake -f src/core/CMakeFiles/GenerateParser.dir/build.make src/core/CMakeFiles/GenerateParser.dir/build gmake[2]: Entering directory '/usr/local/src/kamailio_build' [ 0%] Generating cfg.tab.c and cfg.tab.h from cfg.y cd /usr/local/src/kamailio_build/src/core && /usr/bin/bison -d -b cfg -o /usr/local/src/kamailio_build/src/core/cfg.tab.c /usr/local/src/kamailio/src/core/cfg.y [ 1%] Generating lex.yy.c from cfg.lex cd /usr/local/src/kamailio_build/src/core && /usr/bin/flex -o /usr/local/src/kamailio_build/src/core/lex.yy.c /usr/local/src/kamailio/src/core/cfg.lex [ 1%] Generating parser source files gmake[2]: Leaving directory '/usr/local/src/kamailio_build' [ 1%] Built target GenerateParser /usr/bin/gmake -f src/CMakeFiles/kamailio.dir/build.make src/CMakeFiles/kamailio.dir/depend gmake[2]: Entering directory '/usr/local/src/kamailio_build' cd /usr/local/src/kamailio_build && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /usr/local/src/kamailio /usr/local/src/kamailio/src /usr/local/src/kamailio_build /usr/local/src/kamailio_build/src /usr/local/src/kamailio_build/src/CMakeFiles/kamailio.dir/DependInfo.cmake --color= gmake[2]: Leaving directory '/usr/local/src/kamailio_build' /usr/bin/gmake -f src/CMakeFiles/kamailio.dir/build.make src/CMakeFiles/kamailio.dir/build gmake[2]: Entering directory '/usr/local/src/kamailio_build' [ 2%] Building C object src/CMakeFiles/kamailio.dir/main.c.o cd /usr/local/src/kamailio_build/src && /usr/bin/cc -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DARCH=\"x86_64\" -DCC_GCC_LIKE_ASM -DCFG_DIR=\"/usr/local/etc/kamailio/\" -DCOMPILER="\"gcc 11.4.1\"" -DDBG_SR_MEMORY -DDISABLE_NAGLE -DDNS_IP_HACK -DFAST_LOCK -DFMSTATS -DF_MALLOC -DHAVE_ALLOCA_H -DHAVE_EPOLL -DHAVE_GETHOSTBYNAME2 -DHAVE_IP_MREQN -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_MSG_NOSIGNAL -DHAVE_RESOLV_RES -DHAVE_SCHED_SETSCHEDULER -DHAVE_SCHED_YIELD -DHAVE_SELECT -DHAVE_SIGIO_RT -DHAVE_TIMEGM -DHAVE_UNION_SEMUN -DKMSTATS -DKSR_PTHREAD_MUTEX_SHARED -DMALLOC_STATS -DMODS_DIR=\"/usr/local/lib64/kamailio/modules\" -DNAME=\"kamailio\" -DOS=Linux -DOS_QUOTED=\"Linux\" -DPKG_MALLOC -DQ_MALLOC -DRAW_SOCKS -DRUN_DIR=\"/run/kamailio\" -DSHARE_DIR=\"/usr/local/share/kamailio/\" -DSHM_MMAP -DSIGINFO64_WORKAROUND -DSTATISTICS -DTLSF_MALLOC -DTLS_HOOKS -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_MCAST -DUSE_NAPTR -DUSE_RAW_SOCKS -DUSE_SCTP -DUSE_TCP -DUSE_TLS -DVERSION=\"6.0.0-pre0\" -DVERSIONVAL=6000000 -D__CPU_x86_64 -D__OS_linux -Dkamailio_EXPORTS -I/usr/local/src/kamailio/src/core -g -ffile-prefix-map=/usr/local/src/kamailio/src/= -Wall -funroll-loops -Wcast-align -Werror=implicit-function-declaration -Werror=implicit-int -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -std=gnu11 -MD -MT src/CMakeFiles/kamailio.dir/main.c.o -MF CMakeFiles/kamailio.dir/main.c.o.d -o CMakeFiles/kamailio.dir/main.c.o -c /usr/local/src/kamailio/src/main.c ... [ 91%] Linking C executable kamailio cd /usr/local/src/kamailio_build/src && /usr/bin/cmake -E cmake_link_script CMakeFiles/kamailio.dir/link.txt --verbose=1 /usr/bin/cc -g -Wl,--export-dynamic -rdynamic -m64 CMakeFiles/kamailio.dir/main.c.o CMakeFiles/kamailio.dir/lib/ims/ims_getters.c.o CMakeFiles/kamailio.dir/lib/srdb1/db.c.o CMakeFiles/kamailio.dir/lib/srdb1/db_id.c.o CMakeFiles/kamailio.dir/lib/srdb1/db_pool.c.o CMakeFiles/kamailio.dir/lib/srdb1/db_query.c.o CMakeFiles/kamailio.dir/lib/srdb1/db_res.c.o CMakeFiles/kamailio.dir/lib/srdb1/db_row.c.o CMakeFiles/kamailio.dir/lib/srdb1/db_ut.c.o CMakeFiles/kamailio.dir/lib/srdb1/db_val.c.o CMakeFiles/kamailio.dir/lib/srdb2/db.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_cmd.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_con.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_ctx.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_drv.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_fld.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_gen.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_pool.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_rec.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_res.c.o CMakeFiles/kamailio.dir/lib/srdb2/db_uri.c.o CMakeFiles/kamailio.dir/lib/trie/dtrie.c.o CMakeFiles/kamailio.dir/core/action.c.o CMakeFiles/kamailio.dir/core/async_task.c.o CMakeFiles/kamailio.dir/core/atomic_ops.c.o CMakeFiles/kamailio.dir/core/basex.c.o CMakeFiles/kamailio.dir/core/bit_count.c.o CMakeFiles/kamailio.dir/core/bit_scan.c.o CMakeFiles/kamailio.dir/core/cfg/cfg.c.o CMakeFiles/kamailio.dir/core/cfg/cfg_ctx.c.o CMakeFiles/kamailio.dir/core/cfg/cfg_script.c.o CMakeFiles/kamailio.dir/core/cfg/cfg_select.c.o CMakeFiles/kamailio.dir/core/cfg/cfg_struct.c.o CMakeFiles/kamailio.dir/core/cfg_core.c.o CMakeFiles/kamailio.dir/core/cfg_parser.c.o CMakeFiles/kamailio.dir/core/core_cmd.c.o CMakeFiles/kamailio.dir/core/counters.c.o CMakeFiles/kamailio.dir/core/crc.c.o CMakeFiles/kamailio.dir/core/crypto/md5.c.o CMakeFiles/kamailio.dir/core/crypto/md5utils.c.o CMakeFiles/kamailio.dir/core/crypto/rijndael.c.o CMakeFiles/kamailio.dir/core/crypto/sha256.c.o CMakeFiles/kamailio.dir/core/crypto/shautils.c.o CMakeFiles/kamailio.dir/core/daemonize.c.o CMakeFiles/kamailio.dir/core/data_lump.c.o CMakeFiles/kamailio.dir/core/data_lump_rpl.c.o CMakeFiles/kamailio.dir/core/dns_cache.c.o CMakeFiles/kamailio.dir/core/dns_func.c.o CMakeFiles/kamailio.dir/core/dprint.c.o CMakeFiles/kamailio.dir/core/dset.c.o CMakeFiles/kamailio.dir/core/dst_blocklist.c.o CMakeFiles/kamailio.dir/core/endianness.c.o CMakeFiles/kamailio.dir/core/error.c.o CMakeFiles/kamailio.dir/core/events.c.o CMakeFiles/kamailio.dir/core/flags.c.o CMakeFiles/kamailio.dir/core/fmsg.c.o CMakeFiles/kamailio.dir/core/forward.c.o CMakeFiles/kamailio.dir/core/hash_func.c.o CMakeFiles/kamailio.dir/core/id.c.o CMakeFiles/kamailio.dir/core/io_wait.c.o CMakeFiles/kamailio.dir/core/ip_addr.c.o CMakeFiles/kamailio.dir/core/kemi.c.o CMakeFiles/kamailio.dir/core/kemiexec.c.o CMakeFiles/kamailio.dir/core/local_timer.c.o CMakeFiles/kamailio.dir/core/lock_ops.c.o CMakeFiles/kamailio.dir/core/locking.c.o CMakeFiles/kamailio.dir/core/lvalue.c.o CMakeFiles/kamailio.dir/core/mem/f_malloc.c.o CMakeFiles/kamailio.dir/core/mem/memtest.c.o CMakeFiles/kamailio.dir/core/mem/pkg.c.o CMakeFiles/kamailio.dir/core/mem/q_malloc.c.o CMakeFiles/kamailio.dir/core/mem/shm.c.o CMakeFiles/kamailio.dir/core/mem/tlsf_malloc.c.o CMakeFiles/kamailio.dir/core/mod_fix.c.o CMakeFiles/kamailio.dir/core/modparam.c.o CMakeFiles/kamailio.dir/core/msg_translator.c.o CMakeFiles/kamailio.dir/core/nonsip_hooks.c.o CMakeFiles/kamailio.dir/core/onsend.c.o CMakeFiles/kamailio.dir/core/parser/contact/contact.c.o CMakeFiles/kamailio.dir/core/parser/contact/parse_contact.c.o CMakeFiles/kamailio.dir/core/parser/digest/digest.c.o CMakeFiles/kamailio.dir/core/parser/digest/digest_parser.c.o CMakeFiles/kamailio.dir/core/parser/digest/param_parser.c.o CMakeFiles/kamailio.dir/core/parser/hf.c.o CMakeFiles/kamailio.dir/core/parser/msg_parser.c.o CMakeFiles/kamailio.dir/core/parser/parse_addr_spec.c.o CMakeFiles/kamailio.dir/core/parser/parse_allow.c.o CMakeFiles/kamailio.dir/core/parser/parse_body.c.o CMakeFiles/kamailio.dir/core/parser/parse_content.c.o CMakeFiles/kamailio.dir/core/parser/parse_cseq.c.o CMakeFiles/kamailio.dir/core/parser/parse_date.c.o CMakeFiles/kamailio.dir/core/parser/parse_disposition.c.o CMakeFiles/kamailio.dir/core/parser/parse_diversion.c.o CMakeFiles/kamailio.dir/core/parser/parse_event.c.o CMakeFiles/kamailio.dir/core/parser/parse_expires.c.o CMakeFiles/kamailio.dir/core/parser/parse_fline.c.o CMakeFiles/kamailio.dir/core/parser/parse_from.c.o CMakeFiles/kamailio.dir/core/parser/parse_hname2.c.o CMakeFiles/kamailio.dir/core/parser/parse_identity.c.o CMakeFiles/kamailio.dir/core/parser/parse_identityinfo.c.o CMakeFiles/kamailio.dir/core/parser/parse_methods.c.o CMakeFiles/kamailio.dir/core/parser/parse_nameaddr.c.o CMakeFiles/kamailio.dir/core/parser/parse_option_tags.c.o CMakeFiles/kamailio.dir/core/parser/parse_param.c.o CMakeFiles/kamailio.dir/core/parser/parse_ppi_pai.c.o CMakeFiles/kamailio.dir/core/parser/parse_privacy.c.o CMakeFiles/kamailio.dir/core/parser/parse_refer_to.c.o CMakeFiles/kamailio.dir/core/parser/parse_require.c.o CMakeFiles/kamailio.dir/core/parser/parse_retry_after.c.o CMakeFiles/kamailio.dir/core/parser/parse_rpid.c.o CMakeFiles/kamailio.dir/core/parser/parse_rr.c.o CMakeFiles/kamailio.dir/core/parser/parse_sipifmatch.c.o CMakeFiles/kamailio.dir/core/parser/parse_subscription_state.c.o CMakeFiles/kamailio.dir/core/parser/parse_supported.c.o CMakeFiles/kamailio.dir/core/parser/parse_to.c.o CMakeFiles/kamailio.dir/core/parser/parse_uri.c.o CMakeFiles/kamailio.dir/core/parser/parse_via.c.o CMakeFiles/kamailio.dir/core/parser/parser_f.c.o CMakeFiles/kamailio.dir/core/parser/sdp/sdp.c.o CMakeFiles/kamailio.dir/core/parser/sdp/sdp_helpr_funcs.c.o CMakeFiles/kamailio.dir/core/pass_fd.c.o CMakeFiles/kamailio.dir/core/ppcfg.c.o CMakeFiles/kamailio.dir/core/proxy.c.o CMakeFiles/kamailio.dir/core/pt.c.o CMakeFiles/kamailio.dir/core/pv_core.c.o CMakeFiles/kamailio.dir/core/pvapi.c.o CMakeFiles/kamailio.dir/core/qvalue.c.o CMakeFiles/kamailio.dir/core/rand/cryptorand.c.o CMakeFiles/kamailio.dir/core/rand/fastrand.c.o CMakeFiles/kamailio.dir/core/rand/fortuna/fortuna.c.o CMakeFiles/kamailio.dir/core/rand/fortuna/random.c.o CMakeFiles/kamailio.dir/core/rand/isaac/rand.c.o CMakeFiles/kamailio.dir/core/raw_listener.c.o CMakeFiles/kamailio.dir/core/raw_sock.c.o CMakeFiles/kamailio.dir/core/re.c.o CMakeFiles/kamailio.dir/core/receive.c.o CMakeFiles/kamailio.dir/core/resolve.c.o CMakeFiles/kamailio.dir/core/route.c.o CMakeFiles/kamailio.dir/core/route_struct.c.o CMakeFiles/kamailio.dir/core/rpc_lookup.c.o CMakeFiles/kamailio.dir/core/rvalue.c.o CMakeFiles/kamailio.dir/core/script_cb.c.o CMakeFiles/kamailio.dir/core/sctp_core.c.o CMakeFiles/kamailio.dir/core/select.c.o CMakeFiles/kamailio.dir/core/select_buf.c.o CMakeFiles/kamailio.dir/core/select_core.c.o CMakeFiles/kamailio.dir/core/shm_init.c.o CMakeFiles/kamailio.dir/core/signals.c.o CMakeFiles/kamailio.dir/core/sip_msg_clone.c.o CMakeFiles/kamailio.dir/core/sock_ut.c.o CMakeFiles/kamailio.dir/core/socket_info.c.o CMakeFiles/kamailio.dir/core/sr_compat.c.o CMakeFiles/kamailio.dir/core/sr_module.c.o CMakeFiles/kamailio.dir/core/srapi.c.o CMakeFiles/kamailio.dir/core/str.c.o CMakeFiles/kamailio.dir/core/str_list.c.o CMakeFiles/kamailio.dir/core/strutils.c.o CMakeFiles/kamailio.dir/core/stun.c.o CMakeFiles/kamailio.dir/core/switch.c.o CMakeFiles/kamailio.dir/core/tcp_main.c.o CMakeFiles/kamailio.dir/core/tcp_options.c.o CMakeFiles/kamailio.dir/core/tcp_read.c.o CMakeFiles/kamailio.dir/core/tcp_stats.c.o CMakeFiles/kamailio.dir/core/timer.c.o CMakeFiles/kamailio.dir/core/timer_proc.c.o CMakeFiles/kamailio.dir/core/tls_hooks.c.o CMakeFiles/kamailio.dir/core/tsend.c.o CMakeFiles/kamailio.dir/core/udp_server.c.o CMakeFiles/kamailio.dir/core/usr_avp.c.o CMakeFiles/kamailio.dir/core/ut.c.o CMakeFiles/kamailio.dir/core/utils/srjson.c.o CMakeFiles/kamailio.dir/core/utils/sruid.c.o CMakeFiles/kamailio.dir/core/utils/tmrec.c.o CMakeFiles/kamailio.dir/core/ver.c.o CMakeFiles/kamailio.dir/core/xavp.c.o CMakeFiles/kamailio.dir/core/lex.yy.c.o CMakeFiles/kamailio.dir/core/cfg.tab.c.o -o kamailio -lm -ldl -lresolv gmake[2]: Leaving directory '/usr/local/src/kamailio_build' [ 91%] Built target kamailio /usr/bin/gmake -f src/modules/json/CMakeFiles/json.dir/build.make src/modules/json/CMakeFiles/json.dir/depend gmake[2]: Entering directory '/usr/local/src/kamailio_build' cd /usr/local/src/kamailio_build && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /usr/local/src/kamailio /usr/local/src/kamailio/src/modules/json /usr/local/src/kamailio_build /usr/local/src/kamailio_build/src/modules/json /usr/local/src/kamailio_build/src/modules/json/CMakeFiles/json.dir/DependInfo.cmake --color= gmake[2]: Leaving directory '/usr/local/src/kamailio_build' /usr/bin/gmake -f src/modules/json/CMakeFiles/json.dir/build.make src/modules/json/CMakeFiles/json.dir/build gmake[2]: Entering directory '/usr/local/src/kamailio_build' [ 92%] Building C object src/modules/json/CMakeFiles/json.dir/json_funcs.c.o cd /usr/local/src/kamailio_build/src/modules/json && /usr/bin/cc -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DARCH=\"x86_64\" -DCC_GCC_LIKE_ASM -DCFG_DIR=\"/usr/local/etc/kamailio/\" -DCOMPILER="\"gcc 11.4.1\"" -DDBG_SR_MEMORY -DDISABLE_NAGLE -DDNS_IP_HACK -DFAST_LOCK -DFMSTATS -DF_MALLOC -DHAVE_ALLOCA_H -DHAVE_EPOLL -DHAVE_GETHOSTBYNAME2 -DHAVE_IP_MREQN -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_MSG_NOSIGNAL -DHAVE_RESOLV_RES -DHAVE_SCHED_SETSCHEDULER -DHAVE_SCHED_YIELD -DHAVE_SELECT -DHAVE_SIGIO_RT -DHAVE_TIMEGM -DHAVE_UNION_SEMUN -DKMSTATS -DKSR_PTHREAD_MUTEX_SHARED -DMALLOC_STATS -DMOD_NAME=\"json\" -DMOD_NAMEID=json -DNAME=\"kamailio\" -DOS=Linux -DOS_QUOTED=\"Linux\" -DPKG_MALLOC -DQ_MALLOC -DRAW_SOCKS -DRUN_DIR=\"/run/kamailio\" -DSHARE_DIR=\"/usr/local/share/kamailio/\" -DSHM_MMAP -DSIGINFO64_WORKAROUND -DSTATISTICS -DTLSF_MALLOC -DTLS_HOOKS -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_MCAST -DUSE_NAPTR -DUSE_RAW_SOCKS -DUSE_SCTP -DUSE_TCP -DUSE_TLS -DVERSION=\"6.0.0-pre0\" -DVERSIONVAL=6000000 -D__CPU_x86_64 -D__OS_linux -Djson_EXPORTS -g -fPIC -ffile-prefix-map=/usr/local/src/kamailio/src/modules/json/= -fPIC -Wall -funroll-loops -Wcast-align -Werror=implicit-function-declaration -Werror=implicit-int -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -mtune=generic -std=gnu11 -MD -MT src/modules/json/CMakeFiles/json.dir/json_funcs.c.o -MF CMakeFiles/json.dir/json_funcs.c.o.d -o CMakeFiles/json.dir/json_funcs.c.o -c /usr/local/src/kamailio/src/modules/json/json_funcs.c /usr/local/src/kamailio/src/modules/json/json_funcs.c:26:10: fatal error: json.h: No such file or directory 26 | #include <json.h> | ^~~~~~~~ compilation terminated. gmake[2]: *** [src/modules/json/CMakeFiles/json.dir/build.make:79: src/modules/json/CMakeFiles/json.dir/json_funcs.c.o] Error 1 gmake[2]: Leaving directory '/usr/local/src/kamailio_build' gmake[1]: *** [CMakeFiles/Makefile2:633: src/modules/json/CMakeFiles/json.dir/all] Error 2 gmake[1]: Leaving directory '/usr/local/src/kamailio_build' gmake: *** [Makefile:159: all] Error 2 -ovidiu

3 2

git:master:f4d7e298: cmake/perl: Install files / Add perl user link and def options
by Xenofon Karamanos 27 Jan '25

27 Jan '25

Module: kamailio Branch: master Commit: f4d7e298bb351be5f12652083bd5e37109748169 URL: https://github.com/kamailio/kamailio/commit/f4d7e298bb351be5f12652083bd5e37… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-27T14:23:44Z cmake/perl: Install files / Add perl user link and def options - Fix perl extra_c_flags parsing by using SHELL: - Add user option PERL_LDOPTS to define extra ldopts - Add user option PERL_CCOPTS to define extra defs - Add new generated file to compilation - Add new target for sgml docs - Add install directives for perl libraries --- Modified: src/modules/app_perl/CMakeLists.txt Modified: src/modules/db_perlvdb/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/f4d7e298bb351be5f12652083bd5e37… Patch: https://github.com/kamailio/kamailio/commit/f4d7e298bb351be5f12652083bd5e37…

1 0

git:master:65a296b3: htable: wrapped maco code in do {} while(0)
by Daniel-Constantin Mierla 27 Jan '25

27 Jan '25

Module: kamailio Branch: master Commit: 65a296b3478503ed3519ea9156d8f46f5cb9ce2a URL: https://github.com/kamailio/kamailio/commit/65a296b3478503ed3519ea9156d8f46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-27T10:20:49+01:00 htable: wrapped maco code in do {} while(0) --- Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/65a296b3478503ed3519ea9156d8f46… Patch: https://github.com/kamailio/kamailio/commit/65a296b3478503ed3519ea9156d8f46… --- diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 4e0757f237b..d9fc187e722 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -144,10 +144,19 @@ ht_cell_t *ht_iterator_get_current(str *iname); void ht_slot_lock(ht_t *ht, int idx); void ht_slot_unlock(ht_t *ht, int idx); -#define HT_UPDATE_EXPIRE(ht, it, now) \ - if(ht->updateexpire || (now && it->expire && it->expire < now)) \ - it->expire = now + ht->htexpire -#define HT_COPY_EXPIRE(ht, it, now, src) \ - HT_UPDATE_EXPIRE(ht, it, now); \ - else it->expire = src->expire +#define HT_UPDATE_EXPIRE(ht, it, now) \ + do { \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) { \ + it->expire = now + ht->htexpire; \ + } \ + } while(0) +#define HT_COPY_EXPIRE(ht, it, now, src) \ + do { \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) { \ + it->expire = now + ht->htexpire; \ + } else { \ + it->expire = src->expire; \ + } \ + } while(0) + #endif

1 0

[kamailio/kamailio] htable: Fix expiry on assignment (PR #4103)
by Bastian Triller 27 Jan '25

27 Jan '25

Update cell expiry on assignment for htables w/o updateexpiry (analogue to #4079).   #### 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 - [ ] 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  Currently Kamailio does not update expiry when assigning a value to an expired cell if htable's `updateexpire` equals `0`. So expired cells aren't usable as long htable timer cleans up these cells. Reproduction 1: ``` #!KAMAILIO listen=udp:127.0.0.1:9999 log_stderror=yes loadmodule "xlog.so" loadmodule "pv.so" loadmodule "sl.so" loadmodule "htable.so" modparam("htable", "htable", "foo=>autoexpire=1;updateexpire=0;initval=0") request_route { if ($sht(foo=>bar) == $null) { xlog("it's null, init it\n"); } $sht(foo=>bar) = $sht(foo=>bar) + 1; xlog("$Ts value $sht(foo=>bar)\texpire $shtex(foo=>bar)\n"); sl_send_reply("200", "Hello"); } ``` output: ``` 0(787651) ERROR: <script>: 1736855046 value 1 expire 1 0(787651) ERROR: <script>: 1736855046 value 2 expire 1 0(787651) ERROR: <script>: 1736855047 value 3 expire 0 0(787651) ERROR: <script>: 1736855048 value 0 expire 4294967295 0(787651) ERROR: <script>: 1736855048 value 0 expire 4294967295 0(787651) ERROR: <script>: 1736855049 value 0 expire 4294967294 0(787651) ERROR: <script>: 1736855050 value 0 expire 4294967293 SNIP expire decreases while value stays 0 0(787651) ERROR: <script>: 1736855066 value 1 expire 1 0(787651) ERROR: <script>: 1736855066 value 2 expire 1 0(787651) ERROR: <script>: 1736855067 value 3 expire 0 ``` Reproduction 2: ``` #!KAMAILIO listen=udp:127.0.0.1:9999 log_stderror=yes loadmodule "xlog.so" loadmodule "pv.so" loadmodule "sl.so" loadmodule "htable.so" modparam("htable", "htable", "baz=>") modparam("htable", "htable", "foo=>autoexpire=1;updateexpire=0") request_route { if ($sht(foo=>bar) == $null) { xlog("it's null, init it\n"); } $sht(foo=>bar) = $_s($shtinc(baz=>cnt)); xlog("$Ts value $sht(foo=>bar)\texpire $shtex(foo=>bar)\n"); sl_send_reply("200", "Hello"); } event_route[htable:mod-init] { xlog("htable:mod-init\n"); # $sht(foo=>bar) = 0; $sht(baz=>cnt) = 0; } ``` output: ``` 0(789709) ERROR: <script>: it's null, init it 0(789709) ERROR: <script>: 1736855379 value 1 expire 1 0(789709) ERROR: <script>: 1736855379 value 2 expire 1 0(789709) ERROR: <script>: 1736855380 value 3 expire 0 0(789709) ERROR: <script>: 1736855380 value 4 expire 0 0(789709) ERROR: <script>: it's null, init it 0(789709) ERROR: <script>: 1736855381 value <null> expire 4294967295 0(789709) ERROR: <script>: it's null, init it 0(789709) ERROR: <script>: 1736855382 value <null> expire 4294967294 SNIP expire decreases value stays null 0(789709) ERROR: <script>: it's null, init it 0(789709) ERROR: <script>: 1736855399 value 33 expire 1 0(789709) ERROR: <script>: 1736855399 value 34 expire 1 0(789709) ERROR: <script>: 1736855400 value 35 expire 0 0(789709) ERROR: <script>: 1736855400 value 36 expire 0 ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4103 -- Commit Summary -- * htable: Fix expiry on assignment -- File Changes -- M src/modules/htable/ht_api.c (24) M src/modules/htable/ht_api.h (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4103.patch https://github.com/kamailio/kamailio/pull/4103.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4103 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4103(a)github.com>

2 2

git:master:75994f40: htable: Fix expiry on assignment
by Daniel-Constantin Mierla 27 Jan '25

27 Jan '25

Module: kamailio Branch: master Commit: 75994f40c99ffa2c7c33e5fce5e3d3cd8db7d780 URL: https://github.com/kamailio/kamailio/commit/75994f40c99ffa2c7c33e5fce5e3d3c… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-27T10:15:59+01:00 htable: Fix expiry on assignment Update cell expiry on assignment for htables w/o updateexpiry (analogue to #4079). --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h --- Diff: https://github.com/kamailio/kamailio/commit/75994f40c99ffa2c7c33e5fce5e3d3c… Patch: https://github.com/kamailio/kamailio/commit/75994f40c99ffa2c7c33e5fce5e3d3c… --- diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index 9190dd310ff..47b4b975194 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -496,9 +496,7 @@ int ht_set_cell_ex( it->value.s.s[it->value.s.len] = '\0'; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } @@ -514,11 +512,7 @@ int ht_set_cell_ex( cell->next = it->next; cell->prev = it->prev; if(exv <= 0) { - if(ht->updateexpire) { - cell->expire = now + ht->htexpire; - } else { - cell->expire = it->expire; - } + HT_COPY_EXPIRE(ht, cell, now, it); } else { it->expire = now + exv; } @@ -535,9 +529,7 @@ int ht_set_cell_ex( it->value.n = val->n; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } @@ -556,11 +548,7 @@ int ht_set_cell_ex( return -1; } if(exv <= 0) { - if(ht->updateexpire) { - cell->expire = now + ht->htexpire; - } else { - cell->expire = it->expire; - } + HT_COPY_EXPIRE(ht, cell, now, it); } else { it->expire = now + exv; } @@ -578,9 +566,7 @@ int ht_set_cell_ex( it->value.n = val->n; if(exv <= 0) { - if(ht->updateexpire) { - it->expire = now + ht->htexpire; - } + HT_UPDATE_EXPIRE(ht, it, now); } else { it->expire = now + exv; } diff --git a/src/modules/htable/ht_api.h b/src/modules/htable/ht_api.h index 5ac11b9bb00..4e0757f237b 100644 --- a/src/modules/htable/ht_api.h +++ b/src/modules/htable/ht_api.h @@ -143,4 +143,11 @@ ht_cell_t *ht_iterator_get_current(str *iname); void ht_slot_lock(ht_t *ht, int idx); void ht_slot_unlock(ht_t *ht, int idx); + +#define HT_UPDATE_EXPIRE(ht, it, now) \ + if(ht->updateexpire || (now && it->expire && it->expire < now)) \ + it->expire = now + ht->htexpire +#define HT_COPY_EXPIRE(ht, it, now, src) \ + HT_UPDATE_EXPIRE(ht, it, now); \ + else it->expire = src->expire #endif

1 0

[kamailio/kamailio] The future of internal libraries (Issue #4041)
by Daniel-Constantin Mierla 27 Jan '25

27 Jan '25

Considering that it hasn't been much activity around the internal libraries for long time, I was wondering if it still makes sense to keep them like they are or merge them in the core. Recently, during the devel meeting, I relocated a couple of them to the archive. The `lib/binrpc` (and `print`) can have the same fate, being not actually used. The srdb1 is very common and I guess it is very rare the case when a deployment is used without a module not depending on it (e.g., even if dispatcher is used with a list file, the code is still linked to this library). The `trie` library is small and `ims` is actually a set of getter functions for message attribtues/headers. The `srdb2` is not used much, but I think the right approach for it is to change the modules using it to `libsrdb1` and get rid of it completely sometime in the future. Till then the code is not big and can reside as part of the core. The benefits I see are in simplifying the build system (current makefiles and hopefully soon-to-be-merged the one based on cmake), reducing also the time to compute compile and link dependencies; getting rid of packaging complexity (same library may be needed by different modules, which, when packaged separately, the library has to be in a 3rd package, or have dependency of the other module's package -- probably now the libs are shipped with the core package). The code for libs can stay at the same location, so source code for modules doesn't need to be updated, just that they are compiled with the core, removing internal libs from makefiles. Thinking that we go for 6.0.x, clarifying the plans for this component and cleaning it, if decided so, should fit well in such version number jump. Opinions? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4041 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4041(a)github.com>

4 14

git:master:200cdb31: core/parser/sdp: proper test for media ip separator
by Daniel-Constantin Mierla 26 Jan '25

26 Jan '25

Module: kamailio Branch: master Commit: 200cdb318569191cd012dfe99b252f98fe9623b9 URL: https://github.com/kamailio/kamailio/commit/200cdb318569191cd012dfe99b252f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-26T18:07:54+01:00 core/parser/sdp: proper test for media ip separator --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/200cdb318569191cd012dfe99b252f9… Patch: https://github.com/kamailio/kamailio/commit/200cdb318569191cd012dfe99b252f9… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 61022b6148f..893ef0e58a4 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -561,7 +561,7 @@ int extract_mediaip(str *body, str *mediaip, int *pf, char *line) * - for length, at least 6: ' IP[4|6] x...' * - white space after */ - if(cp + 6 > mediaip->s + mediaip->len && cp[4] != ' ') { + if(cp + 6 > mediaip->s + mediaip->len || cp[4] != ' ') { LM_ERR("invalid content for `%s' line\n", line); return -1; }

1 0

[kamailio/kamailio] Unexpected return code from route with switch-case block (Issue #4088)
by Marat 24 Jan '25

24 Jan '25

### Description I see unexpected return code from route if there is no explicit `return` and switch-case block.  #### Reproduction Here is simple configuration part: ``` route(TEST_ROUTE_WITH_SWITCH); xlog("L_WARN", "TEST_ROUTE_WITH_SWITCH result $rc\n"); ... route[TEST_ROUTE_WITH_SWITCH] { $var(a) = "a"; switch ($var(a)) { case "a": case "b": $var(b) = $var(a); break; default: $var(c) = $var(a); } # must be optional according to documentation: # https://www.kamailio.org/wiki/cookbooks/5.3.x/core#return # > If no value is specified, or a route reaches its end without executing a return statement, it returns 1. # # return 1; } ``` Log: ``` WARNING: <script>: TEST_ROUTE_WITH_SWITCH result 0 ``` At the same time if there is no switch-block, return code is 1 as expected: ``` route[TEST_ROUTE_WITH_SWITCH] { $var(a) = "a"; } ``` Log: ``` WARNING: <script>: TEST_ROUTE_WITH_SWITCH w/o switch-case result 1 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` $ ./build/sbin/kamailio -v version: kamailio 5.7.5 (x86_64/linux) b47500-dirty flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: b47500 -dirty compiled on 22:02:13 Nov 9 2024 with /usr/bin/gcc 11.3.1 ``` * **Operating System**:  ``` Oracle Linux 9 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4088 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4088(a)github.com>

2 2

[kamailio/kamailio] Module dispatcher: ds_is_active() return incorrect. (Issue #4001)
by Minh Vũ 24 Jan '25

24 Jan '25

#### Kamailo 5.8 ### Description I use ```ds_is_active function()``` in ```dispatcher``` module. ``` $var(sip_url) = $sht(conf_fs=>$var(conf_id)); # sip:192.168.1.44:5060 if(ds_is_active("1", "$var(sip_url)")){ #### is allways run } ``` or ```ds_is_active("1", $var(sip_url))``` #### Debugging Data When I check dispatcher: ``` "DEST": { "URI": "sip:192.168.1.44:5060", "FLAGS": "IP", "PRIORITY": 0, "ATTRS": { "BODY": "rweight=50;weight=50;cc=1", "DUID": null, "MAXLOAD": 0, "WEIGHT": 50, "RWEIGHT": 50, "SOCKET": null, "SOCKNAME": null, "OBPROXY": null } } ``` Why is the flag set to ```IP```, but ```ds_is_active()``` returns true? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4001 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4001(a)github.com>

3 5

git:master:65e51b77: presence: do not break on one notify sending failure
by Daniel-Constantin Mierla 24 Jan '25

24 Jan '25

Module: kamailio Branch: master Commit: 65e51b776290a1981e9ac27fbe6b47813516bc8b URL: https://github.com/kamailio/kamailio/commit/65e51b776290a1981e9ac27fbe6b478… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-24T16:53:10+01:00 presence: do not break on one notify sending failure - try all of them, debug message with successful and failure counters - GH #4118 --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/65e51b776290a1981e9ac27fbe6b478… Patch: https://github.com/kamailio/kamailio/commit/65e51b776290a1981e9ac27fbe6b478… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 47a11b23183..191cac0d04b 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1557,6 +1557,8 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) subs_t *subs_array = NULL, *s = NULL; str *notify_body = NULL, *aux_body = NULL; int ret_code = -1; + int retOK = 0; + int retErr = 0; subs_array = get_subs_dialog(pres_uri, event, NULL); if(subs_array == NULL) { @@ -1586,7 +1588,9 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) < 0) { LM_ERR("Could not send notify for [event]=%.*s\n", event->name.len, event->name.s); - goto done; + retErr++; + } else { + retOK++; } if(aux_body != NULL) { @@ -1599,7 +1603,10 @@ int query_db_notify(str *pres_uri, pres_ev_t *event, subs_t *watcher_subs) } } - ret_code = 1; + LM_DBG("sent ok: %d - err: %d\n", retOK, retErr); + if(retOK > 0) { + ret_code = 1; + } done: free_subs_list(subs_array, PKG_MEM_TYPE, 0);

1 0

git:master:b788c39b: github: [codeql] use all available processors when building [skip ci]
by GitHub 24 Jan '25

24 Jan '25

Module: kamailio Branch: master Commit: b788c39bf848fe9d04d0429094156028a991845b URL: https://github.com/kamailio/kamailio/commit/b788c39bf848fe9d04d042909415602… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: GitHub <noreply(a)github.com> Date: 2025-01-24T15:29:25+01:00 github: [codeql] use all available processors when building [skip ci] --- Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/b788c39bf848fe9d04d042909415602… Patch: https://github.com/kamailio/kamailio/commit/b788c39bf848fe9d04d042909415602… --- diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 9cdeafc77ff..1ca3734de17 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -75,7 +75,7 @@ jobs: - name: Build cpp if: ${{ matrix.language == 'cpp' }} - run: make all + run: make -j$(nproc) all - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3

1 0

git:master:f69b22ce: cmake: Install snmpstats files
by Xenofon Karamanos 24 Jan '25

24 Jan '25

Module: kamailio Branch: master Commit: f69b22ce3cdc2c06739c11f19c9ebeb5eb1727f3 URL: https://github.com/kamailio/kamailio/commit/f69b22ce3cdc2c06739c11f19c9ebeb… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-24T09:59:18Z cmake: Install snmpstats files --- Modified: src/modules/snmpstats/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/f69b22ce3cdc2c06739c11f19c9ebeb… Patch: https://github.com/kamailio/kamailio/commit/f69b22ce3cdc2c06739c11f19c9ebeb… --- diff --git a/src/modules/snmpstats/CMakeLists.txt b/src/modules/snmpstats/CMakeLists.txt index fa3980030db..ac416979da7 100644 --- a/src/modules/snmpstats/CMakeLists.txt +++ b/src/modules/snmpstats/CMakeLists.txt @@ -7,3 +7,8 @@ find_package(NETSNMP REQUIRED) # TODO: Compiles fine but need to do some more verifcation target_link_libraries(${module_name} PRIVATE NETSNMP::NETSNMP) + +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mibs + DESTINATION ${CMAKE_INSTALL_DATADIR}/snmp/ + OPTIONAL)

1 0

git:5.8:0cf639ec: pkg/kamailio: added support for CentOS 10 [skip-ci]
by Sergey Safarov 23 Jan '25

23 Jan '25

Module: kamailio Branch: 5.8 Commit: 0cf639eceb6a8fea50d19184add989e049dfb6ca URL: https://github.com/kamailio/kamailio/commit/0cf639eceb6a8fea50d19184add989e… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-01-23T16:14:59+02:00 pkg/kamailio: added support for CentOS 10 [skip-ci] (cherry picked from commit cdafda78c9fc98d9d9fdb7f94e77c9bc60ebf4d1) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0cf639eceb6a8fea50d19184add989e… Patch: https://github.com/kamailio/kamailio/commit/0cf639eceb6a8fea50d19184add989e… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 9c9c257fafb..eb0885e71c5 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -116,21 +116,21 @@ %bcond_without wolfssl %endif -%if 0%{?rhel} == 9 +%if 0%{?rhel} == 9 || 0%{?rhel} == 10 %if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} -%define dist .el9.centos +%define dist .el%{?centos_ver}.centos %endif %if 0%{?almalinux_ver} %define dist_name centos %define dist_version %{?almalinux} -%define dist .el9.almalinux +%define dist .el%{?almalinux_ver}.almalinux %endif %if 0%{?rocky_ver} %define dist_name centos %define dist_version %{?rocky} -%define dist .el9.rocky +%define dist .el%{?rocky_ver}.rocky %endif %if 0%{?centos_ver} == 0 && 0%{?almalinux_ver} == 0 && 0%{?rocky_ver} == 0 %define dist_name rhel

1 0

git:5.8:0e51b497: pkg/kamailio: simplified systemd unit files installation [skip ci]
by Sergey Safarov 23 Jan '25

23 Jan '25

Module: kamailio Branch: 5.8 Commit: 0e51b497a19c525a89d5fead5e0854b2b18317dd URL: https://github.com/kamailio/kamailio/commit/0e51b497a19c525a89d5fead5e0854b… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-01-23T14:56:40+02:00 pkg/kamailio: simplified systemd unit files installation [skip ci] (cherry picked from commit c47108eacba1a6cf7e8564a00ff0850f621d29aa) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0e51b497a19c525a89d5fead5e0854b… Patch: https://github.com/kamailio/kamailio/commit/0e51b497a19c525a89d5fead5e0854b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index f160ec6d7ad..9c9c257fafb 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1205,7 +1205,6 @@ sed -i -e 's|/usr/sbin/kamailio|/usr/sbin/kamailio --atexit=no|' pkg/kamailio/ob %build -ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 export FREERADIUS=1 %endif @@ -1444,29 +1443,29 @@ install -d %{buildroot}%{_sharedstatedir}/kamailio # On RedHat 6 like install -d %{buildroot}%{_var}/run/kamailio install -d %{buildroot}%{_sysconfdir}/rc.d/init.d -install -m755 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.init \ +install -m755 pkg/kamailio/obs/kamailio.init \ %{buildroot}%{_sysconfdir}/rc.d/init.d/kamailio %else # systemd install -d %{buildroot}%{_unitdir} -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.service %{buildroot}%{_unitdir}/kamailio.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf +install -Dpm 0644 pkg/kamailio/obs/kamailio.service %{buildroot}%{_unitdir}/kamailio.service +install -Dpm 0644 pkg/kamailio/obs/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service +install -Dpm 0644 pkg/kamailio/obs/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service +install -Dpm 0644 pkg/kamailio/obs/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf +install -Dpm 0644 pkg/kamailio/obs/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf %endif %if 0%{?suse_version} install -d %{buildroot}%{_fillupdir} -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ +install -m644 pkg/kamailio/obs/kamailio.sysconfig \ %{buildroot}%{_fillupdir}/sysconfig.kamailio -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ +install -m644 pkg/kamailio/obs/sipcapture.sysconfig \ %{buildroot}%{_fillupdir}/sysconfig.sipcapture %else install -d %{buildroot}%{_sysconfdir}/sysconfig -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ +install -m644 pkg/kamailio/obs/kamailio.sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/kamailio -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ +install -m644 pkg/kamailio/obs/sipcapture.sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/sipcapture %endif

1 0

git:6.0:2790d202: pkg/kamailio: simplified systemd unit files installation [skip ci]
by Sergey Safarov 23 Jan '25

23 Jan '25

Module: kamailio Branch: 6.0 Commit: 2790d202e2756e1b5037239983b134d04bdb73f3 URL: https://github.com/kamailio/kamailio/commit/2790d202e2756e1b5037239983b134d… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-01-23T14:54:15+02:00 pkg/kamailio: simplified systemd unit files installation [skip ci] (cherry picked from commit c47108eacba1a6cf7e8564a00ff0850f621d29aa) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/2790d202e2756e1b5037239983b134d… Patch: https://github.com/kamailio/kamailio/commit/2790d202e2756e1b5037239983b134d… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8eba6e06aac..de909ffd85b 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1198,7 +1198,6 @@ sed -i -e 's|/usr/sbin/kamailio|/usr/sbin/kamailio --atexit=no|' pkg/kamailio/ob %build -ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 export FREERADIUS=1 %endif @@ -1431,29 +1430,29 @@ install -d %{buildroot}%{_sharedstatedir}/kamailio # On RedHat 6 like install -d %{buildroot}%{_var}/run/kamailio install -d %{buildroot}%{_sysconfdir}/rc.d/init.d -install -m755 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.init \ +install -m755 pkg/kamailio/obs/kamailio.init \ %{buildroot}%{_sysconfdir}/rc.d/init.d/kamailio %else # systemd install -d %{buildroot}%{_unitdir} -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.service %{buildroot}%{_unitdir}/kamailio.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf +install -Dpm 0644 pkg/kamailio/obs/kamailio.service %{buildroot}%{_unitdir}/kamailio.service +install -Dpm 0644 pkg/kamailio/obs/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service +install -Dpm 0644 pkg/kamailio/obs/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service +install -Dpm 0644 pkg/kamailio/obs/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf +install -Dpm 0644 pkg/kamailio/obs/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf %endif %if 0%{?suse_version} install -d %{buildroot}%{_fillupdir} -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ +install -m644 pkg/kamailio/obs/kamailio.sysconfig \ %{buildroot}%{_fillupdir}/sysconfig.kamailio -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ +install -m644 pkg/kamailio/obs/sipcapture.sysconfig \ %{buildroot}%{_fillupdir}/sysconfig.sipcapture %else install -d %{buildroot}%{_sysconfdir}/sysconfig -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ +install -m644 pkg/kamailio/obs/kamailio.sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/kamailio -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ +install -m644 pkg/kamailio/obs/sipcapture.sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/sipcapture %endif

1 0

git:master:08eda6e8: pkg/kamailio: simplified systemd unit files installation
by Sergey Safarov 23 Jan '25

23 Jan '25

Module: kamailio Branch: master Commit: 08eda6e89c1fb899959c3f07efd93db30d7cb30c URL: https://github.com/kamailio/kamailio/commit/08eda6e89c1fb899959c3f07efd93db… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Sergey Safarov <s.safarov(a)anycast-lb.net> Date: 2025-01-23T14:52:25+02:00 pkg/kamailio: simplified systemd unit files installation --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/08eda6e89c1fb899959c3f07efd93db… Patch: https://github.com/kamailio/kamailio/commit/08eda6e89c1fb899959c3f07efd93db… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8eba6e06aac..de909ffd85b 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1198,7 +1198,6 @@ sed -i -e 's|/usr/sbin/kamailio|/usr/sbin/kamailio --atexit=no|' pkg/kamailio/ob %build -ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 export FREERADIUS=1 %endif @@ -1431,29 +1430,29 @@ install -d %{buildroot}%{_sharedstatedir}/kamailio # On RedHat 6 like install -d %{buildroot}%{_var}/run/kamailio install -d %{buildroot}%{_sysconfdir}/rc.d/init.d -install -m755 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.init \ +install -m755 pkg/kamailio/obs/kamailio.init \ %{buildroot}%{_sysconfdir}/rc.d/init.d/kamailio %else # systemd install -d %{buildroot}%{_unitdir} -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.service %{buildroot}%{_unitdir}/kamailio.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf -install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf +install -Dpm 0644 pkg/kamailio/obs/kamailio.service %{buildroot}%{_unitdir}/kamailio.service +install -Dpm 0644 pkg/kamailio/obs/kamailio@.service %{buildroot}%{_unitdir}/kamailio@.service +install -Dpm 0644 pkg/kamailio/obs/sipcapture.service %{buildroot}%{_unitdir}/sipcapture.service +install -Dpm 0644 pkg/kamailio/obs/kamailio.tmpfiles %{buildroot}%{_tmpfilesdir}/kamailio.conf +install -Dpm 0644 pkg/kamailio/obs/sipcapture.tmpfiles %{buildroot}%{_tmpfilesdir}/sipcapture.conf %endif %if 0%{?suse_version} install -d %{buildroot}%{_fillupdir} -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ +install -m644 pkg/kamailio/obs/kamailio.sysconfig \ %{buildroot}%{_fillupdir}/sysconfig.kamailio -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ +install -m644 pkg/kamailio/obs/sipcapture.sysconfig \ %{buildroot}%{_fillupdir}/sysconfig.sipcapture %else install -d %{buildroot}%{_sysconfdir}/sysconfig -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ +install -m644 pkg/kamailio/obs/kamailio.sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/kamailio -install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ +install -m644 pkg/kamailio/obs/sipcapture.sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/sipcapture %endif

1 0

Build failed in Jenkins: kamailio60-nightly-repos » amd64,buster,master #1
by kamailio＠sipwise.com 23 Jan '25

23 Jan '25

See <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> Changes: ------------------------------------------ [...truncated 1.33 KiB...] originally caused by: Started by user Victor Seva Running as SYSTEM Building on the built-in node in workspace <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> [master] $ /bin/sh -xe /tmp/jenkins1711263832817387987.sh + echo * Removing files workspace before copying artifacts from another project. * * Removing files workspace before copying artifacts from another project. * + rm -f ./* Copied 48 artifacts from "kamailio60-nightly-binaries » amd64,buster" build number 1 [master] $ /bin/sh -xe /tmp/jenkins1081858712971152040.sh + /home/admin/kamailio-deb-jenkins/scripts/jdg-repository + set -e + '[' -z /srv/repository/kamailio60-nightly ']' + repository_is_missing_in_env=false + '[' -r /etc/jenkins/debian_glue ']' + echo '*** Sourcing /etc/jenkins/debian_glue ***' *** Sourcing /etc/jenkins/debian_glue *** + . /etc/jenkins/debian_glue ++ PBUILDER_CONFIG=/etc/jenkins/pbuilderrc ++ KEY_ID=508EA4C8 + '[' -n /srv/repository/kamailio60-nightly ']' + false + '[' '' = true ']' + ARCHITECTURES='amd64 i386 source' + COMPONENTS=main + UDEB_COMPONENTS=main + '[' 1 -gt 1 ']' + '[' 1 -lt 1 ']' + REPOS=buster ++ dpkg --list jenkins-debian-glue ++ awk '/^ii/ {print $3}' + JENKINS_DEBIAN_GLUE_VERSION=0.23.0+0~20240619103048.364~1.gbp807dcd + '[' -n 0.23.0+0~20240619103048.364~1.gbp807dcd ']' + echo '*** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd ***' *** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd *** + '[' -z '' ']' + echo '*** Repository variable DEFAULT_REPOSITORY is unset, using default [] ***' *** Repository variable DEFAULT_REPOSITORY is unset, using default [] *** + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailio60-nightly ']' + mkdir -p /srv/repository/kamailio60-nightly/conf ++ id -un + chown jenkins /srv/repository/kamailio60-nightly/conf + touch /srv/repository/kamailio60-nightly/conf/distributions + '[' -z 508EA4C8 ']' ++ id -un + flock --timeout 5 9 + grep -q '^$Codename\|Suite$: buster$' /srv/repository/kamailio60-nightly/conf/distributions + cat + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + '[' -n main ']' + printf 'UDebComponents: main\n' + printf 'Tracking: minimal\n' + '[' -n 508EA4C8 ']' + echo '*** Signing repository with Key ID 508EA4C8 ***' *** Signing repository with Key ID 508EA4C8 *** + printf 'SignWith: 508EA4C8\n' + echo 'Added buster as new codename/repos to the reprepro configuration.' Added buster as new codename/repos to the reprepro configuration. ++ id -un + rm -f /var/lock/jdg-generate-reprepro-codename.jenkins + set -u + umask 022 + PATH=/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin + export QEMU_RESERVED_VA=0x0 + QEMU_RESERVED_VA=0x0 + export TERM=dumb + TERM=dumb ++ date + echo '*** Starting /usr/bin/build-and-provide-package at Thu 23 Jan 2025 09:08:11 AM UTC ***' *** Starting /usr/bin/build-and-provide-package at Thu 23 Jan 2025 09:08:11 AM UTC *** ++ sed -e 's/^$[0-9]*$.*/\1/' + start_seconds=3627106 ++ dpkg --list jenkins-debian-glue ++ awk '/^ii/ {print $3}' + JENKINS_DEBIAN_GLUE_VERSION=0.23.0+0~20240619103048.364~1.gbp807dcd + '[' -n 0.23.0+0~20240619103048.364~1.gbp807dcd ']' + echo '*** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd ***' *** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd *** ++ dpkg --print-architecture + HOST_ARCH=amd64 + '[' -n amd64 ']' + echo '*** Identified host architecture amd64 ***' *** Identified host architecture amd64 *** + trap bailout SIGHUP SIGINT SIGQUIT SIGABRT SIGALRM SIGTERM + checks_and_defaults + '[' -z /srv/repository/kamailio60-nightly ']' + local repository_is_missing_in_env=false + '[' -r /etc/jenkins/debian_glue ']' + . /etc/jenkins/debian_glue ++ PBUILDER_CONFIG=/etc/jenkins/pbuilderrc ++ KEY_ID=508EA4C8 + '[' -n /srv/repository/kamailio60-nightly ']' + false + '[' -n '' ']' + '[' -z kamailio60-nightly-repos/architecture=amd64,distribution=buster,label=master ']' + '[' -z amd64 ']' + set_debootstrap + '[' -n '' ']' + '[' amd64 = amd64 ']' + DEBOOTSTRAP=debootstrap + return 0 + '[' -z '' ']' + REPREPRO_OPTS='-v --waitforlock 1000' + echo '*** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 ***' *** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 *** + REPREPRO_CMD=reprepro + '[' -z '' ']' + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailio60-nightly ']' + '[' -z '' ']' + PBUILDER_HOOKDIR=/usr/share/jenkins-debian-glue/pbuilder-hookdir/ + '[' -z '' ']' + '[' -z '' ']' + FREIGHT_VARLIB=/var/lib/freight + FREIGHT_VARCACHE=/var/cache/freight + FREIGHT_CONF=/etc/freight.conf + '[' '' = true ']' + clean_workspace ++ pwd + echo '*** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…]>: ***' *** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…]>: *** + ls -la ./ total 12 drwxr-xr-x 3 jenkins jenkins 4096 Jan 23 09:08 . drwxr-xr-x 3 jenkins jenkins 4096 Jan 23 09:08 .. drwxr-xr-x 2 jenkins jenkins 4096 Jan 23 09:08 binaries + identify_package_name + PACKAGE=kamailio60-nightly + PACKAGE=kamailio60-nightly + '[' -n kamailio60-nightly ']' + echo '*** Identified Debian package name kamailio60-nightly ***' *** Identified Debian package name kamailio60-nightly *** + set_base_path + '[' -n binaries/ ']' + echo '*** Using provided binaries/ as BASE_PATH ***' *** Using provided binaries/ as BASE_PATH *** + build_info + '[' -n buster ']' + echo '*** Using supplied repository name buster ***' *** Using supplied repository name buster *** + identify_sourcefile + '[' -n '' ']' + echo '*** Identifying newest package version ***' *** Identifying newest package version *** + newest_version= + for file in "${BASE_PATH}/"*.dsc ++ awk '/^Source: / {print $2}' binaries//kamailio_6.0.0~rc0+bpo10.20250123081832.1.dsc + SOURCE_PACKAGE=kamailio ++ basename binaries//kamailio_6.0.0~rc0+bpo10.20250123081832.1.dsc .dsc + p=kamailio_6.0.0~rc0+bpo10.20250123081832.1 + '[' kamailio_6.0.0~rc0+bpo10.20250123081832.1 = '*' ']' + cur_version=6.0.0~rc0+bpo10.20250123081832.1 + '[' -z '' ']' + newest_version=6.0.0~rc0+bpo10.20250123081832.1 + echo '*** Found package version 6.0.0~rc0+bpo10.20250123081832.1 ***' *** Found package version 6.0.0~rc0+bpo10.20250123081832.1 *** + sourcefile='binaries//kamailio_*6.0.0~rc0+bpo10.20250123081832.1.dsc' + echo '*** Using binaries//kamailio_*6.0.0~rc0+bpo10.20250123081832.1.dsc (version: 6.0.0~rc0+bpo10.20250123081832.1)' *** Using binaries//kamailio_*6.0.0~rc0+bpo10.20250123081832.1.dsc (version: 6.0.0~rc0+bpo10.20250123081832.1) + dist_and_arch_settings + '[' -z amd64 ']' + '[' amd64 = all ']' + arch=amd64 + echo '*** architecture is set to amd64 ***' *** architecture is set to amd64 *** + '[' -n buster ']' + local DIST=buster + '[' -n '' ']' + echo '*** Using cowbuilder base for distribution buster ***' *** Using cowbuilder base for distribution buster *** + COWBUILDER_DIST=buster + '[' -n '' ']' + COWBUILDER_BASE=/var/cache/pbuilder/base-buster-amd64.cow + echo '*** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-buster-amd64.cow as cowbuilder base.cow ***' *** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-buster-amd64.cow as cowbuilder base.cow *** + local lockfiles=/run/lock/buster-amd64 + build_lockfile=/run/lock/buster-amd64.building.2610813 + update_lockfile=/run/lock/buster-amd64.update + update_lockfile_pid=/run/lock/buster-amd64.update.2610813 + '[' -n true ']' + echo '*** Config variable '\''PROVIDE_ONLY'\'' is set, ignoring request to run cowbuilder. ***' *** Config variable 'PROVIDE_ONLY' is set, ignoring request to run cowbuilder. *** + '[' -n '' ']' + deploy_to_releases + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + reprepro_wrapper + '[' -n '' ']' + '[' -d /srv/repository/kamailio60-nightly ']' + '[' -r /srv/repository/kamailio60-nightly/conf/distributions ']' + grep -q '^$Codename\|Suite$: buster$' /srv/repository/kamailio60-nightly/conf/distributions + remove_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_REMOVAL *** + return 0 + remove_missing_binary_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL *** + return 0 + echo '*** Including packages in repository buster ***' *** Including packages in repository buster *** ++ get_arch_changes ++ case ${architecture} in ++ echo amd64 + reprepro -b /srv/repository/kamailio60-nightly -v --waitforlock 1000 --ignore=wrongdistribution --ignore=uploaders --ignore=surprisingbinary include buster <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> Error: packages database contains unused 'bionic|main|amd64' database. This usually means you removed some component, architecture or even a whole distribution from conf/distributions. In that case you most likely want to call reprepro clearvanished to get rid of the databases belonging to those removed parts. (Another reason to get this error is using conf/ and db/ directories belonging to different reprepro repositories). To ignore use --ignore=undefinedtarget. There have been errors! Could not acquire lock: /srv/repository/kamailio60-nightly/db/lockfile already exists! Waiting 10 seconds before trying again. + '[' 255 -eq 0 ']' + bailout 1 'Error: Failed to include binary package in buster repository.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to include binary package in buster repository.' ']' + echo 'Error: Failed to include binary package in buster repository.' Error: Failed to include binary package in buster repository. + rm -f /run/lock/buster-amd64.building.2610813 + '[' -r /run/lock/buster-amd64.update.2610813 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> to avoid problems in next run. *** + rm -f <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> <https://kamailio.sipwise.com/job/kamailio60-nightly-repos/architecture=amd6…> + '[' -n '' ']' + '[' -n '' ']' + '[' -n 3627106 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=10 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Thu 23 Jan 2025 09:08:22 AM UTC [running 10 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Thu 23 Jan 2025 09:08:22 AM UTC [running 10 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints

1 1

git:5.8:b05e8e85: db_unixodbc: fix incompatible-pointer-types warning
by Daniel-Constantin Mierla 23 Jan '25

23 Jan '25

Module: kamailio Branch: 5.8 Commit: b05e8e854bde2ef4ac4c40f227e0794f1a6583ff URL: https://github.com/kamailio/kamailio/commit/b05e8e854bde2ef4ac4c40f227e0794… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-23T12:06:18+01:00 db_unixodbc: fix incompatible-pointer-types warning > dbase.c: In function 'db_unixodbc_close_impl': > dbase.c:261:32: error: passing argument 2 of 'db_do_close' from incompatible pointer type [-Wincompatible-pointer-types] > 261 | return db_do_close(_h, db_unixodbc_free_connection); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > | | > | void (*)(struct my_con *) > In file included from val.h:34, > from dbase.c:33: > ../../lib/srdb1/db.h:495:40: note: expected 'void (*)(struct pool_con *)' but argument is of type 'void (*)(struct my_con *)' > 495 | void db_do_close(db1_con_t *_h, void (*free_connection)(struct pool_con *)); > | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > make[2]: *** [../../Makefile.rules:101: dbase.o] Error 1 related #4064 (cherry picked from commit 7f24bc09863220b4c14e2046708c10ff0891c038) --- Modified: src/modules/db_unixodbc/connection.c Modified: src/modules/db_unixodbc/connection.h --- Diff: https://github.com/kamailio/kamailio/commit/b05e8e854bde2ef4ac4c40f227e0794… Patch: https://github.com/kamailio/kamailio/commit/b05e8e854bde2ef4ac4c40f227e0794… --- diff --git a/src/modules/db_unixodbc/connection.c b/src/modules/db_unixodbc/connection.c index 92b1cdb9ecb..d56f2ac37a5 100644 --- a/src/modules/db_unixodbc/connection.c +++ b/src/modules/db_unixodbc/connection.c @@ -179,14 +179,17 @@ struct my_con *db_unixodbc_new_connection(struct db_id *id) /* * Close the connection and release memory */ -void db_unixodbc_free_connection(struct my_con *con) +void db_unixodbc_free_connection(struct pool_con *con) { + struct my_con *_c; + if(!con) return; - SQLFreeHandle(SQL_HANDLE_ENV, con->env); - SQLDisconnect(con->dbc); - SQLFreeHandle(SQL_HANDLE_DBC, con->dbc); - pkg_free(con); + _c = (struct my_con *)con; + SQLFreeHandle(SQL_HANDLE_ENV, _c->env); + SQLDisconnect(_c->dbc); + SQLFreeHandle(SQL_HANDLE_DBC, _c->dbc); + pkg_free(_c); } diff --git a/src/modules/db_unixodbc/connection.h b/src/modules/db_unixodbc/connection.h index d94f0b48e07..a37bb1e3906 100644 --- a/src/modules/db_unixodbc/connection.h +++ b/src/modules/db_unixodbc/connection.h @@ -83,7 +83,7 @@ struct my_con *db_unixodbc_new_connection(struct db_id *id); /* * Close the connection and release memory */ -void db_unixodbc_free_connection(struct my_con *con); +void db_unixodbc_free_connection(struct pool_con *con); char *db_unixodbc_build_conn_str(const struct db_id *id, char *buf);

1 0

git:master:640bd4fb: cmake: Fix naming to be clear we want the CLIENT version
by Xenofon Karamanos 23 Jan '25

23 Jan '25

Module: kamailio Branch: master Commit: 640bd4fb7529ad8b0a9415775679dca5e64c52be URL: https://github.com/kamailio/kamailio/commit/640bd4fb7529ad8b0a9415775679dca… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-23T10:56:49Z cmake: Fix naming to be clear we want the CLIENT version --- Added: cmake/modules/FindLibfreeradiusClient.cmake Modified: cmake/modules/FindRadius.cmake Removed: cmake/modules/FindLibfreeradius.cmake --- Diff: https://github.com/kamailio/kamailio/commit/640bd4fb7529ad8b0a9415775679dca… Patch: https://github.com/kamailio/kamailio/commit/640bd4fb7529ad8b0a9415775679dca…

1 0

git:master:3198b66a: core: more checks for extract_candidate()
by Daniel-Constantin Mierla 23 Jan '25

23 Jan '25

Module: kamailio Branch: master Commit: 3198b66aa5dbda1c6a03f46a610073671cbd5157 URL: https://github.com/kamailio/kamailio/commit/3198b66aa5dbda1c6a03f46a6100736… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-23T11:52:29+01:00 core: more checks for extract_candidate() --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/3198b66aa5dbda1c6a03f46a6100736… Patch: https://github.com/kamailio/kamailio/commit/3198b66aa5dbda1c6a03f46a6100736… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 483cfdec70e..61022b6148f 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -314,7 +314,7 @@ int extract_candidate(str *body, sdp_stream_cell_t *stream) int len, fl; sdp_ice_attr_t *ice_attr; - if((body->len < 12) || (strncasecmp(body->s, "a=candidate:", 12) != 0)) { + if((body->len <= 12) || (strncasecmp(body->s, "a=candidate:", 12) != 0)) { /*LM_DBG("We are not pointing to an a=candidate: attribute =>`%.*s'\n", body->len, body->s); */ return -1; } @@ -332,6 +332,10 @@ int extract_candidate(str *body, sdp_stream_cell_t *stream) start = space + 1; len = len - (space - start + 1); + if(start + len > body->s + body->len) { + LM_ERR("no component in `a=candidate'\n"); + return -1; + } space = memchr(start, 32, len); if(space == NULL) { LM_ERR("no component in `a=candidate'\n");

1 0

[kamailio/kamailio] Bug: SIP message fails to send over WSS after upgrade to Kamailio 5.8 (Issue #4115)
by Dongsun 23 Jan '25

23 Jan '25

### Description After upgrading from Kamailio 5.7 to 5.8, we encountered an issue where SIP messages fail to send over WSS, resulting in a 477 error. The problem seems to be related to the addition of protocol validation logic in tcp_main.c: https://github.com/kamailio/kamailio/blob/master/src/core/tcp_main.c#L1747 https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e… ``` a->parent->rcv.proto == proto ``` `a->parent->rcv.proto` is `6 (indicating WSS)`, while `proto` is `5 (indicating WS)`, causing the connection lookup to fail. Removing this validation line resolves the issue, restoring the previous behavior where SIP messages are successfully sent over WSS. #### INFO level Log Messages ``` Jan 17 00:07:08.948495 kamailio[3487903]: WARNING: [799a4e2e-5fdf-444a-8dab-b2ab554c4933] tm [../../core/forward.h:204]: msg_send_buffer(): TCP/TLS connection for WebSocket could not be found Jan 17 00:07:08.948516 kamailio[3487903]: WARNING: [799a4e2e-5fdf-444a-8dab-b2ab554c4933] tm [t_fwd.c:1586]: t_send_branch(): sending request on branch 0 failed Jan 17 00:07:08.948536 kamailio[3487903]: INFO: [799a4e2e-5fdf-444a-8dab-b2ab554c4933] sl [sl_funcs.c:420]: sl_reply_error(): message marked with delayed-reply flag ``` #### DEBUG Level Log Messages ``` Jan 17 00:15:03.377043 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.377102 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_hname2.c:314]: parse_sip_header_name(): parsed header name [Allow-Events] type 39 Jan 17 00:15:03.377122 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:661]: parse_headers(): header field type 39, name=<Allow-Events>, body=<talk, hold, conference, refer> Jan 17 00:15:03.377178 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_hname2.c:314]: parse_sip_header_name(): parsed header name [Subscription-State] type 37 Jan 17 00:15:03.377196 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:661]: parse_headers(): header field type 37, name=<Subscription-State>, body=<terminated;reason=noresource> Jan 17 00:15:03.377254 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_hname2.c:314]: parse_sip_header_name(): parsed header name [Route] type 9 Jan 17 00:15:03.377274 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:661]: parse_headers(): header field type 9, name=<Route>, body=<<sip:1.1.1.1:9060;lr;received=sip:[2604:3d08:777a:61a0:601f:864:1234:1234]:52797%3Btransport%3Dws>> Jan 17 00:15:03.377331 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_hname2.c:314]: parse_sip_header_name(): parsed header name [Supported] type 17 Jan 17 00:15:03.377349 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:661]: parse_headers(): header field type 17, name=<Supported>, body=<path, replaces> Jan 17 00:15:03.377406 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_hname2.c:314]: parse_sip_header_name(): parsed header name [Contact] type 7 Jan 17 00:15:03.377426 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:661]: parse_headers(): header field type 7, name=<Contact>, body=<sip:dialpadgw@example.com> Jan 17 00:15:03.377483 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_hname2.c:314]: parse_sip_header_name(): parsed header name [Content-Type] type 11 Jan 17 00:15:03.377501 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:661]: parse_headers(): header field type 11, name=<Content-Type>, body=<application/data> Jan 17 00:15:03.377555 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_hname2.c:314]: parse_sip_header_name(): parsed header name [Event] type 22 Jan 17 00:15:03.377575 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:661]: parse_headers(): header field type 22, name=<Event>, body=<message-summary> Jan 17 00:15:03.377641 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:91]: get_hdr_field(): found end of header Jan 17 00:15:03.377698 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/pvapi.c:1450]: pv_printf_mode(): final buffer length 115 Jan 17 00:15:03.377716 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] 373:route[0]: <sip:1.1.1.1:9060;lr;received=sip:[2604:3d08:777a:61a0:601f:864:1234:1234]:52797%3Btransport%3Dws> Jan 17 00:15:03.377736 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.377754 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] pv [pv_core.c:1971]: pv_get_hdr_helper(): index out of range Jan 17 00:15:03.377773 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/pvapi.c:1450]: pv_printf_mode(): final buffer length 17 Jan 17 00:15:03.377793 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] 374:route[1]: <null> Jan 17 00:15:03.377812 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.377832 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.377849 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_hname2.c:314]: parse_sip_header_name(): parsed header name [Supported] type 17 Jan 17 00:15:03.377867 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_hname2.c:314]: parse_sip_header_name(): parsed header name [X-carrier] type 0 Jan 17 00:15:03.377887 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.377905 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_hname2.c:314]: parse_sip_header_name(): parsed header name [Max-Forwards] type 8 Jan 17 00:15:03.377924 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_hname2.c:314]: parse_sip_header_name(): parsed header name [X-FS-Support] type 0 Jan 17 00:15:03.377943 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_hname2.c:314]: parse_sip_header_name(): parsed header name [Allow-Events] type 39 Jan 17 00:15:03.377962 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_hname2.c:314]: parse_sip_header_name(): parsed header name [X-FS-Support] type 0 Jan 17 00:15:03.377982 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_hname2.c:314]: parse_sip_header_name(): parsed header name [Content-Type] type 11 Jan 17 00:15:03.378001 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_hname2.c:314]: parse_sip_header_name(): parsed header name [X-FS-Support] type 0 Jan 17 00:15:03.378020 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.378038 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.378056 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.378076 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.378096 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.378115 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.378174 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.378194 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.378327 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=200 Jan 17 00:15:03.378383 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/pvapi.c:1450]: pv_printf_mode(): final buffer length 117 Jan 17 00:15:03.378403 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] 387:Route-URI is: sip:1.1.1.1:9060;lr;received=sip:[2604:3d08:777a:61a0:601f:864:1234:1234]:52797%3Btransport%3Dws Jan 17 00:15:03.378422 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] pv [pv_core.c:1343]: pv_get_dsturi(): no destination URI Jan 17 00:15:03.378442 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_lookup.c:1565]: t_check_msg(): msg (0x7f845f8bc2c0) id=3/3519371 global id=2/3519371 T start=0xffffffffffffffff Jan 17 00:15:03.378461 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.378479 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=78 Jan 17 00:15:03.378499 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_lookup.c:781]: t_lookup_request(): start searching: hash=32072, isACK=0 Jan 17 00:15:03.378517 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_lookup.c:499]: matching_3261(): RFC3261 transaction matching failed - via branch [z9hG4bK84d7.eabb4795000000000000000000000000.0] Jan 17 00:15:03.378537 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_lookup.c:981]: t_lookup_request(): no transaction found Jan 17 00:15:03.378555 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_lookup.c:1637]: t_check_msg(): msg (0x7f845f8bc2c0) id=3/3519371 global id=3/3519371 T end=(nil) Jan 17 00:15:03.378572 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1326]: parse_uri(): state=5 Jan 17 00:15:03.378589 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1327]: parse_uri(): parsed uri:#012 type=1 user=<+11234567890-1234>(52)#012 passwd=<>(0)#012 host=<example.com>(22)#012 port=<>(0): 0#012 params=<>(0)#012 headers=<>(0) Jan 17 00:15:03.378607 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1336]: parse_uri(): uri flags : Jan 17 00:15:03.378634 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1341]: parse_uri(): value=0 Jan 17 00:15:03.378655 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1342]: parse_uri(): uri params:#012 transport=<>, val=<>, proto=0 Jan 17 00:15:03.378672 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1345]: parse_uri(): user-param=<>, val=<> Jan 17 00:15:03.378691 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1348]: parse_uri(): method=<>, val=<> Jan 17 00:15:03.378711 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1350]: parse_uri(): ttl=<>, val=<> Jan 17 00:15:03.378730 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1352]: parse_uri(): maddr=<>, val=<> Jan 17 00:15:03.379547 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1354]: parse_uri(): lr=<> Jan 17 00:15:03.379584 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1355]: parse_uri(): r2=<> Jan 17 00:15:03.379759 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] siputils [checks.c:122]: has_totag(): no totag Jan 17 00:15:03.379779 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=200 Jan 17 00:15:03.379799 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] rr [loose.c:80]: is_preloaded(): is_preloaded: Yes Jan 17 00:15:03.379817 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1326]: parse_uri(): state=10 Jan 17 00:15:03.379835 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1327]: parse_uri(): parsed uri:#012 type=1 user=<>(0)#012 passwd=<>(0)#012 host=<1.1.1.1>(13)#012 port=<9060>(4): 9060#012 params=<lr;received=sip:[2604:3d08:777a:61a0:601f:864:1234:1234]:52797%3Btransport%3Dws>(79)#012 headers=<>(0) Jan 17 00:15:03.379856 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1336]: parse_uri(): uri flags : Jan 17 00:15:03.379874 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1341]: parse_uri(): value=0 Jan 17 00:15:03.379892 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1342]: parse_uri(): uri params:#012 transport=<>, val=<>, proto=0 Jan 17 00:15:03.379913 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1345]: parse_uri(): user-param=<>, val=<> Jan 17 00:15:03.379931 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1348]: parse_uri(): method=<>, val=<> Jan 17 00:15:03.379950 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1350]: parse_uri(): ttl=<>, val=<> Jan 17 00:15:03.379969 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1352]: parse_uri(): maddr=<>, val=<> Jan 17 00:15:03.379987 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1354]: parse_uri(): lr=<lr> Jan 17 00:15:03.380007 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1355]: parse_uri(): r2=<> Jan 17 00:15:03.380025 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/socket_info.c:737]: grep_sock_info(): checking if host==us: 13==11 && [1.1.1.1] == [10.128.0.35] Jan 17 00:15:03.380044 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/socket_info.c:741]: grep_sock_info(): checking if port 9060 (advertise 9060) matches port 9060 Jan 17 00:15:03.380064 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/socket_info.c:763]: grep_sock_info(): checking advertise if host==us: 13==13 && [1.1.1.1] == [1.1.1.1] Jan 17 00:15:03.380081 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/forward.c:446]: check_self(): host (0:1.1.1.1:9060) == me Jan 17 00:15:03.380173 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] rr [loose.c:886]: after_loose(): Topmost route URI: 'sip:1.1.1.1:9060;lr;received=sip:[2604:3d08:777a:61a0:601f:864:1234:1234]:52797%3Btransport%3Dws' is me Jan 17 00:15:03.380238 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=200 Jan 17 00:15:03.380295 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:91]: get_hdr_field(): found end of header Jan 17 00:15:03.380351 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] rr [loose.c:181]: find_next_route(): No next Route HF found Jan 17 00:15:03.380379 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] rr [loose.c:916]: after_loose(): No next URI found Jan 17 00:15:03.380398 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] rr [rr_cb.c:94]: run_rr_callbacks(): callback id 1 entered with <lr;received=sip:[2604:3d08:777a:61a0:601f:864:1234:1234]:52797%3Btransport%3Dws> Jan 17 00:15:03.380415 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] uac [replace.c:567]: restore_uri(): getting 'vsf' Route param Jan 17 00:15:03.380435 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] uac [replace.c:570]: restore_uri(): route param 'vsf' not found Jan 17 00:15:03.380453 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] uac [replace.c:567]: restore_uri(): getting 'vst' Route param Jan 17 00:15:03.380473 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] uac [replace.c:570]: restore_uri(): route param 'vst' not found Jan 17 00:15:03.380491 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] rr [rr_cb.c:94]: run_rr_callbacks(): callback id 0 entered with <lr;received=sip:[2604:3d08:777a:61a0:601f:864:1234:1234]:52797%3Btransport%3Dws> Jan 17 00:15:03.380584 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/strutils.c:207]: unescape_user(): unescaped string is <sip:[2604:3d08:777a:61a0:601f:864:1234:1234]:52797;transport=ws> Jan 17 00:15:03.380602 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] path [path.c:504]: path_rr_callback(): setting dst uri: sip:[2604:3d08:777a:61a0:601f:864:1234:1234]:52797;transport=ws Jan 17 00:15:03.380768 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/pvapi.c:1450]: pv_printf_mode(): final buffer length 83 Jan 17 00:15:03.380786 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] 497:outbound proxy is: sip:[2604:3d08:777a:61a0:601f:864:1234:1234]:52797;transport=ws Jan 17 00:15:03.381032 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/pvapi.c:1450]: pv_printf_mode(): final buffer length 66 Jan 17 00:15:03.381049 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] 514:found target_ip from du: [2604:3d08:777a:61a0:601f:864:1234:1234] Jan 17 00:15:03.383827 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/action.c:1477]: do_action(): setting send-socket to [tls:[2600:1900:4000:f7cd:0:f::]:443] Jan 17 00:15:03.383849 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.383911 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.383931 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.383949 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.384006 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.384065 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/pvapi.c:1450]: pv_printf_mode(): final buffer length 22 Jan 17 00:15:03.384181 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1326]: parse_uri(): state=5 Jan 17 00:15:03.384206 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1327]: parse_uri(): parsed uri:#012 type=1 user=<dialpadgw>(9)#012 passwd=<>(0)#012 host=<example.com>(22)#012 port=<>(0): 0#012 params=<>(0)#012 headers=<>(0) Jan 17 00:15:03.384225 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1336]: parse_uri(): uri flags : Jan 17 00:15:03.384244 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1341]: parse_uri(): value=0 Jan 17 00:15:03.384265 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1342]: parse_uri(): uri params:#012 transport=<>, val=<>, proto=0 Jan 17 00:15:03.384286 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1345]: parse_uri(): user-param=<>, val=<> Jan 17 00:15:03.384304 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1348]: parse_uri(): method=<>, val=<> Jan 17 00:15:03.384324 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1350]: parse_uri(): ttl=<>, val=<> Jan 17 00:15:03.384344 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1352]: parse_uri(): maddr=<>, val=<> Jan 17 00:15:03.384362 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1354]: parse_uri(): lr=<> Jan 17 00:15:03.384401 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1355]: parse_uri(): r2=<> Jan 17 00:15:03.384578 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/tcp_main.c:1714]: _tcpconn_find(): 0 port 0 Jan 17 00:15:03.384595 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/pvapi.c:1450]: pv_printf_mode(): final buffer length 95 Jan 17 00:15:03.384612 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] 1168:<==== Relaying to sip:[2604:3d08:777a:61a0:601f:864:1234:1234]:52797;transport=ws conid=<null> Jan 17 00:15:03.384630 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_lookup.c:1868]: t_newtran(): msg (0x7f845f8bc2c0) id=3/3519371 global id=3/3519371 T start=(nil) Jan 17 00:15:03.384648 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.384666 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=78 Jan 17 00:15:03.384682 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_lookup.c:781]: t_lookup_request(): start searching: hash=32072, isACK=0 Jan 17 00:15:03.384701 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_lookup.c:499]: matching_3261(): RFC3261 transaction matching failed - via branch [z9hG4bK84d7.eabb4795000000000000000000000000.0] Jan 17 00:15:03.384717 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_lookup.c:981]: t_lookup_request(): no transaction found Jan 17 00:15:03.384733 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1326]: parse_uri(): state=65 Jan 17 00:15:03.384751 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1327]: parse_uri(): parsed uri:#012 type=1 user=<36k22ler>(8)#012 passwd=<>(0)#012 host=<f6sbiii372li.invalid>(20)#012 port=<>(0): 0#012 params=<transport=ws>(12)#012 headers=<>(0) Jan 17 00:15:03.384768 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1336]: parse_uri(): uri flags : Jan 17 00:15:03.384793 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1341]: parse_uri(): value=0 Jan 17 00:15:03.384812 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1342]: parse_uri(): uri params:#012 transport=<transport=ws>, val=<ws>, proto=5 Jan 17 00:15:03.384828 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1345]: parse_uri(): user-param=<>, val=<> Jan 17 00:15:03.384848 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1348]: parse_uri(): method=<>, val=<> Jan 17 00:15:03.384868 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1350]: parse_uri(): ttl=<>, val=<> Jan 17 00:15:03.384886 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1352]: parse_uri(): maddr=<>, val=<> Jan 17 00:15:03.384907 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1354]: parse_uri(): lr=<> Jan 17 00:15:03.384925 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1355]: parse_uri(): r2=<> Jan 17 00:15:03.385025 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=78 Jan 17 00:15:03.385045 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/crypto/md5utils.c:67]: MD5StringArray(): MD5 calculated: 6e9568ded8dde3ef89a05a4f03829dc5 Jan 17 00:15:03.385065 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [h_table.c:415]: build_cell(): created new cell 0x7f8424c15380 Jan 17 00:15:03.385084 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [h_table.h:549]: insert_into_hash_table_unsafe(): cell label: 1965846678 Jan 17 00:15:03.385457 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1326]: parse_uri(): state=65 Jan 17 00:15:03.385476 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1327]: parse_uri(): parsed uri:#012 type=1 user=<>(0)#012 passwd=<>(0)#012 host=<[2604:3d08:777a:61a0:601f:864:1234:1234]>(40)#012 port=<52797>(5): 52797#012 params=<transport=ws>(12)#012 headers=<>(0) Jan 17 00:15:03.385496 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1336]: parse_uri(): uri flags : Jan 17 00:15:03.385515 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1341]: parse_uri(): value=0 Jan 17 00:15:03.385534 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1342]: parse_uri(): uri params:#012 transport=<transport=ws>, val=<ws>, proto=5 Jan 17 00:15:03.385553 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1345]: parse_uri(): user-param=<>, val=<> Jan 17 00:15:03.385571 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1348]: parse_uri(): method=<>, val=<> Jan 17 00:15:03.385591 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1350]: parse_uri(): ttl=<>, val=<> Jan 17 00:15:03.385608 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1352]: parse_uri(): maddr=<>, val=<> Jan 17 00:15:03.385628 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1354]: parse_uri(): lr=<> Jan 17 00:15:03.385649 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/parse_uri.c:1355]: parse_uri(): r2=<> Jan 17 00:15:03.385668 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/msg_translator.c:1845]: check_boundaries(): no multi-part body Jan 17 00:15:03.385772 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/tcp_main.c:1714]: _tcpconn_find(): 0 port 52797 Jan 17 00:15:03.385792 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/ip_addr.c:580]: print_ip(): tcpconn_find: ip 2604:3d08:777a:61a0:601f:864:1234:1234 Jan 17 00:15:03.385812 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/tcp_main.c:1735]: _tcpconn_find(): a=0x7f8424c013a0, c=0x7f8424c01150, c->id=1, alias port= 52797 port=52797 Jan 17 00:15:03.385830 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/ip_addr.c:580]: print_ip(): ip=2604:3d08:777a:61a0:601f:864:1234:1234 Jan 17 00:15:03.385850 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/tcp_main.c:1746]: _tcpconn_find(): found connection by peer address (id: 1) Jan 17 00:15:03.385869 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/msg_translator.c:162]: check_via_address(): (1.1.1.1, 1.1.1.1, 0) Jan 17 00:15:03.386610 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/tcp_main.c:1714]: _tcpconn_find(): 0 port 52797 Jan 17 00:15:03.386628 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/ip_addr.c:580]: print_ip(): tcpconn_find: ip 2604:3d08:777a:61a0:601f:864:1234:1234 Jan 17 00:15:03.386648 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/tcp_main.c:1735]: _tcpconn_find(): a=0x7f8424c013a0, c=0x7f8424c01150, c->id=1, alias port= 52797 port=52797 Jan 17 00:15:03.386666 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/ip_addr.c:580]: print_ip(): ip=2604:3d08:777a:61a0:601f:864:1234:1234 Jan 17 00:15:03.386685 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/tcp_main.c:1714]: _tcpconn_find(): 0 port 52797 Jan 17 00:15:03.386707 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/ip_addr.c:580]: print_ip(): tcpconn_find: ip 2604:3d08:777a:61a0:601f:864:1234:1234 Jan 17 00:15:03.386726 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/tcp_main.c:1735]: _tcpconn_find(): a=0x7f8424c01380, c=0x7f8424c01150, c->id=1, alias port= 52797 port=52797 Jan 17 00:15:03.386747 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/ip_addr.c:580]: print_ip(): ip=2604:3d08:777a:61a0:601f:864:1234:1234 Jan 17 00:15:03.386766 kamailio[3519371]: WARNING: [61e5f40c-acba-471f-94be-e66334eb217d] tm [../../core/forward.h:204]: msg_send_buffer(): TCP/TLS connection for WebSocket could not be found Jan 17 00:15:03.386786 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_fwd.c:1566]: t_send_branch(): send to 2604:3d08:777a:61a0:601f:864:1234:1234:52797 (5) failed Jan 17 00:15:03.386805 kamailio[3519371]: WARNING: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_fwd.c:1586]: t_send_branch(): sending request on branch 0 failed Jan 17 00:15:03.386825 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_funcs.c:358]: t_relay_to(): t_forward_nonack returned error -1 (-477) Jan 17 00:15:03.386842 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_funcs.c:376]: t_relay_to(): -477 error reply generation delayed Jan 17 00:15:03.386862 kamailio[3519371]: INFO: [61e5f40c-acba-471f-94be-e66334eb217d] sl [sl_funcs.c:420]: sl_reply_error(): message marked with delayed-reply flag Jan 17 00:15:03.386955 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/receive.c:531]: receive_msg(): request-route executed in: 3370 usec Jan 17 00:15:03.386972 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_lookup.c:2032]: t_unref(): delayed error reply generation(-477) Jan 17 00:15:03.386989 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/parser/msg_parser.c:324]: parse_headers(): flags=ffffffffffffffff Jan 17 00:15:03.387008 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/msg_translator.c:162]: check_via_address(): (1.1.1.1, 1.1.1.1, 0) Jan 17 00:15:03.387180 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_reply.c:1782]: cleanup_uac_timers(): RETR/FR timers reset Jan 17 00:15:03.387198 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] siptrace [siptrace.c:2476]: siptrace_net_data_sent(): processing message mode 1 Jan 17 00:15:03.387217 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] siptrace [siptrace_hep.c:523]: pipport2su(): the port string is 9060 Jan 17 00:15:03.387236 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] siptrace [siptrace_hep.c:523]: pipport2su(): the port string is 8060 Jan 17 00:15:03.387331 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/proxy.c:267]: mk_proxy(): doing DNS lookup... Jan 17 00:15:03.387512 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] siptrace [siptrace_hep.c:185]: trace_send_hep3_duplicate(): setting up the socket_info Jan 17 00:15:03.388083 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_reply.c:634]: _reply_light(): reply sent out - buf=0x7f845f88e060: SIP/2.0 477 Unfortun... shmem=0x7f8424c1b010: SIP/2.0 477 Unfortun Jan 17 00:15:03.388181 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_funcs.c:133]: put_on_wait(): put T [0x7f8424c15380] on wait Jan 17 00:15:03.388330 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] tm [t_reply.c:650]: _reply_light(): finished Jan 17 00:15:03.388390 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/usr_avp.c:654]: destroy_avp_list(): destroying list (nil) Jan 17 00:15:03.388437 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/usr_avp.c:654]: destroy_avp_list(): destroying list (nil) Jan 17 00:15:03.388483 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/usr_avp.c:654]: destroy_avp_list(): destroying list (nil) Jan 17 00:15:03.388531 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/usr_avp.c:654]: destroy_avp_list(): destroying list (nil) Jan 17 00:15:03.388578 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/usr_avp.c:654]: destroy_avp_list(): destroying list (nil) Jan 17 00:15:03.388625 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/usr_avp.c:654]: destroy_avp_list(): destroying list (nil) Jan 17 00:15:03.388675 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/xavp.c:630]: xavp_destroy_list(): destroying xavp list (nil) Jan 17 00:15:03.388722 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/xavp.c:630]: xavp_destroy_list(): destroying xavp list (nil) Jan 17 00:15:03.388782 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/xavp.c:630]: xavp_destroy_list(): destroying xavp list (nil) Jan 17 00:15:03.388801 kamailio[3519371]: DEBUG: [61e5f40c-acba-471f-94be-e66334eb217d] <core> [core/receive.c:635]: receive_msg(): cleaning up ``` #### SIP Traffic  ### Test Scenario: 1. A client connects to Kamailio over WSS on port 443 and sends a REGISTER request, successfully registering. 2. Another SIP server attempts to send a NOTIFY request to the client via Kamailio. - Kamailio fails to send the NOTIFY request to the client and responds with a 477 error. ``` Client Kamailio SIP Server | | | |--- REGISTER (WSS:443) -------> | | | | | |<--- 200 OK (Registration) ---- | | | | | | | <-- NOTIFY (UDP) -------------- | | | | | | | | | --- 477 Error -----------------> | | | (Failed to send NOTIFY) | | | | | | | ``` I replaced our Kamailio server domain in the SIP message with 'example.com'. kamailio IP: 1.1.1.1 client IP:3.3.3.3 ``` REGISTER sip:example.com SIP/2.0 Via: SIP/2.0/WSS hfotrcsa7jk0.invalid;branch=z9hG4bK769149 ... Contact: <sip:23ao5h15@hfotrcsa7jk0.invalid;transport=ws>;+sip.ice;reg-id=1;+sip.instance="<urn:uuid:35e6e004-4a78-4c5f-999c-be70dda68e1f>";expires=900 ... ``` ``` NOTIFY sip:23ao5h15@hfotrcsa7jk0.invalid;transport=ws SIP/2.0 Via: SIP/2.0/UDP 2.2.2.2:8060;branch=z9hG4bKa769.503729f6000000000000000000000000.0 To: <sip:+11234567890-1234@example.com> From: <sip:mygw@example.com>;tag=5e6acf4bd0c73e10f5120f096b1fc95c-e0aa3a8f User-Agent: kamailio (5.8.3 (x86_64/linux)) ... Route: <sip:1.1.1.1:9060;lr;received=sip:3.3.3.3:63549%3Btransport%3Dws> ... ``` ``` SIP/2.0 477 Unfortunately error on sending to next hop occurred (477/TM) ``` ### Possible Solutions  https://github.com/kamailio/kamailio/blob/master/src/core/tcp_main.c#L1747 ``` && (proto == PROTO_NONE || a->parent->rcv.proto == proto)) { ``` Removing this validation line resolves the issue, restoring the previous behavior where SIP messages are successfully sent over WSS. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # ./kamailio -v version: kamailio 5.8.3 (x86_64/linux) 42401c flags: , EXTRA_DEBUGUSE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 42401c compiled on 23:24:48 Jan 16 2025 with gcc 10.2.1 ``` * **Operating System**:  debian 11.11 ``` # uname -a Linux 5.10.0-33-cloud-amd64 #1 SMP Debian 5.10.226-1 (2024-10-03) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4115 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4115(a)github.com>

3 4

[kamailio/kamailio] RHEL 10: incompatible-pointer-types build error (Issue #4119)
by sergey-safarov 23 Jan '25

23 Jan '25

``` C (gcc) [M db_sqlite.so] db_sqlite.o CC (gcc) [M db_sqlite.so] dbase.o dbase.c: In function ‘db_sqlite_close’: dbase.c:141:25: error: passing argument 2 of ‘db_do_close’ from incompatible pointer type [-Wincompatible-pointer-types] 141 | db_do_close(_h, db_sqlite_free_connection); | ^~~~~~~~~~~~~~~~~~~~~~~~~ | | | void (*)(struct sqlite_connection *) In file included from ../../lib/srdb1/db_ut.h:37, from dbase.c:28: ../../lib/srdb1/db.h:495:40: note: expected ‘void (*)(struct pool_con *)’ but argument is of type ‘void (*)(struct sqlite_connection *)’ 495 | void db_do_close(db1_con_t *_h, void (*free_connection)(struct pool_con *)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ make[2]: *** [../../Makefile.rules:100: dbase.o] Error 1 make[1]: *** [Makefile:508: modules] Error 1 make[1]: Leaving directory '/root/rpmbuild/BUILD/kamailio-5.8.5/src' make: *** [Makefile:34: every-module] Error 2 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4119 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4119(a)github.com>

2 2

git:5.8:cd68ed20: db_sqlite: fix incompatible-pointer-types warning
by Daniel-Constantin Mierla 23 Jan '25

23 Jan '25

Module: kamailio Branch: 5.8 Commit: cd68ed205895b981d61d84de5138e25329455cd9 URL: https://github.com/kamailio/kamailio/commit/cd68ed205895b981d61d84de5138e25… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-23T11:10:16+01:00 db_sqlite: fix incompatible-pointer-types warning fixes #4064 (cherry picked from commit 06cc2560e5358468178ef3e5c795a8a0ec67b693) --- Modified: src/modules/db_sqlite/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/cd68ed205895b981d61d84de5138e25… Patch: https://github.com/kamailio/kamailio/commit/cd68ed205895b981d61d84de5138e25… --- diff --git a/src/modules/db_sqlite/dbase.c b/src/modules/db_sqlite/dbase.c index 97af64d39a3..a3e9b82f742 100644 --- a/src/modules/db_sqlite/dbase.c +++ b/src/modules/db_sqlite/dbase.c @@ -126,14 +126,17 @@ db1_con_t *db_sqlite_init(const str *_url) * No function should be called after this */ -static void db_sqlite_free_connection(struct sqlite_connection *con) +static void db_sqlite_free_connection(struct pool_con *con) { + struct sqlite_connection *_c; + if(!con) return; + _c = (struct sqlite_connection *)con; - sqlite3_close(con->conn); - free_db_id(con->hdr.id); - pkg_free(con); + sqlite3_close(_c->conn); + free_db_id(_c->hdr.id); + pkg_free(_c); } void db_sqlite_close(db1_con_t *_h)

1 0

git:master:8d1b60bc: cmake: Fix typo
by Xenofon Karamanos 23 Jan '25

23 Jan '25

Module: kamailio Branch: master Commit: 8d1b60bc7f21fe9d0fadd1df926fee931966f34e URL: https://github.com/kamailio/kamailio/commit/8d1b60bc7f21fe9d0fadd1df926fee9… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-23T10:06:46Z cmake: Fix typo --- Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/8d1b60bc7f21fe9d0fadd1df926fee9… Patch: https://github.com/kamailio/kamailio/commit/8d1b60bc7f21fe9d0fadd1df926fee9… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index 10ef2cf9db8..ca8a4f20660 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -264,7 +264,7 @@ else() dbschema_${db_name} COMMAND ${CMAKE_COMMAND} -E make_directory "${db_name_folder}" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Creating scehmas for ${db_name}") + COMMENT "Creating schemas for ${db_name}") # Loop through each table and add a command for xsltproc foreach(table ${EXTRACTED_TABLES})

1 0

git:master:9b7719a6: cmake/sctp: Search for libsctp and error if not found
by Xenofon Karamanos 23 Jan '25

23 Jan '25

Module: kamailio Branch: master Commit: 9b7719a61ab02c93939e3681cb90e9fa04f3ac5d URL: https://github.com/kamailio/kamailio/commit/9b7719a61ab02c93939e3681cb90e9f… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-23T10:06:03Z cmake/sctp: Search for libsctp and error if not found --- Modified: src/modules/sctp/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/9b7719a61ab02c93939e3681cb90e9f… Patch: https://github.com/kamailio/kamailio/commit/9b7719a61ab02c93939e3681cb90e9f… --- diff --git a/src/modules/sctp/CMakeLists.txt b/src/modules/sctp/CMakeLists.txt index 5d8cb523a49..22e51fd7c08 100644 --- a/src/modules/sctp/CMakeLists.txt +++ b/src/modules/sctp/CMakeLists.txt @@ -2,6 +2,23 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) +# TODO: find include file required +find_path( + SCTP_INCLUDE_DIR + NAMES sctp.h + PATHS /usr/include /usr/local/include /usr/include/netinet) + +if(NOT SCTP_INCLUDE_DIR) + message(FATAL_ERROR "sctp.h not found. maybe missing libsctp-dev?") +endif() + +target_include_directories(${module_name} PRIVATE ${SCTP_INCLUDE_DIR}) + +find_library( + SCTP_LIBRARY + NAMES sctp + PATHS /usr/lib /usr/local/lib) + if(UNIX) - target_link_libraries(${module_name} PRIVATE -lsctp) + target_link_libraries(${module_name} PRIVATE ${SCTP_LIBRARY}) endif()

1 0

git:master:2dbd3d47: cmake: Link with correct Erlang target
by Xenofon Karamanos 23 Jan '25

23 Jan '25

Module: kamailio Branch: master Commit: 2dbd3d47cdbd55365fcb37b48a30c3224b8af810 URL: https://github.com/kamailio/kamailio/commit/2dbd3d47cdbd55365fcb37b48a30c32… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-23T10:05:21Z cmake: Link with correct Erlang target --- Modified: src/modules/erlang/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/2dbd3d47cdbd55365fcb37b48a30c32… Patch: https://github.com/kamailio/kamailio/commit/2dbd3d47cdbd55365fcb37b48a30c32… --- diff --git a/src/modules/erlang/CMakeLists.txt b/src/modules/erlang/CMakeLists.txt index 16c4be64bfd..db92655b497 100644 --- a/src/modules/erlang/CMakeLists.txt +++ b/src/modules/erlang/CMakeLists.txt @@ -5,4 +5,6 @@ add_library(${module_name} SHARED ${MODULE_SOURCES}) # erlang-dev find_package(Erlang REQUIRED) -target_link_libraries(${module_name} PRIVATE Erlang::EI) +target_link_libraries(${module_name} PRIVATE Erlang::Erlang) +target_include_directories(${module_name} PRIVATE ${Erlang_INCLUDE_DIRS}) +target_compile_definitions(${module_name} PRIVATE _REENTRANT)

1 0

git:master:53bd567d: cmake/Radius: Add libfreeradius support
by Xenofon Karamanos 23 Jan '25

23 Jan '25

Module: kamailio Branch: master Commit: 53bd567dd7444a8145aa876d82db2c6b579a7e19 URL: https://github.com/kamailio/kamailio/commit/53bd567dd7444a8145aa876d82db2c6… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-23T10:03:26Z cmake/Radius: Add libfreeradius support - Add libfreeradius.cmake to search for libfreeradius-client - Link modules with correct libraries paths - Fix description --- Added: cmake/modules/FindLibfreeradius.cmake Modified: cmake/modules/FindRadius.cmake Modified: src/modules/acc_radius/CMakeLists.txt Modified: src/modules/auth_radius/CMakeLists.txt Modified: src/modules/misc_radius/CMakeLists.txt Modified: src/modules/peering/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/53bd567dd7444a8145aa876d82db2c6… Patch: https://github.com/kamailio/kamailio/commit/53bd567dd7444a8145aa876d82db2c6…

1 0

Kamailio v5.8.5 Released
by Daniel-Constantin Mierla 23 Jan '25

23 Jan '25

Hello, Kamailio SIP Server v5.8.5 stable release is out. This is a maintenance release of the latest stable branch, 5.8, that includes fixes since the release of v5.8.4. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.8.x. Deployments running previous v5.8.x versions are strongly recommended to be upgraded to v5.8.5. For more details about version 5.8.5 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2025/01/kamailio-v5-8-5-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio World Conference, May 12-13, 2025, Berlin -- kamailioworld.com

1 0

git:5.8:b035a803: ChangeLog: content updated for v5.8.5
by Daniel-Constantin Mierla 23 Jan '25

23 Jan '25

Module: kamailio Branch: 5.8 Commit: b035a803ed85cff9d7000b10b70a118fdbdbae6f URL: https://github.com/kamailio/kamailio/commit/b035a803ed85cff9d7000b10b70a118… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-23T09:28:16+01:00 ChangeLog: content updated for v5.8.5 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/b035a803ed85cff9d7000b10b70a118… Patch: https://github.com/kamailio/kamailio/commit/b035a803ed85cff9d7000b10b70a118…

1 0

git:6.0:142260f8: github: set branch 6.0 [skip ci]
by Victor Seva 23 Jan '25

23 Jan '25

Module: kamailio Branch: 6.0 Commit: 142260f8c30d66510e6f186b170b467fb66a15a3 URL: https://github.com/kamailio/kamailio/commit/142260f8c30d66510e6f186b170b467… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-23T09:21:16+01:00 github: set branch 6.0 [skip ci] --- Modified: .github/workflows/cmake_build.yml Modified: .github/workflows/devcontainer.yaml Modified: .github/workflows/main.yml --- Diff: https://github.com/kamailio/kamailio/commit/142260f8c30d66510e6f186b170b467… Patch: https://github.com/kamailio/kamailio/commit/142260f8c30d66510e6f186b170b467… --- diff --git a/.github/workflows/cmake_build.yml b/.github/workflows/cmake_build.yml index 73ab19ef5d7..57513dd549d 100644 --- a/.github/workflows/cmake_build.yml +++ b/.github/workflows/cmake_build.yml @@ -6,9 +6,7 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: push: - branches: [ master ] - pull_request: - branches: [ master ] + branches: [ 6.0 ] jobs: build: @@ -29,7 +27,7 @@ jobs: os: [ubuntu-latest, macos-latest] # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list. build_type: [Release] - c_compiler: [gcc, clang] + c_compiler: [gcc, clang] kamailio_groups: [DEFAULT] target_arch: [aarch64, x86_64] exclude: @@ -51,7 +49,7 @@ jobs: - name: Build Project natively uses: threeal/cmake-action(a)v2.1.0 # Step runs for all except this combination - if: matrix.os != 'ubuntu-latest' || matrix.target_arch != 'aarch64' + if: matrix.os != 'ubuntu-latest' || matrix.target_arch != 'aarch64' with: build-dir: ${{github.workspace}}/build build-args: -j8 @@ -59,7 +57,7 @@ jobs: CMAKE_BUILD_TYPE=${{matrix.build_type}} MODULE_GROUP_NAME=${{matrix.kamailio_groups}} CMAKE_C_COMPILER=${{matrix.c_compiler}} - + - name: Build Project with cross-compiler if: matrix.os == 'ubuntu-latest' && matrix.target_arch == 'aarch64' uses: threeal/cmake-action(a)v2.1.0 @@ -69,4 +67,4 @@ jobs: options: | CMAKE_BUILD_TYPE=${{matrix.build_type}} MODULE_GROUP_NAME=${{matrix.kamailio_groups}} - CMAKE_TOOLCHAIN_FILE=${{github.workspace}}/cmake/aarch64-toolchain.cmake \ No newline at end of file + CMAKE_TOOLCHAIN_FILE=${{github.workspace}}/cmake/aarch64-toolchain.cmake diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml index 3acd963b2df..6718c5359f7 100644 --- a/.github/workflows/devcontainer.yaml +++ b/.github/workflows/devcontainer.yaml @@ -4,7 +4,7 @@ name: build devcontainer image 'on': push: branches: - - master + - 6.0 # Allows you to run this workflow manually from the Actions tab workflow_dispatch: inputs: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8b7ae03a271..2822c36cdbb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: build 'on': push: branches: - - master + - 6.0 # Allows you to run this workflow manually from the Actions tab workflow_dispatch: jobs:

1 0

git:5.8:7c2db662: Makefile.defs: version set to 5.8.5
by Daniel-Constantin Mierla 23 Jan '25

23 Jan '25

Module: kamailio Branch: 5.8 Commit: 7c2db662b81ede6256a871a783146320a03904c6 URL: https://github.com/kamailio/kamailio/commit/7c2db662b81ede6256a871a78314632… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-23T09:08:43+01:00 Makefile.defs: version set to 5.8.5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/7c2db662b81ede6256a871a78314632… Patch: https://github.com/kamailio/kamailio/commit/7c2db662b81ede6256a871a78314632… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index ed7a6b924f6..30a1de0feef 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 8 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = # memory manager switcher

1 0

git:5.8:13ef1a55: core: extended logs for subst lumps
by Daniel-Constantin Mierla 23 Jan '25

23 Jan '25

Module: kamailio Branch: 5.8 Commit: 13ef1a559a57087279ea5c0920ad7253e65b7c98 URL: https://github.com/kamailio/kamailio/commit/13ef1a559a57087279ea5c0920ad725… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-23T09:07:53+01:00 core: extended logs for subst lumps (cherry picked from commit d307fee57b7a8a7e0b5ccf0956464a159e156b73) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/13ef1a559a57087279ea5c0920ad725… Patch: https://github.com/kamailio/kamailio/commit/13ef1a559a57087279ea5c0920ad725…

1 0

git:master:d307fee5: core: extended logs for subst lumps
by Daniel-Constantin Mierla 23 Jan '25

23 Jan '25

Module: kamailio Branch: master Commit: d307fee57b7a8a7e0b5ccf0956464a159e156b73 URL: https://github.com/kamailio/kamailio/commit/d307fee57b7a8a7e0b5ccf0956464a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-23T09:05:33+01:00 core: extended logs for subst lumps --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/d307fee57b7a8a7e0b5ccf0956464a1… Patch: https://github.com/kamailio/kamailio/commit/d307fee57b7a8a7e0b5ccf0956464a1…

1 0

git:6.0:8d0cd75c: pkg/kamailio/deb: version set 6.0.0~rc0 [skip ci]
by Victor Seva 23 Jan '25

23 Jan '25

Module: kamailio Branch: 6.0 Commit: 8d0cd75cc8176105bc6fbdbac75ed57e7d14194f URL: https://github.com/kamailio/kamailio/commit/8d0cd75cc8176105bc6fbdbac75ed57… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-23T08:55:43+01:00 pkg/kamailio/deb: version set 6.0.0~rc0 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/noble/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/8d0cd75cc8176105bc6fbdbac75ed57… Patch: https://github.com/kamailio/kamailio/commit/8d0cd75cc8176105bc6fbdbac75ed57…

1 0

git:master:791fed5e: pkg/kamailio/deb: version set 6.1.0~dev0 [skip ci]
by Victor Seva 23 Jan '25

23 Jan '25

Module: kamailio Branch: master Commit: 791fed5e9f5bd903c9b034fdf48199aea32421ca URL: https://github.com/kamailio/kamailio/commit/791fed5e9f5bd903c9b034fdf48199a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-23T08:53:33+01:00 pkg/kamailio/deb: version set 6.1.0~dev0 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/noble/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/791fed5e9f5bd903c9b034fdf48199a… Patch: https://github.com/kamailio/kamailio/commit/791fed5e9f5bd903c9b034fdf48199a…

1 0

git:5.8:2f7ff721: pkg/kamailio/deb: set version to 5.8.5
by Daniel-Constantin Mierla 23 Jan '25

23 Jan '25

Module: kamailio Branch: 5.8 Commit: 2f7ff72109cb4097c095d86bc5d57d00b3024d7d URL: https://github.com/kamailio/kamailio/commit/2f7ff72109cb4097c095d86bc5d57d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-23T08:31:59+01:00 pkg/kamailio/deb: set version to 5.8.5 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jammy/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/noble/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/2f7ff72109cb4097c095d86bc5d57d0… Patch: https://github.com/kamailio/kamailio/commit/2f7ff72109cb4097c095d86bc5d57d0…

1 0

git:5.8:dbb7696b: pkg/kamailio: version set 5.8.5 for rpms and alpine
by Daniel-Constantin Mierla 23 Jan '25

23 Jan '25

Module: kamailio Branch: 5.8 Commit: dbb7696bee3c43da69c4a12a9dc0bdf91b71460f URL: https://github.com/kamailio/kamailio/commit/dbb7696bee3c43da69c4a12a9dc0bdf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-23T08:30:04+01:00 pkg/kamailio: version set 5.8.5 for rpms and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/dbb7696bee3c43da69c4a12a9dc0bdf… Patch: https://github.com/kamailio/kamailio/commit/dbb7696bee3c43da69c4a12a9dc0bdf… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 53edff7bded..3a8fe938c53 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.8.4 +pkgver=5.8.5 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index e889b0df375..f160ec6d7ad 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.8.4 +%define ver 5.8.5 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Development is open for future release of v6.1.x series
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Hello, the branch 6.0 was created, therefore the master branch is open for adding new features, to be part of future release series v6.1.x. Any bug fix committed to master that applies to 6.0.x or older stable branches should be backported as usual with "git cherry-pick -x ..." to appropriate branches like 6.0 or 5.8. Expect that v6.0.0 will be released in a few weeks from now. Based on the workflow used during the past years, the next future release v6.1.0 should be out after another 8-10 months of development, plus 1-2 months of testing, so sometime during the last part of 2025 or the beginning of 2026. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio World Conference, May 12-13, 2025, Berlin -- kamailioworld.com

1 0

Branch 6.0 has been created
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Hello, the branch 6.0 has been created, to be used for releasing v6.0.x series. To check out this branch, the following commands can be used: git clone https://github.com/kamailio/kamailio kamailio-6.0 cd kamailio-6.0 git checkout -b 6.0 origin/6.0 Pushing commits in this branch: git push origin 6.0:6.0 Note that 6.0 is an official stable branch, so only bug fixes, missing kemi exports (discuss on sr-dev if not sure) or improvements to documentation or helper tools can be pushed to this branch. As usual, if there is a bug fixed, commit and push first to master branch and then cherry pick to 6.0 branch: git cherry-pick -x COMMITID In few weeks, the first release from branch 6.0 will be out, respectively Kamailio v6.0.0. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

1 0

git:6.0:fc3412ed: Makefile.defs: version set to 6.0.0-rc0
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 6.0 Commit: fc3412ed108a9264a28ed1afc41ee5b0fef7a825 URL: https://github.com/kamailio/kamailio/commit/fc3412ed108a9264a28ed1afc41ee5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T20:36:33+01:00 Makefile.defs: version set to 6.0.0-rc0 - version set also in CMakeLists.txt - branch 6.0 created for release series 6.0.x --- Modified: CMakeLists.txt Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/fc3412ed108a9264a28ed1afc41ee5b… Patch: https://github.com/kamailio/kamailio/commit/fc3412ed108a9264a28ed1afc41ee5b… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 074b855959d..67fdbf351cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ project( HOMEPAGE_URL "https://www.kamailio.org") # Set the version number -set(EXTRAVERSION "-pre1") +set(EXTRAVERSION "-rc0") set(RELEASE "${PROJECT_VERSION}${EXTRAVERSION}") message(STATUS "PROJECT_VERSION: ${PROJECT_VERSION}") diff --git a/src/Makefile.defs b/src/Makefile.defs index cc6635bc9fe..5946eb600fa 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 6 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -rc0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:ec5c1907: Makefile.defs: version set to 6.1.0-dev0
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: master Commit: ec5c1907c21ca8a479eed330cc3be9900f98f95a URL: https://github.com/kamailio/kamailio/commit/ec5c1907c21ca8a479eed330cc3be99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T20:34:15+01:00 Makefile.defs: version set to 6.1.0-dev0 - version set also in CMakeLists.txt - master branch is now open for development of the future release series 6.1.x --- Modified: CMakeLists.txt Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/ec5c1907c21ca8a479eed330cc3be99… Patch: https://github.com/kamailio/kamailio/commit/ec5c1907c21ca8a479eed330cc3be99… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 074b855959d..24d2510b725 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,12 +5,12 @@ cmake_minimum_required(VERSION 3.10) # Set the project name project( kamailio - VERSION 6.0.0 + VERSION 6.1.0 DESCRIPTION "Kamailio SIP Server" HOMEPAGE_URL "https://www.kamailio.org") # Set the version number -set(EXTRAVERSION "-pre1") +set(EXTRAVERSION "-dev0") set(RELEASE "${PROJECT_VERSION}${EXTRAVERSION}") message(STATUS "PROJECT_VERSION: ${PROJECT_VERSION}") diff --git a/src/Makefile.defs b/src/Makefile.defs index cc6635bc9fe..7656029123e 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 6 -PATCHLEVEL = 0 +PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:1fc08485: Makefile.defs/CMakeLists.txt: version set to 6.0.0-pre1
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: master Commit: 1fc084851c75ae5b1d3957c25c99c5c76a7e3125 URL: https://github.com/kamailio/kamailio/commit/1fc084851c75ae5b1d3957c25c99c5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T20:28:37+01:00 Makefile.defs/CMakeLists.txt: version set to 6.0.0-pre1 --- Modified: CMakeLists.txt Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1fc084851c75ae5b1d3957c25c99c5c… Patch: https://github.com/kamailio/kamailio/commit/1fc084851c75ae5b1d3957c25c99c5c… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 833e95db6d4..074b855959d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ project( HOMEPAGE_URL "https://www.kamailio.org") # Set the version number -set(EXTRAVERSION "-pre0") +set(EXTRAVERSION "-pre1") set(RELEASE "${PROJECT_VERSION}${EXTRAVERSION}") message(STATUS "PROJECT_VERSION: ${PROJECT_VERSION}") diff --git a/src/Makefile.defs b/src/Makefile.defs index e411a2c1b2c..cc6635bc9fe 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 6 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:b3605a63: README: updated the version
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: master Commit: b3605a63b503d2579cef3f6feb43fbf768de9d21 URL: https://github.com/kamailio/kamailio/commit/b3605a63b503d2579cef3f6feb43fbf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T16:29:16+01:00 README: updated the version --- Modified: README --- Diff: https://github.com/kamailio/kamailio/commit/b3605a63b503d2579cef3f6feb43fbf… Patch: https://github.com/kamailio/kamailio/commit/b3605a63b503d2579cef3f6feb43fbf… --- diff --git a/README b/README index d6c537dac44..26ceba852a1 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ -Kamailio v5.8 +Kamailio v6.0 ============= https://www.kamailio.org

1 0

git:master:874183da: cmake/phonenum: Remove find_package as it's broken for newer distributions
by Xenofon Karamanos 22 Jan '25

22 Jan '25

Module: kamailio Branch: master Commit: 874183da2a6000f5f8e755e19338b74757e09bf0 URL: https://github.com/kamailio/kamailio/commit/874183da2a6000f5f8e755e19338b74… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-22T14:54:28Z cmake/phonenum: Remove find_package as it's broken for newer distributions - Search for the library manually --- Modified: src/modules/phonenum/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/874183da2a6000f5f8e755e19338b74… Patch: https://github.com/kamailio/kamailio/commit/874183da2a6000f5f8e755e19338b74… --- diff --git a/src/modules/phonenum/CMakeLists.txt b/src/modules/phonenum/CMakeLists.txt index de2c23984fb..1003c5115b3 100644 --- a/src/modules/phonenum/CMakeLists.txt +++ b/src/modules/phonenum/CMakeLists.txt @@ -3,14 +3,14 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) # TODO: Support for find_package added after version 8.13.4 -find_package(libphonenumber CONFIG QUIET) +# TODO: Debian and Ubuntu are missing static installation of libphonenumber +# and find_package() does not work for them. +# find_package(libphonenumber CONFIG QUIET) if(libphonenumber_FOUND) - # message(STATUS "Found libphonenumber: ${libphonenumber_INCLUDE_DIRS}") + message(STATUS "Found libphonenumber: ${libphonenumber_INCLUDE_DIRS}") + message(STATUS "Found libphonenumber: ${libphonenumber_LIBRARY}") else() - message( - STATUS - "libphonenumber not found with find_package()... looking with other methods" - ) + message(STATUS "Looking for libphonenumber...") # add additional logic here to handle the missing dependency TODO: Fix lint # issue find_library(libphonenumber_LIBRARY NAMES phonenumber)

1 0

git:5.8:6fd7fd2a: core: reworked how rport, received and extra params are added to first via of generated replies
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: 6fd7fd2acf7d76e4e8ba7669c170dc837a84848d URL: https://github.com/kamailio/kamailio/commit/6fd7fd2acf7d76e4e8ba7669c170dc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:49:47+01:00 core: reworked how rport, received and extra params are added to first via of generated replies (cherry picked from commit d613f30214782d47ed0aab8bf2fb55329d87862a) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/6fd7fd2acf7d76e4e8ba7669c170dc8… Patch: https://github.com/kamailio/kamailio/commit/6fd7fd2acf7d76e4e8ba7669c170dc8… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index f7590dc5161..e775c0c3f00 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2647,57 +2647,50 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, if(unlikely(httpreq)) pvia = p; if(hdr == msg->h_via1) { - if(rport_buf) { - if(msg->via1->rport) { /* delete the old one */ - /* copy until rport */ - append_str_trans(p, hdr->name.s, - msg->via1->rport->start - hdr->name.s - 1, - msg); - /* copy new rport */ - append_str(p, rport_buf, rport_len); - /* copy the rest of the via */ - append_str_trans(p, - msg->via1->rport->start - + msg->via1->rport->size, - hdr->body.s + hdr->body.len - - msg->via1->rport->start - - msg->via1->rport->size, - msg); - } else if(msg->via1->branch) { /* add after branch */ - /* copy until after branch */ - append_str_trans(p, hdr->name.s, - msg->via1->branch->start - hdr->name.s - + msg->via1->branch->size, - msg); - /* copy new rport */ - append_str(p, rport_buf, rport_len); - /* copy the rest of the via */ - append_str_trans(p, - msg->via1->branch->start - + msg->via1->branch->size, - hdr->body.s + hdr->body.len - - msg->via1->branch->start - - msg->via1->branch->size, - msg); - } else { /* just append the new one */ - /* normal whole via copy */ - append_str_trans(p, hdr->name.s, - (hdr->body.s + hdr->body.len) - hdr->name.s, - msg); - append_str(p, rport_buf, rport_len); - } - } else { - /* normal whole via copy */ + if(rport_buf && msg->via1->rport) { /* replace old rport */ + /* copy until rport */ + append_str_trans(p, hdr->name.s, + msg->via1->rport->start - hdr->name.s - 1, msg); + } else if(msg->via1->branch) { /* add after branch */ + append_str_trans(p, hdr->name.s, + msg->via1->branch->start - hdr->name.s + + msg->via1->branch->size, + msg); + } else { /* append after header */ append_str_trans(p, hdr->name.s, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } + if(rport_buf) { + /* add rport */ + append_str(p, rport_buf, rport_len); + } if(received_buf) { + /* add received */ append_str(p, received_buf, received_len); } if(xparams.len > 0) { + /* add extra parameters */ append_str(p, xparams.s, xparams.len); } + /* copy the rest of the via */ + if(rport_buf && msg->via1->rport) { + append_str_trans(p, + msg->via1->rport->start + + msg->via1->rport->size, + hdr->body.s + hdr->body.len + - msg->via1->rport->start + - msg->via1->rport->size, + msg); + } else if(msg->via1->branch) { + append_str_trans(p, + msg->via1->branch->start + + msg->via1->branch->size, + hdr->body.s + hdr->body.len + - msg->via1->branch->start + - msg->via1->branch->size, + msg); + } } else { /* normal whole via copy */ append_str_trans(p, hdr->name.s,

1 0

git:5.8:8eff8116: core: add extra params to first via only for generated replies
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: 8eff811614b72fbf80af6d546d65c65e6b59c1a5 URL: https://github.com/kamailio/kamailio/commit/8eff811614b72fbf80af6d546d65c65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:49:34+01:00 core: add extra params to first via only for generated replies (cherry picked from commit 9045c8d537b8960a18451f870effe2255cb4861d) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/8eff811614b72fbf80af6d546d65c65… Patch: https://github.com/kamailio/kamailio/commit/8eff811614b72fbf80af6d546d65c65… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 262ba07a23a..f7590dc5161 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2692,16 +2692,17 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } - if(received_buf) + if(received_buf) { append_str(p, received_buf, received_len); + } + if(xparams.len > 0) { + append_str(p, xparams.s, xparams.len); + } } else { /* normal whole via copy */ append_str_trans(p, hdr->name.s, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } - if(xparams.len > 0) { - append_str(p, xparams.s, xparams.len); - } append_str(p, CRLF, CRLF_LEN); /* if is HTTP, replace Via with Sia * - HTTP Via format is different than SIP Via

1 0

git:5.8:b6360f4d: core: add rport to generated replies after first via branch when no incoming rport
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: b6360f4d8549c18efad507bc37ef599d9e3316d7 URL: https://github.com/kamailio/kamailio/commit/b6360f4d8549c18efad507bc37ef599… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:49:25+01:00 core: add rport to generated replies after first via branch when no incoming rport (cherry picked from commit 09d1ba87f4d37c3e13153229c63698f09ca195bc) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/b6360f4d8549c18efad507bc37ef599… Patch: https://github.com/kamailio/kamailio/commit/b6360f4d8549c18efad507bc37ef599… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 4e81f89cedb..262ba07a23a 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2663,6 +2663,22 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, - msg->via1->rport->start - msg->via1->rport->size, msg); + } else if(msg->via1->branch) { /* add after branch */ + /* copy until after branch */ + append_str_trans(p, hdr->name.s, + msg->via1->branch->start - hdr->name.s + + msg->via1->branch->size, + msg); + /* copy new rport */ + append_str(p, rport_buf, rport_len); + /* copy the rest of the via */ + append_str_trans(p, + msg->via1->branch->start + + msg->via1->branch->size, + hdr->body.s + hdr->body.len + - msg->via1->branch->start + - msg->via1->branch->size, + msg); } else { /* just append the new one */ /* normal whole via copy */ append_str_trans(p, hdr->name.s,

1 0

git:5.8:132e5324: etc/kamailio.org: do record route for REFER
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: 132e5324bf9f794ea82df0f12ef094f6c12ee178 URL: https://github.com/kamailio/kamailio/commit/132e5324bf9f794ea82df0f12ef094f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:49:13+01:00 etc/kamailio.org: do record route for REFER - it creates a subscription dialog - https://datatracker.ietf.org/doc/html/rfc3515#section-2 (cherry picked from commit cfc9d69435b4bbc53dbe6748e0d22603760c48fd) --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/132e5324bf9f794ea82df0f12ef094f… Patch: https://github.com/kamailio/kamailio/commit/132e5324bf9f794ea82df0f12ef094f… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 3f9a5fe793f..d0a3d2754dc 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -561,7 +561,7 @@ request_route { # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); - if (is_method("INVITE|SUBSCRIBE")) { + if (is_method("INVITE|SUBSCRIBE|REFER")) { record_route(); } @@ -678,8 +678,8 @@ route[WITHINDLG] { } else if ( is_method("ACK") ) { # ACK is forwarded statelessly route(NATMANAGE); - } else if ( is_method("NOTIFY") ) { - # Add Record-Route for in-dialog NOTIFY as per RFC 6665. + } else if ( is_method("NOTIFY|REFER") ) { + # Add Record-Route for in-dialog NOTIFY and REFER (RFC6665, RFC3515) record_route(); } route(RELAY);

1 0

git:5.8:76ffc6d3: core: parser/sdp - check if still before end of the value
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: 76ffc6d3d4053bc43b81c3363e837c10360b0089 URL: https://github.com/kamailio/kamailio/commit/76ffc6d3d4053bc43b81c3363e837c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:48:55+01:00 core: parser/sdp - check if still before end of the value (cherry picked from commit b96bc11a54f11ec688429c057bf5a90c40c147b3) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/76ffc6d3d4053bc43b81c3363e837c1… Patch: https://github.com/kamailio/kamailio/commit/76ffc6d3d4053bc43b81c3363e837c1… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index bad76bcda22..ed34712934d 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -413,7 +413,7 @@ int extract_ice_option(str *body, sdp_stream_cell_t *stream) trim_len(ice_opt->option.len, ice_opt->option.s, ice_opt->option); length = 0; - if(*ptr_src == 32) + if(ptr_src < end && *ptr_src == 32) ptr_src++; /* skip space */ }

1 0

git:5.8:9b26093f: core: socket info - set receive timeout for netlink socket
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: 9b26093fa5cdf05cf664fa3a03619634ed226a47 URL: https://github.com/kamailio/kamailio/commit/9b26093fa5cdf05cf664fa3a0361963… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:48:40+01:00 core: socket info - set receive timeout for netlink socket - GH #4098 (cherry picked from commit 6750e2e2f1d6c10f6b5e66897d38657a576a9732) --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/9b26093fa5cdf05cf664fa3a0361963… Patch: https://github.com/kamailio/kamailio/commit/9b26093fa5cdf05cf664fa3a0361963… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 44f33027c75..8efa594618f 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1332,6 +1332,7 @@ static int nl_bound_sock(void) { int sock = -1; struct sockaddr_nl la; + struct timeval recvtimeout; sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); if(sock < 0) { @@ -1350,6 +1351,15 @@ static int nl_bound_sock(void) goto error; } + recvtimeout.tv_sec = 4; + recvtimeout.tv_usec = 0; + if(setsockopt( + sock, SOL_SOCKET, SO_RCVTIMEO, &recvtimeout, sizeof(recvtimeout)) + < 0) { + LM_ERR("failed to set receive timeout\n"); + goto error; + } + return sock; error: if(sock >= 0) @@ -1402,6 +1412,10 @@ static int get_flags(int family) goto error; } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); + if(rtn <= 0) { + LM_ERR("failed to receive data (%d/%d)\n", rtn, errno); + goto error; + } nlp = (struct nlmsghdr *)p; if(nlp->nlmsg_type == NLMSG_DONE) { LM_DBG("done\n"); @@ -1504,6 +1518,10 @@ static int build_iface_list(void) goto error; } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); + if(rtn <= 0) { + LM_ERR("failed to receive data (%d/%d)\n", rtn, errno); + goto error; + } LM_DBG("received %d byles \n", rtn); nlp = (struct nlmsghdr *)p; if(nlp->nlmsg_type == NLMSG_DONE) {

1 0

git:5.8:59a6a469: parser/sdp: more details in logs for setting fmtp payload
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: 59a6a469d1627de069abb8b7755776a8e87c9008 URL: https://github.com/kamailio/kamailio/commit/59a6a469d1627de069abb8b7755776a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:48:18+01:00 parser/sdp: more details in logs for setting fmtp payload (cherry picked from commit 81b84ef83f59981b6e5f199055e9ab6a94c58b38) --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/59a6a469d1627de069abb8b7755776a… Patch: https://github.com/kamailio/kamailio/commit/59a6a469d1627de069abb8b7755776a… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index 06fc411f502..5eb04b0c047 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -233,7 +233,13 @@ void set_sdp_payload_attr(sdp_payload_attr_t *payload_attr, str *rtp_enc, void set_sdp_payload_fmtp(sdp_payload_attr_t *payload_attr, str *fmtp_string) { if(payload_attr == NULL) { - LM_ERR("Invalid payload location\n"); + if(fmtp_string != NULL && fmtp_string->s != NULL + && fmtp_string->len > 0) { + LM_ERR("Invalid payload location - fmtp: %.*s\n", fmtp_string->len, + fmtp_string->s); + } else { + LM_ERR("Invalid payload location\n"); + } return; } payload_attr->fmtp_string.s = fmtp_string->s; @@ -354,6 +360,8 @@ sdp_payload_attr_t *get_sdp_payload4payload( } } + LM_DBG("payload not found: %.*s\n", rtp_payload->len, rtp_payload->s); + return NULL; }

1 0

git:5.8:f499cb1f: core: tcp - remove level and function name from log message
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: f499cb1fffb0ec8ef7b659ecde90de303fde0553 URL: https://github.com/kamailio/kamailio/commit/f499cb1fffb0ec8ef7b659ecde90de3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:47:54+01:00 core: tcp - remove level and function name from log message (cherry picked from commit 5fe61ec6dbcd9d2dde3f2bd978dad5130ac5bff9) --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/f499cb1fffb0ec8ef7b659ecde90de3… Patch: https://github.com/kamailio/kamailio/commit/f499cb1fffb0ec8ef7b659ecde90de3… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index cd7790eb958..77ba6e97cfa 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1522,8 +1522,7 @@ int tcp_read_req(struct tcp_connection *con, int *bytes_read, if(unlikely(bytes < 0)) { LOG(cfg_get(core, core_cfg, corelog), - "ERROR: tcp_read_req: error reading - c: %p r: %p (%d)\n", - con, req, bytes); + "error reading - c: %p r: %p (%d)\n", con, req, bytes); resp = CONN_ERROR; goto end_req; }

1 0

git:master:d613f302: core: reworked how rport, received and extra params are added to first via of generated replies
by Daniel-Constantin Mierla 21 Jan '25

21 Jan '25

Module: kamailio Branch: master Commit: d613f30214782d47ed0aab8bf2fb55329d87862a URL: https://github.com/kamailio/kamailio/commit/d613f30214782d47ed0aab8bf2fb553… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-21T21:43:06+01:00 core: reworked how rport, received and extra params are added to first via of generated replies --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/d613f30214782d47ed0aab8bf2fb553… Patch: https://github.com/kamailio/kamailio/commit/d613f30214782d47ed0aab8bf2fb553… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 7ad113aa955..6cd65716625 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2667,57 +2667,50 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, if(unlikely(httpreq)) pvia = p; if(hdr == msg->h_via1) { - if(rport_buf) { - if(msg->via1->rport) { /* delete the old one */ - /* copy until rport */ - append_str_trans(p, hdr->name.s, - msg->via1->rport->start - hdr->name.s - 1, - msg); - /* copy new rport */ - append_str(p, rport_buf, rport_len); - /* copy the rest of the via */ - append_str_trans(p, - msg->via1->rport->start - + msg->via1->rport->size, - hdr->body.s + hdr->body.len - - msg->via1->rport->start - - msg->via1->rport->size, - msg); - } else if(msg->via1->branch) { /* add after branch */ - /* copy until after branch */ - append_str_trans(p, hdr->name.s, - msg->via1->branch->start - hdr->name.s - + msg->via1->branch->size, - msg); - /* copy new rport */ - append_str(p, rport_buf, rport_len); - /* copy the rest of the via */ - append_str_trans(p, - msg->via1->branch->start - + msg->via1->branch->size, - hdr->body.s + hdr->body.len - - msg->via1->branch->start - - msg->via1->branch->size, - msg); - } else { /* just append the new one */ - /* normal whole via copy */ - append_str_trans(p, hdr->name.s, - (hdr->body.s + hdr->body.len) - hdr->name.s, - msg); - append_str(p, rport_buf, rport_len); - } - } else { - /* normal whole via copy */ + if(rport_buf && msg->via1->rport) { /* replace old rport */ + /* copy until rport */ + append_str_trans(p, hdr->name.s, + msg->via1->rport->start - hdr->name.s - 1, msg); + } else if(msg->via1->branch) { /* add after branch */ + append_str_trans(p, hdr->name.s, + msg->via1->branch->start - hdr->name.s + + msg->via1->branch->size, + msg); + } else { /* append after header */ append_str_trans(p, hdr->name.s, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } + if(rport_buf) { + /* add rport */ + append_str(p, rport_buf, rport_len); + } if(received_buf) { + /* add received */ append_str(p, received_buf, received_len); } if(xparams.len > 0) { + /* add extra parameters */ append_str(p, xparams.s, xparams.len); } + /* copy the rest of the via */ + if(rport_buf && msg->via1->rport) { + append_str_trans(p, + msg->via1->rport->start + + msg->via1->rport->size, + hdr->body.s + hdr->body.len + - msg->via1->rport->start + - msg->via1->rport->size, + msg); + } else if(msg->via1->branch) { + append_str_trans(p, + msg->via1->branch->start + + msg->via1->branch->size, + hdr->body.s + hdr->body.len + - msg->via1->branch->start + - msg->via1->branch->size, + msg); + } } else { /* normal whole via copy */ append_str_trans(p, hdr->name.s,

1 0

git:master:9045c8d5: core: add extra params to first via only for generated replies
by Daniel-Constantin Mierla 21 Jan '25

21 Jan '25

Module: kamailio Branch: master Commit: 9045c8d537b8960a18451f870effe2255cb4861d URL: https://github.com/kamailio/kamailio/commit/9045c8d537b8960a18451f870effe22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-21T21:22:38+01:00 core: add extra params to first via only for generated replies --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/9045c8d537b8960a18451f870effe22… Patch: https://github.com/kamailio/kamailio/commit/9045c8d537b8960a18451f870effe22… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 50e867804be..7ad113aa955 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2712,16 +2712,17 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } - if(received_buf) + if(received_buf) { append_str(p, received_buf, received_len); + } + if(xparams.len > 0) { + append_str(p, xparams.s, xparams.len); + } } else { /* normal whole via copy */ append_str_trans(p, hdr->name.s, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } - if(xparams.len > 0) { - append_str(p, xparams.s, xparams.len); - } append_str(p, CRLF, CRLF_LEN); /* if is HTTP, replace Via with Sia * - HTTP Via format is different than SIP Via

1 0

git:master:09d1ba87: core: add rport to generated replies after first via branch when no incoming rport
by Daniel-Constantin Mierla 21 Jan '25

21 Jan '25

Module: kamailio Branch: master Commit: 09d1ba87f4d37c3e13153229c63698f09ca195bc URL: https://github.com/kamailio/kamailio/commit/09d1ba87f4d37c3e13153229c63698f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-21T19:45:20+01:00 core: add rport to generated replies after first via branch when no incoming rport --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/09d1ba87f4d37c3e13153229c63698f… Patch: https://github.com/kamailio/kamailio/commit/09d1ba87f4d37c3e13153229c63698f… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 8924e8a2609..50e867804be 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2683,6 +2683,22 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, - msg->via1->rport->start - msg->via1->rport->size, msg); + } else if(msg->via1->branch) { /* add after branch */ + /* copy until after branch */ + append_str_trans(p, hdr->name.s, + msg->via1->branch->start - hdr->name.s + + msg->via1->branch->size, + msg); + /* copy new rport */ + append_str(p, rport_buf, rport_len); + /* copy the rest of the via */ + append_str_trans(p, + msg->via1->branch->start + + msg->via1->branch->size, + hdr->body.s + hdr->body.len + - msg->via1->branch->start + - msg->via1->branch->size, + msg); } else { /* just append the new one */ /* normal whole via copy */ append_str_trans(p, hdr->name.s,

1 0

git:master:cfc9d694: etc/kamailio.org: do record route for REFER
by Daniel-Constantin Mierla 21 Jan '25

21 Jan '25

Module: kamailio Branch: master Commit: cfc9d69435b4bbc53dbe6748e0d22603760c48fd URL: https://github.com/kamailio/kamailio/commit/cfc9d69435b4bbc53dbe6748e0d2260… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-21T18:15:19+01:00 etc/kamailio.org: do record route for REFER - it creates a subscription dialog - https://datatracker.ietf.org/doc/html/rfc3515#section-2 --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/cfc9d69435b4bbc53dbe6748e0d2260… Patch: https://github.com/kamailio/kamailio/commit/cfc9d69435b4bbc53dbe6748e0d2260… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index ea0aa10ca7e..a61227d4173 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -578,7 +578,7 @@ request_route { # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); - if (is_method("INVITE|SUBSCRIBE")) { + if (is_method("INVITE|SUBSCRIBE|REFER")) { record_route(); } @@ -700,8 +700,8 @@ route[WITHINDLG] { } else if ( is_method("ACK") ) { # ACK is forwarded statelessly route(NATMANAGE); - } else if ( is_method("NOTIFY") ) { - # Add Record-Route for in-dialog NOTIFY as per RFC 6665. + } else if ( is_method("NOTIFY|REFER") ) { + # Add Record-Route for in-dialog NOTIFY and REFER (RFC6665, RFC3515) record_route(); } route(RELAY);

1 0

git:master:c994fb8d: ims_qos_npn: fix documentation XML names, it was not adapted after the copy from ims_qos
by Henning Westerholt 21 Jan '25

21 Jan '25

Module: kamailio Branch: master Commit: c994fb8d3906f2199d61302882f3836aa83dd6bb URL: https://github.com/kamailio/kamailio/commit/c994fb8d3906f2199d61302882f3836… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-21T12:23:49Z ims_qos_npn: fix documentation XML names, it was not adapted after the copy from ims_qos --- Added: src/modules/ims_qos_npn/doc/ims_qos_npn.xml Added: src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml Removed: src/modules/ims_qos_npn/doc/ims_qos.xml Removed: src/modules/ims_qos_npn/doc/ims_qos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c994fb8d3906f2199d61302882f3836… Patch: https://github.com/kamailio/kamailio/commit/c994fb8d3906f2199d61302882f3836… --- diff --git a/src/modules/ims_qos_npn/doc/ims_qos.xml b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml similarity index 98% rename from src/modules/ims_qos_npn/doc/ims_qos.xml rename to src/modules/ims_qos_npn/doc/ims_qos_npn.xml index c1a88ad94fe..0cd99dcd0c7 100644 --- a/src/modules/ims_qos_npn/doc/ims_qos.xml +++ b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml @@ -108,6 +108,6 @@ <toc/> - <xi:include href="ims_qos_admin.xml" + <xi:include href="ims_qos_npn_admin.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> </book> diff --git a/src/modules/ims_qos_npn/doc/ims_qos_admin.xml b/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml similarity index 100% rename from src/modules/ims_qos_npn/doc/ims_qos_admin.xml rename to src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml

1 0

git:master:13d306dd: cmake: Fix FindBerkeleyDB to correct lib name.
by Xenofon Karamanos 21 Jan '25

21 Jan '25

Module: kamailio Branch: master Commit: 13d306dd97989162bf716fa23342608bce037b9b URL: https://github.com/kamailio/kamailio/commit/13d306dd97989162bf716fa23342608… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-21T10:29:55Z cmake: Fix FindBerkeleyDB to correct lib name. - CMake lint - Search only C version --- Modified: cmake/modules/FindBerkeleyDB.cmake --- Diff: https://github.com/kamailio/kamailio/commit/13d306dd97989162bf716fa23342608… Patch: https://github.com/kamailio/kamailio/commit/13d306dd97989162bf716fa23342608…

1 0

[kamailio/kamailio] kamcmd tls.reload problem (Issue #4033)
by ynasida 21 Jan '25

21 Jan '25

Hello, I am using letsencrypt cert and key and do not want to restart kamailio every 3 months to load new ones. I know that there is: kamcmd tls.reload method but it has an error for me. error: 500 - Error while fixing TLS configuration (consult server log) I am checking the logs and see: kamailio[3865480]: INFO: tls [tls_domain.c:345]: ksr_tls_fill_missing(): TLSs<default>: tls_method=3 kamailio[3865480]: INFO: tls [tls_domain.c:357]: ksr_tls_fill_missing(): TLSs<default>: certificate='/etc/kamailio/certs/my_cert.crt' kamailio[3865480]: INFO: tls [tls_domain.c:364]: ksr_tls_fill_missing(): TLSs<default>: ca_list='(null)' kamailio[3865480]: INFO: tls [tls_domain.c:371]: ksr_tls_fill_missing(): TLSs<default>: ca_path='(null)' kamailio[3865480]: INFO: tls [tls_domain.c:378]: ksr_tls_fill_missing(): TLSs<default>: crl='(null)' kamailio[3865480]: INFO: tls [tls_domain.c:382]: ksr_tls_fill_missing(): TLSs<default>: require_certificate=0 kamailio[3865480]: INFO: tls [tls_domain.c:390]: ksr_tls_fill_missing(): TLSs<default>: cipher_list='(null)' kamailio[3865480]: INFO: tls [tls_domain.c:397]: ksr_tls_fill_missing(): TLSs<default>: private_key='/etc/kamailio/certs/private.key' kamailio[3865480]: INFO: tls [tls_domain.c:401]: ksr_tls_fill_missing(): TLSs<default>: verify_certificate=0 kamailio[3865480]: INFO: tls [tls_domain.c:406]: ksr_tls_fill_missing(): TLSs<default>: verify_depth=9 kamailio[3865480]: INFO: tls [tls_domain.c:410]: ksr_tls_fill_missing(): TLSs<default>: verify_client=0 kamailio[3865480]: NOTICE: tls [tls_domain.c:1168]: ksr_tls_fix_domain(): registered server_name callback handler for socket [:0], server_name='<default>' ... kamailio[3865480]: ERROR: tls [tls_domain.c:590]: load_cert(): TLSs<default>: Unable to load certificate file '/etc/kamailio/certs/my_cert.crt' kamailio[3865480]: ERROR: tls [tls_util.h:49]: tls_err_ret(): load_cert:error:03000072:digital envelope routines::decode error (sni: unknown) kamailio[3865480]: ERROR: tls [tls_util.h:49]: tls_err_ret(): load_cert:error:0A00018F:SSL routines::ee key too small (sni: unknown) Any advice ? It's interesting that there are not any TLS errors in case I restart kamailio. I can make TLS calls without problems. deb 12.5 version: kamailio 5.7.4 (x86_64/linux) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4033 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4033(a)github.com>

4 5

[kamailio/kamailio] Close parenthesis on error description (#2589)
by Javier Valencia 20 Jan '25

20 Jan '25

Close parentheses on error description when *Not enough parameters* on *htable_rpc_delete*. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2589 -- Commit Summary -- * Close parenthesis on error description -- File Changes -- M src/modules/htable/htable.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2589.patch https://github.com/kamailio/kamailio/pull/2589.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2589

3 4

git:master:024c649c: htable: close parentheses on error description
by Henning Westerholt 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: 024c649c36bbe1d5ba4b306de53102cec4096734 URL: https://github.com/kamailio/kamailio/commit/024c649c36bbe1d5ba4b306de53102c… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-20T19:36:11Z htable: close parentheses on error description --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/024c649c36bbe1d5ba4b306de53102c… Patch: https://github.com/kamailio/kamailio/commit/024c649c36bbe1d5ba4b306de53102c… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index bd0a7bf6e57..d458e83141a 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1561,7 +1561,7 @@ static void htable_rpc_delete(rpc_t *rpc, void *c) int res; if(rpc->scan(c, "SS", &htname, &keyname) < 2) { - rpc->fault(c, 500, "Not enough parameters (htable name & key name"); + rpc->fault(c, 500, "Not enough parameters (htable name & key name)"); return; } ht = ht_get_table(&htname);

1 0

git:master:e8389b36: cdp: remove level and function name from log messages
by Victor Seva 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: e8389b36aff772d1a419a5b9d28ede0e86b2109e URL: https://github.com/kamailio/kamailio/commit/e8389b36aff772d1a419a5b9d28ede0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-20T18:37:51+01:00 cdp: remove level and function name from log messages --- Modified: src/modules/cdp/authstatemachine.c Modified: src/modules/cdp/common.c Modified: src/modules/cdp/config.c Modified: src/modules/cdp/configparser.c Modified: src/modules/cdp/diameter_avp.c Modified: src/modules/cdp/diameter_comm.c Modified: src/modules/cdp/diameter_msg.c Modified: src/modules/cdp/diameter_peer.c Modified: src/modules/cdp/peermanager.c Modified: src/modules/cdp/peerstatemachine.c Modified: src/modules/cdp/receiver.c Modified: src/modules/cdp/routing.c Modified: src/modules/cdp/session.c Modified: src/modules/cdp/tcp_accept.c Modified: src/modules/cdp/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/e8389b36aff772d1a419a5b9d28ede0… Patch: https://github.com/kamailio/kamailio/commit/e8389b36aff772d1a419a5b9d28ede0…

1 0

git:master:b96bc11a: core: parser/sdp - check if still before end of the value
by Daniel-Constantin Mierla 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: b96bc11a54f11ec688429c057bf5a90c40c147b3 URL: https://github.com/kamailio/kamailio/commit/b96bc11a54f11ec688429c057bf5a90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-20T17:10:05+01:00 core: parser/sdp - check if still before end of the value --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/b96bc11a54f11ec688429c057bf5a90… Patch: https://github.com/kamailio/kamailio/commit/b96bc11a54f11ec688429c057bf5a90… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 5c7076823c4..483cfdec70e 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -413,7 +413,7 @@ int extract_ice_option(str *body, sdp_stream_cell_t *stream) trim_len(ice_opt->option.len, ice_opt->option.s, ice_opt->option); length = 0; - if(*ptr_src == 32) + if(ptr_src < end && *ptr_src == 32) ptr_src++; /* skip space */ }

1 0

git:master:6750e2e2: core: socket info - set receive timeout for netlink socket
by Daniel-Constantin Mierla 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: 6750e2e2f1d6c10f6b5e66897d38657a576a9732 URL: https://github.com/kamailio/kamailio/commit/6750e2e2f1d6c10f6b5e66897d38657… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-20T12:58:18+01:00 core: socket info - set receive timeout for netlink socket - GH #4098 --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/6750e2e2f1d6c10f6b5e66897d38657… Patch: https://github.com/kamailio/kamailio/commit/6750e2e2f1d6c10f6b5e66897d38657… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index b431ea395db..24243fea153 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1378,6 +1378,7 @@ static int nl_bound_sock(void) { int sock = -1; struct sockaddr_nl la; + struct timeval recvtimeout; sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); if(sock < 0) { @@ -1396,6 +1397,15 @@ static int nl_bound_sock(void) goto error; } + recvtimeout.tv_sec = 4; + recvtimeout.tv_usec = 0; + if(setsockopt( + sock, SOL_SOCKET, SO_RCVTIMEO, &recvtimeout, sizeof(recvtimeout)) + < 0) { + LM_ERR("failed to set receive timeout\n"); + goto error; + } + return sock; error: if(sock >= 0) @@ -1448,6 +1458,10 @@ static int get_flags(int family) goto error; } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); + if(rtn <= 0) { + LM_ERR("failed to receive data (%d/%d)\n", rtn, errno); + goto error; + } nlp = (struct nlmsghdr *)p; if(nlp->nlmsg_type == NLMSG_DONE) { LM_DBG("done\n"); @@ -1550,6 +1564,10 @@ static int build_iface_list(void) goto error; } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); + if(rtn <= 0) { + LM_ERR("failed to receive data (%d/%d)\n", rtn, errno); + goto error; + } LM_DBG("received %d byles \n", rtn); nlp = (struct nlmsghdr *)p; if(nlp->nlmsg_type == NLMSG_DONE) {

1 0

[kamailio/kamailio] cmake - make clean deletes readme files from modules source folders (Issue #4084)
by Daniel-Constantin Mierla 20 Jan '25

20 Jan '25

Executing `make clean` in the `build` folder deletes the `README` files from the modules folders. This is probably because the README is an output of a `cmake-make` command. What would be the best option to skip this removing? I found: - https://stackoverflow.com/questions/6259372/cmake-preventing-make-clean-fro… Which indicates adding: ``` SET_DIRECTORY_PROPERTIES(PROPERTIES CLEAN_NO_CUSTOM 1) ``` In the CMakeLists.txt inside the module folders. But maybe it is another place where it can be done once for all modules, or another option... -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4084 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4084(a)github.com>

3 9

git:master:e50a24aa: cmake/os-specific/darwin.cmake: use -undefined dynamic_lookup for OS v24+
by Daniel-Constantin Mierla 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: e50a24aa4a4fcc6c0310f9f2d5f130197372b2f9 URL: https://github.com/kamailio/kamailio/commit/e50a24aa4a4fcc6c0310f9f2d5f1301… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-20T11:05:08+01:00 cmake/os-specific/darwin.cmake: use -undefined dynamic_lookup for OS v24+ - the option -undefined suppress has been deprecated --- Modified: cmake/os-specific/darwin.cmake --- Diff: https://github.com/kamailio/kamailio/commit/e50a24aa4a4fcc6c0310f9f2d5f1301… Patch: https://github.com/kamailio/kamailio/commit/e50a24aa4a4fcc6c0310f9f2d5f1301… --- diff --git a/cmake/os-specific/darwin.cmake b/cmake/os-specific/darwin.cmake index bd02a290b53..a43c075142b 100644 --- a/cmake/os-specific/darwin.cmake +++ b/cmake/os-specific/darwin.cmake @@ -25,11 +25,20 @@ if(NOT ${USE_FAST_LOCK}) target_compile_definitions(common INTERFACE USE_PTHREAD_MUTEX USE_SYSV_SEM) endif() +if (CMAKE_HOST_SYSTEM_VERSION VERSION_LESS 24) + message(STATUS "Running on Big Sur") set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -bundle -flat_namespace -undefined suppress") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -dynamiclib -flat_namespace -undefined suppress" ) +else () +set(CMAKE_MODULE_LINKER_FLAGS + "${CMAKE_MODULE_LINKER_FLAGS} -bundle -flat_namespace -undefined dynamic_lookup") +set(CMAKE_SHARED_LINKER_FLAGS + "${CMAKE_SHARED_LINKER_FLAGS} -dynamiclib -flat_namespace -undefined dynamic_lookup" +) +endif () if(NOT NO_SELECT) target_compile_definitions(common INTERFACE HAVE_SELECT)

1 0

git:master:a1bdef91: cmake: messages about not finding docs-related tools made status
by Daniel-Constantin Mierla 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: a1bdef919414173e8327a8dd65ecaa2fca279d6a URL: https://github.com/kamailio/kamailio/commit/a1bdef919414173e8327a8dd65ecaa2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-20T10:54:14+01:00 cmake: messages about not finding docs-related tools made status - they should not be needed for development and usual installation, warning makes it look like something relevant cannot be done --- Modified: cmake/modules-docs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/a1bdef919414173e8327a8dd65ecaa2… Patch: https://github.com/kamailio/kamailio/commit/a1bdef919414173e8327a8dd65ecaa2… --- diff --git a/cmake/modules-docs.cmake b/cmake/modules-docs.cmake index 10b1b70a8f2..721ba7d0b45 100644 --- a/cmake/modules-docs.cmake +++ b/cmake/modules-docs.cmake @@ -6,12 +6,12 @@ find_program(LYNX_EXECUTABLE lynx QUIET) find_program(DOCBOOK2X_EXECUTABLE docbook2x-man QUIET) if(BUILD_DOC AND (NOT XSLTPROC_EXECUTABLE OR NOT LYNX_EXECUTABLE)) - message(WARNING "xsltproc or lynx not found but required for doc generation.") + message(STATUS "xsltproc or lynx not found but required for doc generation.") set(BUILD_DOC OFF) endif() if(BUILD_DOC AND (NOT DOCBOOK2X_EXECUTABLE)) - message(WARNING "docbook2x-man not found but required for man generation.") + message(STATUS "docbook2x-man not found but required for man generation.") set(BUILD_DOC OFF) endif()

1 0

git:master:09628a8e: cmake: fix typo, missing KRADIUS
by Victor Seva 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: 09628a8e6060a21805fccccc1f530062fca1bb75 URL: https://github.com/kamailio/kamailio/commit/09628a8e6060a21805fccccc1f53006… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-20T09:18:45+01:00 cmake: fix typo, missing KRADIUS --- Modified: .pre-commit-config.yaml Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/09628a8e6060a21805fccccc1f53006… Patch: https://github.com/kamailio/kamailio/commit/09628a8e6060a21805fccccc1f53006… --- diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7892175df39..c5df7975c1f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,4 +16,10 @@ repos: rev: v0.6.13 hooks: - id: cmake-format + verbose: true + args: + - -c cmake/cmake-format.py - id: cmake-lint + verbose: true + args: + - -c cmake/cmake-format.py diff --git a/cmake/groups.cmake b/cmake/groups.cmake index b3562cbbbcc..9cd7ddf77dc 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -720,7 +720,7 @@ list( KPOSTGRES KCPL KXML - KRAIDUS + KRADIUS KUNIXODBC KPERL KSNMPSTATS

1 0

git:master:0a5db680: cmake: Remove depracated modules from groups
by Xenofon Karamanos 17 Jan '25

17 Jan '25

Module: kamailio Branch: master Commit: 0a5db6808e859e88aae739e277d1647e05a4f4c6 URL: https://github.com/kamailio/kamailio/commit/0a5db6808e859e88aae739e277d1647… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-17T14:56:31Z cmake: Remove depracated modules from groups - cmake lint --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/0a5db6808e859e88aae739e277d1647… Patch: https://github.com/kamailio/kamailio/commit/0a5db6808e859e88aae739e277d1647…

1 0

git:master:eeffe798: cmake: Fix ignoring excluded module
by Xenofon Karamanos 17 Jan '25

17 Jan '25

Module: kamailio Branch: master Commit: eeffe798b85d4f8c580c221b0e655b1b49a7420f URL: https://github.com/kamailio/kamailio/commit/eeffe798b85d4f8c580c221b0e655b1… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-17T14:56:31Z cmake: Fix ignoring excluded module - When adding groups, we now also check if they contain a user-excluded module. --- Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/eeffe798b85d4f8c580c221b0e655b1… Patch: https://github.com/kamailio/kamailio/commit/eeffe798b85d4f8c580c221b0e655b1… --- diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 22c1341db8a..be55da5f065 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -4,6 +4,7 @@ set(MODULES_DIR "${CMAKE_CURRENT_SOURCE_DIR}") # Initialize a global property to track added modules set_property(GLOBAL PROPERTY ADDED_MODULES_LIST "") set_property(GLOBAL PROPERTY ALL_MODULE_DOC_TARGETS "") +set_property(GLOBAL PROPERTY EXCLUDED_MODULES_LIST "") include(${CMAKE_SOURCE_DIR}/cmake/groups.cmake) @@ -52,9 +53,12 @@ function(add_module_group group_modules) foreach(module_name IN LISTS group_modules) # Check if the module has already been added get_property(ALREADY_ADDED GLOBAL PROPERTY ADDED_MODULES_LIST) - if(";${ALREADY_ADDED};" MATCHES ";${module_name};") + if("${module_name}" IN_LIST ALREADY_ADDED) message( STATUS "Module ${module_name} has already been added. Skipping...") + elseif("${module_name}" IN_LIST EXCLUDED_MODULES_LIST) + message(STATUS "Module ${module_name} is excluded. Skipping...") + list(REMOVE_ITEM ADDED_MODULES_LIST ${module_name}) else() # Construct the path to the module set(module_path "${MODULES_DIR}/${module_name}") @@ -108,28 +112,6 @@ function(add_module_group group_modules) endforeach() endfunction() -list(APPEND FINAL_MODULES_LIST "") - -# Parse and add extra modules specified by the user -separate_arguments(INCLUDE_MODULES_LIST UNIX_COMMAND "${INCLUDE_MODULES}") -message( - STATUS - "Extra modules (if module already included already from group is ignored): - ${INCLUDE_MODULES_LIST}") -list(APPEND FINAL_MODULES_LIST ${INCLUDE_MODULES_LIST}) - -# Exclude modules that were explicitly excluded by the user -separate_arguments(EXCLUDE_MODULES_LIST UNIX_COMMAND "${EXCLUDE_MODULES}") -message(STATUS "Excluded modules (exlcude even if in included modules): - ${EXCLUDE_MODULES_LIST}") -foreach(module_name IN LISTS EXCLUDE_MODULES_LIST) - # if in list remove it and print a message - if(";${FINAL_MODULES_LIST};" MATCHES ";${module_name};") - list(REMOVE_ITEM FINAL_MODULES_LIST ${module_name}) - message(STATUS "Removed module: ${module_name}") - endif() -endforeach() - # Define targets before adding the groups and modules, so that we can add # dependencies to them. add_custom_target( @@ -140,8 +122,19 @@ add_custom_target( add_custom_target(kamailio_docs_man COMMENT "Generating man pages") +# Parse and add extra modules specified by the user +separate_arguments(INCLUDE_MODULES_LIST UNIX_COMMAND "${INCLUDE_MODULES}") +message( + STATUS + "Extra modules (if module already included already from group is ignored): + ${INCLUDE_MODULES_LIST}") +list(APPEND USER_MODULES_LIST ${INCLUDE_MODULES_LIST}) + +separate_arguments(EXCLUDED_MODULES_LIST UNIX_COMMAND "${EXCLUDE_MODULES}") +message(STATUS "Excluded modules (exlcude even if in included modules): + ${EXCLUDED_MODULES_LIST}") + # Add each group of modules -add_module_group("${FINAL_MODULES_LIST}") foreach(group IN LISTS FULL_MODULE_GROUP_NAMES) get_property(MODULES_IN_GROUP VARIABLE PROPERTY "${group}") if(VERBOSE) @@ -149,10 +142,12 @@ foreach(group IN LISTS FULL_MODULE_GROUP_NAMES) endif() add_module_group("${MODULES_IN_GROUP}") endforeach() +add_module_group("${USER_MODULES_LIST}") get_property(ADDED_MODULES_LIST GLOBAL PROPERTY ADDED_MODULES_LIST) message(STATUS "Modules to be built: ${ADDED_MODULES_LIST}") # TODO: Comment is not showing. probably a bug in CMAKE +# https://gitlab.kitware.com/cmake/cmake/-/issues/26571 add_custom_target(modules COMMENT "Building modules") add_dependencies(modules ${ADDED_MODULES_LIST})

1 0

git:master:81b84ef8: parser/sdp: more details in logs for setting fmtp payload
by Daniel-Constantin Mierla 17 Jan '25

17 Jan '25

Module: kamailio Branch: master Commit: 81b84ef83f59981b6e5f199055e9ab6a94c58b38 URL: https://github.com/kamailio/kamailio/commit/81b84ef83f59981b6e5f199055e9ab6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-17T09:31:42+01:00 parser/sdp: more details in logs for setting fmtp payload --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/81b84ef83f59981b6e5f199055e9ab6… Patch: https://github.com/kamailio/kamailio/commit/81b84ef83f59981b6e5f199055e9ab6… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index 06fc411f502..5eb04b0c047 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -233,7 +233,13 @@ void set_sdp_payload_attr(sdp_payload_attr_t *payload_attr, str *rtp_enc, void set_sdp_payload_fmtp(sdp_payload_attr_t *payload_attr, str *fmtp_string) { if(payload_attr == NULL) { - LM_ERR("Invalid payload location\n"); + if(fmtp_string != NULL && fmtp_string->s != NULL + && fmtp_string->len > 0) { + LM_ERR("Invalid payload location - fmtp: %.*s\n", fmtp_string->len, + fmtp_string->s); + } else { + LM_ERR("Invalid payload location\n"); + } return; } payload_attr->fmtp_string.s = fmtp_string->s; @@ -354,6 +360,8 @@ sdp_payload_attr_t *get_sdp_payload4payload( } } + LM_DBG("payload not found: %.*s\n", rtp_payload->len, rtp_payload->s); + return NULL; }

1 0

[kamailio/kamailio] lib/srdb1/schema: ims_usrloc_pcscf definitions (PR #4108)
by Victor Seva 16 Jan '25

16 Jan '25

#### 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 - [x] Related to issue #4100 #### Description db_schema for ims_usrloc_pcscf module You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4108 -- Commit Summary -- * lib/srdb1/schema: ims_usrloc_pcscf definitions * utils/kamctl: regenerate db table definitions -- File Changes -- A src/lib/srdb1/schema/kamailio-ims_usrloc_pcscf.xml (12) A src/lib/srdb1/schema/location_pcscf.xml (436) A utils/kamctl/db_sqlite/ims_usrloc_pcscf-create.sql (52) M utils/kamctl/mysql/ims_usrloc_pcscf-create.sql (99) A utils/kamctl/oracle/ims_usrloc_pcscf-create.sql (60) A utils/kamctl/postgres/ims_usrloc_pcscf-create.sql (52) A utils/kamctl/xhttp_pi/ims_usrloc_pcscf-mod (167) A utils/kamctl/xhttp_pi/ims_usrloc_pcscf-table (51) M utils/kamctl/xhttp_pi/pi_framework.xml (218) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4108.patch https://github.com/kamailio/kamailio/pull/4108.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4108 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4108(a)github.com>

2 8

git:master:fbf120d3: cmake: Add dbschema_xhttp_pi to have consisteny across the targets
by Xenofon Karamanos 16 Jan '25

16 Jan '25

Module: kamailio Branch: master Commit: fbf120d3696b63ecd90055b136fd40c87b5db68e URL: https://github.com/kamailio/kamailio/commit/fbf120d3696b63ecd90055b136fd40c… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-16T13:40:18Z cmake: Add dbschema_xhttp_pi to have consisteny across the targets --- Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/fbf120d3696b63ecd90055b136fd40c… Patch: https://github.com/kamailio/kamailio/commit/fbf120d3696b63ecd90055b136fd40c… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index c5eb602a18a..10ef2cf9db8 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -314,6 +314,14 @@ else() 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") + add_custom_target(dbschema_xhttp_pi) + add_dependencies(dbschema_xhttp_pi dbschema_pi_framework_table + dbschema_pi_framework_mod) + + add_custom_target(dbschema_xhttp_pi_clean) + add_dependencies(dbschema_xhttp_pi dbschema_pi_framework_table_clean + dbschema_pi_framework_mod_clean) + add_dependencies(dbschema dbschema_pi_framework_table dbschema_pi_framework_mod) add_dependencies(dbschema_clean dbschema_pi_framework_table_clean

1 0

git:master:a4f44cea: utils/kamctl: regenerate db table definitions
by Henning Westerholt 16 Jan '25

16 Jan '25

Module: kamailio Branch: master Commit: a4f44ceaaf2203e79c8b2f1ea19a7ffc18c2712a URL: https://github.com/kamailio/kamailio/commit/a4f44ceaaf2203e79c8b2f1ea19a7ff… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-16T13:35:47+01:00 utils/kamctl: regenerate db table definitions related #4100 --- Added: utils/kamctl/db_sqlite/ims_usrloc_pcscf-create.sql Added: utils/kamctl/oracle/ims_usrloc_pcscf-create.sql Added: utils/kamctl/postgres/ims_usrloc_pcscf-create.sql Added: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-mod Added: utils/kamctl/xhttp_pi/ims_usrloc_pcscf-table Modified: utils/kamctl/mysql/ims_usrloc_pcscf-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/a4f44ceaaf2203e79c8b2f1ea19a7ff… Patch: https://github.com/kamailio/kamailio/commit/a4f44ceaaf2203e79c8b2f1ea19a7ff…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev