sr-dev

sr-dev@lists.kamailio.org

20 participants
45159 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

[kamailio/kamailio] Fix Makefile.groups and SLACK for build on FreeBSD (PR #3130)
by Boris Korzun 31 May '22

31 May '22

#### 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 - [X] Related to issue #3091 #### Description `module_group_standard` and `slack` are 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/3130 -- Commit Summary -- * Makefile.groups: renamed malloc_test to misctest * slack: Makefile - support for FreeBSD build -- File Changes -- M src/Makefile.groups (2) M src/modules/slack/Makefile (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3130.patch https://github.com/kamailio/kamailio/pull/3130.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3130 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3130(a)github.com>

2 2

git:master:afcab24d: Merge pull request #3130 from drTr0jan/fix-freebsd
by GitHub 31 May '22

31 May '22

Module: kamailio Branch: master Commit: afcab24d999fa999fbc99cda607423cde9fa8714 URL: https://github.com/kamailio/kamailio/commit/afcab24d999fa999fbc99cda607423c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2022-05-31T18:43:31+02:00 Merge pull request #3130 from drTr0jan/fix-freebsd Fix Makefile.groups and SLACK for build on FreeBSD --- Modified: src/Makefile.groups Modified: src/modules/slack/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/afcab24d999fa999fbc99cda607423c… Patch: https://github.com/kamailio/kamailio/commit/afcab24d999fa999fbc99cda607423c… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index c388489a66..bd111ca7b5 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -38,7 +38,7 @@ mod_list_dbuid=db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \ uid_uri_db # - modules for devel purposes -mod_list_devel=malloc_test print print_lib +mod_list_devel=misctest print print_lib # - modules depending on pcre3 library mod_list_pcre=dialplan lcr regex diff --git a/src/modules/slack/Makefile b/src/modules/slack/Makefile index 9bc748a2e5..a4f0c1ff81 100644 --- a/src/modules/slack/Makefile +++ b/src/modules/slack/Makefile @@ -8,5 +8,21 @@ include ../../Makefile.defs auto_gen= NAME=slack.so +ifeq ($(CROSS_COMPILE),) +CURL_BUILDER=$(shell \ + if pkg-config --exists libcurl; then \ + echo 'pkg-config libcurl'; \ + else \ + which curl-config; \ + fi) +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 0

git:master:5910c818: Makefile.groups: renamed malloc_test to misctest
by drTr0jan 31 May '22

31 May '22

Module: kamailio Branch: master Commit: 5910c8184f42e9564711a07959d410aa2d483b43 URL: https://github.com/kamailio/kamailio/commit/5910c8184f42e9564711a07959d410a… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-05-31T19:08:28+03:00 Makefile.groups: renamed malloc_test to misctest - building module_group_standard fail due to rename of malloc_test module. --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/5910c8184f42e9564711a07959d410a… Patch: https://github.com/kamailio/kamailio/commit/5910c8184f42e9564711a07959d410a… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index c388489a66..bd111ca7b5 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -38,7 +38,7 @@ mod_list_dbuid=db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \ uid_uri_db # - modules for devel purposes -mod_list_devel=malloc_test print print_lib +mod_list_devel=misctest print print_lib # - modules depending on pcre3 library mod_list_pcre=dialplan lcr regex

1 0

git:master:36baa8cd: slack: Makefile - support for FreeBSD build
by drTr0jan 31 May '22

31 May '22

Module: kamailio Branch: master Commit: 36baa8cda606e107308303c33c5b98cbb513c653 URL: https://github.com/kamailio/kamailio/commit/36baa8cda606e107308303c33c5b98c… Author: drTr0jan <drtr0jan(a)yandex.ru> Committer: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-05-31T19:08:29+03:00 slack: Makefile - support for FreeBSD build - added LIBS and DEFS variables, making them consistent with the rest of modules. --- Modified: src/modules/slack/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/36baa8cda606e107308303c33c5b98c… Patch: https://github.com/kamailio/kamailio/commit/36baa8cda606e107308303c33c5b98c… --- diff --git a/src/modules/slack/Makefile b/src/modules/slack/Makefile index 9bc748a2e5..a4f0c1ff81 100644 --- a/src/modules/slack/Makefile +++ b/src/modules/slack/Makefile @@ -8,5 +8,21 @@ include ../../Makefile.defs auto_gen= NAME=slack.so +ifeq ($(CROSS_COMPILE),) +CURL_BUILDER=$(shell \ + if pkg-config --exists libcurl; then \ + echo 'pkg-config libcurl'; \ + else \ + which curl-config; \ + fi) +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 0

[kamailio/kamailio] outbound build warning (Issue #3128)
by sergey-safarov 31 May '22

31 May '22

``` [root@logan-0a kamailio]# make -C src/modules/outbound install make: Entering directory '/root/kamailio/src/modules/outbound' CC (gcc) [M outbound.so] config.o CC (gcc) [M outbound.so] outbound_mod.o outbound_mod.c: In function ‘mod_init’: outbound_mod.c:112:25: warning: pointer targets in passing argument 1 of ‘SHA1’ differ in signedness [-Wpointer-sign] SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); ~~~~~~~~~~~~~~~~~^~ In file included from outbound_mod.c:28: /usr/include/openssl/sha.h:44:16: note: expected ‘const unsigned char *’ but argument is of type ‘char *’ unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md); ^~~~ outbound_mod.c:112:58: warning: pointer targets in passing argument 3 of ‘SHA1’ differ in signedness [-Wpointer-sign] SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); ~~~~~~^~ In file included from outbound_mod.c:28: /usr/include/openssl/sha.h:44:16: note: expected ‘unsigned char *’ but argument is of type ‘char *’ unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md); ^~~~ LD (gcc) [M outbound.so] outbound.so touch /usr/local/lib64/kamailio//modules/outbound.so install -m 755 outbound.so /usr/local/lib64/kamailio//modules make: Leaving directory '/root/kamailio/src/modules/outbound' ``` Build on CentOS 8 Stream -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3128 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3128(a)github.com>

1 2

[kamailio/kamailio] rx_aar: unreference dialog in case of aar update (PR #3104)
by Atanas Bakalov 31 May '22

31 May '22

- release the dialog reference even for aar updates as the dialog was already referenced when issuing the aar request You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3104 -- Commit Summary -- * rx_aar: unreference dialog in case of aar update -- File Changes -- M src/modules/ims_qos/rx_aar.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3104.patch https://github.com/kamailio/kamailio/pull/3104.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3104 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3104(a)github.com>

4 7

git:master:80c941bd: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 31 May '22

31 May '22

Module: kamailio Branch: master Commit: 80c941bd083854c4b55bd4af218cb65d06040d94 URL: https://github.com/kamailio/kamailio/commit/80c941bd083854c4b55bd4af218cb65… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-31T10:16:16+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/80c941bd083854c4b55bd4af218cb65… Patch: https://github.com/kamailio/kamailio/commit/80c941bd083854c4b55bd4af218cb65… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index f02167fb7e..dbbf9c55d5 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -302,13 +302,15 @@ ipsec_create("location", "1"); * domain - Logical domain within the registrar. If a database is used then this must be name of the table which stores the contacts. flags - 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. - + 0x04 - use destination URI for IPSec tunnel search. Useful for - routing requests within dialog. - + 0x08 - use new R-URI for IPSec tunnel search. + + 0x01 (1) - set force socket for request messages. Useful for + ipsec and TCP. + + 0x02 (2) - reverse search for a contact in the memory. Useful + when contact alias is disabled. + + 0x04 (4) - use destination URI for IPSec tunnel search. Useful + for routing requests within dialog. + + 0x08 (8) - use new R-URI for IPSec tunnel search. + + 0x10 (16) - do not look for alias parameter to set received + details. This is an optional parameter, default value - 0. Example 1.12. ipsec_forward

1 0

git:master:f71e8e66: ims_ipsec_pcscf: option to skip use of alias for pcontact received details
by Daniel-Constantin Mierla 31 May '22

31 May '22

Module: kamailio Branch: master Commit: f71e8e66da1e4c611a7b00bb6a264ab59f279ac7 URL: https://github.com/kamailio/kamailio/commit/f71e8e66da1e4c611a7b00bb6a264ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-31T10:11:10+02:00 ims_ipsec_pcscf: option to skip use of alias for pcontact received details --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/f71e8e66da1e4c611a7b00bb6a264ab… Patch: https://github.com/kamailio/kamailio/commit/f71e8e66da1e4c611a7b00bb6a264ab… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 336395d4ca..480191cb44 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -77,13 +77,15 @@ extern usrloc_api_t ul; extern struct tm_binds tmb; /* if set - set send force socket for request messages */ -#define IPSEC_SEND_FORCE_SOCKET 0x01 +#define IPSEC_SEND_FORCE_SOCKET 1 /* if set - start searching from the last element */ -#define IPSEC_REVERSE_SEARCH 0x02 +#define IPSEC_REVERSE_SEARCH 2 /* if set - use destination address for IPSec tunnel search */ -#define IPSEC_DSTADDR_SEARCH 0x04 +#define IPSEC_DSTADDR_SEARCH (1<<2) /* if set - use new r-uri address for IPSec tunnel search */ -#define IPSEC_RURIADDR_SEARCH 0x08 +#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 - delete unused tunnels before every registration */ #define IPSEC_CREATE_DELETE_UNUSED_TUNNELS 0x01 @@ -219,16 +221,16 @@ static int fill_contact( ci->via_prot = vb->proto; } - if(uri.params.len > 6 - && (alias_start = _strnistr( - uri.params.s, "alias=", uri.params.len)) - != NULL) { + alias_start = NULL; + if((!(sflags & IPSEC_NOALIAS_SEARCH)) && uri.params.len > 6) { + alias_start = _strnistr(uri.params.s, "alias=", uri.params.len); + } + if(alias_start!=NULL && *(alias_start-1)==';') { char *p, *port_s, *proto_s; char portbuf[5]; str alias_s; - LM_DBG("contact has an alias [%.*s] - we can use that as the " - "received\n", + LM_DBG("contact has an alias [%.*s] - use that as the received\n", uri.params.len, uri.params.s); alias_s.len = uri.params.len - (alias_start - uri.params.s) - 6; @@ -858,7 +860,8 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) if(ul.get_pcontact(d, &ci, &pcontact, _cflags & IPSEC_REVERSE_SEARCH) != 0 || pcontact == NULL) { - LM_ERR("Contact doesn't exist\n"); + LM_ERR("contact not found [%d:%.*s:%d]\n", (int)ci.via_prot, + ci.via_host.len, ci.via_host.s, (int)ci.via_port); goto cleanup; } @@ -891,6 +894,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) //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"); pkg_free(m->dst_uri.s); m->dst_uri.s = NULL; m->dst_uri.len = 0; @@ -938,6 +942,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) 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( @@ -951,6 +956,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) // Set destination info struct dest_info dst_info; + init_dest_info(&dst_info); dst_info.send_sock = client_sock; if(m->first_line.type == SIP_REQUEST && (_cflags & IPSEC_SEND_FORCE_SOCKET)) {

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