Skip to content

Commit a615e85

Browse files
andywolkandywolk
committed
Merge branch 'master' into v1.10
2 parents 3510866 + 3cb697c commit a615e85

File tree

361 files changed

+310
-90174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

361 files changed

+310
-90174
lines changed

‎Freeswitch.2017.sln

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsmlib", "src\mod\endpoints
417417
EndProject
418418
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_gsmopen", "src\mod\endpoints\mod_gsmopen\mod_gsmopen.2017.vcxproj", "{74B120FF-6935-4DFE-A142-CDB6BEA99C90}"
419419
EndProject
420-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzrtp", "libs\libzrtp\projects\win\libzrtp.2017.vcxproj", "{C13CC324-0032-4492-9A30-310A6BD64FF5}"
421-
EndProject
422420
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_redis", "src\mod\applications\mod_redis\mod_redis.2017.vcxproj", "{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}"
423421
EndProject
424422
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "libs\win32\libjpeg\libjpeg.2017.vcxproj", "{019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}"
@@ -1865,17 +1863,6 @@ Global
18651863
{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|Win32.Build.0 = Release|Win32
18661864
{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|x64.ActiveCfg = Release|x64
18671865
{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|x64.Build.0 = Release|x64
1868-
{C13CC324-0032-4492-9A30-310A6BD64FF5}.All|Win32.ActiveCfg = Release|Win32
1869-
{C13CC324-0032-4492-9A30-310A6BD64FF5}.All|Win32.Build.0 = Release|Win32
1870-
{C13CC324-0032-4492-9A30-310A6BD64FF5}.All|x64.ActiveCfg = Release|Win32
1871-
{C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|Win32.ActiveCfg = Debug|Win32
1872-
{C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|Win32.Build.0 = Debug|Win32
1873-
{C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|x64.ActiveCfg = Debug|x64
1874-
{C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|x64.Build.0 = Debug|x64
1875-
{C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|Win32.ActiveCfg = Release|Win32
1876-
{C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|Win32.Build.0 = Release|Win32
1877-
{C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|x64.ActiveCfg = Release|x64
1878-
{C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|x64.Build.0 = Release|x64
18791866
{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}.All|Win32.ActiveCfg = Release|x64
18801867
{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}.All|x64.ActiveCfg = Release|x64
18811868
{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}.All|x64.Build.0 = Release|x64
@@ -2670,7 +2657,6 @@ Global
26702657
{9DE35039-A8F6-4FBF-B1B6-EB527F802411} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
26712658
{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
26722659
{74B120FF-6935-4DFE-A142-CDB6BEA99C90} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
2673-
{C13CC324-0032-4492-9A30-310A6BD64FF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
26742660
{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
26752661
{019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
26762662
{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9} = {9DE35039-A8F6-4FBF-B1B6-EB527F802411}

‎LICENSE

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,27 +1709,6 @@ License: LGPL-2.1
17091709
Files: libs/broadvoice/autogen.sh
17101710
License: GPL-2
17111711

1712-
Files: libs/libzrtp/*
1713-
Copyright: 2006-2012 Philip R. Zimmermann.
1714-
1993-2005 Colin Plumb
1715-
1998-2006, Dr Brian Gladman, Worcester, UK.
1716-
2002, Bryce "Zooko" Wilcox-O'Hearn
1717-
2010 Soft Industry
1718-
License: AGPL-3 or MPL-1.1
1719-
1720-
Files: libs/libzrtp/test/cmockery/cmockery.c
1721-
Copyright: 2008 Google Inc
1722-
License: Apache-2.0
1723-
1724-
Files: libs/libzrtp/third_party/bnlib/legal.c
1725-
libs/libzrtp/third_party/bnlib/*
1726-
Copyright: 1993-2005 Colin Plumb
1727-
License: GPL-2 or GPL-3 or MPL-1.1
1728-
1729-
Files: libs/libzrtp/third_party/bnlib/test/md5.c
1730-
Copyright: 1995 Abandoned Colin Plumb
1731-
License: public-domain
1732-
17331712
Files: libs/win32/sqlite/sqlite3.[ch]
17341713
libs/win32/sqlite/parse.c
17351714
Copyright: 2006 Abandoned D. Richard Hipp <[email protected]>

‎Makefile.am

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -244,19 +244,6 @@ if HAVE_ODBC
244244
libfreeswitch_la_LDFLAGS += $(ODBC_LIB_FLAGS)
245245
endif
246246

247-
if ENABLE_ZRTP
248-
CORE_CFLAGS += -I$(switch_srcdir)/libs/libzrtp/third_party/bgaes
249-
CORE_CFLAGS += -I$(switch_srcdir)/libs/libzrtp/third_party/bnlib
250-
CORE_CFLAGS += -isystem $(switch_srcdir)/libs/libzrtp/include
251-
ZRTP_LDFLAGS = -L$(switch_srcdir)/libs/libzrtp/third_party/bnlib
252-
ZRTP_LDFLAGS += -L$(switch_srcdir)/libs/libzrtp
253-
ZRTP_LIBS = -lbn -lzrtp
254-
libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS)
255-
libfreeswitch_la_LIBADD += $(ZRTP_LIBS)
256-
CORE_LIBS += libs/libzrtp/libzrtp.a
257-
LIBS += libs/libzrtp/third_party/bnlib/libbn.a
258-
endif
259-
260247
library_includetestdir = $(includedir)/test
261248
library_includetest_HEADERS = \
262249
src/include/test/switch_fct.h \
@@ -570,9 +557,6 @@ src/include/switch_version.h: src/include/switch_version.h.in Makefile $(switch_
570557
libs/libedit/src/.libs/libedit.a:
571558
cd libs/libedit && $(MAKE)
572559

573-
libs/libzrtp/libzrtp.a:
574-
cd libs/libzrtp && $(MAKE)
575-
576560
libs/libvpx/Makefile: libs/libvpx/.update
577561
cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) $(VISIBILITY_FLAG)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --size-limit=16384x16384
578562

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Visit [https://signalwire.com](https://signalwire.com/) or https://github.com/
88

99
FreeSWITCH is available on [Github](https://github.com/signalwire/freeswitch) in source code format. You can checkout the development branch and build for many popular platforms including Linux, Windows, MacOSX and BSD. There is an issue tracker and pull request system available as part of the repo online.
1010

11-
See [https://freeswitch.com/#getting-started](https://freeswitch.com/#getting-started) for more detailed instructions.
11+
See https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/ for more detailed instructions.
1212

1313
## Additional Help
1414

‎bootstrap.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BGJOB=false
1010
VERBOSE=false
1111
BASEDIR=`pwd`;
1212
LIBDIR=${BASEDIR}/libs;
13-
SUBDIRS="apr libzrtp iksemel srtp fs";
13+
SUBDIRS="apr iksemel srtp fs";
1414

1515
while getopts 'jhd:v' o; do
1616
case "$o" in
@@ -172,10 +172,6 @@ bootstrap_apr() {
172172

173173
}
174174

175-
bootstrap_libzrtp() {
176-
(cd ${LIBDIR}/libzrtp && ./bootstrap.sh)
177-
}
178-
179175
# Libs automake automation function
180176
libbootstrap() {
181177
i=$1
@@ -260,7 +256,7 @@ bootstrap_libs_post() {
260256
bootstrap_libs() {
261257
for i in ${SUBDIRS}; do
262258
case "$i" in
263-
apr|fs|libzrtp)
259+
apr|fs)
264260
${BGJOB} && wait
265261
bootstrap_$i
266262
continue

‎build/buildzrtp.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎build/next-release.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.10.8-release
1+
1.10.9-release

‎conf/insideout/sip_profiles/external.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
<param name="auth-calls" value="false"/>
4949
<param name="rtp-timeout-sec" value="1800"/>
5050
<param name="inbound-late-negotiation" value="true"/>
51-
<param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
5251
<!--
5352
DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
5453
-->

‎conf/insideout/sip_profiles/internal-ipv6.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@
7070
<!-- Let calls hit the dialplan before selecting codec for the a-leg -->
7171
<param name="inbound-late-negotiation" value="true"/>
7272

73-
<!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
74-
<param name="inbound-zrtp-passthru" value="true"/>
75-
7673
<!-- this lets anything register -->
7774
<!-- comment the next line and uncomment one or both of the other 2 lines for call authentication -->
7875
<!-- <param name="accept-blind-reg" value="true"/> -->

‎conf/insideout/sip_profiles/internal.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@
106106
<!-- Let calls hit the dialplan before selecting codec for the a-leg -->
107107
<param name="inbound-late-negotiation" value="true"/>
108108

109-
<!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
110-
<param name="inbound-zrtp-passthru" value="true"/>
111-
112109
<!-- this lets anything register -->
113110
<!-- comment the next line and uncomment one or both of the other 2 lines for call authentication -->
114111
<!-- <param name="accept-blind-reg" value="true"/> -->

‎conf/rayo/autoload_configs/switch.conf.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@
145145
<!-- <param name="rtp-start-port" value="16384"/> -->
146146
<!-- <param name="rtp-end-port" value="32768"/> -->
147147

148-
<param name="rtp-enable-zrtp" value="true"/>
149-
150148
<!--
151149
Native PostgreSQL support was removed from the FreeSWITCH Core!
152150
=================================

‎conf/rayo/sip_profiles/external.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<param name="nonce-ttl" value="60"/>
5858
<param name="auth-calls" value="$${external_auth_calls}"/>
5959
<param name="inbound-late-negotiation" value="true"/>
60-
<param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
6160
<!--
6261
DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
6362
-->

‎conf/rayo/vars.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@
1414
<X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
1515
<X-PRE-PROCESS cmd="set" data="use_profile=external"/>
1616

17-
<!--
18-
Enable ZRTP globally you can override this on a per channel basis
19-
20-
http://wiki.freeswitch.org/wiki/ZRTP (on how to enable zrtp)
21-
-->
22-
<X-PRE-PROCESS cmd="set" data="zrtp_secure_media=true"/>
23-
2417
<X-PRE-PROCESS cmd="set" data="global_codec_prefs=PCMU,PCMA"/>
2518
<X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=PCMU,PCMA"/>
2619

‎conf/sbc/sbc_profiles/external.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
<param name="auth-calls" value="false"/>
5050
<param name="rtp-timeout-sec" value="1800"/>
5151
<param name="inbound-late-negotiation" value="true"/>
52-
<param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
5352
<!--
5453
DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
5554
-->

‎conf/sbc/sbc_profiles/internal-ipv6.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@
6969
<!-- Let calls hit the dialplan before selecting codec for the a-leg -->
7070
<param name="inbound-late-negotiation" value="true"/>
7171

72-
<!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
73-
<param name="inbound-zrtp-passthru" value="true"/>
74-
7572
<!-- this lets anything register -->
7673
<!-- comment the next line and uncomment one or both of the other 2 lines for call authentication -->
7774
<!-- <param name="accept-blind-reg" value="true"/> -->

‎conf/sbc/sbc_profiles/internal.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@
110110
<!-- Let calls hit the dialplan before selecting codec for the a-leg -->
111111
<param name="inbound-late-negotiation" value="true"/>
112112

113-
<!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
114-
<param name="inbound-zrtp-passthru" value="true"/>
115-
116113
<!-- this lets anything register -->
117114
<!-- comment the next line and uncomment one or both of the other 2 lines for call authentication -->
118115
<!-- <param name="accept-blind-reg" value="true"/> -->

‎conf/testing/autoload_configs/switch.conf.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,6 @@
150150
<!-- Test each port to make sure it is not in use by some other process before allocating it to RTP -->
151151
<!-- <param name="rtp-port-usage-robustness" value="true"/> -->
152152

153-
<param name="rtp-enable-zrtp" value="true"/>
154-
155153
<!--
156154
Native PostgreSQL support was removed from the FreeSWITCH Core!
157155
=================================

‎conf/testing/sip_profiles/external-ipv6.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<param name="nonce-ttl" value="60"/>
5252
<param name="auth-calls" value="false"/>
5353
<param name="inbound-late-negotiation" value="true"/>
54-
<param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
5554
<!--
5655
DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
5756
-->

‎conf/testing/sip_profiles/external.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<param name="nonce-ttl" value="60"/>
5858
<param name="auth-calls" value="false"/>
5959
<param name="inbound-late-negotiation" value="true"/>
60-
<param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
6160
<!--
6261
DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
6362
-->

‎conf/testing/sip_profiles/internal-ipv6.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@
7171
<!-- Let calls hit the dialplan before selecting codec for the a-leg -->
7272
<param name="inbound-late-negotiation" value="true"/>
7373

74-
<!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
75-
<param name="inbound-zrtp-passthru" value="true"/>
76-
7774
<!-- this lets anything register -->
7875
<!-- comment the next line and uncomment one or both of the other 2 lines for call authentication -->
7976
<!-- <param name="accept-blind-reg" value="true"/> -->

‎conf/testing/sip_profiles/internal.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,6 @@
246246
<!-- Let calls hit the dialplan before selecting codec for the a-leg -->
247247
<param name="inbound-late-negotiation" value="true"/>
248248

249-
<!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
250-
<param name="inbound-zrtp-passthru" value="true"/>
251-
252249
<!-- this lets anything register -->
253250
<!-- comment the next line and uncomment one or both of the other 2 lines for call authentication -->
254251
<!-- <param name="accept-blind-reg" value="true"/> -->

‎conf/testing/vars.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
88
<X-PRE-PROCESS cmd="set" data="use_profile=external"/>
99
<X-PRE-PROCESS cmd="set" data="rtp_sdes_suites=AEAD_AES_256_GCM_8|AEAD_AES_128_GCM_8|AES_CM_256_HMAC_SHA1_80|AES_CM_192_HMAC_SHA1_80|AES_CM_128_HMAC_SHA1_80|AES_CM_256_HMAC_SHA1_32|AES_CM_192_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_32|AES_CM_128_NULL_AUTH"/>
10-
<X-PRE-PROCESS cmd="set" data="zrtp_secure_media=true"/>
1110
<X-PRE-PROCESS cmd="set" data="global_codec_prefs=OPUS,G722,PCMU,PCMA,VP8,H264,H263,H263-1998,G7221@32000h"/>
1211
<X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=OPUS,G722,PCMU,PCMA,VP8,H264,H263,H263-1998,G7221@32000h"/>
1312
<X-PRE-PROCESS cmd="set" data="outbound_caller_name=FreeSWITCH"/>

‎conf/vanilla/autoload_configs/switch.conf.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,6 @@
153153
<!-- Test each port to make sure it is not in use by some other process before allocating it to RTP -->
154154
<!-- <param name="rtp-port-usage-robustness" value="true"/> -->
155155

156-
<param name="rtp-enable-zrtp" value="false"/>
157-
158156
<!--
159157
Store encryption keys for secure media in channel variables and call CDRs. Default: false.
160158
WARNING: If true, anyone with CDR access can decrypt secure media!

‎conf/vanilla/dialplan/default.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -443,10 +443,6 @@
443443
This will take the SAS from the b-leg and send it to the display on the a-leg phone.
444444
Known working with Polycom and Snom maybe others.
445445
-->
446-
<!--
447-
<action application="set" data="exec_after_bridge_app=${sched_api(+4 zrtp expand uuid_display ${uuid} \${uuid_getvar(\${uuid_getvar(${uuid} signal_bond)} zrtp_sas1_string )} \${uuid_getvar(\${uuid_getvar(${uuid} signal_bond)} zrtp_sas2_string )} )}"/>
448-
<action application="export" data="nolocal:zrtp_secure_media=true"/>
449-
-->
450446
<action application="bridge" data="sofia/${use_profile}/[email protected]"/>
451447
</condition>
452448
</extension>
@@ -768,13 +764,6 @@
768764
</condition>
769765
</extension>
770766

771-
<!-- install zrtp_agent.lua into scripts (ZRTP == 9787) -->
772-
<extension name="zrtp_enrollement">
773-
<condition field="destination_number" expression="^9787$">
774-
<action application="lua" data="zrtp_agent.lua"/>
775-
</condition>
776-
</extension>
777-
778767
<!--
779768
You will no longer hear the bong tone. The wav file is playing stating the call is secure.
780769
The file will not play unless you have both TLS and SRTP active.
@@ -786,10 +775,8 @@
786775
<action application="answer"/>
787776
<action application="execute_extension" data="is_secure XML features"/>
788777
<action application="playback" data="$${hold_music}"/>
789-
<anti-action application="set" data="zrtp_secure_media=true"/>
790778
<anti-action application="answer"/>
791779
<anti-action application="playback" data="silence_stream://2000"/>
792-
<anti-action application="execute_extension" data="is_zrtp_secure XML features"/>
793780
<anti-action application="playback" data="$${hold_music}"/>
794781
</condition>
795782
</extension>

‎conf/vanilla/dialplan/features.xml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,7 @@
4444
<action application="transfer" data="$1 XML default"/>
4545
</condition>
4646
</extension>
47-
48-
<extension name="is_zrtp_secure" continue="true">
49-
<condition field="${zrtp_secure_media_confirmed}" expression="^true$">
50-
<action application="sleep" data="1000"/>
51-
<action application="playback" data="misc/call_secured.wav"/>
52-
<anti-action application="eval" data="not_secure"/>
53-
</condition>
54-
</extension>
55-
47+
5648
<extension name="is_secure" continue="true">
5749
<!-- Only Truly consider it secure if its TLS and SRTP -->
5850
<condition field="${sip_via_protocol}" expression="tls"/>

‎conf/vanilla/sip_profiles/external-ipv6.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<param name="nonce-ttl" value="60"/>
5858
<param name="auth-calls" value="false"/>
5959
<param name="inbound-late-negotiation" value="true"/>
60-
<param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
6160
<!--
6261
DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
6362
-->

‎conf/vanilla/sip_profiles/external.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<param name="nonce-ttl" value="60"/>
5858
<param name="auth-calls" value="false"/>
5959
<param name="inbound-late-negotiation" value="true"/>
60-
<param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
6160
<!--
6261
DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
6362
-->

‎conf/vanilla/sip_profiles/internal-ipv6.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@
7373
<!-- Let calls hit the dialplan before selecting codec for the a-leg -->
7474
<param name="inbound-late-negotiation" value="true"/>
7575

76-
<!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
77-
<param name="inbound-zrtp-passthru" value="true"/>
78-
7976
<!-- this lets anything register -->
8077
<!-- comment the next line and uncomment one or both of the other 2 lines for call authentication -->
8178
<!-- <param name="accept-blind-reg" value="true"/> -->

‎conf/vanilla/sip_profiles/internal.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,6 @@
251251
<!-- Let calls hit the dialplan before selecting codec for the a-leg -->
252252
<param name="inbound-late-negotiation" value="true"/>
253253

254-
<!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
255-
<param name="inbound-zrtp-passthru" value="true"/>
256-
257254
<!-- this lets anything register -->
258255
<!-- comment the next line and uncomment one or both of the other 2 lines for call authentication -->
259256
<!-- <param name="accept-blind-reg" value="true"/> -->

0 commit comments

Comments
 (0)