sr-dev January 2021

sr-dev@lists.kamailio.org

17 participants
186 discussions

git:master:bcb3fc59: secsipid: sync header file with upstream project
by Daniel-Constantin Mierla 11 Jan '21

11 Jan '21

Module: kamailio Branch: master Commit: bcb3fc59d4b18d71603e6614e20bc86df39a39b5 URL: https://github.com/kamailio/kamailio/commit/bcb3fc59d4b18d71603e6614e20bc86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-11T10:36:49+01:00 secsipid: sync header file with upstream project --- Modified: src/modules/secsipid/secsipid.h --- Diff: https://github.com/kamailio/kamailio/commit/bcb3fc59d4b18d71603e6614e20bc86… Patch: https://github.com/kamailio/kamailio/commit/bcb3fc59d4b18d71603e6614e20bc86… --- diff --git a/src/modules/secsipid/secsipid.h b/src/modules/secsipid/secsipid.h index 050bfe97d9..81f9ad0b48 100644 --- a/src/modules/secsipid/secsipid.h +++ b/src/modules/secsipid/secsipid.h @@ -5,4 +5,12 @@ #include "libsecsipid.h" +/** + * SECSIPID_VERSION = 0xAABBCC00 + * - corresponds to version AA.BB.CC + * - last two hexdigits are left for patch extensions + * - example: 0x1010000 corresponds to version 1.1.0 + */ +#define SECSIPID_VERSION 0x1010000 + #endif

1 0

Errored: kamailio/kamailio#9800 (5.4 - 06bd17a)
by Travis CI 11 Jan '21

11 Jan '21

Build Update for kamailio/kamailio ------------------------------------- Build: #9800 Status: Errored Duration: 5 mins and 33 secs Commit: 06bd17a (5.4) Author: Daniel-Constantin Mierla Message: secsipid: include secsipid.h from standard path (cherry picked from commit c1a3443b09cee8a923f8801f8f3034f078034bf5) View the changeset: https://github.com/kamailio/kamailio/compare/b0a629ef9b36...06bd17a83870 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/753907192?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:5.4:b7cff8de: secsipid: Makefile - detect of pkg-config knows about libsecsipid
by Victor Seva 11 Jan '21

11 Jan '21

Module: kamailio Branch: 5.4 Commit: b7cff8de3b3d26b1120678fac331ca52424e6c01 URL: https://github.com/kamailio/kamailio/commit/b7cff8de3b3d26b1120678fac331ca5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-01-11T09:48:46+01:00 secsipid: Makefile - detect of pkg-config knows about libsecsipid (cherry picked from commit 664542adf42a4d829ddf9b9e482aba81f30883d8) --- Modified: src/modules/secsipid/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b7cff8de3b3d26b1120678fac331ca5… Patch: https://github.com/kamailio/kamailio/commit/b7cff8de3b3d26b1120678fac331ca5… --- diff --git a/src/modules/secsipid/Makefile b/src/modules/secsipid/Makefile index 13012cd248..2b97061d31 100644 --- a/src/modules/secsipid/Makefile +++ b/src/modules/secsipid/Makefile @@ -7,7 +7,16 @@ include ../../Makefile.defs auto_gen= NAME=secsipid.so -BUILDER = $(shell which pkg-config) +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGLIBSECSIPID = $(shell $(BUILDER) --exists secsipid-1 > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGLIBSECSIPID),0) + BUILDER = +endif +endif +endif + ifeq ($(BUILDER),) DEFS+= -I. LIBS = -L. -lsecsipid

1 0

git:5.4:06bd17a8: secsipid: include secsipid.h from standard path
by Victor Seva 11 Jan '21

11 Jan '21

