sr-dev June 2022

sr-dev@lists.kamailio.org

20 participants
280 discussions

git:master:a6a3bd08: ims_ipsec_pcscf: new option for ipsec_forward() to set trasport for tcp dst uri

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a6a3bd088368fbf65c283ae27e999d315db0844b URL: https://github.com/kamailio/kamailio/commit/a6a3bd088368fbf65c283ae27e999d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-01T18:15:43+02:00 ims_ipsec_pcscf: new option for ipsec_forward() to set trasport for tcp dst uri --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/a6a3bd088368fbf65c283ae27e999d3… Patch: https://github.com/kamailio/kamailio/commit/a6a3bd088368fbf65c283ae27e999d3… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 5aa208d334..6f6c15e21b 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -90,6 +90,8 @@ extern struct tm_binds tmb; #define IPSEC_NODSTURI_RESET (1<<5) /* if set - use user equipment client port as target for requests over TCP */ #define IPSEC_TCPPORT_UEC (1<<6) +/* if set - build new dst uri with transport parameter for TCP */ +#define IPSEC_SETDSTURI_FULL (1<<7) /* if set - delete unused tunnels before every registration */ #define IPSEC_CREATE_DELETE_UNUSED_TUNNELS 0x01 @@ -947,8 +949,14 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) 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); + int buf_len; + if((_cflags & IPSEC_SETDSTURI_FULL) && (dst_proto == PROTO_TCP)) { + buf_len = snprintf(buf, sizeof(buf) - 1, "sip:%.*s:%d;transport=tcp", + ci.via_host.len, ci.via_host.s, dst_port); + } else { + 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");

1 year, 11 months

