sr-dev March 2025

sr-dev@lists.kamailio.org

10 participants
176 discussions

git:5.8:a66faa10: pkg/kamailio: version set 5.8.6 for rpms and alpine
by Daniel-Constantin Mierla 20 Mar '25

20 Mar '25

Module: kamailio Branch: 5.8 Commit: a66faa10092aac8c4ec2122ceb77e285a2fecbce URL: https://github.com/kamailio/kamailio/commit/a66faa10092aac8c4ec2122ceb77e28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-03-20T08:21:34+01:00 pkg/kamailio: version set 5.8.6 for rpms and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/a66faa10092aac8c4ec2122ceb77e28… Patch: https://github.com/kamailio/kamailio/commit/a66faa10092aac8c4ec2122ceb77e28… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 3a8fe938c53..f55461f9a78 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.5 +pkgver=5.8.6 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 eb0885e71c5..956c5b111f8 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.8.5 +%define ver 5.8.6 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.8:d6d1641b: pkg/kamailio/deb: set version to 5.8.6
by Daniel-Constantin Mierla 20 Mar '25

20 Mar '25

Module: kamailio Branch: 5.8 Commit: d6d1641b81e130fa14b8daf617d595fe2818f084 URL: https://github.com/kamailio/kamailio/commit/d6d1641b81e130fa14b8daf617d595f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-03-20T08:19:59+01:00 pkg/kamailio/deb: set version to 5.8.6 --- 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/d6d1641b81e130fa14b8daf617d595f… Patch: https://github.com/kamailio/kamailio/commit/d6d1641b81e130fa14b8daf617d595f…

1 0

Releasing v5.8.6
by Daniel-Constantin Mierla 20 Mar '25

20 Mar '25

Hello, I am considering to release Kamailio v5.8.6 (out of branch 5.8) on Thursday, March 20, 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. The most of the commits are backported, should any be found missing, reply to sr-dev mailing list. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com Kamailio Advanced Training, March 24-28, 2025 -- asipto.com Kamailio World Conference, May 12-13, 2025, Berlin -- kamailioworld.com

1 1

git:5.8:e83be987: pua_reginfo: handle_notify - fix AoR key parsing
by Daniel-Constantin Mierla 20 Mar '25

20 Mar '25

Module: kamailio Branch: 5.8 Commit: e83be98778dde043df7251155ac63c5d651ed45b URL: https://github.com/kamailio/kamailio/commit/e83be98778dde043df7251155ac63c5… Author: JoÃ£o Capucho <capucho(a)jcapucho.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-03-20T07:31:14+01:00 pua_reginfo: handle_notify - fix AoR key parsing - The AoR key generated by handle_notify no longer includes the domain of the AoR when usrloc use_domain isn't enabled (cherry picked from commit b7e16294ae1bbfe8cc469facf59fc9e3960ff2a4) (cherry picked from commit 00544a66aad09faf345d54bef7f464f2749ef548) --- Modified: src/modules/pua_reginfo/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/e83be98778dde043df7251155ac63c5… Patch: https://github.com/kamailio/kamailio/commit/e83be98778dde043df7251155ac63c5… --- diff --git a/src/modules/pua_reginfo/notify.c b/src/modules/pua_reginfo/notify.c index cb64be19597..8bcf391c857 100644 --- a/src/modules/pua_reginfo/notify.c +++ b/src/modules/pua_reginfo/notify.c @@ -303,10 +303,10 @@ int process_body(str notify_body, udomain_t *domain) if(reginfo_use_domain) { aor_key.s = uri; + aor_key.len = strlen(uri); } else { - aor_key.s = parsed_aor.user.s; + aor_key = parsed_aor.user; } - aor_key.len = strlen(aor_key.s); /* Now let's lock that domain for this AOR: */ ul.lock_udomain(domain, &aor_key); /* and retrieve the user-record for this user: */

1 0

git:5.8:89b1f907: microhttpd: handle all incoming body data
by Daniel-Constantin Mierla 20 Mar '25

20 Mar '25