Module: kamailio Branch: 5.4 Commit: 06bd17a8387008a3c7b797bd820a687ece5e3627 URL: https://github.com/kamailio/kamailio/commit/06bd17a8387008a3c7b797bd820a687… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-01-11T09:48:47+01:00 secsipid: include secsipid.h from standard path (cherry picked from commit c1a3443b09cee8a923f8801f8f3034f078034bf5) --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/06bd17a8387008a3c7b797bd820a687… Patch: https://github.com/kamailio/kamailio/commit/06bd17a8387008a3c7b797bd820a687… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index d3ad1c896e..efdb5ff50e 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -25,14 +25,14 @@ #include <stdlib.h> #include <string.h> +#include <secsipid.h> + #include "../../core/sr_module.h" #include "../../core/dprint.h" #include "../../core/mod_fix.h" #include "../../core/data_lump.h" #include "../../core/kemi.h" -#include "secsipid.h" - MODULE_VERSION static int secsipid_expire = 300;

1 0

git:master:c1a3443b: secsipid: include secsipid.h from standard path
by Daniel-Constantin Mierla 09 Jan '21

09 Jan '21

Module: kamailio Branch: master Commit: c1a3443b09cee8a923f8801f8f3034f078034bf5 URL: https://github.com/kamailio/kamailio/commit/c1a3443b09cee8a923f8801f8f3034f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-08T08:21:55+01:00 secsipid: include secsipid.h from standard path --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c1a3443b09cee8a923f8801f8f3034f… Patch: https://github.com/kamailio/kamailio/commit/c1a3443b09cee8a923f8801f8f3034f… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index f0b0fdf91f..986ed3a5b5 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -25,6 +25,8 @@ #include <stdlib.h> #include <string.h> +#include <secsipid.h> + #include "../../core/sr_module.h" #include "../../core/dprint.h" #include "../../core/mod_fix.h" @@ -32,8 +34,6 @@ #include "../../core/lvalue.h" #include "../../core/kemi.h" -#include "secsipid.h" - MODULE_VERSION static int secsipid_expire = 300;

1 0

git:master:664542ad: secsipid: Makefile - detect of pkg-config knows about libsecsipid
by Daniel-Constantin Mierla 09 Jan '21

09 Jan '21

Module: kamailio Branch: master Commit: 664542adf42a4d829ddf9b9e482aba81f30883d8 URL: https://github.com/kamailio/kamailio/commit/664542adf42a4d829ddf9b9e482aba8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-07T17:34:36+01:00 secsipid: Makefile - detect of pkg-config knows about libsecsipid --- Modified: src/modules/secsipid/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/664542adf42a4d829ddf9b9e482aba8… Patch: https://github.com/kamailio/kamailio/commit/664542adf42a4d829ddf9b9e482aba8… --- diff --git a/src/modules/secsipid/Makefile b/src/modules/secsipid/Makefile index 752c07c855..108659fd5e 100644 --- a/src/modules/secsipid/Makefile +++ b/src/modules/secsipid/Makefile @@ -7,7 +7,16 @@ include ../../Makefile.defs auto_gen= NAME=secsipid.so -BUILDER = $(shell which pkg-config) +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGLIBSECSIPID = $(shell $(BUILDER) --exists secsipid-1 > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGLIBSECSIPID),0) + BUILDER = +endif +endif +endif + ifeq ($(BUILDER),) DEFS+= -I. LIBS = -L. -lsecsipid

1 0