[kamailio/kamailio] Fix LOST for build on FreeBSD (PR #3131)

by Boris Korzun

#### 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 - [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 `lost` is not build on FreeBSD environment. The proposed patch fixes it and makes the module is consistent with the rest of modules. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3131 -- Commit Summary -- * lost: Makefile - support for FreeBSD build -- File Changes -- M src/modules/lost/Makefile (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3131.patch https://github.com/kamailio/kamailio/pull/3131.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3131 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3131(a)github.com>

1 year, 11 months

git:master:881e3e1e: lost: Makefile - support for FreeBSD build

by Henning Westerholt

Module: kamailio Branch: master Commit: 881e3e1e195858d36d863a32f3c40f1cb83c8d9d URL: https://github.com/kamailio/kamailio/commit/881e3e1e195858d36d863a32f3c40f1… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-06-01T15:31:13+02:00 lost: Makefile - support for FreeBSD build - added libcurl deps. --- Modified: src/modules/lost/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/881e3e1e195858d36d863a32f3c40f1… Patch: https://github.com/kamailio/kamailio/commit/881e3e1e195858d36d863a32f3c40f1… --- diff --git a/src/modules/lost/Makefile b/src/modules/lost/Makefile index 30c12ce655..b847094e1c 100755 --- a/src/modules/lost/Makefile +++ b/src/modules/lost/Makefile @@ -16,6 +16,12 @@ XML2CFG=$(shell \ echo 'pkg-config libxml-2.0'; \ fi) endif +CURL_BUILDER=$(shell \ + if pkg-config --exists libcurl; then \ + echo 'pkg-config libcurl'; \ + else \ + which curl-config; \ + fi) endif ifneq ($(XML2CFG),) @@ -26,4 +32,12 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +ifneq ($(CURL_BUILDER),) + DEFS += $(shell $(CURL_BUILDER) --cflags ) + LIBS += $(shell $(CURL_BUILDER) --libs) +else + DEFS+=-I$(LOCALBASE)/include + LIBS+=-L$(LOCALBASE)/lib -lcurl +endif + include ../../Makefile.modules

1 year, 11 months

git:master:f1634883: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: f1634883e64587e28df629fa902c7f4116338f2c URL: https://github.com/kamailio/kamailio/commit/f1634883e64587e28df629fa902c7f4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-01T14:16:40+02:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/f1634883e64587e28df629fa902c7f4… Patch: https://github.com/kamailio/kamailio/commit/f1634883e64587e28df629fa902c7f4… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index dbbf9c55d5..4a1aba9a15 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -311,6 +311,9 @@ ipsec_create("location", "1"); + 0x08 (8) - use new R-URI for IPSec tunnel search. + 0x10 (16) - do not look for alias parameter to set received details. + + 0x20 (32) - do not reset the destination URI. + + 0x40 (64) - use user equipment client port as target for TCP + requests. This is an optional parameter, default value - 0. Example 1.12. ipsec_forward

1 year, 11 months

git:master:9ce0f4ae: ims_ipsec_pcscf: removed shadowing (sub-scope) variables

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9ce0f4ae1aca95380729b1717c6b7658270034bc URL: https://github.com/kamailio/kamailio/commit/9ce0f4ae1aca95380729b1717c6b765… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-01T14:10:10+02:00 ims_ipsec_pcscf: removed shadowing (sub-scope) variables --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/9ce0f4ae1aca95380729b1717c6b765… Patch: https://github.com/kamailio/kamailio/commit/9ce0f4ae1aca95380729b1717c6b765… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 35bcaa28fb..5aa208d334 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -838,6 +838,9 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) ip_addr_t via_host; struct sip_msg *req = NULL; struct cell *t = NULL; + struct socket_info *client_sock = NULL; + + LM_DBG("processing with flags: 0x%x\n", _cflags); if(m->first_line.type == SIP_REPLY) { // Get request from reply @@ -915,8 +918,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) dst_port = dst_proto == PROTO_TCP ? s->port_uc : s->port_us; // Check send socket - struct socket_info *client_sock = - grep_sock_info(via_host.af == AF_INET ? &ipsec_listen_addr + client_sock = grep_sock_info(via_host.af == AF_INET ? &ipsec_listen_addr : &ipsec_listen_addr6, src_port, dst_proto); if(!client_sock) { @@ -960,7 +962,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) } // Set send socket - struct socket_info *client_sock = grep_sock_info( + client_sock = grep_sock_info( via_host.af == AF_INET ? &ipsec_listen_addr : &ipsec_listen_addr6, src_port, dst_proto); if(!client_sock) { @@ -990,10 +992,12 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) // Update dst_info in message if(m->first_line.type == SIP_REPLY) { - struct cell *t = tmb.t_gett(); if(!t) { - LM_ERR("Error getting transaction\n"); - goto cleanup; + t = tmb.t_gett(); + if(!t) { + LM_ERR("Error getting transaction\n"); + goto cleanup; + } } t->uas.response.dst = dst_info; }

1 year, 11 months

git:master:3c885a2a: ims_ipsec_pcscf: docs for the ipsec_forward() flag to use UE client port for TCP requests

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3c885a2a1052373b5998ada2793e31362cd64818 URL: https://github.com/kamailio/kamailio/commit/3c885a2a1052373b5998ada2793e313… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-01T13:52:15+02:00 ims_ipsec_pcscf: docs for the ipsec_forward() flag to use UE client port for TCP requests --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3c885a2a1052373b5998ada2793e313… Patch: https://github.com/kamailio/kamailio/commit/3c885a2a1052373b5998ada2793e313… --- 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 c220e39063..e602275960 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 @@ -314,6 +314,11 @@ ipsec_create("location", "1"); <emphasis>0x20</emphasis> (32) - do not reset the destination URI. </para> </listitem> + <listitem> + <para> + <emphasis>0x40</emphasis> (64) - use user equipment client port as target for TCP requests. + </para> + </listitem> </itemizedlist> </para> <para>

1 year, 11 months

git:master:762fc606: ims_ipsec_pcscf: ipsec_forward() option to use UE client port for requests over TCP

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 762fc6068a23e7afd3251be58732d054a9dadab0 URL: https://github.com/kamailio/kamailio/commit/762fc6068a23e7afd3251be58732d05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-01T13:11:37+02:00 ims_ipsec_pcscf: ipsec_forward() option to use UE client port for requests over TCP --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/762fc6068a23e7afd3251be58732d05… Patch: https://github.com/kamailio/kamailio/commit/762fc6068a23e7afd3251be58732d05… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 8fa4d9cf23..35bcaa28fb 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -88,6 +88,8 @@ extern struct tm_binds tmb; #define IPSEC_NOALIAS_SEARCH (1<<4) /* if set - do not reset dst uri for IPsec forward */ #define IPSEC_NODSTURI_RESET (1<<5) +/* if set - use user equipment client port as target for requests over TCP */ +#define IPSEC_TCPPORT_UEC (1<<6) /* if set - delete unused tunnels before every registration */ #define IPSEC_CREATE_DELETE_UNUSED_TUNNELS 0x01 @@ -925,11 +927,20 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) // for Request get the dest proto from the saved contact dst_proto = pcontact->received_proto; - // for Request sends from P-CSCF client port - src_port = s->port_pc; + if(_cflags & IPSEC_TCPPORT_UEC) { + // for Request and TCP sends from P-CSCF server port, for Request and UDP sends from P-CSCF client port + src_port = dst_proto == PROTO_TCP ? s->port_ps : s->port_pc; - // for Request sends to UE server port - dst_port = s->port_us; + // for Request and TCP sends to UE client port, for Request and UDP sends to UE server port + dst_port = dst_proto == PROTO_TCP ? s->port_uc : s->port_us; + + } else { + // for Request sends from P-CSCF client port + src_port = s->port_pc; + + // for Request sends to UE server port + dst_port = s->port_us; + } } if(!(_cflags & IPSEC_NODSTURI_RESET)) {

1 year, 11 months

git:master:21f3b485: ims_ipsec_pcscf: docs for flag to not reset dst uri

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 21f3b485a4fa5cadd84962020a54a63db742e667 URL: https://github.com/kamailio/kamailio/commit/21f3b485a4fa5cadd84962020a54a63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-01T13:00:42+02:00 ims_ipsec_pcscf: docs for flag to not reset dst uri --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/21f3b485a4fa5cadd84962020a54a63… Patch: https://github.com/kamailio/kamailio/commit/21f3b485a4fa5cadd84962020a54a63… --- 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 0715da7fae..c220e39063 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 @@ -309,6 +309,11 @@ ipsec_create("location", "1"); <emphasis>0x10</emphasis> (16) - do not look for alias parameter to set received details. </para> </listitem> + <listitem> + <para> + <emphasis>0x20</emphasis> (32) - do not reset the destination URI. + </para> + </listitem> </itemizedlist> </para> <para>

1 year, 11 months

git:master:0bc56bd1: ims_ipsec_pcscf: new option to skip resetting the dst uri in ipsec_forward()

by Daniel-Constantin Mierla

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 year, 11 months

git:master:2234a18e: core: new socket global parameter to set listen attributes with a structure style

by Daniel-Constantin Mierla

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 year, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2022