sr-dev

sr-dev@lists.kamailio.org

16 participants
45408 discussions

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev