sr-dev December 2023

sr-dev@lists.kamailio.org

14 participants
234 discussions

git:5.7:b634dc7f: tls: init early the local lock for memory

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.7 Commit: b634dc7f4d8f1653502328488f0dded134547b54 URL: https://github.com/kamailio/kamailio/commit/b634dc7f4d8f1653502328488f0dded… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T12:37:26+01:00 tls: init early the local lock for memory - needed to done before mod param init_mode is set - runtime uses the modparam to do lock/unlock - #3668 (cherry picked from commit 1a9b0b63617afebcee2aecb3b2240d7684ecabc2) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/b634dc7f4d8f1653502328488f0dded… Patch: https://github.com/kamailio/kamailio/commit/b634dc7f4d8f1653502328488f0dded… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 6106cc7f884..57be9cad814 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -78,7 +78,7 @@ int ksr_tls_lock_init(void) { pthread_mutexattr_t attr; - if(!(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM)) { + if(ksr_tls_lock_shm != NULL) { return 0; } ksr_tls_lock_shm = (pthread_mutex_t *)shm_mallocxz(sizeof(pthread_mutex_t)); @@ -723,6 +723,11 @@ int tls_pre_init(void) LM_INFO("libssl linked mode: static\n"); #endif + if(ksr_tls_lock_init() < 0) { + LM_ERR("failed to init local lock\n"); + return -1; + } + /* * this has to be called before any function calling CRYPTO_malloc, * CRYPTO_malloc will set allow_customize in openssl to 0 @@ -770,6 +775,10 @@ int tls_h_mod_pre_init_f(void) LM_DBG("already mod pre-initialized\n"); return 0; } + if(ksr_tls_lock_init() < 0) { + LM_ERR("failed to init local lock\n"); + return -1; + } LM_DBG("preparing tls env for modules initialization\n"); #if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n");

1 year

git:master:1a9b0b63: tls: init early the local lock for memory

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1a9b0b63617afebcee2aecb3b2240d7684ecabc2 URL: https://github.com/kamailio/kamailio/commit/1a9b0b63617afebcee2aecb3b2240d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T12:34:56+01:00 tls: init early the local lock for memory - needed to done before mod param init_mode is set - runtime uses the modparam to do lock/unlock - #3668 --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/1a9b0b63617afebcee2aecb3b2240d7… Patch: https://github.com/kamailio/kamailio/commit/1a9b0b63617afebcee2aecb3b2240d7… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 7824245813b..9be5e1d4fab 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -78,7 +78,7 @@ int ksr_tls_lock_init(void) { pthread_mutexattr_t attr; - if(!(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM)) { + if(ksr_tls_lock_shm != NULL) { return 0; } ksr_tls_lock_shm = (pthread_mutex_t *)shm_mallocxz(sizeof(pthread_mutex_t)); @@ -721,6 +721,11 @@ int tls_pre_init(void) LM_INFO("libssl linked mode: static\n"); #endif + if(ksr_tls_lock_init() < 0) { + LM_ERR("failed to init local lock\n"); + return -1; + } + /* * this has to be called before any function calling CRYPTO_malloc, * CRYPTO_malloc will set allow_customize in openssl to 0 @@ -772,6 +777,10 @@ int tls_h_mod_pre_init_f(void) LM_DBG("already mod pre-initialized\n"); return 0; } + if(ksr_tls_lock_init() < 0) { + LM_ERR("failed to init local lock\n"); + return -1; + } LM_DBG("preparing tls env for modules initialization\n"); #if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n");

1 year

git:master:73536c5f: core: msg translator - consider af from advertise structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 73536c5fe93f6f4e41eb92de29d054a0ac38536b URL: https://github.com/kamailio/kamailio/commit/73536c5fe93f6f4e41eb92de29d054a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T12:21:40+01:00 core: msg translator - consider af from advertise structure --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/73536c5fe93f6f4e41eb92de29d054a… Patch: https://github.com/kamailio/kamailio/commit/73536c5fe93f6f4e41eb92de29d054a…

1 year

