Skip to content

Commit 883d2cb

Browse files
andywolkandywolk
committed
Merge branch 'master' into v1.10
2 parents 1ff9d0a + f9994c0 commit 883d2cb

File tree

596 files changed

+52105
-126056
lines changed

Some content is hidden

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

596 files changed

+52105
-126056
lines changed

‎.drone.yml

+25-23
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@ name: unit-tests
55
steps:
66
- name: bootstrap
77
image: signalwire/freeswitch-public-base
8-
pull: true
8+
pull: always
99
commands:
1010
- cat /proc/sys/kernel/core_pattern
1111
- ./bootstrap.sh -j
1212

1313
- name: configure
1414
image: signalwire/freeswitch-public-base
15-
pull: true
15+
pull: always
1616
commands:
17-
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev
18-
- DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev
19-
- echo "applications/mod_test" >> modules.conf
17+
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libsofia-sip-ua0 libspandsp-dev
18+
- DEBIAN_FRONTEND=noninteractive apt-get -yq install libspandsp3-dev
19+
- git clone https://github.com/freeswitch/sofia-sip.git
20+
- cd sofia-sip && ./autogen.sh && ./configure.gnu && make -j`nproc` && make install && cd ..
2021
- echo 'codecs/mod_openh264' >> modules.conf
2122
- sed -i '/applications\\/mod_http_cache/s/^#//g' modules.conf
2223
- sed -i '/event_handlers\\/mod_rayo/s/^#//g' modules.conf
@@ -27,20 +28,22 @@ steps:
2728

2829
- name: build
2930
image: signalwire/freeswitch-public-base
30-
pull: true
31+
pull: always
3132
commands:
32-
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev
33-
- DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev
33+
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libsofia-sip-ua0 libspandsp-dev
34+
- DEBIAN_FRONTEND=noninteractive apt-get -yq install libspandsp3-dev
35+
- cd sofia-sip && make install && cd ..
3436
- echo '#!/bin/bash\nmake -j`nproc --all` |& tee ./unit-tests-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./build-status.txt\n' > build.sh
3537
- chmod +x build.sh
3638
- ./build.sh
3739

3840
- name: run-tests
3941
image: signalwire/freeswitch-public-base
40-
pull: true
42+
pull: always
4143
commands:
42-
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev
43-
- DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev
44+
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libsofia-sip-ua0 libspandsp-dev
45+
- DEBIAN_FRONTEND=noninteractive apt-get -yq install libspandsp3-dev
46+
- cd sofia-sip && make install && cd ..
4447
- make install || true
4548
- cd tests/unit
4649
- ./run-tests.sh
@@ -53,15 +56,15 @@ steps:
5356

5457
- name: notify
5558
image: signalwire/drone-notify
56-
pull: true
59+
pull: always
5760
environment:
5861
SLACK_WEBHOOK_URL:
5962
from_secret: slack_webhook_url
6063
ENV_FILE:
6164
from_secret: notify_env
6265
commands:
6366
- /root/unit-tests-notify.sh
64-
67+
6568
trigger:
6669
branch:
6770
- master
@@ -75,14 +78,14 @@ name: scan-build
7578

7679
steps:
7780
- name: bootstrap
78-
image: signalwire/freeswitch-public-base:stretch
79-
pull: true
81+
image: signalwire/freeswitch-public-base
82+
pull: always
8083
commands:
8184
- ./bootstrap.sh -j
8285

8386
- name: configure
84-
image: signalwire/freeswitch-public-base:stretch
85-
pull: true
87+
image: signalwire/freeswitch-public-base
88+
pull: always
8689
commands:
8790
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev
8891
- DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev
@@ -112,21 +115,21 @@ steps:
112115
- ./configure
113116

