sr-dev February 2025

sr-dev@lists.kamailio.org

9 participants
163 discussions

[kamailio/kamailio] tls: Create one shared context and reuse it. (PR #3972)
by Xenofon Karamanos 17 Feb '25

17 Feb '25

#### 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 - [x] Related to issue #3823 #### Description  This PR aims to implement what was discussed in [mailing list](https://lists.kamailio.org/mailman3/hyperkitty/list/sr-dev@lists.kama… regarding some `tls.reload` and increasing memory usage. It adds a new parameter `enable_shared_ctx` in `tls` module that if set to 0, preserves the old behavior and if set to 1 (other than 0 tbh), it creates a single SSL context that is being shared. This have the effect of using way less memory when initialized as well, but also minimizes (can't say it fixes the problem) the `tls.reload` memory increase. I have also added a small markdown (comparison.md) file, where some comparisons where made between enabled/disabled shared context and with/without CA file (where the initial problem was occurring by the reporter). Feedback would be necessary to verify whether this patch, acts as expected and kamailio works as intented. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3972 -- Commit Summary -- * tls: Add parameter for shared contexts * tls: Comparison for enable_shared_ctx -- File Changes -- A comparison.md (15) M src/modules/tls/tls_domain.c (172) M src/modules/tls/tls_mod.c (11) M src/modules/tls/tls_mod.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3972.patch https://github.com/kamailio/kamailio/pull/3972.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3972 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3972(a)github.com>

4 8

[kamailio/kamailio] core: local TCP socket is bound on listening address (PR #3925)
by sergey-safarov 17 Feb '25

17 Feb '25

#### 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description As a local IP address for TCP sending operation the Kamailio service is taking the same network_interface/IP_address, which is used by the service for TCP listening. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3925 -- Commit Summary -- * core: local TCP socket is bound on listening address -- File Changes -- M src/core/tcp_main.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3925.patch https://github.com/kamailio/kamailio/pull/3925.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3925 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3925(a)github.com>

5 13

git:master:5d3ae2ac: dialog: set keepalive local cseq value to 0
by Daniel-Constantin Mierla 16 Feb '25

16 Feb '25

Module: kamailio Branch: master Commit: 5d3ae2acfab38eda88c6369c0db18a286faba2e3 URL: https://github.com/kamailio/kamailio/commit/5d3ae2acfab38eda88c6369c0db18a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-16T12:06:57+01:00 dialog: set keepalive local cseq value to 0 --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/5d3ae2acfab38eda88c6369c0db18a2… Patch: https://github.com/kamailio/kamailio/commit/5d3ae2acfab38eda88c6369c0db18a2… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index 25dbae3a54c..62b6aea1a9c 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -787,7 +787,7 @@ int dlg_send_ka(dlg_cell_t *dlg, int dir) if(di->loc_seq.value > 1) di->loc_seq.value -= 2; else - di->loc_seq.value -= 1; + di->loc_seq.value = 0; LM_DBG("sending OPTIONS to %s\n", (dir == DLG_CALLER_LEG) ? "caller" : "callee");

1 0

git:master:413c9020: core: socket info - print index values in error message for overflow
by Daniel-Constantin Mierla 16 Feb '25

16 Feb '25

Module: kamailio Branch: master Commit: 413c90202975886f4dfcb579a1157a19c3065341 URL: https://github.com/kamailio/kamailio/commit/413c90202975886f4dfcb579a1157a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-16T10:36:57+01:00 core: socket info - print index values in error message for overflow --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/413c90202975886f4dfcb579a1157a1… Patch: https://github.com/kamailio/kamailio/commit/413c90202975886f4dfcb579a1157a1… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 4fd44fec2dc..dac3f08a6e6 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1453,22 +1453,22 @@ static int get_flags(int family) } while(1) { - if(sizeof(buf) <= nll) { - LM_ERR("netlink buffer overflow in get_flags"); - 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; } + if(nll >= sizeof(buf) - rtn) { + LM_ERR("netlink buffer overflow [%u/%d]\n", nll, rtn); + goto error; + } nlp = (struct nlmsghdr *)p; if(nlp->nlmsg_type == NLMSG_DONE) { LM_DBG("done\n"); break; } if(nlp->nlmsg_type == NLMSG_ERROR) { - LM_DBG("Error on message to netlink"); + LM_DBG("error on message to netlink"); break; } p += rtn;

1 0

git:master:6b7af1be: registrar: remove unnecessary condition
by Daniel-Constantin Mierla 16 Feb '25

16 Feb '25

Module: kamailio Branch: master Commit: 6b7af1beb7fdaaec1b5d069fdfff3e3af5ca43ca URL: https://github.com/kamailio/kamailio/commit/6b7af1beb7fdaaec1b5d069fdfff3e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-16T10:23:18+01:00 registrar: remove unnecessary condition --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/6b7af1beb7fdaaec1b5d069fdfff3e3… Patch: https://github.com/kamailio/kamailio/commit/6b7af1beb7fdaaec1b5d069fdfff3e3… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 1709868f8e6..5ec02909ba6 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -955,8 +955,6 @@ int save(struct sip_msg *_m, udomain_t *_d, int _cflags, str *_uri) return -1; } } - if(u == NULL) - goto error; rerrno = R_FINE; ret = 1;

1 0

git:master:bf0cb8dd: ims_auth: restructured function to avoid unnecessary condition
by Daniel-Constantin Mierla 16 Feb '25

16 Feb '25

Module: kamailio Branch: master Commit: bf0cb8dd85c38c00435bfe6591b4b39b717b743c URL: https://github.com/kamailio/kamailio/commit/bf0cb8dd85c38c00435bfe6591b4b39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-16T10:19:53+01:00 ims_auth: restructured function to avoid unnecessary condition --- Modified: src/modules/ims_auth/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/bf0cb8dd85c38c00435bfe6591b4b39… Patch: https://github.com/kamailio/kamailio/commit/bf0cb8dd85c38c00435bfe6591b4b39… --- diff --git a/src/modules/ims_auth/authorize.c b/src/modules/ims_auth/authorize.c index 0d16e658893..6fa9937cb68 100644 --- a/src/modules/ims_auth/authorize.c +++ b/src/modules/ims_auth/authorize.c @@ -1999,17 +1999,14 @@ int drop_auth_vectors(str private_identity, str public_identity) { auth_userdata *aud; aud = get_auth_userdata(private_identity, public_identity); - if(!aud) - goto error; + if(!aud) { + LM_DBG("no authdata to drop any auth vectors\n"); + return 0; + } drop_auth_vectors_for_userdata(aud); auth_data_unlock(aud->hash); return 1; -error: - LM_DBG("no authdata to drop any auth vectors\n"); - if(aud) - auth_data_unlock(aud->hash); - return 0; } void drop_auth_vectors_for_userdata(auth_userdata *aud)

1 0

git:master:aae4cb32: db_redis: clean the keyname variable
by Daniel-Constantin Mierla 15 Feb '25

15 Feb '25

Module: kamailio Branch: master Commit: aae4cb323d4ea9d07b4b8aec61a6c9bc03e2ab83 URL: https://github.com/kamailio/kamailio/commit/aae4cb323d4ea9d07b4b8aec61a6c9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-15T15:28:35+01:00 db_redis: clean the keyname variable --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/aae4cb323d4ea9d07b4b8aec61a6c9b… Patch: https://github.com/kamailio/kamailio/commit/aae4cb323d4ea9d07b4b8aec61a6c9b… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 7f1d5720bd6..ac8b40756ec 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -616,7 +616,10 @@ static int db_redis_build_type_keys(km_redis_con_t *con, const str *table_name, if(set_keys) { // add key for parent set // <version>:<table>::index::<type> - pkg_free(keyname.s); + if(keyname.s) { + pkg_free(keyname.s); + keyname.s = NULL; + } keyname.len = table->version_code.len + table_name->len + 9 + type->type.len; keyname.s = pkg_malloc(keyname.len + 1); @@ -630,12 +633,16 @@ static int db_redis_build_type_keys(km_redis_con_t *con, const str *table_name, type->type.s); if(db_redis_key_add_str(set_keys, &keyname) != 0) { LM_ERR("Failed to add query key to set key list\n"); + pkg_free(keyname.s); + keyname.s = NULL; goto err; } } } - if(keyname.s) + if(keyname.s) { pkg_free(keyname.s); + keyname.s = NULL; + } } return 0;

1 0

git:master:d029de63: tsilo: free duplicated ruri and contact on error cases
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: d029de6380f8e30e0c82435b820744c21a5fbc78 URL: https://github.com/kamailio/kamailio/commit/d029de6380f8e30e0c82435b820744c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 tsilo: free duplicated ruri and contact on error cases --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/d029de6380f8e30e0c82435b820744c… Patch: https://github.com/kamailio/kamailio/commit/d029de6380f8e30e0c82435b820744c… --- diff --git a/src/modules/tsilo/tsilo.c b/src/modules/tsilo/tsilo.c index 6af49d59dd3..4e3c3501359 100644 --- a/src/modules/tsilo/tsilo.c +++ b/src/modules/tsilo/tsilo.c @@ -642,27 +642,33 @@ static int w_ts_append_by_contact3( if(ts_check_uri(&ruri) < 0) { LM_ERR("failed to parse R-URI.\n"); + pkg_free(ruri.s); return -1; } /* parse Contact header */ if(fixup_get_svalue(_msg, (gparam_t *)_contact, &contact_fixed) != 0) { LM_ERR("failed to convert contact parameter\n"); + pkg_free(ruri.s); return -1; } if(contact_fixed.s == NULL || contact_fixed.len <= 0) { LM_ERR("invalid contact parameter value\n"); + pkg_free(ruri.s); return -1; } if(pkg_str_dup(&contact, &contact_fixed) < 0) { LM_ERR("failed to copy r-uri parameter\n"); + pkg_free(ruri.s); return -1; } if(ts_check_uri(&contact) < 0) { LM_ERR("failed to parse Contact parameter.\n"); + pkg_free(ruri.s); + pkg_free(contact.s); return -1; } @@ -687,16 +693,22 @@ static int ki_ts_append_by_contact_uri( int rc; /* parse R-URI */ - if(ts_check_uri(_ruri) < 0) + if(ts_check_uri(_ruri) < 0) { return -1; - if(pkg_str_dup(&ruri, _ruri) < 0) + } + if(pkg_str_dup(&ruri, _ruri) < 0) { return -1; + } /* parse Contact header */ - if(ts_check_uri(_contact) < 0) + if(ts_check_uri(_contact) < 0) { + pkg_free(ruri.s); return -1; - if(pkg_str_dup(&contact, _contact) < 0) + } + if(pkg_str_dup(&contact, _contact) < 0) { + pkg_free(ruri.s); return -1; + } /* contact must be of syntax: sip:<user>@<host>:<port> with no parameters list */ rc = ts_append(_msg, &ruri, &contact, _table->s);

1 0

git:master:6a2a8255: dlgs: return -1 for 0 tags count
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 6a2a82555ee8bbfaca1e825c19d1532f22c2c629 URL: https://github.com/kamailio/kamailio/commit/6a2a82555ee8bbfaca1e825c19d1532… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 dlgs: return -1 for 0 tags count --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6a2a82555ee8bbfaca1e825c19d1532… Patch: https://github.com/kamailio/kamailio/commit/6a2a82555ee8bbfaca1e825c19d1532… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index f06c9d0ceaa..041356cedb1 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -341,7 +341,7 @@ static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags) int ret; ret = dlgs_tags_count(msg, vtags); - return (ret <= 0) ? (ret - 1) : ret; + return (ret == 0 || ret == -1) ? (ret - 1) : ret; } /**

1 0

git:master:39ba53a2: http_client: free dumplicated name in case of errors
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: 39ba53a2499dd1f0e080bb011d7438a60ea5faec URL: https://github.com/kamailio/kamailio/commit/39ba53a2499dd1f0e080bb011d7438a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T12:40:57+01:00 http_client: free dumplicated name in case of errors --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/39ba53a2499dd1f0e080bb011d7438a… Patch: https://github.com/kamailio/kamailio/commit/39ba53a2499dd1f0e080bb011d7438a… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index 16dfb6cc09b..3582ecde199 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -582,21 +582,29 @@ int curl_parse_conn(void *param, cfg_parser_t *parser, unsigned int flags) t.start.line, t.start.col); return -1; } - pkg_str_dup(&name, &t.val); + if(pkg_str_dup(&name, &t.val) < 0) { + return -1; + } ret = cfg_get_token(&t, parser, 0); - if(ret < 0) + if(ret < 0) { + pkg_free(name.s); return -1; + } if((ret > 0) || (t.type != ']')) { LM_ERR("%s:%d:%d: Syntax error, ']' expected\n", parser->file, t.start.line, t.start.col); + pkg_free(name.s); return -1; } - if(cfg_eat_eol(parser, flags)) + if(cfg_eat_eol(parser, flags)) { + pkg_free(name.s); return -1; + } raw_cc = pkg_malloc(sizeof(raw_http_client_conn_t)); if(raw_cc == NULL) { + pkg_free(name.s); return -1; } memset(raw_cc, 0, sizeof(raw_http_client_conn_t));

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2025