sr-dev October 2023

sr-dev@lists.kamailio.org

15 participants
286 discussions

git:master:f97149ae: dmq_usrloc: avoid needless second local socket search

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f97149aec9da71085df9dcf4541abba7b756939c URL: https://github.com/kamailio/kamailio/commit/f97149aec9da71085df9dcf4541abba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-25T18:31:21+02:00 dmq_usrloc: avoid needless second local socket search - remove overwriting local socket string value with received item --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/f97149aec9da71085df9dcf4541abba… Patch: https://github.com/kamailio/kamailio/commit/f97149aec9da71085df9dcf4541abba… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 61342cca2fe..8cbf63731c2 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -373,10 +373,6 @@ static int usrloc_dmq_execute_action(srjson_t *jdoc_action, dmq_node_t *node) sock = grep_sock_info(&host, (unsigned short)port, proto); if(sock == 0) { LM_DBG("non-local socket <%s>...ignoring\n", it->valuestring); - } else { - sock = grep_sock_info(&host, (unsigned short)port, proto); - sock->sock_str.s = it->valuestring; - sock->sock_str.len = strlen(sock->sock_str.s); } } else if(_dmq_usrloc_replicate_socket_info == DMQ_USRLOC_REPLICATE_SOCKNAME

1 year, 1 month

git:master:19a32b86: pv_headers: pvh_xavi_get_child() fix fallback logic

by Victor Seva

Module: kamailio Branch: master Commit: 19a32b863d9a79c0cbaf04a7a9864e0c08a914f7 URL: https://github.com/kamailio/kamailio/commit/19a32b863d9a79c0cbaf04a7a9864e0… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-25T18:29:50+02:00 pv_headers: pvh_xavi_get_child() fix fallback logic * don't fallback to Initial request headers for Replies --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/19a32b863d9a79c0cbaf04a7a9864e0… Patch: https://github.com/kamailio/kamailio/commit/19a32b863d9a79c0cbaf04a7a9864e0… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 441a2a664af..203c8b8be2a 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -285,7 +285,7 @@ sr_xavp_t *pvh_xavi_get_child(struct sip_msg *msg, str *xname, str *name) pvh_get_branch_xname(msg, xname, &br_xname); xavi = xavi_get_child(&br_xname, name); - if(xavi == NULL) { + if(xavi == NULL && msg->first_line.type == SIP_REQUEST) { if(cmp_str(xname, &br_xname) != 0) { xavi = xavi_get_child(xname, name); if(xavi) {

1 year, 1 month

git:master:dc42a189: modules: readme files regenerated - http_client ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: dc42a1892282ffb7a95f731224a9ae88ac16c17d URL: https://github.com/kamailio/kamailio/commit/dc42a1892282ffb7a95f731224a9ae8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-10-24T20:47:06+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/dc42a1892282ffb7a95f731224a9ae8… Patch: https://github.com/kamailio/kamailio/commit/dc42a1892282ffb7a95f731224a9ae8…

1 year, 1 month

git:master:b882db36: http_client: Add parameter timeout_mode (timeout in seconds or milliseconds)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b882db36bbb7f7f13366bcc8f1db9f50910d2c0c URL: https://github.com/kamailio/kamailio/commit/b882db36bbb7f7f13366bcc8f1db9f5… Author: Nicolas C <nchaigne(a)capgemini.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-24T20:36:39+02:00 http_client: Add parameter timeout_mode (timeout in seconds or milliseconds) A new parameter timeout_mode is added. This parameter defines if timeouts are enabled, and in which unit timeout values are expressed. - 0 - Timeouts are disabled. - 1 - Timeout values are in seconds (default). - 2 - Timeout values are in milliseconds. Implementation detail: default global timeout = 0 (unconfigured). Parse connections as usual. If they have a timeout configured, use it. In mod_init: if global timeout == 0 (unconfigured), and timeout_mode is 1 or 2: if timeout_mode == 1 -> global timeout = 4 (seconds) if timeout_mode == 2 -> global timeout = 4000 (milliseconds) for each connection "conn" (fixup): if timeout_mode is not 1 or 2 -> conn.timeout = 0 (to reflect the fact that no timeout will be handled) else if conn.timeout is not configured -> conn.timeout = global timeout (in seconds or milliseconds, depending on timeout_mode). When doing Curl requests (curL_request_url): if timeout_mode == 1: set CURLOPT_TIMEOUT if timeout_mode == 2: set CURLOPT_TIMEOUT_MS --- Modified: src/modules/http_client/curlcon.c Modified: src/modules/http_client/curlcon.h Modified: src/modules/http_client/doc/http_client_admin.xml Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/http_client.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/b882db36bbb7f7f13366bcc8f1db9f5… Patch: https://github.com/kamailio/kamailio/commit/b882db36bbb7f7f13366bcc8f1db9f5…