[kamailio/kamailio] topos_redis: record-route not updated in dialog key redis during re-invite (#2554)
by balajeesv 08 Jan '21

08 Jan '21

### Description Kamailio not updating record-route value stored in redis (topos module) during re-invite config: modparam("ndb_redis", "server", "name=srv1;addr=localhost;port=6379;db=1") modparam("topos", "storage", "redis") modparam("topos_redis", "serverid", "srv1") modparam("topos", "branch_expire", 300) modparam("topos", "dialog_expire", 10800) modparam("topos", "sanity_checks", 1) modparam("topos", "clean_interval", 20)  ### Troubleshooting #### Reproduction 1. Initial Invite from Kamailio to Server1 (Transaction complete) 2. Server1 is down 3. Re-invite from Kamailio to Server2 4. 200 OK contains record-route of Server2 5. ACK is forwarded to Server1 (record-route stored in dialog Key still has old record-route)  #### Debugging Data b_rr value remains same even after 200 OK for re-invite has a different record-route ``` **redis data after Initial Invite:** 127.0.0.1:6379[1]> hgetall d:z:atpsh-5fb50084-5b44-1 1) "b_rr" 2) "<sip:10.130.74.130;lr;ftag=11368SIPpTag091;did=07f.8fa;nat=yes>" 3) "as_contact" 4) "<sip:atpsh-5fb50084-5b44-1@3.225.0.56>" 5) "s_rr" 6) "<sip:3.225.0.56;lr;ftag=11368SIPpTag091;nat=yes>" 7) "b_tag" 8) "2" 9) "bs_contact" 10) "<sip:btpsh-5fb50084-5b44-1@3.225.0.56>" 11) "rectime" 12) "1605698163" 13) "a_tag" 14) "11368SIPpTag091" 15) "s_cseq" 16) "1" 17) "s_method" 18) "INVITE" 19) "b_contact" 20) "sip:atpsh-5fb3efba-4a95-1@52.55.224.188;alias=10.130.72.128~5060~1" 21) "a_callid" 22) "1-11368(a)10.130.74.171" 23) "a_uuid" 24) "atpsh-5fb50084-5b44-1" 25) "b_uuid" 26) "btpsh-5fb50084-5b44-1" 27) "a_contact" 28) "sip:sipp@10.130.74.171:5060;alias=10.130.74.171~5060~1" 29) "iflags" 30) "2" **redis data after re-Invite:** 127.0.0.1:6379[1]> hgetall d:z:atpsh-5fb50084-5b44-1 1) "b_rr" 2) "<sip:10.130.74.130;lr;ftag=11368SIPpTag091;did=07f.8fa;nat=yes>" 3) "as_contact" 4) "<sip:atpsh-5fb50084-5b44-1@3.225.0.56>" 5) "s_rr" 6) "<sip:3.225.0.56;lr;ftag=11368SIPpTag091;nat=yes>" 7) "b_tag" 8) "2" 9) "bs_contact" 10) "<sip:btpsh-5fb50084-5b44-1@3.225.0.56>" 11) "rectime" 12) "1605698163" 13) "a_tag" 14) "11368SIPpTag091" 15) "s_cseq" 16) "1" 17) "s_method" 18) "INVITE" 19) "b_contact" 20) "sip:atpsh-5fb3efba-4a95-1@52.55.224.188;alias=10.130.72.128~5060~1;alias=10.130.72.145~5060~1" 21) "a_callid" 22) "1-11368(a)10.130.74.171" 23) "a_uuid" 24) "atpsh-5fb50084-5b44-1" 25) "b_uuid" 26) "btpsh-5fb50084-5b44-1" 27) "a_contact" 28) "sip:sipp@10.130.74.171:5060;alias=10.130.74.171~5060~1" 29) "iflags" 30) "2" ``` same issue seen for a_rr value in redis.  #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic ``` **Initial Invite Incoming:** INVITE sip:+919535346001@10.130.72.228:5060 SIP/2.0 Via: SIP/2.0/UDP 10.130.74.171:5060;branch=z9hG4bK-11368-1-0 From: sipp <sip:9535346001@10.130.72.228>;tag=11368SIPpTag091 To: sut <sip:9535346001@10.130.72.228> Call-ID: 1-11368(a)10.130.74.171 CSeq: 1 INVITE Contact: sip:sipp@10.130.74.171:5060 Supported: timer, 100rel , replaces Max-Forwards: 70 Subject: Performance Test Content-Type: application/sdp Content-Length: 208 **Initial Invite outgoing:** INVITE sip:919535346001@10.130.74.130:5060 SIP/2.0 Via: SIP/2.0/UDP 3.225.0.56:5060;branch=z9hG4bK7afa.d2d1cbb7e8c7a99adf854ba4d854a467.0 From: sipp <sip:9535346001@10.130.72.228>;tag=11368SIPpTag091 To: sut <sip:9535346001@10.130.72.228> Call-ID: 1-11368(a)10.130.74.171 CSeq: 1 INVITE Supported: timer, 100rel , replaces Max-Forwards: 69 Subject: Performance Test Content-Type: application/sdp Content-Length: 208 Contact: <sip:btpsh-5fb50084-5b44-1@3.225.0.56> **response incoming** SIP/2.0 200 OK From: sipp <sip:+9535346001@10.130.72.228>;tag=11368SIPpTag091 To: sut <sip:9535346001@10.130.72.228>;tag=2 Call-ID: 1-11368(a)10.130.74.171 CSeq: 1 INVITE Content-Type: application/sdp Content-Length: 162 Via: SIP/2.0/UDP 3.225.0.56:5060;rport=5060;received=10.130.72.228;branch=z9hG4bK7afa.d2d1cbb7e8c7a99adf854ba4d854a467.0 Contact: <sip:atpsh-5fb3efba-4a95-1@52.55.224.188;alias=10.130.72.128~5060~1> Record-Route: <sip:10.130.74.130;lr;ftag=11368SIPpTag091;did=07f.8fa;nat=yes> Accept: application/sdp Allow: INVITE,ACK,CANCEL,BYE,UPDATE **response outgoing** SIP/2.0 200 OK From: sipp <sip:+9535346001@10.130.72.228>;tag=11368SIPpTag091 To: sut <sip:9535346001@10.130.72.228>;tag=2 Call-ID: 1-11368(a)10.130.74.171 CSeq: 1 INVITE Content-Type: application/sdp Content-Length: 162 Accept: application/sdp Allow: INVITE,ACK,CANCEL,BYE,UPDATE Via: SIP/2.0/UDP 10.130.74.171:5060;rport=5060;branch=z9hG4bK-11368-1-0 Contact: <sip:atpsh-5fb50084-5b44-1@3.225.0.56> **ACK Incoming** ACK sip:atpsh-5fb50084-5b44-1@3.225.0.56 SIP/2.0 Via: SIP/2.0/UDP 10.130.74.171:5060;branch=z9hG4bK-11368-1-5 From: sipp <sip:sipp@10.130.74.171:5060>;tag=11368SIPpTag091 To: sut <sip:service@10.130.72.228:5060>;tag=2 Call-ID: 1-11368(a)10.130.74.171 CSeq: 1 ACK Contact: sip:sipp@10.130.74.171:5060 Max-Forwards: 70 Subject: Performance Test Content-Length: 0 **ACK outgoing** ACK sip:atpsh-5fb3efba-4a95-1@52.55.224.188;alias=10.130.72.128~5060~1 SIP/2.0 Via: SIP/2.0/UDP 3.225.0.56:5060;branch=z9hG4bK7afa.5b31cae6abf9db84bc4197496dd24951.0 From: sipp <sip:sipp@10.130.74.171:5060>;tag=11368SIPpTag091 To: sut <sip:service@10.130.72.228:5060>;tag=2 Call-ID: 1-11368(a)10.130.74.171 CSeq: 1 ACK Max-Forwards: 69 Subject: Performance Test Content-Length: 0 Route: <sip:10.130.74.130;lr;ftag=11368SIPpTag091;did=07f.8fa;nat=yes> Contact: <sip:btpsh-5fb50084-5b44-1@3.225.0.56> **re-invite incoimg** INVITE sip:atpsh-5fb50084-5b44-1@3.225.0.56 SIP/2.0 Via: SIP/2.0/UDP 10.130.74.171:5060;branch=z9hG4bK-11368-1-7 From: sipp <sip:9535346001@10.130.72.228>;tag=11368SIPpTag091 To: sut <sip:9535346001@10.130.72.228>;tag=2 Call-ID: 1-11368(a)10.130.74.171 CSeq: 2 INVITE Contact: sip:sipp@10.130.74.171:5060 Supported: timer, 100rel , replaces Max-Forwards: 70 Subject: Performance Test Content-Type: application/sdp Content-Length: 208 **re-invite outgoing** INVITE sip:atpsh-5fb3efba-4a95-1@52.55.224.188;alias=10.130.72.128~5060~1 SIP/2.0 Via: SIP/2.0/UDP 3.225.0.56:5060;branch=z9hG4bK4afa.168b5e5898c0e5586bbbe73c71d2f089.1 From: sipp <sip:9535346001@10.130.72.228>;tag=11368SIPpTag091 To: sut <sip:9535346001@10.130.72.228>;tag=2 Call-ID: 1-11368(a)10.130.74.171 CSeq: 2 INVITE Supported: timer, 100rel , replaces Max-Forwards: 69 Subject: Performance Test Content-Type: application/sdp Content-Length: 208 Route: <sip:10.130.72.145;lr;ftag=11368SIPpTag091;did=07f.8fa;nat=yes> Contact: <sip:btpsh-5fb50084-5b44-1@3.225.0.56> **response incoming** SIP/2.0 200 OK From: sipp <sip:+9535346001@10.130.72.228>;tag=11368SIPpTag091 To: sut <sip:9535346001@10.130.72.228>;tag=2 Call-ID: 1-11368(a)10.130.74.171 CSeq: 2 INVITE Content-Type: application/sdp Content-Length: 162 Via: SIP/2.0/UDP 3.225.0.56:5060;rport=5060;received=10.130.72.228;branch=z9hG4bK4afa.168b5e5898c0e5586bbbe73c71d2f089.1 Contact: <sip:atpsh-5fb3efba-4a95-1@52.55.224.188;alias=10.130.72.128~5060~1> Record-Route: <sip:10.130.72.145;lr;ftag=11368SIPpTag091;did=07f.8fa> Accept: application/sdp Allow: INVITE,ACK,CANCEL,BYE,UPDATE **response outgoing** SIP/2.0 200 OK From: sipp <sip:+9535346001@10.130.72.228>;tag=11368SIPpTag091 To: sut <sip:9535346001@10.130.72.228>;tag=2 Call-ID: 1-11368(a)10.130.74.171 CSeq: 2 INVITE Content-Type: application/sdp Content-Length: 162 Accept: application/sdp Allow: INVITE,ACK,CANCEL,BYE,UPDATE Via: SIP/2.0/UDP 10.130.74.171:5060;rport=5060;branch=z9hG4bK-11368-1-7 Contact: <sip:atpsh-5fb50084-5b44-1@3.225.0.56> **ACK Incoming** ACK sip:atpsh-5fb50084-5b44-1@3.225.0.56 SIP/2.0 Via: SIP/2.0/UDP 10.130.74.171:5060;branch=z9hG4bK-11368-1-11 From: sipp <sip:sipp@10.130.74.171:5060>;tag=11368SIPpTag091 To: sut <sip:service@10.130.72.228:5060>;tag=2 Call-ID: 1-11368(a)10.130.74.171 CSeq: 2 ACK Contact: sip:sipp@10.130.74.171:5060 Max-Forwards: 70 Subject: Performance Test Content-Length: 0 **ACK outgoing** ACK sip:atpsh-5fb3efba-4a95-1@52.55.224.188;alias=10.130.72.128~5060~1 SIP/2.0 Via: SIP/2.0/UDP 3.225.0.56:5060;branch=z9hG4bK4afa.773266b9ff87b7e02982aef7cafa13e7.0 From: sipp <sip:sipp@10.130.74.171:5060>;tag=11368SIPpTag091 To: sut <sip:service@10.130.72.228:5060>;tag=2 Call-ID: 1-11368(a)10.130.74.171 CSeq: 2 ACK Max-Forwards: 69 Subject: Performance Test Content-Length: 0 Route: <sip:10.130.74.130;lr;ftag=11368SIPpTag091;did=07f.8fa;nat=yes> Contact: <sip:btpsh-5fb50084-5b44-1@3.225.0.56> ```  ### Possible Solutions I checked code for topos_redis module, looks like only duiring initial transaction b_rr and a_rr values are stored https://github.com/kamailio/kamailio/blob/master/src/modules/topos_redis/to…  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.8 (x86_64/linux) 5a7f5b flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 5a7f5b compiled on 09:15:42 Nov 16 2020 with gcc 7.5.0 ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/issues/2554

3 4

[kamailio/kamailio] sdp_get_address_family with media param (#2598)
by sergey-safarov 07 Jan '21

07 Jan '21

### Description SDP may contain multiple 'c=' lines. These lines may contain different IP address family. Say `audio` may be used `IPv4` and for MSRP messages may be used `IPv6`. I want to get address family for specific media. ### Expected behavior return address family for specific media like ``` sdp_get_address_family("message") ``` -- 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/issues/2598

1 1

git:5.4:b0a629ef: secsipid: use pkg-config when available
by Victor Seva 07 Jan '21

07 Jan '21

Module: kamailio Branch: 5.4 Commit: b0a629ef9b366f4946dd1e73ce4aed2e028c119b URL: https://github.com/kamailio/kamailio/commit/b0a629ef9b366f4946dd1e73ce4aed2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-01-07T12:35:20+01:00 secsipid: use pkg-config when available (cherry picked from commit 231a6eceeb67318cf4708a765b47df6c336350da) --- Modified: src/modules/secsipid/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b0a629ef9b366f4946dd1e73ce4aed2… Patch: https://github.com/kamailio/kamailio/commit/b0a629ef9b366f4946dd1e73ce4aed2… --- diff --git a/src/modules/secsipid/Makefile b/src/modules/secsipid/Makefile index ec8ad07980..13012cd248 100644 --- a/src/modules/secsipid/Makefile +++ b/src/modules/secsipid/Makefile @@ -7,8 +7,14 @@ include ../../Makefile.defs auto_gen= NAME=secsipid.so -DEFS+= -I. -LIBS+= -L. -lsecsipid +BUILDER = $(shell which pkg-config) +ifeq ($(BUILDER),) + DEFS+= -I. + LIBS = -L. -lsecsipid +else + DEFS+= $(shell pkg-config --cflags secsipid-1) + LIBS = $(shell pkg-config --libs secsipid-1) +endif ifeq ($(OS), darwin) LIBS+= -framework CoreFoundation -framework Security -lpthread

1 0

git:master:231a6ece: secsipid: use pkg-config when available
by Victor Seva 07 Jan '21

07 Jan '21

Module: kamailio Branch: master Commit: 231a6eceeb67318cf4708a765b47df6c336350da URL: https://github.com/kamailio/kamailio/commit/231a6eceeb67318cf4708a765b47df6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-01-07T12:17:23+01:00 secsipid: use pkg-config when available --- Modified: src/modules/secsipid/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/231a6eceeb67318cf4708a765b47df6… Patch: https://github.com/kamailio/kamailio/commit/231a6eceeb67318cf4708a765b47df6… --- diff --git a/src/modules/secsipid/Makefile b/src/modules/secsipid/Makefile index 1ac4cdb87c..752c07c855 100644 --- a/src/modules/secsipid/Makefile +++ b/src/modules/secsipid/Makefile @@ -7,8 +7,14 @@ include ../../Makefile.defs auto_gen= NAME=secsipid.so -DEFS+= -I. -LIBS+= -L. -lsecsipid +BUILDER = $(shell which pkg-config) +ifeq ($(BUILDER),) + DEFS+= -I. + LIBS = -L. -lsecsipid +else + DEFS+= $(shell pkg-config --cflags secsipid-1) + LIBS = $(shell pkg-config --libs secsipid-1) +endif ifeq ($(OS), darwin) LIBS+= -framework CoreFoundation -framework Security -lpthread

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 January 2021