git:master:59592e04: core: consider af from advertise structure to build recv socket uri

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 59592e0499fbb61ec701a1d7901c357ff5ebc4a4 URL: https://github.com/kamailio/kamailio/commit/59592e0499fbb61ec701a1d7901c357… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:53:45+01:00 core: consider af from advertise structure to build recv socket uri --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/59592e0499fbb61ec701a1d7901c357… Patch: https://github.com/kamailio/kamailio/commit/59592e0499fbb61ec701a1d7901c357… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index c0a06b6af1a..a8504873073 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1341,6 +1341,7 @@ int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype) char *p; str ip, port; int len; + int af; str proto = STR_NULL; if(!uri || !m || !m->rcv.bind_address) { @@ -1385,8 +1386,13 @@ int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype) port.s = m->rcv.bind_address->useinfo.port_no_str.s; port.len = m->rcv.bind_address->useinfo.port_no_str.len; } + if(atype == 1 && m->rcv.bind_address->useinfo.address_str.len > 0) { + af = m->rcv.bind_address->useinfo.af; + } else { + af = m->rcv.src_ip.af; + } - len = 4 + ip.len + 2 * (m->rcv.src_ip.af == AF_INET6) + 1 + port.len; + len = 4 + ip.len + 2 * (af == AF_INET6) + 1 + port.len; if(proto.s) { len += TRANSPORT_PARAM_LEN; len += proto.len; @@ -1401,11 +1407,11 @@ int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype) memcpy(p, "sip:", 4); p += 4; - if(m->rcv.src_ip.af == AF_INET6) + if(af == AF_INET6) *p++ = '['; memcpy(p, ip.s, ip.len); p += ip.len; - if(m->rcv.src_ip.af == AF_INET6) + if(af == AF_INET6) *p++ = ']'; *p++ = ':';

1 year

git:master:faf24134: core: keep address family indication in advertised structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: faf24134a00c1b15933f22e8e7702ec8e0dba35d URL: https://github.com/kamailio/kamailio/commit/faf24134a00c1b15933f22e8e7702ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:43:02+01:00 core: keep address family indication in advertised structure --- Modified: src/core/ip_addr.h Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/faf24134a00c1b15933f22e8e7702ec… Patch: https://github.com/kamailio/kamailio/commit/faf24134a00c1b15933f22e8e7702ec… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index cec63fc4fa9..a8f9660b9c6 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -122,6 +122,7 @@ typedef struct advertise_info { str name; /* name - eg.: foo.bar or 10.0.0.1 */ int proto; /* protocol id */ + int af; /* address family based on [ ] around name */ unsigned short port_no; /* port number */ short port_pad; /* padding field */ str port_no_str; /* port number converted to string -- optimization*/ diff --git a/src/core/socket_info.c b/src/core/socket_info.c index caad839ee8f..3f67f16981b 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -336,6 +336,7 @@ static inline struct socket_info *new_sock_info(char *name, if(usename[0] == '[' && usename[si->useinfo.name.len - 1] == ']') { si->useinfo.address_str.len = si->useinfo.name.len - 2; p = si->useinfo.name.s + 1; + si->useinfo.af = AF_INET6; } else { si->useinfo.address_str.len = si->useinfo.name.len; p = si->useinfo.name.s;

1 year

git:master:975bbde5: core: use advertise proto when building get_rcv_socket_uri()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 975bbde5aa0fd4c2ef4063d906e125911d162ed6 URL: https://github.com/kamailio/kamailio/commit/975bbde5aa0fd4c2ef4063d906e1259… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:36:32+01:00 core: use advertise proto when building get_rcv_socket_uri() --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/975bbde5aa0fd4c2ef4063d906e1259… Patch: https://github.com/kamailio/kamailio/commit/975bbde5aa0fd4c2ef4063d906e1259… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 5d2e799d69d..c0a06b6af1a 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1341,31 +1341,32 @@ int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype) char *p; str ip, port; int len; - str proto; + str proto = STR_NULL; if(!uri || !m || !m->rcv.bind_address) { ERR("invalid parameter value\n"); return -1; } - if(tmode == 0) { - switch(m->rcv.proto) { - case PROTO_NONE: - case PROTO_UDP: - proto.s = - 0; /* Do not add transport parameter, UDP is default */ - proto.len = 0; - break; - default: - if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto) < 0) { - ERR("unknown transport protocol\n"); - return -1; - } - } + if((tmode == 0) + && (m->rcv.proto == PROTO_NONE || m->rcv.proto == PROTO_UDP)) { + /* do not add transport parameter, UDP is default */ + proto.s = NULL; + proto.len = 0; } else { - if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto) < 0) { - ERR("unknown transport protocol\n"); - return -1; + if(atype == 0 || m->rcv.bind_address->useinfo.address_str.len <= 0 + || m->rcv.bind_address->useinfo.proto == PROTO_NONE) { + if(get_valid_proto_string(m->rcv.proto, 1, 0, &proto) < 0) { + ERR("unknown transport protocol\n"); + return -1; + } + } else { + if(get_valid_proto_string( + m->rcv.bind_address->useinfo.proto, 1, 0, &proto) + < 0) { + ERR("unknown transport protocol\n"); + return -1; + } } }

