sr-dev August 2020

sr-dev@lists.kamailio.org

17 participants
245 discussions

[kamailio/kamailio] Extend get pcontact (#2426)
by alexyosifov 12 Aug '20

12 Aug '20

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2426 -- Commit Summary -- * ims_usrloc_pcscf: added a reverse searchin get_pcontact * ims_registrar_pcscf: update_contacts get received from req * ims_qos: extend get_pcontact with the new parameter. * ims_ipsec_pcscf: extend get_pcontact with the new parameter. -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (7) M src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml (5) M src/modules/ims_qos/cdpeventprocessor.c (2) M src/modules/ims_qos/ims_qos_mod.c (2) M src/modules/ims_qos/rx_aar.c (2) M src/modules/ims_registrar_pcscf/notify.c (2) M src/modules/ims_registrar_pcscf/save.c (20) M src/modules/ims_registrar_pcscf/service_routes.c (8) M src/modules/ims_usrloc_pcscf/udomain.c (20) M src/modules/ims_usrloc_pcscf/udomain.h (2) M src/modules/ims_usrloc_pcscf/usrloc.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2426.patch https://github.com/kamailio/kamailio/pull/2426.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/2426

2 6

git:master:89833d74: ims_ipsec_pcscf: fixed spelling issue
by Henning Westerholt 12 Aug '20

12 Aug '20

Module: kamailio Branch: master Commit: 89833d74d6c978512495e7e03b21e9f50e9f7af8 URL: https://github.com/kamailio/kamailio/commit/89833d74d6c978512495e7e03b21e9f… Author: alexyosifov <47529095+alexyosifov(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-08-12T20:44:08+02:00 ims_ipsec_pcscf: fixed spelling issue --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/89833d74d6c978512495e7e03b21e9f… Patch: https://github.com/kamailio/kamailio/commit/89833d74d6c978512495e7e03b21e9f… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index e63e9315de..f283528b1a 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -76,7 +76,7 @@ extern usrloc_api_t ul; extern struct tm_binds tmb; #define IPSEC_SEND_FORCE_SOCKET 0x01 /* if set - set send force socket for request messages */ -#define IPSEC_REVERSE_SEARCH 0x02 /* if set - start seraching from the last element */ +#define IPSEC_REVERSE_SEARCH 0x02 /* if set - start searching from the last element */ int bind_ipsec_pcscf(ipsec_pcscf_api_t* api) { if(!api){

1 0

git:master:2e112825: ims_registrar_pcscf: fix extraction of received host in save()
by Henning Westerholt 12 Aug '20

12 Aug '20

Module: kamailio Branch: master Commit: 2e11282502dce2b222d2884f308edf31fdd42d05 URL: https://github.com/kamailio/kamailio/commit/2e11282502dce2b222d2884f308edf3… Author: alexyosifov <47529095+alexyosifov(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-08-12T20:44:08+02:00 ims_registrar_pcscf: fix extraction of received host in save() --- Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/2e11282502dce2b222d2884f308edf3… Patch: https://github.com/kamailio/kamailio/commit/2e11282502dce2b222d2884f308edf3… --- diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index a16ba48091..9432574005 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -128,6 +128,7 @@ static inline int update_contacts(struct sip_msg *req,struct sip_msg *rpl, udoma char *alias_start, *p, *port_s, *proto_s; char portbuf[5]; str alias_s; + char srcip[50]; pcscf_act_time(); local_time_now = time_now; @@ -197,13 +198,7 @@ static inline int update_contacts(struct sip_msg *req,struct sip_msg *rpl, udoma } } } else { - char* srcip = NULL; - if((srcip = pkg_malloc(50)) == NULL) { - LM_ERR("Error allocating memory for source IP address\n"); - return -1; - } - - ci.received_host.len = ip_addr2sbuf(&req->rcv.src_ip, srcip, 50); + ci.received_host.len = ip_addr2sbuf(&req->rcv.src_ip, srcip, sizeof(srcip)); ci.received_host.s = srcip; ci.received_port = req->rcv.src_port; ci.received_proto = req->rcv.proto;

1 0

git:master:e10dc0db: ims_ipsec_pcscf: extend get_pcontact with the new parameter.
by Henning Westerholt 12 Aug '20

12 Aug '20

Module: kamailio Branch: master Commit: e10dc0db1b890d6ae2067f2fbff803ba8f816b68 URL: https://github.com/kamailio/kamailio/commit/e10dc0db1b890d6ae2067f2fbff803b… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-08-12T20:44:08+02:00 ims_ipsec_pcscf: extend get_pcontact with the new parameter. - added a new bitwise value for _cflags in ipsec_forward. - performing a reverse search for a contact in ipsec_forward if the new flag IPSEC_REVERSE_SEARCH is set. --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e10dc0db1b890d6ae2067f2fbff803b… Patch: https://github.com/kamailio/kamailio/commit/e10dc0db1b890d6ae2067f2fbff803b… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 16a62f8e6e..e63e9315de 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -76,6 +76,7 @@ extern usrloc_api_t ul; extern struct tm_binds tmb; #define IPSEC_SEND_FORCE_SOCKET 0x01 /* if set - set send force socket for request messages */ +#define IPSEC_REVERSE_SEARCH 0x02 /* if set - start seraching from the last element */ int bind_ipsec_pcscf(ipsec_pcscf_api_t* api) { if(!api){ @@ -663,7 +664,7 @@ int ipsec_create(struct sip_msg* m, udomain_t* d) ul.lock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); - if (ul.get_pcontact(d, &ci, &pcontact) != 0) { + if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0) { LM_ERR("Contact doesn't exist\n"); goto cleanup; } @@ -802,7 +803,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) ul.lock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); - if (ul.get_pcontact(d, &ci, &pcontact) != 0) { + if (ul.get_pcontact(d, &ci, &pcontact, _cflags & IPSEC_REVERSE_SEARCH) != 0) { LM_ERR("Contact doesn't exist\n"); goto cleanup; } @@ -946,7 +947,7 @@ int ipsec_destroy(struct sip_msg* m, udomain_t* d) ul.lock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); - if (ul.get_pcontact(d, &ci, &pcontact) != 0) { + if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0) { LM_ERR("Contact doesn't exist\n"); goto cleanup; } diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index 95b44f2c90..3d2a19efc9 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -243,8 +243,9 @@ ipsec_create("location"); stores the contacts. </para> <para> - <emphasis>flags</emphasis> - Set send force socket for request messages. - If 1 - set force socket for request messages. Useful for ipsec and TCP. + <emphasis>flags</emphasis> - bitwise flag: + 0x01 - set force socket for request messages. Useful for ipsec and TCP. + 0x02 - reverse search for a contact in the memory. Useful when contact alias is disabled. This is an optional parameter, default value - 0. </para> </listitem>

1 0

git:master:45ebf8bd: ims_qos: extend get_pcontact with the new parameter.
by Henning Westerholt 12 Aug '20

12 Aug '20

Module: kamailio Branch: master Commit: 45ebf8bd87c7ef23aed0461808cad25d8127db7f URL: https://github.com/kamailio/kamailio/commit/45ebf8bd87c7ef23aed0461808cad25… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-08-12T20:44:08+02:00 ims_qos: extend get_pcontact with the new parameter. --- Modified: src/modules/ims_qos/cdpeventprocessor.c Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/45ebf8bd87c7ef23aed0461808cad25… Patch: https://github.com/kamailio/kamailio/commit/45ebf8bd87c7ef23aed0461808cad25… --- diff --git a/src/modules/ims_qos/cdpeventprocessor.c b/src/modules/ims_qos/cdpeventprocessor.c index 8c31ef05ac..352c39396a 100644 --- a/src/modules/ims_qos/cdpeventprocessor.c +++ b/src/modules/ims_qos/cdpeventprocessor.c @@ -275,7 +275,7 @@ void cdp_cb_event_process() contact_info.aor = p_session_data->registration_aor; contact_info.reg_state = PCONTACT_ANY; - if (ul.get_pcontact(domain, &contact_info, &pcontact) != 0) { + if (ul.get_pcontact(domain, &contact_info, &pcontact, 0) != 0) { LM_DBG("no contact found for terminated Rx reg session..... ignoring\n"); } else { LM_DBG("Updating contact [%.*s] after Rx reg session terminated, setting state to PCONTACT_DEREG_PENDING_PUBLISH\n", pcontact->aor.len, pcontact->aor.s); diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index e58dd2c140..5fa584bcd7 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -1314,7 +1314,7 @@ static int w_rx_aar_register(struct sip_msg *msg, char* route, char* str1, char* contact_info.received_host.len = 0; contact_info.reg_state = PCONTACT_ANY; //search for any state - if (ul.get_pcontact(domain_t, &contact_info, &pcontact) != 0) { + if (ul.get_pcontact(domain_t, &contact_info, &pcontact, 0) != 0) { LM_ERR("This contact does not exist in PCSCF usrloc - error in cfg file\n"); ul.unlock_udomain(domain_t, &vb->host, vb->port, vb->proto); lock_release(saved_t_data->lock); diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index b1e8df51b8..987b5c22bd 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -321,7 +321,7 @@ void async_aar_reg_callback(int is_timeout, void *param, AAAMessage *aaa, long e contact_info.via_prot = local_data->via_proto; contact_info.reg_state = PCONTACT_ANY; - if (ul.get_pcontact(domain_t, &contact_info, &pcontact) != 0) { + if (ul.get_pcontact(domain_t, &contact_info, &pcontact, 0) != 0) { LM_ERR("Shouldn't get here, can't find contact....\n"); ul.unlock_udomain(domain_t, &local_data->via_host, local_data->via_port, local_data->via_proto); goto error;

1 0

git:master:3ee011fa: ims_registrar_pcscf: update_contacts get received from req
by Henning Westerholt 12 Aug '20

12 Aug '20

Module: kamailio Branch: master Commit: 3ee011fa21e2d24f0c9d110ec09ccb731c5859c7 URL: https://github.com/kamailio/kamailio/commit/3ee011fa21e2d24f0c9d110ec09ccb7… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-08-12T20:44:08+02:00 ims_registrar_pcscf: update_contacts get received from req - update_contacts - if the reply doesn't include contact alias get received info from the request. - extend get_pcontact eith the new parameter. --- Modified: src/modules/ims_registrar_pcscf/notify.c Modified: src/modules/ims_registrar_pcscf/save.c Modified: src/modules/ims_registrar_pcscf/service_routes.c --- Diff: https://github.com/kamailio/kamailio/commit/3ee011fa21e2d24f0c9d110ec09ccb7… Patch: https://github.com/kamailio/kamailio/commit/3ee011fa21e2d24f0c9d110ec09ccb7…

1 0

git:master:71b590f4: ims_usrloc_pcscf: added a reverse searchin get_pcontact
by Henning Westerholt 12 Aug '20

12 Aug '20

Module: kamailio Branch: master Commit: 71b590f446512a4b0b26de4654b195c82ae29aea URL: https://github.com/kamailio/kamailio/commit/71b590f446512a4b0b26de4654b195c… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-08-12T20:44:08+02:00 ims_usrloc_pcscf: added a reverse searchin get_pcontact - added a new parameter for reverse search in get_pcontact. --- Modified: src/modules/ims_usrloc_pcscf/udomain.c Modified: src/modules/ims_usrloc_pcscf/udomain.h Modified: src/modules/ims_usrloc_pcscf/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/71b590f446512a4b0b26de4654b195c… Patch: https://github.com/kamailio/kamailio/commit/71b590f446512a4b0b26de4654b195c…

1 0

[kamailio/kamailio] fix compilation without deprecated OpenSSL APIs (#2428)
by Rosen Penev 12 Aug '20

12 Aug '20

Signed-off-by: Rosen Penev <rosenp(a)gmail.com> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2428 -- Commit Summary -- * fix compilation without deprecated OpenSSL APIs -- File Changes -- M src/modules/tls/tls_domain.c (4) M src/modules/tls/tls_init.c (15) M src/modules/tls/tls_locking.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2428.patch https://github.com/kamailio/kamailio/pull/2428.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/2428

2 6

git:master:234b0223: tls: support compilation without deprecated OpenSSL APIs
by Daniel-Constantin Mierla 12 Aug '20

12 Aug '20

Module: kamailio Branch: master Commit: 234b02236b3ad13cdaf5624d11c727ad7d804747 URL: https://github.com/kamailio/kamailio/commit/234b02236b3ad13cdaf5624d11c727a… Author: Rosen Penev <rosenp(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-12T16:37:13+02:00 tls: support compilation without deprecated OpenSSL APIs - GH #2428 --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/234b02236b3ad13cdaf5624d11c727a… Patch: https://github.com/kamailio/kamailio/commit/234b02236b3ad13cdaf5624d11c727a… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index a8859c4a31..fc84033e68 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -27,6 +27,8 @@ #include <stdlib.h> #include <openssl/ssl.h> #include <openssl/opensslv.h> +#include <openssl/bn.h> +#include <openssl/dh.h> #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> @@ -61,7 +63,7 @@ static void setup_ecdh(SSL_CTX *ctx) { EC_KEY *ecdh; - if (SSLeay() < 0x1000005fL) { + if (OpenSSL_version_num() < 0x1000005fL) { return; } diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index b9288cbd9a..351ed4187e 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -627,14 +627,13 @@ int tls_h_mod_pre_init_f(void) return 0; } 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"); - OPENSSL_init_ssl(0, NULL); -#else +#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) LM_DBG("preparing tls env for modules initialization (libssl <=1.0)\n"); SSL_library_init(); -#endif SSL_load_error_strings(); +#else + LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n"); +#endif tls_mod_preinitialized=1; return 0; } @@ -668,7 +667,7 @@ int tls_h_mod_init_f(void) #if OPENSSL_VERSION_NUMBER < 0x00907000L LM_WARN("You are using an old version of OpenSSL (< 0.9.7). Upgrade!\n"); #endif - ssl_version=SSLeay(); + ssl_version=OpenSSL_version_num(); /* check if version have the same major minor and fix level * (e.g. 0.9.8a & 0.9.8c are ok, but 0.9.8 and 0.9.9x are not) * - values is represented as 0xMMNNFFPPS: major minor fix patch status @@ -680,7 +679,7 @@ int tls_h_mod_init_f(void) " compiled \"%s\" (0x%08lx).\n" " Please make sure a compatible version is used" " (tls_force_run in kamailio.cfg will override this check)\n", - SSLeay_version(SSLEAY_VERSION), ssl_version, + OpenSSL_version(OPENSSL_VERSION), ssl_version, OPENSSL_VERSION_TEXT, (long)OPENSSL_VERSION_NUMBER); if (cfg_get(tls, tls_cfg, force_run)) LM_WARN("tls_force_run turned on, ignoring " @@ -857,6 +856,7 @@ int tls_check_sockets(tls_domains_cfg_t* cfg) void tls_h_mod_destroy_f(void) { LM_DBG("tls module final tls destroy\n"); +#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) if(tls_mod_preinitialized > 0) ERR_free_strings(); /* TODO: free all the ctx'es */ @@ -869,4 +869,5 @@ void tls_h_mod_destroy_f(void) LM_DBG("executing openssl v1.1+ cleanup\n"); OPENSSL_cleanup(); #endif +#endif } diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 4e5bbcc5e3..3eb6f033a5 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -140,6 +140,8 @@ unsigned long sr_ssl_id_f() /* returns -1 on error, 0 on success */ int tls_init_locks() { +/* OpenSSL is thread-safe since 1.1.0 */ +#if OPENSSL_VERSION_NUMBER < 0x10100000L /* init "static" tls locks */ n_static_locks=CRYPTO_num_locks(); if (n_static_locks<0){ @@ -167,13 +169,10 @@ int tls_init_locks() CRYPTO_set_locking_callback(locking_f); } -/* OpenSSL is thread-safe since 1.1.0 */ -#if OPENSSL_VERSION_NUMBER < 0x10100000L /* set "dynamic" locks callbacks */ CRYPTO_set_dynlock_create_callback(dyn_create_f); CRYPTO_set_dynlock_lock_callback(dyn_lock_f); CRYPTO_set_dynlock_destroy_callback(dyn_destroy_f); -#endif /* starting with v1.0.0 openssl does not use anymore getpid(), but address * of errno which can point to same virtual address in a multi-process @@ -186,6 +185,7 @@ int tls_init_locks() * (only atomic_inc), fallback to the default use-locks mode * CRYPTO_set_add_lock_callback(atomic_add_f); */ +#endif return 0; error:

1 0

[kamailio/kamailio] siptrace: fix drop() usage in siptrace:msg event route (#2431)
by Nuno Ferreira 12 Aug '20

12 Aug '20

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  `ctx` was not getting initialized with the result of `run_top_route()` execution preventing `drop();` to work in the `siptrace:msg` event route You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2431 -- Commit Summary -- * siptrace: fix run_top_route() call to set ctx -- File Changes -- M src/modules/siptrace/siptrace.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2431.patch https://github.com/kamailio/kamailio/pull/2431.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/2431

2 3

← Newer
1
...
16
17
18
19
20
21
22
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2020