Module: kamailio Branch: 5.8 Commit: 89b1f907da5428de79670df28d0fd7135a8379ff URL: https://github.com/kamailio/kamailio/commit/89b1f907da5428de79670df28d0fd71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-03-20T07:31:09+01:00 microhttpd: handle all incoming body data - GH #4176 (cherry picked from commit 96392eda8fac1cb075e7f407c0155085acc92c5f) (cherry picked from commit f24315c2bc4ec7b9507516a96603e91ae2ce0fd1) --- Modified: src/modules/microhttpd/microhttpd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/89b1f907da5428de79670df28d0fd71… Patch: https://github.com/kamailio/kamailio/commit/89b1f907da5428de79670df28d0fd71… --- diff --git a/src/modules/microhttpd/microhttpd_mod.c b/src/modules/microhttpd/microhttpd_mod.c index 1bf684d01a7..3bfef79b038 100644 --- a/src/modules/microhttpd/microhttpd_mod.c +++ b/src/modules/microhttpd/microhttpd_mod.c @@ -176,6 +176,13 @@ static void mod_destroy(void) { } +typedef struct ksr_mhd_cstream +{ + int ctype; + int rcvmode; + str data; +} ksr_mhd_cstream_t; + typedef struct ksr_mhttpd_ctx { struct MHD_Connection *connection; @@ -436,23 +443,68 @@ static int fixup_mhttpd_send_reply(void **param, int param_no) } + static enum MHD_Result ksr_microhttpd_request(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **ptr) { - static int _first_callback; sr_kemi_eng_t *keng = NULL; str evname = str_init("microhttpd:request"); sip_msg_t *fmsg = NULL; run_act_ctx_t ctx; int rtb; + ksr_mhd_cstream_t *cstream = NULL; + + cstream = (ksr_mhd_cstream_t *)*ptr; + if(cstream == NULL) { + cstream = (ksr_mhd_cstream_t *)malloc(sizeof(ksr_mhd_cstream_t)); + if(cstream == NULL) { + LM_ERR("no more system memroy\n"); + return MHD_NO; + } + memset(cstream, 0, sizeof(ksr_mhd_cstream_t)); + *ptr = cstream; + } - if(&_first_callback != *ptr) { + if(cstream->rcvmode == 0) { + cstream->rcvmode = 1; /* the first time only the headers are valid, - do not respond in the first round... */ - *ptr = &_first_callback; + * do not respond in the first round */ return MHD_YES; + } else { + if(*upload_data_size != 0) { + char *buf = NULL; + int bsize = 0; + if(cstream->data.s != NULL) { + bsize = *upload_data_size + cstream->data.len + 1; + } else { + bsize = *upload_data_size + 1; + } + buf = (char *)malloc(sizeof(char) * bsize); + if(buf == NULL) { + if(cstream->data.s != NULL) { + free(cstream->data.s); + free(cstream); + *ptr = NULL; + return MHD_NO; + } + } + if(cstream->data.s != NULL) { + snprintf(buf, bsize, "%s%s", cstream->data.s, upload_data); + free(cstream->data.s); + } else { + snprintf(buf, bsize, "%s", upload_data); + } + cstream->data.s = buf; + cstream->data.len = bsize - 1; + *upload_data_size = 0; + return MHD_YES; + } else { + LM_DBG("incoming data: [%.*s]\n", + cstream->data.len <= 64 ? cstream->data.len : 64, + cstream->data.s); + } } *ptr = NULL; /* clear context pointer */ @@ -463,13 +515,19 @@ static enum MHD_Result ksr_microhttpd_request(void *cls, _ksr_mhttpd_ctx.url.len = strlen(_ksr_mhttpd_ctx.url.s); _ksr_mhttpd_ctx.httpversion.s = (char *)version; _ksr_mhttpd_ctx.httpversion.len = strlen(_ksr_mhttpd_ctx.httpversion.s); - if(*upload_data_size > 0) { - _ksr_mhttpd_ctx.data.s = (char *)upload_data; - _ksr_mhttpd_ctx.data.len = (int)(*upload_data_size); + if(_ksr_mhttpd_ctx.data.s != NULL) { + free(_ksr_mhttpd_ctx.data.s); + } + if(cstream->data.len > 0) { + if(_ksr_mhttpd_ctx.data.s != NULL) { + free(_ksr_mhttpd_ctx.data.s); + } + _ksr_mhttpd_ctx.data = cstream->data; } else { _ksr_mhttpd_ctx.data.s = NULL; _ksr_mhttpd_ctx.data.len = 0; } + free(cstream); _ksr_mhttpd_ctx.cinfo = MHD_get_connection_info( connection, MHD_CONNECTION_INFO_CLIENT_ADDRESS); _ksr_mhttpd_ctx.srcip.s = NULL;

1 0

git:5.8:1d3eed5c: microhttpd: create response with MHD_RESPMEM_MUST_COPY flag
by Daniel-Constantin Mierla 20 Mar '25

20 Mar '25

