sr-dev December 2023

sr-dev@lists.kamailio.org

14 participants
235 discussions

git:master:159282d6: cdp: add destination realm avp only if not present
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 159282d6bd05b73961037b753e0a9df5ac9cdbe3 URL: https://github.com/kamailio/kamailio/commit/159282d6bd05b73961037b753e0a9df… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:10:36+01:00 cdp: add destination realm avp only if not present --- Modified: src/modules/cdp/authstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/159282d6bd05b73961037b753e0a9df… Patch: https://github.com/kamailio/kamailio/commit/159282d6bd05b73961037b753e0a9df… --- diff --git a/src/modules/cdp/authstatemachine.c b/src/modules/cdp/authstatemachine.c index 4a8d6f12ed9..a5aadb1c274 100644 --- a/src/modules/cdp/authstatemachine.c +++ b/src/modules/cdp/authstatemachine.c @@ -751,7 +751,7 @@ void auth_server_stateless_sm_process( int dup_routing_avps(AAAMessage *src, AAAMessage *dest) { - AAA_AVP *avp; + AAA_AVP *avp, *avp2; str dest_realm; if(!src) @@ -782,18 +782,24 @@ int dup_routing_avps(AAAMessage *src, AAAMessage *dest) LM_DBG("dup_routing_avps: Origin Realm AVP present, duplicating %.*s\n", avp->data.len, avp->data.s); dest_realm = avp->data; - avp = AAACreateAVP(AVP_Destination_Realm, AAA_AVP_FLAG_MANDATORY, 0, - dest_realm.s, dest_realm.len, AVP_DUPLICATE_DATA); - if(!avp) { - LM_ERR("dup_routing_avps: Failed creating Destination Host avp\n"); - goto error; - } - if(AAAAddAVPToMessage(dest, avp, dest->avpList.tail) - != AAA_ERR_SUCCESS) { - LM_ERR("dup_routing_avps: Failed adding Destination Host avp to " - "message\n"); - AAAFreeAVP(&avp); - goto error; + avp2 = AAAFindMatchingAVP(src, src->avpList.head, AVP_Destination_Realm, + 0, AAA_FORWARD_SEARCH); + if(!avp2) { + avp = AAACreateAVP(AVP_Destination_Realm, AAA_AVP_FLAG_MANDATORY, 0, + dest_realm.s, dest_realm.len, AVP_DUPLICATE_DATA); + if(!avp) { + LM_ERR("dup_routing_avps: Failed creating Destination Realm " + "avp\n"); + goto error; + } + if(AAAAddAVPToMessage(dest, avp, dest->avpList.tail) + != AAA_ERR_SUCCESS) { + LM_ERR("dup_routing_avps: Failed adding Destination Realm avp " + "to " + "message\n"); + AAAFreeAVP(&avp); + goto error; + } } }

1 0