114117
- name: scan-build
115-
image: signalwire/freeswitch-public-base:stretch
116-
pull: true
118+
image: signalwire/freeswitch-public-base
119+
pull: always
117120
commands:
118121
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev
119122
- DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev
120123
- mkdir -p scan-build
121-
- echo '#!/bin/bash\nscan-build-4.0 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./scan-build-status.txt\n' > scan.sh
124+
- echo '#!/bin/bash\nscan-build-7 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./scan-build-status.txt\n' > scan.sh
122125
- chmod +x scan.sh
123126
- ./scan.sh
124127
- exitstatus=`cat ./scan-build-status.txt`
125128
- echo "*** Exit status is $exitstatus"
126129

127130
- name: notify
128131
image: signalwire/drone-notify
129-
pull: true
132+
pull: always
130133
environment:
131134
SLACK_WEBHOOK_URL:
132135
from_secret: slack_webhook_url
@@ -135,7 +138,6 @@ steps:
135138
commands:
136139
- /root/scan-build-notify.sh
137140

138-
139141
trigger:
140142
branch:
141143
- master
@@ -145,6 +147,6 @@ trigger:
145147

146148
---
147149
kind: signature
148-
hmac: af77439b382612b49140cb95f04d6d695e0a188c411ae227abcba205bf96bab9
150+
hmac: a85b0db203d2c9a71c3e4a63a46b5513fbdb3b8f5135e21d0fe0992f33626824
149151

150152
...

‎.gitignore