Module: kamailio Branch: 5.8 Commit: 1d3eed5c186d2b4584459fb5d3fcdd8458a01186 URL: https://github.com/kamailio/kamailio/commit/1d3eed5c186d2b4584459fb5d3fcdd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-03-20T07:31:03+01:00 microhttpd: create response with MHD_RESPMEM_MUST_COPY flag (cherry picked from commit 1569a7b71af26f5b3cb7cb25de7d2425c75f5587) (cherry picked from commit f761cad5b462820af060d6e07410f0dd84c1a52f) --- Modified: src/modules/microhttpd/microhttpd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1d3eed5c186d2b4584459fb5d3fcdd8… Patch: https://github.com/kamailio/kamailio/commit/1d3eed5c186d2b4584459fb5d3fcdd8… --- diff --git a/src/modules/microhttpd/microhttpd_mod.c b/src/modules/microhttpd/microhttpd_mod.c index dbfaec01786..1bf684d01a7 100644 --- a/src/modules/microhttpd/microhttpd_mod.c +++ b/src/modules/microhttpd/microhttpd_mod.c @@ -359,7 +359,7 @@ static int ksr_mhttpd_send_reply( } response = MHD_create_response_from_buffer( - sbody->len, sbody->s, MHD_RESPMEM_PERSISTENT); + sbody->len, sbody->s, MHD_RESPMEM_MUST_COPY); if(response == NULL) { LM_ERR("failed to create the response\n"); return -1;

1 0

git:5.8:c9503124: microhttpd: debug message for http response queue
by Daniel-Constantin Mierla 20 Mar '25

20 Mar '25

Module: kamailio Branch: 5.8 Commit: c9503124f1e5d066163c505470124b9a1bd4b9e6 URL: https://github.com/kamailio/kamailio/commit/c9503124f1e5d066163c505470124b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-03-20T07:30:58+01:00 microhttpd: debug message for http response queue (cherry picked from commit 7a793a257b12f946e54bca3d3d92b6c07602fb20) (cherry picked from commit 813d3ed6a532cc0baa98d27ef9eea579e5ca1688) --- Modified: src/modules/microhttpd/microhttpd_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c9503124f1e5d066163c505470124b9… Patch: https://github.com/kamailio/kamailio/commit/c9503124f1e5d066163c505470124b9… --- diff --git a/src/modules/microhttpd/microhttpd_mod.c b/src/modules/microhttpd/microhttpd_mod.c index f1ee8334b8b..dbfaec01786 100644 --- a/src/modules/microhttpd/microhttpd_mod.c +++ b/src/modules/microhttpd/microhttpd_mod.c @@ -371,6 +371,9 @@ static int ksr_mhttpd_send_reply( _ksr_mhttpd_ctx.connection, (unsigned int)rcode, response); MHD_destroy_response(response); + LM_DBG("queue response return: %d (%s)\n", ret, + (ret == MHD_YES) ? "YES" : "XYZ"); + return (ret == MHD_YES) ? 1 : -1; }

1 0

git:5.8:f807c4d2: tls: get wss connections as well for selects and vars
by Daniel-Constantin Mierla 20 Mar '25

20 Mar '25

Module: kamailio Branch: 5.8 Commit: f807c4d249bff27007dc8898a338ad7be4f45ea7 URL: https://github.com/kamailio/kamailio/commit/f807c4d249bff27007dc8898a338ad7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-03-20T07:30:51+01:00 tls: get wss connections as well for selects and vars - GH #4167 (cherry picked from commit 3a3856c68cf0cc04385921f8bbec72420cf8f656) (cherry picked from commit b3cb2b38c5d81c48b0b6315cb7feb99d236d15e3) --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/f807c4d249bff27007dc8898a338ad7… Patch: https://github.com/kamailio/kamailio/commit/f807c4d249bff27007dc8898a338ad7… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index 8b1a0457c0a..ad8654b1050 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -127,14 +127,14 @@ struct tcp_connection *get_cur_connection(struct sip_msg *msg) if(_tls_pv_con != 0) return _tls_pv_con; - if(msg->rcv.proto != PROTO_TLS) { + if(msg->rcv.proto != PROTO_TLS && msg->rcv.proto != PROTO_WSS) { ERR("Transport protocol is not TLS (bug in config)\n"); return 0; } c = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, cfg_get(tls, tls_cfg, con_lifetime)); - if(c && c->type != PROTO_TLS) { + if(c && c->type != PROTO_TLS && msg->rcv.proto != PROTO_WSS) { ERR("Connection found but is not TLS\n"); tcpconn_put(c); return 0;

1 0

git:5.8:2b0b8714: dialog: enforce second bye towards callee for dlg_bye()
by Daniel-Constantin Mierla 20 Mar '25

20 Mar '25