[kamailio/kamailio] cdp: fix disabled parts for openssl version newer than 1.1.0 (PR #3691)
by Supreeth Herle 28 Dec '23

28 Dec '23

#### 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) - [ ] 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  This PR fixes the disabled parts of the TLS code in cdp module which resulted in getting an error (**undefined symbol init_ssl_methods**) whenever cdp module was loaded and following openssl version was used. ``` openssl version OpenSSL 1.1.1f 31 Mar 2020 ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3691 -- Commit Summary -- * cdp: fix disabled parts for openssl version newer than 1.1.0 -- File Changes -- M src/modules/cdp/cdp_tls.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3691.patch https://github.com/kamailio/kamailio/pull/3691.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3691 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3691(a)github.com>

2 2

git:master:7b9e90e0: cdp: fix disabled parts for openssl version newer than 1.1.0
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 7b9e90e06f95b4192fb40ed2c4854a8554fac45b URL: https://github.com/kamailio/kamailio/commit/7b9e90e06f95b4192fb40ed2c4854a8… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:09:47+01:00 cdp: fix disabled parts for openssl version newer than 1.1.0 --- Modified: src/modules/cdp/cdp_tls.c --- Diff: https://github.com/kamailio/kamailio/commit/7b9e90e06f95b4192fb40ed2c4854a8… Patch: https://github.com/kamailio/kamailio/commit/7b9e90e06f95b4192fb40ed2c4854a8… --- diff --git a/src/modules/cdp/cdp_tls.c b/src/modules/cdp/cdp_tls.c index 3f1c15fd182..a3cfdfa9252 100644 --- a/src/modules/cdp/cdp_tls.c +++ b/src/modules/cdp/cdp_tls.c @@ -1,4 +1,3 @@ -#if OPENSSL_VERSION_NUMBER >= 0x10100000L #include "cdp_tls.h" cfg_option_t methods[] = {{"TLSv1", .val = TLS_USE_TLSv1}, @@ -14,6 +13,7 @@ cfg_option_t methods[] = {{"TLSv1", .val = TLS_USE_TLSv1}, tls_methods_t tls_methods[TLS_METHOD_MAX]; +#if OPENSSL_VERSION_NUMBER >= 0x10100000L void init_ssl_methods(void) { /* openssl 1.1.0+ */ @@ -76,10 +76,12 @@ void init_ssl_methods(void) tls_methods[TLS_USE_TLSv1_3_PLUS - 1].TLSMethodMin = TLS1_3_VERSION; #endif } +#endif /* * Convert TLS method string to integer */ +#if OPENSSL_VERSION_NUMBER >= 0x10100000L int tls_parse_method(str *m) { cfg_option_t *opt; @@ -95,7 +97,9 @@ int tls_parse_method(str *m) return opt->val; } +#endif +#if OPENSSL_VERSION_NUMBER >= 0x10100000L SSL_CTX *init_ssl_ctx(int method) { SSL_CTX *ctx; @@ -131,7 +135,9 @@ SSL_CTX *init_ssl_ctx(int method) } return ctx; } +#endif +#if OPENSSL_VERSION_NUMBER >= 0x10100000L int load_certificates(SSL_CTX *ctx, str *cert, str *key) { str cert_fixed = STR_NULL; @@ -163,6 +169,7 @@ int load_certificates(SSL_CTX *ctx, str *cert, str *key) } return 0; } +#endif /* * Get any leftover errors from OpenSSL and print them. @@ -170,6 +177,7 @@ int load_certificates(SSL_CTX *ctx, str *cert, str *key) * 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). */ +#if OPENSSL_VERSION_NUMBER >= 0x10100000L void cdp_openssl_clear_errors(void) { int i; @@ -179,7 +187,9 @@ void cdp_openssl_clear_errors(void) LM_INFO("clearing leftover error before SSL_* calls: %s\n", err); } } +#endif +#if OPENSSL_VERSION_NUMBER >= 0x10100000L SSL *init_ssl_conn(int client_fd, SSL_CTX *ctx) { X509 *cert = NULL; @@ -237,14 +247,18 @@ SSL *init_ssl_conn(int client_fd, SSL_CTX *ctx) return NULL; } +#endif +#if OPENSSL_VERSION_NUMBER >= 0x10100000L void cleanup_ssl(SSL_CTX *tls_ctx, SSL *tls_conn) { SSL_shutdown(tls_conn); SSL_free(tls_conn); SSL_CTX_free(tls_ctx); } +#endif +#if OPENSSL_VERSION_NUMBER >= 0x10100000L int to_ssl(SSL_CTX **tls_ctx_p, SSL **tls_conn_p, int tcp_sock, int method) { *tls_ctx_p = init_ssl_ctx(method); @@ -273,4 +287,4 @@ int to_ssl(SSL_CTX **tls_ctx_p, SSL **tls_conn_p, int tcp_sock, int method) } return 0; } -#endif \ No newline at end of file +#endif

1 0

[kamailio/kamailio] smsops: fix utf8 to ucs2 conversion (PR #3690)
by Supreeth Herle 28 Dec '23

28 Dec '23

#### Pre-Submission Checklist    - [x] 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  Fixes the conversion fro UTF-8 to UCS-2 conversion when SMS is sent with emojis You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3690 -- Commit Summary -- * smsops: fix utf8 to ucs2 conversion -- File Changes -- M src/modules/smsops/smsops_impl.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3690.patch https://github.com/kamailio/kamailio/pull/3690.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3690 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3690(a)github.com>

2 2

git:master:61d91d7a: smsops: fix utf8 to ucs2 conversion
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 61d91d7a684df73a328c3062653522a7439d4d61 URL: https://github.com/kamailio/kamailio/commit/61d91d7a684df73a328c3062653522a… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:08:38+01:00 smsops: fix utf8 to ucs2 conversion --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/61d91d7a684df73a328c3062653522a… Patch: https://github.com/kamailio/kamailio/commit/61d91d7a684df73a328c3062653522a… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 703092542b0..9ed55328d8e 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -606,17 +606,17 @@ int utf8_to_ucs2(char *utf8, int utf8_len, char *ucs2, int buffer_len) } else if((utf8_char & 0xF0) == 0xE0) { // Three-byte UTF-8 character codepoint = ((utf8_char & 0x0F) << 12) - | (((unsigned char)utf8[utf8_index + 1] & 0x3F) << 6) - | ((unsigned char)utf8[utf8_index + 2] & 0x3F); + | (((unsigned char)utf8[utf8_index] & 0x3F) << 6) + | ((unsigned char)utf8[utf8_index + 1] & 0x3F); utf8_index += 2; tmp_buff[ucs2_index++] = (uint8_t)(codepoint >> 8); tmp_buff[ucs2_index++] = (uint8_t)(codepoint & 0xFF); } else if((utf8_char & 0xF8) == 0xF0) { // Four-byte UTF-8 character codepoint = ((utf8_char & 0x07) << 18) - | (((unsigned char)utf8[utf8_index + 1] & 0x3F) << 12) - | (((unsigned char)utf8[utf8_index + 2] & 0x3F) << 6) - | ((unsigned char)utf8[utf8_index + 3] & 0x3F); + | (((unsigned char)utf8[utf8_index] & 0x3F) << 12) + | (((unsigned char)utf8[utf8_index + 1] & 0x3F) << 6) + | ((unsigned char)utf8[utf8_index + 2] & 0x3F); utf8_index += 3; // Convert to UCS-2 surrogate pair codepoint -= 0x10000;

1 0

[kamailio/kamailio] ims_ipsec_pcscf: reset destination URI after value is used to decide … (PR #3689)
by Supreeth Herle 28 Dec '23

28 Dec '23

…destination protocol to use   #### 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  This commits rearrange the place where destination URI was resetted. This was needed because the value was used to decide destination protocol to use. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3689 -- Commit Summary -- * ims_ipsec_pcscf: reset destination URI after value is used to decide destination protocol to use -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3689.patch https://github.com/kamailio/kamailio/pull/3689.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3689 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3689(a)github.com>

2 4

git:master:75de09f3: ims_ipsec_pcscf: reset destination URI after value is used to decide destination protocol to use
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 75de09f369abad7192c853e74c99741feadec619 URL: https://github.com/kamailio/kamailio/commit/75de09f369abad7192c853e74c99741… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:07:40+01:00 ims_ipsec_pcscf: reset destination URI after value is used to decide destination protocol to use --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/75de09f369abad7192c853e74c99741… Patch: https://github.com/kamailio/kamailio/commit/75de09f369abad7192c853e74c99741… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index de61ad7cf6b..47f9e401702 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -1016,13 +1016,6 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) // from URI //int uri_len = 4 /* strlen("sip:") */ + ci.via_host.len + 5 /* max len of port number */ ; - if(!(_cflags & IPSEC_NODSTURI_RESET) && (m->dst_uri.s != NULL)) { - LM_DBG("resetting dst uri [%.*s]\n", m->dst_uri.len, m->dst_uri.s); - pkg_free(m->dst_uri.s); - m->dst_uri.s = NULL; - m->dst_uri.len = 0; - } - if(_cflags & IPSEC_FORWARD_USEVIA) { vb = cscf_get_last_via(m); } @@ -1119,6 +1112,13 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) } } + if(!(_cflags & IPSEC_NODSTURI_RESET) && (m->dst_uri.s != NULL)) { + LM_DBG("resetting dst uri [%.*s]\n", m->dst_uri.len, m->dst_uri.s); + pkg_free(m->dst_uri.s); + m->dst_uri.s = NULL; + m->dst_uri.len = 0; + } + if(!(_cflags & IPSEC_NODSTURI_RESET)) { char buf[1024]; int buf_len;

1 0

[kamailio/kamailio] Dialogs loaded from the DB are no longer saved. (Issue #3669)
by Dennis 28 Dec '23

28 Dec '23

Hi ! ### Description I have а scenario where dialogs are saved at kamailio shutdown and loaded at startup, the dialog module related configuration: modparam("dialog", "db_url", DBURL) modparam("dialog", "db_mode", 3) When kamailio shut down first time all dialogs a saved in DB, upon startup they loaded as expected, but when in some resonable short time kamailio shutdowned again with active dialogs loaded at startup, they not saved in DB. I think this happens because the dialog dflags in load_dialog_info_from_db function set to zero after dialog loaded, so in update_dialog_dbinfo_unsafe such dialogs are ignored (no DLG_FLAG_NEW, no DLG_FLAG_CHANGED set). #### Debugging Data Before shutdown: kamcmd> dlg.list { h_entry: 521 h_id: 11463 ref: 2 call-id: 7z32YR9BCg from_uri: sip:XXXXX@[XXXX:XXXX:b081:1320::1:2c] to_uri: sip:YYYYY@[XXXX:XXXX:0:201d::a1] state: 4 start_ts: 1702137597 init_ts: 1702137595 end_ts: 0 duration: 18 timeout: 1702144797 lifetime: 7200 **dflags: 643** sflags: 0 iflags: 0 ..... After startup: kamcmd> dlg.list { h_entry: 521 h_id: 11463 ref: 2 call-id: 7z32YR9BCg from_uri: sip:XXXXX@[XXXX:XXXX:b081:1320::1:2c] to_uri: sip:YYYYY@[XXXX:XXXX:0:201d::a1] state: 4 start_ts: 1702137597 init_ts: 1702137636 end_ts: 0 duration: 46 timeout: 1702144798 lifetime: 7201 **dflags: 0** sflags: 0 iflags: 0 .... ### Possible Solutions At first glance, it's easy to set dlg->flags = DLG_FLAG_CHANGED (or may be to DLG_FLAG_NEW|DLG_FLAG_CHANGED) after loading from the database in load_dialog_info_from_db function, but I'm not sure if this could break anything else (e.g. DMQ). ### Additional Information * **Kamailio Version** - kamailio 5.7.2 (x86_64/linux) * **Operating System**: Ubuntu 18.04.6 LTS -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3669 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3669(a)github.com>

4 10

[kamailio/kamailio] Fixed saving dialogs on shutdown that are already loaded at startup in db_mode 3 (PR #3688)
by Dennis 28 Dec '23

28 Dec '23

…tartup when using db_mode 3 - The dialogs that loaded at startup are not saved in DB on shutdown, and so not loaded at restart, fixes issue #3669   #### 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/3688 -- Commit Summary -- * dialog: fixed saving dialogs on shutdown that are already loaded at startup when using db_mode 3 -- File Changes -- M src/modules/dialog/dlg_db_handler.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3688.patch https://github.com/kamailio/kamailio/pull/3688.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3688 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3688(a)github.com>

3 7

git:master:2d00ce54: dialog: fixed saving dialogs on shutdown that are already loaded at startup when using db_mode 3
by Daniel-Constantin Mierla 28 Dec '23

28 Dec '23

Module: kamailio Branch: master Commit: 2d00ce546bb0852dc1784d5bc2e794d06f919577 URL: https://github.com/kamailio/kamailio/commit/2d00ce546bb0852dc1784d5bc2e794d… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:06:12+01:00 dialog: fixed saving dialogs on shutdown that are already loaded at startup when using db_mode 3 - The dialogs that loaded at startup are not saved in DB on shutdown, and so not loaded at restart, fixes issue #3669 --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/2d00ce546bb0852dc1784d5bc2e794d… Patch: https://github.com/kamailio/kamailio/commit/2d00ce546bb0852dc1784d5bc2e794d… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index ecfd872504f..b6fe1afda6f 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -509,6 +509,9 @@ int load_dialog_info_from_db( get_ticks()); dlg->dflags = 0; + if(mode == 0 && dlg_db_mode == DB_MODE_SHUTDOWN) { + dlg->dflags |= DLG_FLAG_NEW; + } if(mode != 0) { if(loaded_extra < DLG_MAX_DB_LOAD_EXTRA) {

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2023