1 year

git:master:b02a38e6: pv: support for Diversion header in $hfl() and $hflc()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b02a38e66d3bd198e75103727130906b2ff9786c URL: https://github.com/kamailio/kamailio/commit/b02a38e66d3bd198e75103727130906… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:04:27+01:00 pv: support for Diversion header in $hfl() and $hflc() --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/b02a38e66d3bd198e75103727130906… Patch: https://github.com/kamailio/kamailio/commit/b02a38e66d3bd198e75103727130906… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index ff6e23f811a..4b8f98bcfd3 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1100,7 +1100,7 @@ int pv_get_diversion(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) } if(param->pvn.u.isname.name.n == 1) { /* uri */ - return pv_get_strval(msg, param, res, &(get_diversion(msg)->uri)); + return pv_get_strval(msg, param, res, &(get_diversion(msg)->id->uri)); } if(param->pvn.u.isname.name.n == 2) { /* reason param */ @@ -2090,6 +2090,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) via_body_t *vb = NULL; rr_t *rrb = NULL; contact_t *cb = NULL; + diversion_body_t *db = NULL; p_id_body_t *ppib = NULL; p_id_body_t *paib = NULL; hdr_field_t *hf = NULL; @@ -2340,6 +2341,58 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); } + if((tv.flags == 0) && (tv.ri == HDR_DIVERSION_T)) { + if(msg->diversion == NULL) { + LM_WARN("no Diversion header\n"); + return pv_get_null(msg, param, res); + } + + if(parse_diversion_header(msg) < 0) { + LM_WARN("failed to parse Diversion headers\n"); + return pv_get_null(msg, param, res); + } + + db = (diversion_body_t *)msg->diversion->parsed; + n = 0; + + while(db != NULL) { + n += db->num_ids; + db = db->next; + } + + if(idx < 0) { + idx = -idx; + if(idx > n) { + LM_WARN("index out of range\n"); + return pv_get_null(msg, param, res); + } + idx = n - idx; + } + + n = 0; + db = (diversion_body_t *)msg->diversion->parsed; + /* loop through all parsed Diversion headers lists */ + while(db != NULL) { + if(n + db->num_ids > idx) { + /* Calculate the index within this specific list */ + int innerIndex = idx - n; + + /* Access the desired element within this list */ + sval.s = db->id[innerIndex].body.s; + sval.len = db->id[innerIndex].body.len; + trim(&sval); + res->rs = sval; + return 0; + } + + /* Move to the next Diversion header list */ + n += db->num_ids; + db = db->next; + } + LM_DBG("unexpected diversion index out of range\n"); + return pv_get_null(msg, param, res); + } + if((tv.flags == 0) && (tv.ri == HDR_PPI_T)) { if(msg->ppi == NULL) { LM_DBG("no PPI header\n"); @@ -2563,6 +2616,25 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_sintval(msg, param, res, n); } + if((tv.flags == 0) && (tv.ri == HDR_DIVERSION_T)) { + if(msg->diversion == NULL) { + LM_DBG("no Diversion header\n"); + return pv_get_sintval(msg, param, res, 0); + } + if(parse_diversion_header(msg) < 0) { + LM_DBG("failed to parse Diversion headers\n"); + return pv_get_sintval(msg, param, res, 0); + } + + diversion_body_t *db = (diversion_body_t *)msg->diversion->parsed; + int diversion_body_count = 0; + while(db != NULL) { + diversion_body_count += db->num_ids; + db = db->next; + } + return pv_get_sintval(msg, param, res, diversion_body_count); + } + if((tv.flags == 0) && (tv.ri == HDR_PPI_T)) { if(msg->ppi == NULL) { LM_DBG("no PPI header\n");

