- sr-dev - kamailio.org

git:master:2bcd29a7: core: option to skip auto-bind on ipv6 local link
by Daniel-Constantin Mierla 10 Sep '24

10 Sep '24

Module: kamailio Branch: master Commit: 2bcd29a7a2981670baea0b7fb2e8454b5ad9f4d7 URL: https://github.com/kamailio/kamailio/commit/2bcd29a7a2981670baea0b7fb2e8454… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-10T18:01:57+02:00 core: option to skip auto-bind on ipv6 local link - set bind_ipv6_link_local=2 --- Modified: src/core/cfg.y Modified: src/core/socket_info.c Modified: src/core/socket_info.h Modified: src/core/tcp_main.c Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/2bcd29a7a2981670baea0b7fb2e8454… Patch: https://github.com/kamailio/kamailio/commit/2bcd29a7a2981670baea0b7fb2e8454…

1 0

git:master:42c107b9: permissions: reformat rpc exports
by Daniel-Constantin Mierla 10 Sep '24

10 Sep '24

Module: kamailio Branch: master Commit: 42c107b9e5d5822cd2bd16f7b5d57b66bcde0861 URL: https://github.com/kamailio/kamailio/commit/42c107b9e5d5822cd2bd16f7b5d57b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-10T11:26:13+02:00 permissions: reformat rpc exports --- Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/42c107b9e5d5822cd2bd16f7b5d57b6… Patch: https://github.com/kamailio/kamailio/commit/42c107b9e5d5822cd2bd16f7b5d57b6… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index fadedc4fe53..33c0f4acb18 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -1036,44 +1036,58 @@ int allow_test(char *file, char *uri, char *contact) return 1; } +/* clang-format off */ static const char *rpc_trusted_reload_doc[2] = { - "Reload permissions trusted table", 0}; + "Reload permissions trusted table", + 0 +}; static const char *rpc_address_reload_doc[2] = { - "Reload permissions address table", 0}; + "Reload permissions address table", + 0 +}; static const char *rpc_trusted_dump_doc[2] = { - "Dump permissions trusted table", 0}; + "Dump permissions trusted table", + 0 +}; static const char *rpc_address_dump_doc[2] = { - "Dump permissions address table", 0}; + "Dump permissions address table", + 0 +}; static const char *rpc_subnet_dump_doc[2] = { - "Dump permissions subnet table", 0}; + "Dump permissions subnet table", + 0 +}; static const char *rpc_domain_name_dump_doc[2] = { - "Dump permissions domain name table", 0}; - + "Dump permissions domain name table", + 0 +}; static const char *rpc_test_uri_doc[2] = { - "Tests if (URI, Contact) pair is allowed according to allow/deny files", - 0}; + "Tests if (URI, Contact) pair is allowed according to allow/deny files", + 0 +}; rpc_export_t permissions_rpc[] = { - {"permissions.trustedReload", rpc_trusted_reload, - rpc_trusted_reload_doc, RPC_EXEC_DELTA}, - {"permissions.addressReload", rpc_address_reload, - rpc_address_reload_doc, RPC_EXEC_DELTA}, - {"permissions.trustedDump", rpc_trusted_dump, rpc_trusted_dump_doc, 0}, - {"permissions.addressDump", rpc_address_dump, rpc_address_dump_doc, - RET_ARRAY}, - {"permissions.subnetDump", rpc_subnet_dump, rpc_subnet_dump_doc, - RET_ARRAY}, - {"permissions.domainDump", rpc_domain_name_dump, - rpc_domain_name_dump_doc, 0}, - {"permissions.testUri", rpc_test_uri, rpc_test_uri_doc, 0}, - {"permissions.allowUri", rpc_test_uri, rpc_test_uri_doc, 0}, - {0, 0, 0, 0}}; + {"permissions.trustedReload", rpc_trusted_reload, rpc_trusted_reload_doc, + RPC_EXEC_DELTA}, + {"permissions.addressReload", rpc_address_reload, rpc_address_reload_doc, + RPC_EXEC_DELTA}, + {"permissions.trustedDump", rpc_trusted_dump, rpc_trusted_dump_doc, 0}, + {"permissions.addressDump", rpc_address_dump, rpc_address_dump_doc, + RET_ARRAY}, + {"permissions.subnetDump", rpc_subnet_dump, rpc_subnet_dump_doc, RET_ARRAY}, + {"permissions.domainDump", rpc_domain_name_dump, + rpc_domain_name_dump_doc, 0}, + {"permissions.testUri", rpc_test_uri, rpc_test_uri_doc, 0}, + {"permissions.allowUri", rpc_test_uri, rpc_test_uri_doc, 0}, + {0, 0, 0, 0} +}; +/* clang-format on */ static int permissions_init_rpc(void) {

1 0

git:master:4534d71f: permissions: use core fixup function
by Daniel-Constantin Mierla 10 Sep '24

10 Sep '24

Module: kamailio Branch: master Commit: 4534d71f0e3f53d3f13ecd760e07d6d402b666c4 URL: https://github.com/kamailio/kamailio/commit/4534d71f0e3f53d3f13ecd760e07d6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-10T07:51:05+02:00 permissions: use core fixup function - add a few fixup-free functions to exports --- Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/4534d71f0e3f53d3f13ecd760e07d6d… Patch: https://github.com/kamailio/kamailio/commit/4534d71f0e3f53d3f13ecd760e07d6d… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index f91f1a0f112..fadedc4fe53 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -114,8 +114,6 @@ static int single_fixup(void **param, int param_no); */ static int double_fixup(void **param, int param_no); -static int fixup_allow_address(void **param, int param_no); - static int allow_routing_0(struct sip_msg *msg, char *str1, char *str2); static int allow_routing_1(struct sip_msg *msg, char *basename, char *str2); static int allow_routing_2( @@ -159,10 +157,10 @@ static cmd_export_t cmds[] = { fixup_free_spve_all, ANY_ROUTE}, {"allow_uri", (cmd_function)allow_uri, 2, double_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"allow_address", (cmd_function)w_allow_address, 3, fixup_allow_address, - 0, ANY_ROUTE}, + {"allow_address", (cmd_function)w_allow_address, 3, fixup_isi, + fixup_free_isi, ANY_ROUTE}, {"allow_source_address", (cmd_function)w_allow_source_address, 1, - fixup_igp_null, 0, ANY_ROUTE}, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"allow_source_address", (cmd_function)w_allow_source_address, 0, 0, 0, ANY_ROUTE}, {"allow_source_address_group", (cmd_function)allow_source_address_group, @@ -1038,20 +1036,6 @@ int allow_test(char *file, char *uri, char *contact) return 1; } -/** - * - */ -static int fixup_allow_address(void **param, int param_no) -{ - if(param_no == 1) - return fixup_igp_null(param, 1); - if(param_no == 2) - return fixup_spve_null(param, 1); - if(param_no == 3) - return fixup_igp_null(param, 1); - return 0; -} - static const char *rpc_trusted_reload_doc[2] = { "Reload permissions trusted table", 0};