Module: kamailio Branch: 5.8 Commit: 2b0b8714b7f75d13be6f8156f4f8efbf6401f0b7 URL: https://github.com/kamailio/kamailio/commit/2b0b8714b7f75d13be6f8156f4f8efb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-03-20T07:30:45+01:00 dialog: enforce second bye towards callee for dlg_bye() - GH #4169 (cherry picked from commit 7de1693573fc08e54db1955095d66c495b2051b9) (cherry picked from commit 0cbf7eede6dbd3198664160b77d1b4d0337833b8) --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/2b0b8714b7f75d13be6f8156f4f8efb… Patch: https://github.com/kamailio/kamailio/commit/2b0b8714b7f75d13be6f8156f4f8efb… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index 06111e9783f..0b7b140fd61 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -374,7 +374,8 @@ static inline int build_extra_hdr( * DLG_CALLER_LEG (0): caller * DLG_CALLEE_LEG (1): callee */ -static inline int send_bye(struct dlg_cell *cell, int dir, str *hdrs) +static inline int send_bye( + struct dlg_cell *cell, int dir, str *hdrs, int enforce) { uac_req_t uac_r; dlg_t *dialog_info; @@ -384,16 +385,15 @@ static inline int send_bye(struct dlg_cell *cell, int dir, str *hdrs) str lhdrs; /* dialog is already in deleted state, nothing to do */ - if(cell->state == DLG_STATE_DELETED) { + if(cell->state == DLG_STATE_DELETED && enforce == 0) { LM_WARN("dlg [%u:%u] with callid %.*s already in deleted state, BYE " "not sent.\n", cell->h_entry, cell->h_id, cell->callid.len, cell->callid.s); - return 0; + return 1; } /* Send Cancel or final response for non-confirmed dialogs */ - if(cell->state != DLG_STATE_CONFIRMED_NA - && cell->state != DLG_STATE_CONFIRMED) { + if(cell->state < DLG_STATE_CONFIRMED_NA) { if(cell->t) { if(dir == DLG_CALLER_LEG) { if(d_tmb.t_reply(cell->t->uas.request, bye_early_code, @@ -841,7 +841,7 @@ int dlg_bye(struct dlg_cell *dlg, str *hdrs, int side) LM_ERR("failed to build dlg headers\n"); return -1; } - ret = send_bye(dlg, side, &all_hdrs); + ret = send_bye(dlg, side, &all_hdrs, 0); pkg_free(all_hdrs.s); dlg_run_event_route(dlg, NULL, dlg->state, DLG_STATE_DELETED); @@ -862,8 +862,10 @@ int dlg_bye_all(struct dlg_cell *dlg, str *hdrs) return -1; } - ret = send_bye(dlg, DLG_CALLER_LEG, &all_hdrs); - ret |= send_bye(dlg, DLG_CALLEE_LEG, &all_hdrs); + ret = send_bye(dlg, DLG_CALLER_LEG, &all_hdrs, 0); + if(ret == 0) { + ret |= send_bye(dlg, DLG_CALLEE_LEG, &all_hdrs, 1); + } pkg_free(all_hdrs.s);

1 0

git:6.0:00544a66: pua_reginfo: handle_notify - fix AoR key parsing
by Daniel-Constantin Mierla 20 Mar '25

20 Mar '25

Module: kamailio Branch: 6.0 Commit: 00544a66aad09faf345d54bef7f464f2749ef548 URL: https://github.com/kamailio/kamailio/commit/00544a66aad09faf345d54bef7f464f… Author: JoÃ£o Capucho <capucho(a)jcapucho.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-03-20T07:17:09+01:00 pua_reginfo: handle_notify - fix AoR key parsing - The AoR key generated by handle_notify no longer includes the domain of the AoR when usrloc use_domain isn't enabled (cherry picked from commit b7e16294ae1bbfe8cc469facf59fc9e3960ff2a4) --- Modified: src/modules/pua_reginfo/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/00544a66aad09faf345d54bef7f464f… Patch: https://github.com/kamailio/kamailio/commit/00544a66aad09faf345d54bef7f464f… --- diff --git a/src/modules/pua_reginfo/notify.c b/src/modules/pua_reginfo/notify.c index a390a00f238..23b44caaee9 100644 --- a/src/modules/pua_reginfo/notify.c +++ b/src/modules/pua_reginfo/notify.c @@ -305,10 +305,10 @@ int process_body(str notify_body, udomain_t *domain) if(reginfo_use_domain) { aor_key.s = uri; + aor_key.len = strlen(uri); } else { - aor_key.s = parsed_aor.user.s; + aor_key = parsed_aor.user; } - aor_key.len = strlen(aor_key.s); /* Now let's lock that domain for this AOR: */ ul.lock_udomain(domain, &aor_key); /* and retrieve the user-record for this user: */

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2025