1 year, 1 month

[kamailio/kamailio] http_client: Add parameter timeout_mode (timeout in seconds or ms) (PR #3615)

by Nicolas C

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description A new parameter timeout_mode is added. This parameter defines if timeouts are enabled, and in which unit timeout values are expressed. - 0 - Timeouts are disabled. - 1 - Timeout values are in seconds (default). - 2 - Timeout values are in milliseconds. For reference, see discussion in: https://github.com/kamailio/kamailio/pull/3611 Implementation detail: ``` default global timeout = 0 (unconfigured). Parse connections as usual. If they have a timeout configured, use it. In mod_init: if global timeout == 0 (unconfigured), and timeout_mode is 1 or 2: if timeout_mode == 1 -> global timeout = 4 (seconds) if timeout_mode == 2 -> global timeout = 4000 (milliseconds) for each connection "conn" (fixup): if timeout_mode is not 1 or 2 -> conn.timeout = 0 (to reflect the fact that no timeout will be handled) else if conn.timeout is not configured -> conn.timeout = global timeout (in seconds or milliseconds, depending on timeout_mode). When doing Curl requests (curL_request_url): if timeout_mode == 1: set CURLOPT_TIMEOUT if timeout_mode == 2: set CURLOPT_TIMEOUT_MS ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3615 -- Commit Summary -- * http_client: Add parameter timeout_mode (timeout in seconds or milliseconds) -- File Changes -- M src/modules/http_client/curlcon.c (27) M src/modules/http_client/curlcon.h (14) M src/modules/http_client/doc/http_client_admin.xml (35) M src/modules/http_client/functions.c (21) M src/modules/http_client/http_client.c (32) M src/modules/http_client/http_client.h (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3615.patch https://github.com/kamailio/kamailio/pull/3615.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3615 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3615(a)github.com>

1 year, 1 month

[kamailio/kamailio] cdp: Add and apply cdp_openssl_clear_errors function (PR #3612)

by Xenofon Karamanos

- Add new function to clear OpenSSL errors prior to any SSL_* call - Apply function where appropriate   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR proposes similar fixes like https://github.com/kamailio/kamailio/pull/3607. OpenSSL docs suggest that the error stack must be empty for [SSL_get_error() to work reliably](https://www.openssl.org/docs/man3.0/man3/SSL_get_error.html). _Note: This has not been tested like previous PR and any feedback of course is appreciated._ You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3612 -- Commit Summary -- * cdp: Add and apply cdp_openssl_clear_errors function -- File Changes -- M src/modules/cdp/cdp_tls.c (2) M src/modules/cdp/receiver.c (3) A src/modules/cdp/utils.c (21) M src/modules/cdp/utils.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3612.patch https://github.com/kamailio/kamailio/pull/3612.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3612 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3612(a)github.com>

1 year, 1 month

git:master:4ec11b1a: cdp: Add and apply cdp_openssl_clear_errors function (#3612)

by GitHub

Module: kamailio Branch: master Commit: 4ec11b1a851d321959a0a38041bc7a6ea8107f39 URL: https://github.com/kamailio/kamailio/commit/4ec11b1a851d321959a0a38041bc7a6… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: GitHub <noreply(a)github.com> Date: 2023-10-24T20:07:36+02:00 cdp: Add and apply cdp_openssl_clear_errors function (#3612) * cdp: Add and apply cdp_openssl_clear_errors function - add new function to clear OpenSSL errors prior to any SSL_* call --- Modified: src/modules/cdp/cdp_tls.c Modified: src/modules/cdp/cdp_tls.h Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/4ec11b1a851d321959a0a38041bc7a6… Patch: https://github.com/kamailio/kamailio/commit/4ec11b1a851d321959a0a38041bc7a6… --- diff --git a/src/modules/cdp/cdp_tls.c b/src/modules/cdp/cdp_tls.c index 903445b676d..3f1c15fd182 100644 --- a/src/modules/cdp/cdp_tls.c +++ b/src/modules/cdp/cdp_tls.c @@ -164,6 +164,22 @@ int load_certificates(SSL_CTX *ctx, str *cert, str *key) return 0; } +/* + * Get any leftover errors from OpenSSL and print them. + * ERR_get_error() also removes the error from the OpenSSL error stack. + * This is useful to call before any SSL_* IO calls to make sure + * we don't have any leftover errors from previous calls (OpenSSL docs). + */ +void cdp_openssl_clear_errors(void) +{ + int i; + char err[256]; + while((i = ERR_get_error())) { + ERR_error_string(i, err); + LM_INFO("clearing leftover error before SSL_* calls: %s\n", err); + } +} + SSL *init_ssl_conn(int client_fd, SSL_CTX *ctx) { X509 *cert = NULL; @@ -184,6 +200,7 @@ SSL *init_ssl_conn(int client_fd, SSL_CTX *ctx) goto cleanup; } /* Perform the TLS handshake */ + cdp_openssl_clear_errors(); ssl_ret = SSL_connect(ssl); if(ssl_ret != 1) { error = SSL_get_error(ssl, ssl_ret); diff --git a/src/modules/cdp/cdp_tls.h b/src/modules/cdp/cdp_tls.h index b2e49408b34..a4981fbade9 100644 --- a/src/modules/cdp/cdp_tls.h +++ b/src/modules/cdp/cdp_tls.h @@ -67,6 +67,7 @@ static inline int tls_err_ret(char *s, SSL_CTX *ctx) } while(0) int tls_parse_method(str *method); +void cdp_openssl_clear_errors(void); void init_ssl_methods(void); SSL_CTX *init_ssl_ctx(int method); SSL *init_ssl_conn(int client_fd, SSL_CTX *ctx); diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index ceee98127f6..223d14dd403 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -537,6 +537,7 @@ static inline int do_read(serviced_peer_t *sp, char *dst, int n) char *err_str; if(sp->tls_conn) { + cdp_openssl_clear_errors(); cnt = SSL_read(sp->tls_conn, dst, n); if(unlikely(cnt < 0)) { ssl_err = SSL_get_error(sp->tls_conn, cnt); @@ -687,6 +688,7 @@ static int do_write(serviced_peer_t *sp, const void *buf, int num) char *err_str; if(sp->tls_conn) { + cdp_openssl_clear_errors(); cnt = SSL_write(sp->tls_conn, buf, num); if(unlikely(cnt <= 0)) { ssl_err = SSL_get_error(sp->tls_conn, cnt);

1 year, 1 month

git:master:16378fd6: core: use advertised proto to build lump-based recv/send values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 16378fd6435355749d9a6602769132be7ef0aa6d URL: https://github.com/kamailio/kamailio/commit/16378fd6435355749d9a6602769132b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-24T20:05:03+02:00 core: use advertised proto to build lump-based recv/send values --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/16378fd6435355749d9a6602769132b… Patch: https://github.com/kamailio/kamailio/commit/16378fd6435355749d9a6602769132b…

1 year, 1 month

git:master:558afc14: core: via builder can use proto from xavp fields or advertised address

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 558afc14d71913214fa11c926f66ec2337a1ec3a URL: https://github.com/kamailio/kamailio/commit/558afc14d71913214fa11c926f66ec2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-24T17:18:11+02:00 core: via builder can use proto from xavp fields or advertised address --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/558afc14d71913214fa11c926f66ec2… Patch: https://github.com/kamailio/kamailio/commit/558afc14d71913214fa11c926f66ec2… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index f3e2ce6c28b..019bd610a0d 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2825,6 +2825,7 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, char *comp_name; #endif /* USE_COMP */ int port; + int proto; struct ip_addr ip; union sockaddr_union *from = NULL; union sockaddr_union local_addr; @@ -2868,7 +2869,23 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, else port_str = &(send_sock->port_no_str); } - + proto = PROTO_NONE; + if(msg && (msg->msg_flags & FL_USE_XAVP_VIA_FIELDS) + && _ksr_xavp_via_fields.len > 0) { + xname.s = "proto"; + xname.len = 5; + rxavp = xavp_get_child_with_sval(&_ksr_xavp_via_fields, &xname); + if(rxavp != NULL) { + proto = get_valid_proto_id(&rxavp->val.v.s); + } + } + if(proto==PROTO_NONE) { + if(send_sock->useinfo.proto != PROTO_NONE) { + proto = send_sock->useinfo.proto; + } else { + proto = send_info->proto; + } + } comp_len = comp_name_len = 0; #ifdef USE_COMP comp_name = 0; @@ -2891,7 +2908,7 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, } #endif /* USE_COMP */ - via_prefix_len = MY_VIA_LEN + (send_info->proto == PROTO_SCTP); + via_prefix_len = MY_VIA_LEN + (proto == PROTO_SCTP); max_len = via_prefix_len + address_str->len /* space in MY_VIA */ + 2 /* just in case it is a v6 address ... [ ] */ + 1 /*':'*/ + port_str->len @@ -2910,15 +2927,15 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, via_len = via_prefix_len + address_str->len; /*space included in MY_VIA*/ memcpy(line_buf, MY_VIA, MY_VIA_LEN); - if(send_info->proto == PROTO_UDP) { + if(proto == PROTO_UDP) { /* do nothing */ - } else if(send_info->proto == PROTO_TCP) { + } else if(proto == PROTO_TCP) { memcpy(line_buf + MY_VIA_LEN - 4, "TCP ", 4); - } else if(send_info->proto == PROTO_TLS) { + } else if(proto == PROTO_TLS) { memcpy(line_buf + MY_VIA_LEN - 4, "TLS ", 4); - } else if(send_info->proto == PROTO_SCTP) { + } else if(proto == PROTO_SCTP) { memcpy(line_buf + MY_VIA_LEN - 4, "SCTP ", 5); - } else if(send_info->proto == PROTO_WS) { + } else if(proto == PROTO_WS) { if(unlikely(send_info->send_flags.f & SND_F_FORCE_SOCKET && send_info->send_sock)) { local_addr = send_info->send_sock->su; @@ -2957,10 +2974,10 @@ char *via_builder(unsigned int *len, sip_msg_t *msg, return 0; } tcpconn_put(con); - } else if(send_info->proto == PROTO_WSS) { + } else if(proto == PROTO_WSS) { memcpy(line_buf + MY_VIA_LEN - 4, "WSS ", 4); } else { - LM_CRIT("unknown proto %d\n", send_info->proto); + LM_CRIT("unknown proto %d\n", proto); pkg_free(line_buf); return 0; }

1 year, 1 month

git:master:296ed155: core: helper function to get proto id from str

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 296ed155be83bc854507892f944748cb8864b704 URL: https://github.com/kamailio/kamailio/commit/296ed155be83bc854507892f944748c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-24T17:16:16+02:00 core: helper function to get proto id from str --- Modified: src/core/ip_addr.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/296ed155be83bc854507892f944748c… Patch: https://github.com/kamailio/kamailio/commit/296ed155be83bc854507892f944748c… --- diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index bc42b4532d8..02c26f969d5 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -705,6 +705,44 @@ char *get_proto_name(unsigned int proto) } } +/** get protocol id from string value. + * @param protoval - protocol value + * @return int value of the protocol. + */ +int get_valid_proto_id(str *protoval) +{ + if(protoval == NULL || protoval->s == NULL || protoval->len <= 0) { + return PROTO_NONE; + } + switch(protoval->len) { + case 2: + if(strncasecmp(protoval->s, "ws", 2) == 0) { + return PROTO_WS; + } + break; + case 3: + if(strncasecmp(protoval->s, "udp", 3) == 0) { + return PROTO_UDP; + } + if(strncasecmp(protoval->s, "tcp", 3) == 0) { + return PROTO_TCP; + } + if(strncasecmp(protoval->s, "tls", 3) == 0) { + return PROTO_TLS; + } + if(strncasecmp(protoval->s, "wss", 3) == 0) { + return PROTO_WSS; + } + break; + case 4: + if(strncasecmp(protoval->s, "sctp", 4) == 0) { + return PROTO_SCTP; + } + break; + } + return PROTO_NONE; +} + /** get address family name (asciiz). * @param af - address family id * @return string with the adderess family name or "unknown". diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index c0067b56d2a..cec63fc4fa9 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -338,6 +338,7 @@ char *get_proto_name(unsigned int proto); int get_valid_proto_string( unsigned int iproto, int utype, int vtype, str *sproto); +int get_valid_proto_id(str *protoval); char *get_af_name(unsigned int af);

1 year, 1 month

← Newer
1
...
15
16
17
18
19
20
21
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2023