1 year

git:master:ced8d46e: core: parser extended to handle diversion with multiple bodies

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ced8d46eddb2bda614eaace98437b7dab2d123e3 URL: https://github.com/kamailio/kamailio/commit/ced8d46eddb2bda614eaace98437b7d… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T11:01:39+01:00 core: parser extended to handle diversion with multiple bodies - similar to PAI and PPI --- Modified: src/core/parser/hf.c Modified: src/core/parser/parse_diversion.c Modified: src/core/parser/parse_diversion.h --- Diff: https://github.com/kamailio/kamailio/commit/ced8d46eddb2bda614eaace98437b7d… Patch: https://github.com/kamailio/kamailio/commit/ced8d46eddb2bda614eaace98437b7d…

1 year

[kamailio/kamailio] lib: big integers should not be treated as negative ones (#2106)

by Ivan Murashko

0xffffffff00000000ULL mask does not take into consideration signed 32 bit integers and as result 2147483648 will be stored as -2147483648. Another mask should be used to correct the issue: 0xffffffff80000000ULL. It processes correctly the case of integers that are greater than 2147483647. There are several gdb tests below: (gdb) p ((unsigned long long)2147483648 & 0xffffffff80000000ULL) $1= 2147483648 (gdb) p ((unsigned long long)2147483647 & 0xffffffff80000000ULL) $2 = 0 (gdb) p ((unsigned long long)2147483646 & 0xffffffff80000000ULL) $3 = 0 (gdb) p ((unsigned long long)4147483646 & 0xffffffff80000000ULL) $4 = 2147483648   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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/2106 -- Commit Summary -- * lib: big integers should not be treated as negative ones -- File Changes -- M src/lib/srdb1/db_ut.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2106.patch https://github.com/kamailio/kamailio/pull/2106.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/2106

1 year

git:master:6d14b4e4: lib/srdb1: rework store of long long values as number if value fits

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6d14b4e439aec3d046addfa776a4be5f471a33f0 URL: https://github.com/kamailio/kamailio/commit/6d14b4e439aec3d046addfa776a4be5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-08T10:23:20+01:00 lib/srdb1: rework store of long long values as number if value fits - GH #2106 --- Modified: src/lib/srdb1/db_ut.c --- Diff: https://github.com/kamailio/kamailio/commit/6d14b4e439aec3d046addfa776a4be5… Patch: https://github.com/kamailio/kamailio/commit/6d14b4e439aec3d046addfa776a4be5… --- diff --git a/src/lib/srdb1/db_ut.c b/src/lib/srdb1/db_ut.c index c7a8887044e..9975672aeea 100644 --- a/src/lib/srdb1/db_ut.c +++ b/src/lib/srdb1/db_ut.c @@ -610,11 +610,16 @@ int db_val2pv_spec(struct sip_msg *msg, db_val_t *dbval, pv_spec_t *pvs) pv.rs.len = LL_LEN; db_longlong2str(dbval->val.ll_val, ll_buf, &pv.rs.len); pv.rs.s = ll_buf; - /* if it fits, also store as 32 bit integer*/ - if(!((unsigned long long)dbval->val.ll_val - & 0xffffffff00000000ULL)) { + /* if it fits, also store as long number */ + if(sizeof(long long) == sizeof(long)) { pv.flags |= PV_VAL_INT | PV_TYPE_INT; - pv.ri = (int)dbval->val.ll_val; + pv.ri = (long)dbval->val.ll_val; + } else { + if(dbval->val.ll_val >= LONG_MIN + && dbval->val.ll_val <= LONG_MAX) { + pv.flags |= PV_VAL_INT | PV_TYPE_INT; + pv.ri = (long)dbval->val.ll_val; + } } break; default:

1 year

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2023