+11-9
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Release/
102102
/build/config/ltmain.sh
103103
/build/config/missing
104104
/build/freeswitch.pc
105+
/build/standalone_module/freeswitch.pc
105106
/build/getlib.sh
106107
/build/getg729.sh
107108
/build/getsounds.sh
@@ -115,15 +116,6 @@ Release/
115116
/libs/esl/fs_ivrd
116117
/libs/esl/testclient
117118
/libs/esl/testserver
118-
/libs/freetdm/detect_dtmf
119-
/libs/freetdm/detect_tones
120-
/libs/freetdm/testanalog
121-
/libs/freetdm/testapp
122-
/libs/freetdm/testcid
123-
/libs/freetdm/testpri
124-
/libs/freetdm/testr2
125-
/libs/freetdm/testsangomaboost
126-
/libs/freetdm/testtones
127119
/libs/fsg729-*-installer
128120
/libs/g729/
129121
/libs/libcodec2/compile
@@ -165,6 +157,7 @@ Release/
165157
/src/mod/languages/mod_lua/mod_lua_wrap.cpp.orig
166158
/src/mod/languages/mod_perl/mod_perl_wrap.cpp.orig
167159
/src/mod/languages/mod_python/mod_python_wrap.cpp.orig
160+
/src/mod/languages/mod_python3/mod_python_wrap.cpp.orig
168161
/src/mod/say/mod_say_de/Makefile
169162
/src/mod/say/mod_say_es/Makefile
170163
/src/mod/say/mod_say_fr/Makefile
@@ -273,9 +266,18 @@ src/mod/applications/mod_http_cache/test/test_aws.log
273266
src/mod/applications/mod_http_cache/test/test_aws.trs
274267
src/mod/formats/mod_sndfile/test/test_sndfile
275268
src/mod/formats/mod_sndfile/test/test_sndfile_conf
269+
src/mod/formats/mod_ssml/test/test_tts_format
276270
src/mod/*/*/test/*.log
277271
src/mod/*/*/test/*.trs
278272
src/mod/*/*/test/[0-9]*/*
279273
test-suite.log
280274
src/mod/applications/mod_av/test/test_BT7.mp4
281275
src/mod/applications/mod_av/test/test_RGB.mp4
276+
images/test-argb.png
277+
images/test-rgb.png
278+
images/test.png
279+
images/test_patched.png
280+
images/test_text.png
281+
282+
src/mod/codecs/mod_amrwb/test/test_amrwb
283+
src/mod/endpoints/mod_sofia/test/sipp-based-tests

‎Makefile.am

+12-5
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ endif
248248
lib_LTLIBRARIES = libfreeswitch.la
249249
libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(SQLITE_CFLAGS) $(GUMBO_CFLAGS) $(FVAD_CFLAGS) $(FREETYPE_CFLAGS) $(CURL_CFLAGS) $(PCRE_CFLAGS) $(SPEEX_CFLAGS) $(LIBEDIT_CFLAGS) $(openssl_CFLAGS) $(SOFIA_SIP_CFLAGS) $(AM_CFLAGS) $(TPL_CFLAGS)
250250
libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_LDFLAGS) -no-undefined
251-
libfreeswitch_la_LIBADD = $(CORE_LIBS) $(APR_LIBS) $(SQLITE_LIBS) $(GUMBO_LIBS) $(FVAD_LIBS) $(FREETYPE_LIBS) $(CURL_LIBS) $(PCRE_LIBS) $(SPEEX_LIBS) $(LIBEDIT_LIBS) $(openssl_LIBS) $(PLATFORM_CORE_LIBS) $(TPL_LIBS) $(SPANDSP_LIBS) $(SOFIA_SIP_LIBS)
251+
libfreeswitch_la_LIBADD = $(CORE_LIBS) $(APR_LIBS) $(SQLITE_LIBS) $(GUMBO_LIBS) $(FVAD_LIBS) $(FREETYPE_LIBS) $(CURL_LIBS) $(PCRE_LIBS) $(SPEEX_LIBS) $(LIBEDIT_LIBS) $(SYSTEMD_LIBS) $(openssl_LIBS) $(PLATFORM_CORE_LIBS) $(TPL_LIBS) $(SPANDSP_LIBS) $(SOFIA_SIP_LIBS)
252252
libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES)
253253

254254
if HAVE_PNG
@@ -300,6 +300,7 @@ library_include_HEADERS = \
300300
src/include/switch_dso.h \
301301
src/include/switch_loadable_module.h \
302302
src/include/switch_module_interfaces.h \
303+
src/include/switch_packetizer.h \
303304
src/include/switch_platform.h \
304305
src/include/switch_resample.h \
305306
src/include/switch_regex.h \
@@ -364,6 +365,7 @@ libfreeswitch_la_SOURCES = \
364365
src/switch_version.c \
365366
src/switch_core_media.c \
366367
src/switch_core_video.c \
368+
src/switch_packetizer.c \
367369
src/switch_sdp.c \
368370
src/switch_scheduler.c \
369371
src/switch_core_db.c \
@@ -599,14 +601,15 @@ libs/apr/libapr-1.la: libs/apr/Makefile libs/apr/.update
599601
libs/apr-util/libaprutil-1.la: libs/apr/libapr-1.la libs/apr-util libs/apr-util/.update
600602
@if [ $(MAKELEVEL) = 0 -o -z "`echo "$(MAKEARGS)" | grep "j"`" ] ; then touch $(switch_srcdir)/src/include/switch.h; cd libs/apr-util && $(MAKE) $(MFLAGS) && touch libaprutil-1.la; fi
601603

602-
SRTP_SRC = libs/srtp/srtp/srtp.c libs/srtp/srtp/ekt.c libs/srtp/crypto/cipher/cipher.c libs/srtp/crypto/cipher/null_cipher.c \
604+
SRTP_SRC = libs/srtp/srtp/srtp.c libs/srtp/crypto/cipher/cipher.c libs/srtp/crypto/cipher/null_cipher.c \
603605
libs/srtp/crypto/cipher/aes.c libs/srtp/crypto/cipher/aes_icm.c \
604606
libs/srtp/crypto/hash/null_auth.c libs/srtp/crypto/hash/sha1.c \
605607
libs/srtp/crypto/hash/hmac.c libs/srtp/crypto/hash/auth.c \
606-
libs/srtp/crypto/math/datatypes.c libs/srtp/crypto/math/stat.c \
608+
libs/srtp/crypto/math/datatypes.c \
607609
libs/srtp/crypto/kernel/crypto_kernel.c libs/srtp/crypto/kernel/alloc.c \
608610
libs/srtp/crypto/kernel/key.c libs/srtp/crypto/kernel/err.c \
609-
libs/srtp/crypto/replay/rdb.c libs/srtp/crypto/replay/rdbx.c libs/srtp/crypto/replay/ut_sim.c
611+
libs/srtp/crypto/replay/rdb.c libs/srtp/crypto/replay/rdbx.c \
612+
libs/srtp/crypto/cipher/cipher_test_cases.c libs/srtp/crypto/hash/auth_test_cases.c
610613

611614
libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update $(SRTP_SRC)
612615
touch $(switch_srcdir)/src/include/switch.h
@@ -741,7 +744,7 @@ pristine:
741744
git clean -fdx
742745
git reset --hard
743746

744-
update-clean: clean python-reconf
747+
update-clean: clean python-reconf python3-reconf
745748
cd libs/esl && $(MAKE) clean
746749
cd libs/srtp && $(MAKE) clean
747750

@@ -758,6 +761,10 @@ python-reconf:
758761
rm -f src/mod/languages/mod_python/Makefile
759762
./config.status
760763

764+
python3-reconf:
765+
rm -f src/mod/languages/mod_python3/Makefile
766+
./config.status
767+
761768
reconf:
762769
rm config.cache
763770
sh ./config.status --recheck

‎bootstrap.sh

+1-1
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 libdingaling srtp freetdm unimrcp fs";
13+
SUBDIRS="apr libzrtp iksemel libdingaling srtp unimrcp fs";
1414

1515
while getopts 'jhd:v' o; do
1616
case "$o" in

‎build/freeswitch.service

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ After=syslog.target network.target
44
After=postgresql.service postgresql-9.3.service postgresql-9.4.service mysqld.service httpd.service
55

66
[Service]
7+
# You can use Type=notify only if you compile FreeSWITCH with --enable-systemd configure option
8+
# In this case you have to run FreeSWITCH in foreground mode (-nf option)!
9+
#Type=notify
10+
#NotifyAccess=main
711
User=freeswitch
812
EnvironmentFile=-/etc/sysconfig/freeswitch
913
# RuntimeDirectory is not yet supported in CentOS 7. A workaround is to use /etc/tmpfiles.d/freeswitch.conf

‎build/modcheck.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ cd $here
2121
for i in $files ; do
2222
mod=${i%%.*}
2323

24-
infile=`grep ^.*$mod\$ ../modules.conf | grep -v ftmod_`
25-
commented=`grep ^\#.*$mod\$ ../modules.conf | grep -v ftmod_`
24+
infile=`grep -E "^.*$mod(\|.*)?$" ../modules.conf | grep -v ftmod_`
25+
commented=`grep -E "^\#.*$mod(\|.*)?$" ../modules.conf | grep -v ftmod_`
2626

2727
if [ -z "$infile" ] ; then
2828
echo "${on}WARNING: installed module: $i was not installed by this build. It is not present in modules.conf.${off}"

‎build/modules.conf.in

+3-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ applications/mod_sms
4949
applications/mod_spandsp
5050
#applications/mod_spy
5151
#applications/mod_stress
52+
applications/mod_test
5253
#applications/mod_translate
5354
applications/mod_valet_parking
5455
#applications/mod_video_filter
@@ -134,6 +135,7 @@ languages/mod_lua
134135
#languages/mod_managed
135136
#languages/mod_perl
136137
#languages/mod_python
138+
#languages/mod_python3
137139
#languages/mod_v8
138140
#languages/mod_yaml
139141
loggers/mod_console
@@ -168,7 +170,7 @@ xml_int/mod_xml_cdr
168170
xml_int/mod_xml_rpc
169171
xml_int/mod_xml_scgi
170172

171-
#../../libs/freetdm/mod_freetdm
173+
#mod_freetdm|https://github.com/freeswitch/freetdm.git -b master
172174

173175
## Experimental Modules (don't cry if they're broken)
174176
#../../contrib/mod/xml_int/mod_xml_odbc

‎build/modules.conf.most

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ applications/mod_soundtouch
4747
applications/mod_spandsp
4848
applications/mod_spy
4949
applications/mod_stress
50+
applications/mod_test
5051
applications/mod_translate
5152
applications/mod_valet_parking
5253
applications/mod_video_filter
@@ -127,7 +128,7 @@ languages/mod_java
127128
languages/mod_lua
128129
languages/mod_managed
129130
languages/mod_perl
130-
languages/mod_python
131+
languages/mod_python3
131132
#languages/mod_v8
132133
languages/mod_yaml
133134
loggers/mod_console

‎build/next-release.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.10.6-release
1+
1.10.7-release

‎build/swigall.sh

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ make swigclean
1313
make mod_python_wrap.cpp
1414
cd ../../../..
1515

16+
cd src/mod/languages/mod_python3
17+
make swigclean
18+
make mod_python_wrap.cpp
19+
cd ../../../..
20+
1621
cd src/mod/languages/mod_java
1722
make reswig
1823
cd ../../../..

‎conf/FreeMono.ttf

579 KB
Binary file not shown.

‎conf/curl/autoload_configs/timezones.conf.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
185185
<zone name="America/Santiago" value="CLST" />
186186
<zone name="America/Santo_Domingo" value="AST4" />
187-
<zone name="America/Sao_Paulo" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
187+
<zone name="America/Sao_Paulo" value="BRT3" />
188188
<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
189189
<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
190190
<zone name="America/St_Barthelemy" value="AST4" />

‎conf/insideout/autoload_configs/modules.conf.xml

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
<load module="mod_v8"/>
8282
<!-- <load module="mod_perl"/> -->
8383
<!-- <load module="mod_python"/> -->
84+
<!-- <load module="mod_python3"/> -->
8485
<!-- <load module="mod_java"/> -->
8586
<load module="mod_lua"/>
8687

‎conf/insideout/autoload_configs/timezones.conf.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
185185
<zone name="America/Santiago" value="CLST" />
186186
<zone name="America/Santo_Domingo" value="AST4" />
187-
<zone name="America/Sao_Paulo" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
187+
<zone name="America/Sao_Paulo" value="BRT3" />
188188
<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
189189
<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
190190
<zone name="America/St_Barthelemy" value="AST4" />

‎conf/minimal/autoload_configs/timezones.conf.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
<zone name="America/Santarem" value="BRT3" />
197197
<zone name="America/Santiago" value="CLST" />
198198
<zone name="America/Santo_Domingo" value="AST4" />
199-
<zone name="America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
199+
<zone name="America/Sao_Paulo" value="BRT3" />
200200
<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
201201
<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
202202
<zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />

‎conf/rayo/autoload_configs/timezones.conf.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
185185
<zone name="America/Santiago" value="CLST" />
186186
<zone name="America/Santo_Domingo" value="AST4" />
187-
<zone name="America/Sao_Paulo" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
187+
<zone name="America/Sao_Paulo" value="BRT3" />
188188
<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
189189
<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
190190
<zone name="America/St_Barthelemy" value="AST4" />

‎conf/sbc/autoload_configs/timezones.conf.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
185185
<zone name="America/Santiago" value="CLST" />
186186
<zone name="America/Santo_Domingo" value="AST4" />
187-
<zone name="America/Sao_Paulo" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
187+
<zone name="America/Sao_Paulo" value="BRT3" />
188188
<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
189189
<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
190190
<zone name="America/St_Barthelemy" value="AST4" />

‎conf/testing/autoload_configs/amrwb.conf.xml

+2
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@
1818
<param name="adjust-bitrate" value="0"/>
1919
<!-- force OA when originating -->
2020
<param name="force-oa" value="0"/>
21+
<!-- don't mirror mode-set in SDP answer, but use our own (default-bitrate). -->
22+
<param name="mode-set-overwrite" value="0"/>
2123
</settings>
2224
</configuration>

0 commit comments

Comments
 (0)