sr-dev June 2022

sr-dev@lists.kamailio.org

20 participants
282 discussions

git:master:0bc56bd1: ims_ipsec_pcscf: new option to skip resetting the dst uri in ipsec_forward()
by Daniel-Constantin Mierla 01 Jun '22

01 Jun '22

Module: kamailio Branch: master Commit: 0bc56bd13b343057a62177b1b77e9aa82ae00155 URL: https://github.com/kamailio/kamailio/commit/0bc56bd13b343057a62177b1b77e9aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-01T12:58:07+02:00 ims_ipsec_pcscf: new option to skip resetting the dst uri in ipsec_forward() --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/0bc56bd13b343057a62177b1b77e9aa… Patch: https://github.com/kamailio/kamailio/commit/0bc56bd13b343057a62177b1b77e9aa… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 480191cb44..8fa4d9cf23 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -86,6 +86,8 @@ extern struct tm_binds tmb; #define IPSEC_RURIADDR_SEARCH (1<<3) /* if set - do not use alias for IPSec tunnel received details */ #define IPSEC_NOALIAS_SEARCH (1<<4) +/* if set - do not reset dst uri for IPsec forward */ +#define IPSEC_NODSTURI_RESET (1<<5) /* if set - delete unused tunnels before every registration */ #define IPSEC_CREATE_DELETE_UNUSED_TUNNELS 0x01 @@ -893,14 +895,13 @@ 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(m->dst_uri.s) { - LM_DBG("resetting dst uri\n"); + 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; } - char buf[1024]; if(m->first_line.type == SIP_REPLY) { // for Reply get the dest proto from the received request dst_proto = req->rcv.proto; @@ -931,18 +932,21 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) dst_port = s->port_us; } - int buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, - ci.via_host.s, dst_port); + if(!(_cflags & IPSEC_NODSTURI_RESET)) { + char buf[1024]; + int buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d", ci.via_host.len, + ci.via_host.s, dst_port); - if((m->dst_uri.s = pkg_malloc(buf_len + 1)) == NULL) { - LM_ERR("Error allocating memory for dst_uri\n"); - goto cleanup; - } + if((m->dst_uri.s = pkg_malloc(buf_len + 1)) == NULL) { + LM_ERR("Error allocating memory for dst_uri\n"); + goto cleanup; + } - memcpy(m->dst_uri.s, buf, buf_len); - m->dst_uri.len = buf_len; - m->dst_uri.s[m->dst_uri.len] = '\0'; - LM_ERR("new destination URI: %.*s\n", m->dst_uri.len, m->dst_uri.s); + memcpy(m->dst_uri.s, buf, buf_len); + m->dst_uri.len = buf_len; + m->dst_uri.s[m->dst_uri.len] = '\0'; + LM_ERR("new destination URI: %.*s\n", m->dst_uri.len, m->dst_uri.s); + } // Set send socket struct socket_info *client_sock = grep_sock_info(

1 0

git:master:2234a18e: core: new socket global parameter to set listen attributes with a structure style
by Daniel-Constantin Mierla 01 Jun '22

01 Jun '22

Module: kamailio Branch: master Commit: 2234a18e9031a634ba43655779c644ce549af505 URL: https://github.com/kamailio/kamailio/commit/2234a18e9031a634ba43655779c644c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-01T08:28:43+02:00 core: new socket global parameter to set listen attributes with a structure style - alternative to listen when a usual bind address is provided - example: socket = { bind = udp:127.0.0.1:5060; advertise = 1.2.3.4:5080; name = "udp0"; } --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/ip_addr.h Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/2234a18e9031a634ba43655779c644c… Patch: https://github.com/kamailio/kamailio/commit/2234a18e9031a634ba43655779c644c…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2022