sr-dev January 2025

sr-dev@lists.kamailio.org

21 participants
296 discussions

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

21 Jan '25

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

1 0

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

21 Jan '25

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

1 0

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

21 Jan '25

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

1 0

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

21 Jan '25

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

1 0

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

21 Jan '25

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

4 5

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

20 Jan '25

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

3 4

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

20 Jan '25

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

1 0

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

20 Jan '25

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

1 0

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

20 Jan '25

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

1 0

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

20 Jan '25

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

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2025