1 0

[kamailio/kamailio] 5.8.2++: TCP/TLS connection for WebSocket could not be found (Issue #3969)
by schoberw 09 Sep '24

09 Sep '24

### Description Kamailio is setup as a WebRTC to SIP(UDP) gateway. It forwards WSS to UDP and UDP to WSS connections. This was doing fine until 5.8.2 (so 5.8.1 is running perfectly). Since 5.8.2 (and 5.8.3) the following message is printed on sending towards a connected WSS connection: ``` Sep 4 17:02:20 p01t-1 kamailio.webrtc[336177]: WARNING: webrtc:tm [../../core/forward.h:204]: msg_send_buffer(): TCP/TLS connection for WebSocket could not be found Sep 4 17:02:20 p01t-1 kamailio.webrtc[336177]: WARNING: webrtc:tm [t_fwd.c:1586]: t_send_branch(): sending request on branch 0 failed Sep 4 17:02:20 p01t-1 kamailio.webrtc[336177]: WARNING: webrtc:<script>: Forwarding request failed Sep 4 17:02:20 p01t-1 kamailio.webrtc[336177]: INFO: webrtc:sl [sl_funcs.c:420]: sl_reply_error(): message marked with delayed-reply flag ``` ### Troubleshooting Code: - handle_ruri_alias() sets the $du from the alias parameter and looks good: - $fs sets the local socket (saved on incoming register to the Contact URI) (optional, removed, same result) - set_forward_no_connect() we cannot connect outbound, the connection must exists - tcp_get_conid("$dd:$dp", "$var(conid)") and well: it is existing! - reset the R-URI to the contact - and send out with t_relay() ``` # $ru = INVITE sip:43130110221@192.168.48.131:5063;transport=udp;ntv3=4;alias=1.2.3.4~51820~6;fs=tls:100.100.100.100:443;uri=sip:43130110221%40192.168.63.105%3bline%3dwc-x9u7ra%3bx-ts;line=wc-x9u7ra;x-ts if ($(ru{uri.param,alias}{s.len}) && $(ru{uri.param,uri}{s.len})) { $var(target) = $rU; if (!handle_ruri_alias()) { xlog("L_ERR", ">> Bad alias <$ru>"); sl_send_reply("400", "Bad Request"); exit; } if ($(ru{uri.param,fs}{s.len})) { xlog("L_INFO", ">> setting local socket to $(ru{uri.param,fs})"); $fs = $(ru{uri.param,fs}); } if ($dP =~ "ws|tls|tcp") { set_forward_no_connect(); xlog("L_INFO", ">> checking tcp connection to $dd:$dp"); if(tcp_get_conid("$dd:$dp", "$var(conid)")) { xlog("L_INFO", ">> connection id to $dd:$dp is: $var(conid)"); } else { if (is_method("NOTIFY")) { xlog("L_ERR", ">> connection to $dd:$dp is no longer connected. Client must resubscribe!"); sl_send_reply("604", "Please Remove Subscription"); } else { xlog("L_ERR", ">> connection to $dd:$dp is no longer connected. Client must reregister!"); sl_send_reply("480", "TCP not connected"); } exit; } } $ru = $(ru{uri.param,uri}{s.unescape.param}); $rU = $var(target); xlog("L_INFO", ">> OUT-CONTACT: $rm $ru ($du) - rP=$rP -> dp=$dP nh(P)=$nh(P)"); route(FORWARD); # route that call immediately } route[FORWARD] { xlog("L_INFO", "ROUTE[FORWARD] - R-URI/D-URI: $rm $ru ($du): $mf"); ... xlog("L_INFO", ">> Forwarding request now"); if (!t_relay()) { xlog("L_WARN", "Forwarding request failed"); ... onsend_route { if ($mt==1) { xlog("L_INFO", ">>> Sending Request: $rm $ru ($sndfrom(ip):$sndfrom(port) -> $sndto(ip):$sndto(port): $du)"); xlog("L_INFO", "$sndto(buf)"); #!ifdef WITH_HOMER # for some reason the ACK flagged in FORWARD is not traced on sending out if (isflagset(FL_TRACE)) { xlog("L_INFO", ">> FL_TRACE on $rm set!"); } if (is_method("ACK") && isflagset(FL_TRACE)) { sip_trace(); } #!endif } else { xlog("L_INFO", ">>> Sending Reply: $rs $rr ($sndfrom(ip):$sndfrom(port) -> $sndto(ip):$sndto(port))"); xlog("L_INFO", "$sndto(buf)"); } } ``` #### Reproduction Any call to the WebSocket is rejected now. Working fine before 5.8.2. #### Log Messages ``` kamailio.webrtc[338351]: INFO: webrtc:<script>: ROUTE[OUTBOUND] - route to registered contact: INVITE sip:15551234521@192.168.48.131:5063;transport=udp;ntv3=4;alias=101.100.100.129~52201~6;fs=tls:100.100.100.131:443;uri=sip:15551234521%40192.168.63.105%3bline%3dwc-x9u7ra%3bx-ts;line=wc-x9u7ra;x-ts kamailio.webrtc[338351]: INFO: webrtc:<script>: >> read domain from P-Called-Party-ID: ws2.ipbx.tld kamailio.webrtc[338351]: INFO: webrtc:<script>: >> Reduce Session Timer from 1800 to 120 kamailio.webrtc[338351]: INFO: webrtc:<script>: >> setting local socket to tls:100.100.100.131:443 optional. same without $fs=tls:100.100.100.131:443 (ws: and wss: are invalid for $fs) kamailio.webrtc[338351]: INFO: webrtc:<script>: >> checking tcp connection to 101.100.100.129:52201 kamailio.webrtc[338351]: INFO: webrtc:<script>: >> connection id to 101.100.100.129:52201 is: 1 The connection is found and alive! kamailio.webrtc[338351]: INFO: webrtc:<script>: >> OUT-CONTACT: INVITE sip:15551234521@192.168.63.105;line=wc-x9u7ra;x-ts (sip:101.100.100.129:52201;transport=ws) - rP=UDP -> dp=ws nh(P)=ws kamailio.webrtc[338351]: INFO: webrtc:<script>: ROUTE[FORWARD] - R-URI/D-URI: INVITE sip:15551234521@192.168.63.105;line=wc-x9u7ra;x-ts (sip:101.100.100.129:52201;transport=ws): 8388624 kamailio.webrtc[338351]: INFO: webrtc:<script>: ROUTE[RTPP_REQ] kamailio.webrtc[338351]: INFO: webrtc:<script>: ROUTE[RTP_MANAGE] kamailio.webrtc[338351]: INFO: webrtc:<script>: > SIP -> WebRTC, bridging RTP->SRTP-DTLS and adding ICE - o-313732353436333239323434393936-ytpwonh6n9aq kamailio.webrtc[338351]: INFO: webrtc:<script>: ROUTE[RTP_MANAGE] method:INVITE, ruri:sip:15551234521@192.168.63.105;line=wc-x9u7ra;x-ts, callid:o-313732353436333239323434393936-ytpwonh6n9aq, rtpengine_manage:call-id=o-313732353436333239323434393936-ytpwonh6n9aq via-branch=auto trust-address r eplace-origin replace-session-connection rtcp-mux-accept rtcp-mux-require generate-mid SDES-off ICE=force ICE-lite=forward UDP/TLS/RTP/SAVPF pad-crypto kamailio.webrtc[338351]: INFO: webrtc:<script>: > rtpengine(): SUCCESS kamailio.webrtc[338351]: INFO: webrtc:<script>: >> Forwarding request now 100 trying ... kamailio.webrtc[338351]: INFO: webrtc:<script>: >>> Sending Request: INVITE sip:15551234521@192.168.63.105;line=wc-x9u7ra;x-ts (100.100.100.131:443 -> 101.100.100.129:52201: sip:101.100.100.129:52201;transport=ws) kamailio.webrtc[338351]: INFO: webrtc:<script>: INVITE sip:15551234521@192.168.63.105;line=wc-x9u7ra;x-ts SIP/2.0 Record-Route: <sip:100.100.100.131:443;transport=ws;r2=on;lr;ftag=ly9574qrtx;x-dir=o;x-rtpp=1> Record-Route: <sip:192.168.48.131:5063;r2=on;lr;ftag=ly9574qrtx;x-dir=o;x-rtpp=1> Via: SIP/2.0/WSS 100.100.100.131:443;branch=z9hG4bK727a.06944932aa61c384f55e7cbc0a59ec0a.0 Via: SIP/2.0/UDP 192.168.48.74:5060;branch=z9hG4bKgWoe~Gc5kT Via: SIP/2.0/UDP 192.168.48.74:5060;branch=z9hG4bKvA3weqaC-e;internal=6715591-1 From: "Walter 22" <sip:22@ws2.ipbx.tld>;tag=ly9574qrtx To: <sip:21@ws2.ipbx.tld;user=phone> Call-ID: 313732353436333239323434393936-ytpwonh6n9aq-UASession-p1EoqWEkFt-CQ-100- CSeq: 1 INVITE Max-Forwards: 67 Supported: replaces,from-change,timer,histinfo Allow: INVITE,ACK,CANCEL,BYE,INFO,REFER,PRACK,NOTIFY Contact: <sip:192.168.48.74:5060;internal=6715591-1;type=tpcc> Content-Length: 649 Content-Type: application/sdp Record-Route: <sip:192.168.48.74:5060;transport=udp;lr> Allow-Events: talk,hold,refer Accept: application/sdp Session-Expires: 90;refresher=uas [...] shortened SDP body kamailio.webrtc[338351]: INFO: webrtc:<script>: >> FL_TRACE on INVITE set! kamailio.webrtc[338351]: INFO: webrtc:<script>: Network sending: >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> INVITE sip:15551234521@192.168.63.105;line=wc-x9u7ra;x-ts SIP/2.0 Record-Route: <sip:100.100.100.131:443;transport=ws;r2=on;lr;ftag=ly9574qrtx;x-dir=o;x-rtpp=1> Record-Route: <sip:192.168.48.131:5063;r2=on;lr;ftag=ly9574qrtx;x-dir=o;x-rtpp=1> Via: SIP/2.0/WSS 100.100.100.131:443;branch=z9hG4bK727a.06944932aa61c384f55e7cbc0a59ec0a.0 Via: SIP/2.0/UDP 192.168.48.74:5060;branch=z9hG4bKgWoe~Gc5kT Via: SIP/2.0/UDP 192.168.48.74:5060;branch=z9hG4bKvA3weqaC-e;internal=6715591-1 From: "Walter 22" <sip:22@ws2.ipbx.tld>;tag=ly9574qrtx To: <sip:21@ws2.ipbx.tld;user=phone> Call-ID: 313732353436333239323434393936-ytpwonh6n9aq-UASession-p1EoqWEkFt-CQ-100- CSeq: 1 INVITE Max-Forwards: 67 Supported: replaces,from-change,timer,histinfo Allow: INVITE,ACK,CANCEL,BYE,INFO,REFER,PRACK,NOTIFY Contact: <sip:192.168.48.74:5060;internal=6715591-1;type=tpcc> Content-Length: 649 Content-Type: application/sdp Record-Route: <sip:192.168.48.74:5060;transport=udp;lr> Allow-Events: talk,hold,refer Accept: application/sdp Session-Expires: 90;refresher=uas [...] shortened SDP body >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> kamailio.webrtc[338351]: WARNING: webrtc:tm [../../core/forward.h:204]: msg_send_buffer(): TCP/TLS connection for WebSocket could not be found kamailio.webrtc[338351]: WARNING: webrtc:tm [t_fwd.c:1586]: t_send_branch(): sending request on branch 0 failed kamailio.webrtc[338351]: WARNING: webrtc:<script>: Forwarding request failed ``` ### ~~Possible~~ Solutions Downgrade to 5.8.1 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3969 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3969(a)github.com>

3 15

[kamailio/kamailio] core: parser - use sip_parser_log (PR #3967)
by Lucian Balaceanu 09 Sep '24

09 Sep '24

Silencing messages that tend to appear when processing HEP.   #### 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) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3967 -- Commit Summary -- * core: parser - use sip_parser_log -- File Changes -- M src/core/parser/msg_parser.c (5) M src/core/parser/parse_hname2.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3967.patch https://github.com/kamailio/kamailio/pull/3967.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3967 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3967(a)github.com>

2 4

git:master:e6a3b355: core: parser - use sip_parser_log
by Lucian Balaceanu 09 Sep '24

09 Sep '24

Module: kamailio Branch: master Commit: e6a3b3554af01e5141ba063df408a06b28261927 URL: https://github.com/kamailio/kamailio/commit/e6a3b3554af01e5141ba063df408a06… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2024-09-09T14:01:48+03:00 core: parser - use sip_parser_log Silencing messages that tend to appear when processing HEP. --- Modified: src/core/parser/msg_parser.c Modified: src/core/parser/parse_hname2.c --- Diff: https://github.com/kamailio/kamailio/commit/e6a3b3554af01e5141ba063df408a06… Patch: https://github.com/kamailio/kamailio/commit/e6a3b3554af01e5141ba063df408a06… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index a8504873073..3e094c50907 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -95,7 +95,7 @@ char *get_hdr_field( tmp = parse_hname(buf, end, hdr); if(hdr->type == HDR_ERROR_T) { - ERR("bad header\n"); + LOG(cfg_get(core, core_cfg, sip_parser_log), "bad header\n"); goto error; } @@ -336,7 +336,8 @@ int parse_headers( rest = get_hdr_field(tmp, end, hf); switch(hf->type) { case HDR_ERROR_T: - ERR("bad header field [%.*s]\n", + LOG(cfg_get(core, core_cfg, sip_parser_log), + "bad header field [%.*s]\n", (end - tmp > 100) ? 100 : (int)(end - tmp), tmp); goto error; case HDR_EOH_T: diff --git a/src/core/parser/parse_hname2.c b/src/core/parser/parse_hname2.c index e7d0792e988..49c62d3d181 100644 --- a/src/core/parser/parse_hname2.c +++ b/src/core/parser/parse_hname2.c @@ -278,7 +278,8 @@ char *parse_sip_header_name(char *const begin, const char *const end, if(*p != ' ' && *p != '\t') { /* no white space - bad header name format */ if(likely(logmode)) { - LM_ERR("invalid header name for [%.*s]\n", (int)(end - begin), + LOG(cfg_get(core, core_cfg, sip_parser_log), + "invalid header name for [%.*s]\n", (int)(end - begin), begin); } hdr->type = HDR_ERROR_T;

1 0

RFC: Support for icc or suncc compilers
by Daniel-Constantin Mierla 09 Sep '24

09 Sep '24

Hello, I was wondering if icc or suncc compilers are still used in the community, and by that if it still worth trying to support them via Makefiles and compile time flags (defines). Personally I haven't had to deal with them for more than 10-15 years, I have no access with a system offering them. Furthermore, I am not even sure if the code compiles with them. Maybe someone (or many) in the community use one or the other and confirm that they still worth to be kept. If not, maybe we can consider them for removing, it can be a good task to be done during Kamailio development meeting planned in Dusseldorf, Germany during November. 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, October 8-10, 2024 -- asipto.com

1 0

cdp: Should "poll" be used instead of "select"?
by whliu＠citictel.com 09 Sep '24

09 Sep '24

Hi All, I am using kamailio 5.8.3 as IMS-PCSCF. It connects to PCRF and uses module. It is found that in module cdp, "select" is used in receiving message, which has a limitation in the value for file descriptor. It does not work if the value of fd is greater than 1023. Any idea on how to tackle the case when the value of fd is greater than 1023? Please advise. Thank you. Regards, Hong

1 0

git:master:c5c84099: core: dprint - add possibility to set the structured log function
by Daniel-Constantin Mierla 09 Sep '24

09 Sep '24

Module: kamailio Branch: master Commit: c5c84099fc29623c4f0b8faf9e6151eeaf4421c1 URL: https://github.com/kamailio/kamailio/commit/c5c84099fc29623c4f0b8faf9e6151e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-09T11:29:20+02:00 core: dprint - add possibility to set the structured log function --- Modified: src/core/dprint.c Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/c5c84099fc29623c4f0b8faf9e6151e… Patch: https://github.com/kamailio/kamailio/commit/c5c84099fc29623c4f0b8faf9e6151e… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 83d1e30f3ca..f167fac0fc4 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -828,6 +828,14 @@ void ksr_slog_init(char *ename) } } +/** + * + */ +void km_slog_func_set(ksr_slog_f f) +{ + _ksr_slog_func = f; +} + static void log_callid_set(sip_msg_t *msg) { if(!(_ksr_slog_json_flags & KSR_SLOGJSON_FL_CALLID)) { diff --git a/src/core/dprint.h b/src/core/dprint.h index 13957b269c9..a72b297e194 100644 --- a/src/core/dprint.h +++ b/src/core/dprint.h @@ -112,7 +112,8 @@ /** * */ -typedef struct ksr_loglevels { +typedef struct ksr_loglevels +{ int ll_alert; int ll_bug; int ll_crit; @@ -123,8 +124,10 @@ typedef struct ksr_loglevels { int ll_dbg; } ksr_loglevels_t; -#define KSR_LOGLEVELS_DEFAULTS {L_ALERT, L_BUG, L_CRIT2, L_ERR, L_WARN, \ - L_NOTICE, L_INFO, L_DBG} +#define KSR_LOGLEVELS_DEFAULTS \ + { \ + L_ALERT, L_BUG, L_CRIT2, L_ERR, L_WARN, L_NOTICE, L_INFO, L_DBG \ + } /** * data fileds used for structured logging */ @@ -148,6 +151,7 @@ typedef void (*ksr_slog_f)(ksr_logdata_t *, const char *, ...); void ksr_slog_init(char *ename); extern ksr_slog_f _ksr_slog_func; +void km_slog_func_set(ksr_slog_f f); /** @brief my_pid(), process_no are from pt.h but we cannot \#include it here because of circular dependencies */ @@ -458,9 +462,9 @@ void log_prefix_init(void); #ifdef MOD_NAMEID -#define KSR_LLMODVAR_COMBINEZ(X,Y) X##Y -#define KSR_LLMODVAR_COMBINE(X,Y) KSR_LLMODVAR_COMBINEZ(X,Y) -#define KSR_LLMODVAR KSR_LLMODVAR_COMBINE(_ksr_loglevels_,MOD_NAMEID) +#define KSR_LLMODVAR_COMBINEZ(X, Y) X##Y +#define KSR_LLMODVAR_COMBINE(X, Y) KSR_LLMODVAR_COMBINEZ(X, Y) +#define KSR_LLMODVAR KSR_LLMODVAR_COMBINE(_ksr_loglevels_, MOD_NAMEID) /* use local log level mapping */ #define LLM_ALERT(fmt, args...) LOG(KSR_LLMODVAR.alert, fmt, ##args)

1 0

[kamailio/kamailio] New weighted distribution over hash algorithm for dispatcher module. (Issue #3916)
by Ben Kaufman 08 Sep '24

08 Sep '24

### Description Feature request/suggestion: Currently, the predicative hashing algorithm for dispatcher gives equal weight to all members of the set. It would be convenient to use the rweight attribute to allow something like [weighted rendezvous hashing](https://en.wikipedia.org/wiki/Rendezvous_hashing#Weighted_rendezvo… to provide weighted load balancing will still keeping correct routing for stateless messages (most specifically CANCELs). -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3916 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3916(a)github.com>

2 2

git:master:8a13a1d8: utils/kamctl: regenerate db table definitions
by Daniel-Constantin Mierla 06 Sep '24

06 Sep '24

Module: kamailio Branch: master Commit: 8a13a1d8301aa22baa9b3a52b891fd04a04c3768 URL: https://github.com/kamailio/kamailio/commit/8a13a1d8301aa22baa9b3a52b891fd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-06T10:16:50+02:00 utils/kamctl: regenerate db table definitions --- Modified: utils/kamctl/db_sqlite/htable-create.sql Modified: utils/kamctl/mysql/htable-create.sql Modified: utils/kamctl/oracle/htable-create.sql Modified: utils/kamctl/postgres/htable-create.sql 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/8a13a1d8301aa22baa9b3a52b891fd0… Patch: https://github.com/kamailio/kamailio/commit/8a13a1d8301aa22baa9b3a52b891fd0…

1 0

git:master:12cdb896: lib/srdb1/schema: increase default size of columns for htable
by Daniel-Constantin Mierla 06 Sep '24

06 Sep '24

Module: kamailio Branch: master Commit: 12cdb896fed98a38bfd9b77e1ace1dd346901cc3 URL: https://github.com/kamailio/kamailio/commit/12cdb896fed98a38bfd9b77e1ace1dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-06T10:07:41+02:00 lib/srdb1/schema: increase default size of columns for htable - same type, version kept, code nca work with different size already --- Modified: src/lib/srdb1/schema/htable.xml --- Diff: https://github.com/kamailio/kamailio/commit/12cdb896fed98a38bfd9b77e1ace1dd… Patch: https://github.com/kamailio/kamailio/commit/12cdb896fed98a38bfd9b77e1ace1dd… --- diff --git a/src/lib/srdb1/schema/htable.xml b/src/lib/srdb1/schema/htable.xml index 9ee35d2fe71..ab60cc7fd3c 100644 --- a/src/lib/srdb1/schema/htable.xml +++ b/src/lib/srdb1/schema/htable.xml @@ -36,7 +36,7 @@ <column id="key_name"> <name>key_name</name> <type>string</type> - <size>64</size> + <size>256</size> <default/> <description>Name of the hash key</description> </column> @@ -58,7 +58,7 @@ <column id="attribute"> <name>key_value</name> <type>string</type> - <size>128</size> + <size>512</size> <default/> <description>The value of the key</description> </column>

1 0

[kamailio/kamailio] [htable] db_sql "key_value" length = 128 too small, what if change to 1024 ? (Issue #3944)
by gao114882 06 Sep '24

06 Sep '24

### Description  ### Expected behavior large "key_value" can store to db_sql。 #### Actual observed behavior the key_value = "{\"id\":1,\"in_port\":\"5263\",\"in_ptl\":\"udp\",\"rate_limit\":\"\",\"out_port\":\"5262\",\"out_ptl\":\"udp\",\"mode\":2,\"proxied_ip\":\"172.16.4.114\",\"proxied_port\":\"5080\",\"in_gateway_ip\":\"116.198.229.196\",\"in_gateway_port\":\"5080\",\"black_list\":{\"ip\":[\"127.0.0.1\"],\"user\":[]},\"white_list\":{\"ip\":[\"127.0.0.1\"],\"user\":[]},\"called_prefix\":[{\"match_num\":\"\",\"caller_rule\":{\"start_pos\":0,\"length\":2,\"new_num\":\"\",\"type\":2},\"called_rule\":{\"start_pos\":0,\"length\":0,\"new_num\":\"\",\"type\":0}}],\"caller_prefix\":[{\"match_num\":\"\",\"caller_rule\":{\"start_pos\":0,\"length\":2,\"new_num\":\"\",\"type\":1},\"called_rule\":{\"start_pos\":0,\"length\":0,\"new_num\":\"\",\"type\":0}}]}" <img width="913" alt="企业微信截图_17234562508919" src="https://github.com/user-attachments/assets/ab0acd4b-980a-4dc5-95b3-8e8afb7a…"> #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### 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: compiled on 11:50:37 Aug 9 2024 with gcc 4.8.5 ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3944 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3944(a)github.com>

2 2

git:master:60165196: registrar: safety check for uri and remove duplicated aor extract
by Daniel-Constantin Mierla 05 Sep '24

05 Sep '24

Module: kamailio Branch: master Commit: 60165196ad3144597c24eb9f7bb7fb0cd56f8c25 URL: https://github.com/kamailio/kamailio/commit/60165196ad3144597c24eb9f7bb7fb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-05T11:28:08+02:00 registrar: safety check for uri and remove duplicated aor extract - follow up of changes from previous commit --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/60165196ad3144597c24eb9f7bb7fb0… Patch: https://github.com/kamailio/kamailio/commit/60165196ad3144597c24eb9f7bb7fb0… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 4bd4a1505a1..1f5b7e0acbd 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -936,7 +936,7 @@ int save(struct sip_msg *_m, udomain_t *_d, int _cflags, str *_uri) int novariation = 0; - if(_uri->len > 0) { + if(_uri != NULL && _uri->len > 0) { if(extract_aor(_uri, &aor, &turi) < 0) { LM_ERR("failed to extract Address Of Record\n"); return -1; @@ -1043,11 +1043,6 @@ int save(struct sip_msg *_m, udomain_t *_d, int _cflags, str *_uri) get_act_time(); c = get_first_contact(_m); - if(extract_aor((_uri) ? _uri : &get_to(_m)->uri, &aor, NULL) < 0) { - LM_ERR("failed to extract Address Of Record\n"); - goto error; - } - mem_only = is_cflag_set(REG_SAVE_MEM_FL) ? FL_MEM : FL_NONE; novariation = is_cflag_set(REG_SAVE_NOVARIATION_FL) ? 1 : 0; @@ -1118,7 +1113,7 @@ int unregister(struct sip_msg *_m, udomain_t *_d, str *_uri, str *_ruid) if(_ruid == NULL || _ruid->len <= 0) { /* No ruid provided - remove all contacts for aor */ - if(_uri->len > 0) { + if(_uri != NULL && _uri->len > 0) { if(extract_aor(_uri, &aor, &turi) < 0) { LM_ERR("failed to extract Address Of Record\n"); return -1; @@ -1142,9 +1137,7 @@ int unregister(struct sip_msg *_m, udomain_t *_d, str *_uri, str *_ruid) } } else { /* ruid provided - remove a specific contact */ - - if(_uri->len > 0) { - + if(_uri != NULL && _uri->len > 0) { if(extract_aor(_uri, &aor, NULL) < 0) { LM_ERR("failed to extract Address Of Record\n"); return -1; @@ -1162,9 +1155,7 @@ int unregister(struct sip_msg *_m, udomain_t *_d, str *_uri, str *_ruid) return -2; } _reg_ul.unlock_udomain(_d, &aor); - } else { - res = _reg_ul.delete_urecord_by_ruid(_d, _ruid); switch(res) { case -1:

1 0

[kamailio/kamailio] Kamailio 5.8.3 breaks IPv6 endpoints (Issue #3968)
by Sebastian Damm 05 Sep '24

05 Sep '24

### Description  We are running Kamailio in front of a backend farm, REGISTERs go directly to the backend. After registration, the backend sends out OPTIONS requests periodically. This worked with 5.8.2. Now when running a 5.8.3 server (taken from your apt repository), I get the following errors in the log: ``` Sep 04 14:41:36 sipproxy /usr/sbin/kamailio[124]: ERROR: tm [ut.h:235]: uri2dst2(): bad_uri: [sip:[[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]]:59580;transport=tls] Sep 04 14:41:36 sipproxy /usr/sbin/kamailio[124]: ERROR: tm [t_fwd.c:1764]: t_forward_nonack(): failure to add branches ``` There are extra square brackets in the URI. I compared the REGISTERs from old and new Kamailio to the backend, and also the OPTIONS packets sent by the backend, the are identical except for the obvious differences. ### Troubleshooting #### Reproduction  * Have a Kamailio with nathelper enabled. * Do something like this for nat detection: ``` def ksr_route_natdetect(self, msg): KSR.force_rport() # Checks if request goes to backend or not if not msg.is_internal_message(): KSR.setbflag(FLB_NATB) KSR.setflag(FLT_NATS) if KSR.textops.is_present_hf("Contact") > 0: if KSR.nathelper.set_contact_alias() < 0: msg.log("Error in aliasing contact") KSR.sl.sl_send_reply(400,"Bad request") return False else: if msg.is_request(): KSR.nathelper.handle_ruri_alias() return 1 ``` * register a phone to the backend (e.g. an Asterisk server) * send an OPTIONS packet from the backend to the registered device. #### SIP The REGISTER from Kamailio to the backend looks like this: ``` REGISTER sip:domain;transport=tcp SIP/2.0 Via: SIP/2.0/TCP 100.74.11.1:5063;branch=z9hG4bK6c3e.2cedb59e7724d263255c1996d9d2d4fa.0;i=6 Via: SIP/2.0/TLS [2001:16e0:affe:affe:24a2:55a2:15bf:23d1]:61391;received=2001:16e0:affe:affe:24a2:55a2:15bf:23d1;rport=61391;branch=z9hG4bKPjAB7F905A-A6A2-491D-A456-89C8FD4C5183;alias Max-Forwards: 69 From: <sip:dZmIQyb70tzt2J9@sdammone>;tag=AAA80708-4968-4B49-95B8-7DBCEFCC5E62 To: <sip:dZmIQyb70tzt2J9@sdammone> Call-ID: 4922AA11-F4BA-49D0-AE64-EECF49735684 CSeq: 44208 REGISTER User-Agent: foobar Supported: outbound, path Contact: <sip:dZmIQyb70tzt2J9@[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]:61391;transport=TLS;p-xs=6eb17056fba34ce6bc7d458a1a7a80ba;ob;alias=[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]~61391~3>;reg-id=1;+sip.instance="<urn:uuid:00000000-0000-0000-0000-00000c73bfc6>" Expires: 300 Allow: PRACK, INVITE, ACK, BYE, CANCEL, UPDATE, INFO, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS Content-Length: 0 Path: <sip:100.74.11.1:5063;transport=tcp;lr;xep=true> ``` The OPTIONS packet from backend to the client looks like this: ``` OPTIONS sip:dZmIQyb70tzt2J9@[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]:61391;transport=TLS;p-xs=6eb17056fba34ce6bc7d458a1a7a80ba;ob;alias=[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]~61391~3 SIP/2.0 Via: SIP/2.0/TCP 100.74.130.66:5060;rport;branch=z9hG4bKPj3e558221-2506-4a2b-9daa-ff7e73d05e8c;alias From: <sip:dZmIQyb70tzt2J9@sdammone>;tag=18c9809a-4775-4c35-8e88-5c5a7bdcf1fe To: <sip:dZmIQyb70tzt2J9@[2001:16e0:affe:affe:24a2:55a2:15bf:23d1];p-xs=6eb17056fba34ce6bc7d458a1a7a80ba;ob;alias=[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]~61391~3> Contact: <sip:dZmIQyb70tzt2J9@100.74.130.66:5060;transport=TCP> Call-ID: 2e1efbd3-9366-4542-b909-83429266b6ef CSeq: 2989 OPTIONS Supported: path Route: <sip:100.74.11.1:5063;transport=tcp;lr;xep=true> Max-Forwards: 70 User-Agent: barfoo Content-Length: 0 ``` #### Log Messages ``` Sep 04 14:41:36 sipproxy /usr/sbin/kamailio[124]: ERROR: tm [ut.h:235]: uri2dst2(): bad_uri: [sip:[[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]]:59580;transport=tls] Sep 04 14:41:36 sipproxy /usr/sbin/kamailio[124]: ERROR: tm [t_fwd.c:1764]: t_forward_nonack(): failure to add branches ``` ### Possible Solutions Downgrading to 5.8.2 again works. I suppose, the problem comes from this commit by @vingarzan: https://github.com/kamailio/kamailio/commit/52ab6f3dcf5ad8d967be8bdecaa64ef… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.3 (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 11.4.0 ``` * **Operating System**:  ``` Ubuntu Jammy ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3968 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3968(a)github.com>

3 6

git:5.8:be1fe948: nathelper: add_contact_alias() with parameters to enclose ipv6 in square brackets
by Daniel-Constantin Mierla 05 Sep '24

05 Sep '24

Module: kamailio Branch: 5.8 Commit: be1fe948b188ba84ec542e5622377d3772463e5b URL: https://github.com/kamailio/kamailio/commit/be1fe948b188ba84ec542e5622377d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-05T09:44:37+02:00 nathelper: add_contact_alias() with parameters to enclose ipv6 in square brackets - the add_contact_alias() without parameters was doing it already - discovered while investigating GH #3968 (cherry picked from commit 744e5ac9678c0c9ef07bfb0de44c7c478a2debdc) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/be1fe948b188ba84ec542e5622377d3… Patch: https://github.com/kamailio/kamailio/commit/be1fe948b188ba84ec542e5622377d3… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 9ee73e62a21..99904557847 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -998,6 +998,8 @@ static int add_contact_alias_3( struct lump *anchor; struct sip_uri uri; char *bracket, *lt, *param, *at, *start; + int is_ipv6 = 0; + int i; /* Do nothing if Contact header does not exist */ if(!msg->contact) { @@ -1058,8 +1060,8 @@ static int add_contact_alias_3( } /* Create ;alias param */ - param_len = _ksr_contact_salias.len + IP6_MAX_STR_SIZE - + 1 /* ~ */ + 5 /* port */ + param_len = _ksr_contact_salias.len + 1 /* [ */ + IP6_MAX_STR_SIZE + + 1 /* ] */ + 1 /* ~ */ + 5 /* port */ + 1 /* ~ */ + 1 /* proto */ + 1 /* closing > */; param = (char *)pkg_malloc(param_len); if(!param) { @@ -1068,8 +1070,20 @@ static int add_contact_alias_3( } at = param; /* ip address */ + for(i = 0; i < ip_str->len; i++) { + if(ip_str->s[i] == ':') { + is_ipv6 = 1; + break; + } + } + if(is_ipv6 && ip_str->s[0] != '[') { + append_chr(at, '['); + } append_str(at, _ksr_contact_salias.s, _ksr_contact_salias.len); append_str(at, ip_str->s, ip_str->len); + if(is_ipv6 && ip_str->s[0] != '[') { + append_chr(at, ']'); + } /* port */ append_chr(at, '~'); append_str(at, port_str->s, port_str->len);

1 0

git:master:aa794581: core: try to lookup connection for WSS when TCPCONN_MATCH_STRICT is set
by Daniel-Constantin Mierla 05 Sep '24

05 Sep '24

Module: kamailio Branch: master Commit: aa794581ecf105b5313d2f5b8bcfe516ab337936 URL: https://github.com/kamailio/kamailio/commit/aa794581ecf105b5313d2f5b8bcfe51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-05T09:01:52+02:00 core: try to lookup connection for WSS when TCPCONN_MATCH_STRICT is set - URIs have always transport ws, but most likely the connection is wss - GH #3969 --- Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/aa794581ecf105b5313d2f5b8bcfe51… Patch: https://github.com/kamailio/kamailio/commit/aa794581ecf105b5313d2f5b8bcfe51… --- diff --git a/src/core/forward.h b/src/core/forward.h index 31086c6512b..8d96e4df5cb 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -137,6 +137,7 @@ static inline int msg_send_buffer( union sockaddr_union local_addr; struct tcp_connection *con = NULL; struct ws_event_info wsev; + int dproto; int ret; #endif @@ -192,9 +193,21 @@ static inline int msg_send_buffer( if(likely(port)) { su2ip_addr(&ip, &dst->to); if(tcp_connection_match == TCPCONN_MATCH_STRICT) { + /* lookup first for WSS, because transport=ws is in URI, + * but WS is less likely */ + if(dst->proto == PROTO_WSS || dst->proto == PROTO_WS) { + dproto = PROTO_WSS; + } else { + dproto = dst->proto; + } con = tcpconn_lookup(dst->id, &ip, port, from, (dst->send_sock) ? dst->send_sock->port_no : 0, 0, - dst->proto); + dproto); + if(con == NULL && dst->proto == PROTO_WS) { + con = tcpconn_lookup(dst->id, &ip, port, from, + (dst->send_sock) ? dst->send_sock->port_no : 0, 0, + PROTO_WS); + } } else { con = tcpconn_get(dst->id, &ip, port, from, 0); }

1 0

git:master:744e5ac9: nathelper: add_contact_alias() with parameters to enclose ipv6 in square brackets
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: master Commit: 744e5ac9678c0c9ef07bfb0de44c7c478a2debdc URL: https://github.com/kamailio/kamailio/commit/744e5ac9678c0c9ef07bfb0de44c7c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T19:36:34+02:00 nathelper: add_contact_alias() with parameters to enclose ipv6 in square brackets - the add_contact_alias() without parameters was doing it already - discovered while investigating GH #3968 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/744e5ac9678c0c9ef07bfb0de44c7c4… Patch: https://github.com/kamailio/kamailio/commit/744e5ac9678c0c9ef07bfb0de44c7c4… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 1188dbeb04b..bf4b3b21893 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -998,6 +998,8 @@ static int add_contact_alias_3( struct lump *anchor; struct sip_uri uri; char *bracket, *lt, *param, *at, *start; + int is_ipv6 = 0; + int i; /* Do nothing if Contact header does not exist */ if(!msg->contact) { @@ -1058,8 +1060,8 @@ static int add_contact_alias_3( } /* Create ;alias param */ - param_len = _ksr_contact_salias.len + IP6_MAX_STR_SIZE - + 1 /* ~ */ + 5 /* port */ + param_len = _ksr_contact_salias.len + 1 /* [ */ + IP6_MAX_STR_SIZE + + 1 /* ] */ + 1 /* ~ */ + 5 /* port */ + 1 /* ~ */ + 1 /* proto */ + 1 /* closing > */; param = (char *)pkg_malloc(param_len); if(!param) { @@ -1068,8 +1070,20 @@ static int add_contact_alias_3( } at = param; /* ip address */ + for(i = 0; i < ip_str->len; i++) { + if(ip_str->s[i] == ':') { + is_ipv6 = 1; + break; + } + } + if(is_ipv6 && ip_str->s[0] != '[') { + append_chr(at, '['); + } append_str(at, _ksr_contact_salias.s, _ksr_contact_salias.len); append_str(at, ip_str->s, ip_str->len); + if(is_ipv6 && ip_str->s[0] != '[') { + append_chr(at, ']'); + } /* port */ append_chr(at, '~'); append_str(at, port_str->s, port_str->len);

1 0

git:5.8:3c89405e: nathelper: check if alias ipv6 has already square brackets
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: 5.8 Commit: 3c89405ed74152fd59365ad7dacb144092f5516a URL: https://github.com/kamailio/kamailio/commit/3c89405ed74152fd59365ad7dacb144… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T18:58:00+02:00 nathelper: check if alias ipv6 has already square brackets - GH #3968 (cherry picked from commit 6e01172a138d395fa3f7c3f25238647934137dba) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/3c89405ed74152fd59365ad7dacb144… Patch: https://github.com/kamailio/kamailio/commit/3c89405ed74152fd59365ad7dacb144… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 9c0bebad3a7..9ee73e62a21 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1140,6 +1140,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) *trans, *start; unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, ip_len, ip_port_len, port_len, i; + int is_ipv6 = 0; if(parse_sip_msg_uri(msg) < 0) { LM_ERR("while parsing Request-URI\n"); @@ -1188,7 +1189,6 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) // IPv6 needs some [] added when composing a SIP URI, which further // complicates this code. ip_len = port - val; - int is_ipv6 = 0; for(i = 0; i < ip_len; i++) { if(val[i] == ':') { is_ipv6 = 1; @@ -1206,7 +1206,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) append_str(at, "sip:", 4); ip_port_len = trans - val; alias_len = _ksr_contact_salias.len + ip_port_len + 2 /* ~n */; - if(is_ipv6) { + if(is_ipv6 && val[0] != '[') { // IPv6 - add '[' ']' around IP // then append ':' and copy the port append_chr(at, '[');

1 0

git:master:6e01172a: nathelper: check if alias ipv6 has already square brackets
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: master Commit: 6e01172a138d395fa3f7c3f25238647934137dba URL: https://github.com/kamailio/kamailio/commit/6e01172a138d395fa3f7c3f25238647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T18:54:22+02:00 nathelper: check if alias ipv6 has already square brackets - GH #3968 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/6e01172a138d395fa3f7c3f25238647… Patch: https://github.com/kamailio/kamailio/commit/6e01172a138d395fa3f7c3f25238647… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 3c829709c0f..1188dbeb04b 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1140,6 +1140,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) *trans, *start; unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, ip_len, ip_port_len, port_len, i; + int is_ipv6 = 0; if(parse_sip_msg_uri(msg) < 0) { LM_ERR("while parsing Request-URI\n"); @@ -1188,7 +1189,6 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) // IPv6 needs some [] added when composing a SIP URI, which further // complicates this code. ip_len = port - val; - int is_ipv6 = 0; for(i = 0; i < ip_len; i++) { if(val[i] == ':') { is_ipv6 = 1; @@ -1206,7 +1206,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) append_str(at, "sip:", 4); ip_port_len = trans - val; alias_len = _ksr_contact_salias.len + ip_port_len + 2 /* ~n */; - if(is_ipv6) { + if(is_ipv6 && val[0] != '[') { // IPv6 - add '[' ']' around IP // then append ':' and copy the port append_chr(at, '[');

1 0

git:master:21e2d966: registrar: use parsed uri parameter when provided for save()
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: master Commit: 21e2d96672ccbe65eebdf64f839a1ce465a11b7c URL: https://github.com/kamailio/kamailio/commit/21e2d96672ccbe65eebdf64f839a1ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T13:02:19+02:00 registrar: use parsed uri parameter when provided for save() - instead of to-uri, aor being built from uri parameter --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/21e2d96672ccbe65eebdf64f839a1ce… Patch: https://github.com/kamailio/kamailio/commit/21e2d96672ccbe65eebdf64f839a1ce… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 2e25c8e000a..4bd4a1505a1 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -926,6 +926,7 @@ int save(struct sip_msg *_m, udomain_t *_d, int _cflags, str *_uri) str aor; int ret; sip_uri_t *u; + sip_uri_t turi; rr_t *route; struct sip_uri puri; param_hooks_t hooks; @@ -935,7 +936,23 @@ int save(struct sip_msg *_m, udomain_t *_d, int _cflags, str *_uri) int novariation = 0; - u = parse_to_uri(_m); + if(_uri->len > 0) { + if(extract_aor(_uri, &aor, &turi) < 0) { + LM_ERR("failed to extract Address Of Record\n"); + return -1; + } + u = &turi; + } else { + u = parse_to_uri(_m); + if(u == NULL) { + LM_ERR("failed to extract Address Of Record\n"); + return -1; + } + if(extract_aor(&(get_to(_m)->uri), &aor, NULL) < 0) { + LM_ERR("failed to extract Address Of Record\n"); + return -1; + } + } if(u == NULL) goto error;

1 0

git:master:29686758: auth_xkey: use memcpy() instead of strncpy()
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: master Commit: 29686758e1ce51abb8d8dd5bebb0d7fa1a019dc6 URL: https://github.com/kamailio/kamailio/commit/29686758e1ce51abb8d8dd5bebb0d7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T12:43:59+02:00 auth_xkey: use memcpy() instead of strncpy() --- Modified: src/modules/auth_xkeys/auth_xkeys.c --- Diff: https://github.com/kamailio/kamailio/commit/29686758e1ce51abb8d8dd5bebb0d7f… Patch: https://github.com/kamailio/kamailio/commit/29686758e1ce51abb8d8dd5bebb0d7f… --- diff --git a/src/modules/auth_xkeys/auth_xkeys.c b/src/modules/auth_xkeys/auth_xkeys.c index 9f63ed7b993..a89faa4ce31 100644 --- a/src/modules/auth_xkeys/auth_xkeys.c +++ b/src/modules/auth_xkeys/auth_xkeys.c @@ -250,10 +250,10 @@ int auth_xkeys_add(sip_msg_t *msg, str *hdr, str *key, str *alg, str *data) return -1; } - strncpy(xdata.s, hdr->s, hdr->len); + memcpy(xdata.s, hdr->s, hdr->len); xdata.s[hdr->len] = ':'; xdata.s[hdr->len + 1] = ' '; - strncpy(xdata.s + hdr->len + 2, xout, xdata.len); + memcpy(xdata.s + hdr->len + 2, xout, xdata.len); xdata.len += hdr->len + 2; xdata.s[xdata.len] = '\r'; xdata.s[xdata.len + 1] = '\n';

1 0

Kamailio v5.8.3 Released
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Hello, Kamailio SIP Server v5.8.3 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.2. 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.3. For more details about version 5.8.3 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2024/09/kamailio-v5-8-3-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 Advanced Training, October 8-10, 2024 -- asipto.com

1 0

git:5.8:6f8a04e8: ChangeLog: content updated for v5.8.3
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: 5.8 Commit: 6f8a04e8b05cf014ac2ac6b54103420f5da051eb URL: https://github.com/kamailio/kamailio/commit/6f8a04e8b05cf014ac2ac6b54103420… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T10:51:34+02:00 ChangeLog: content updated for v5.8.3 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/6f8a04e8b05cf014ac2ac6b54103420… Patch: https://github.com/kamailio/kamailio/commit/6f8a04e8b05cf014ac2ac6b54103420…

1 0

git:5.8:38b407b3: pkg/kamailio: version set 5.8.3 for rpms and alpine
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: 5.8 Commit: 38b407b353131b74032892e6eb0269731d00145f URL: https://github.com/kamailio/kamailio/commit/38b407b353131b74032892e6eb02697… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T09:49:20+02:00 pkg/kamailio: version set 5.8.3 for rpms and alpine --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/38b407b353131b74032892e6eb02697… Patch: https://github.com/kamailio/kamailio/commit/38b407b353131b74032892e6eb02697… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index f68763c8c3a..885ba533674 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.2 +pkgver=5.8.3 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 53831a5d27b..17a91dde0f2 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.8.2 +%define ver 5.8.3 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev