Merge branch 'master' into v1.10

.drone.yml

@@ -0,0 +1,47 @@
+---
+kind: pipeline
+name: unit-tests
+
+steps:
+    - name: run-tests
+      image: signalwire/freeswitch-public-base
+      pull: true
+      commands:
+      - ./bootstrap.sh -j
+      - echo "applications/mod_test" >> modules.conf
+      - ./configure
+      - echo "#!/bin/bash\nmake -j`nproc --all` |& tee ./unit-tests-build-result.txt\nexitstatus=\${PIPESTATUS[0]}\necho \$exitstatus > ./build-status.txt\nmake install\n" > build.sh
+      - chmod +x build.sh
+      - ./build.sh
+      - cd tests/unit
+      - ./run-tests.sh
+      - mkdir logs && (mv log_run-tests_*.html logs || true)
+      - echo 0 > run-tests-status.txt
+      - ./collect-test-logs.sh && exit 0 || echo 'Some tests failed'
+      - echo 1 > run-tests-status.txt
+      - cd logs && ls -la
+
+    - name: notify
+      image: signalwire/unit-tests-notify
+      pull: true
+      environment:
+        GITHUB_CI_APP_PEM:
+          from_secret: github_ci_app_pem
+        SSH_KEY:
+          from_secret: ssh_key
+        SLACK_WEBHOOK_URL:
+          from_secret: slack_webhook_url
+      commands:
+      - /root/notify.sh
+
+trigger:
+  branch:
+  - master
+  event:
+  - pull_request
+  - push
+---
+kind: signature
+hmac: a34718dd1e2b9468a845962219ff05cac0c922ddf90d885af557a937a9e412e0
+
+...

Freeswitch.2017.sln

@@ -586,6 +586,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_pgsql", "src\mod\databa
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_mariadb", "src\mod\databases\mod_mariadb\mod_mariadb.2017.vcxproj", "{0B612F84-7533-4DEC-AEDD-5C9CBCF15EAC}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_switch_core_db", "tests\unit\test_switch_core_db.2017.vcxproj", "{580675D7-C1C9-4197-AAC5-00F64FAFDE78}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_switch_ivr_originate", "tests\unit\test_switch_ivr_originate.2017.vcxproj", "{69A7464A-9B0D-4804-A108-835229DACF58}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		All|Win32 = All|Win32
@@ -2689,6 +2693,30 @@ Global
 		{0B612F84-7533-4DEC-AEDD-5C9CBCF15EAC}.Release|Win32.Build.0 = Release|Win32
 		{0B612F84-7533-4DEC-AEDD-5C9CBCF15EAC}.Release|x64.ActiveCfg = Release|x64
 		{0B612F84-7533-4DEC-AEDD-5C9CBCF15EAC}.Release|x64.Build.0 = Release|x64
+		{580675D7-C1C9-4197-AAC5-00F64FAFDE78}.All|Win32.ActiveCfg = Release|Win32
+		{580675D7-C1C9-4197-AAC5-00F64FAFDE78}.All|Win32.Build.0 = Release|Win32
+		{580675D7-C1C9-4197-AAC5-00F64FAFDE78}.All|x64.ActiveCfg = Release|x64
+		{580675D7-C1C9-4197-AAC5-00F64FAFDE78}.All|x64.Build.0 = Release|x64
+		{580675D7-C1C9-4197-AAC5-00F64FAFDE78}.Debug|Win32.ActiveCfg = Debug|Win32
+		{580675D7-C1C9-4197-AAC5-00F64FAFDE78}.Debug|Win32.Build.0 = Debug|Win32
+		{580675D7-C1C9-4197-AAC5-00F64FAFDE78}.Debug|x64.ActiveCfg = Debug|x64
+		{580675D7-C1C9-4197-AAC5-00F64FAFDE78}.Debug|x64.Build.0 = Debug|x64
+		{580675D7-C1C9-4197-AAC5-00F64FAFDE78}.Release|Win32.ActiveCfg = Release|Win32
+		{580675D7-C1C9-4197-AAC5-00F64FAFDE78}.Release|Win32.Build.0 = Release|Win32
+		{580675D7-C1C9-4197-AAC5-00F64FAFDE78}.Release|x64.ActiveCfg = Release|x64
+		{580675D7-C1C9-4197-AAC5-00F64FAFDE78}.Release|x64.Build.0 = Release|x64
+		{69A7464A-9B0D-4804-A108-835229DACF58}.All|Win32.ActiveCfg = Release|Win32
+		{69A7464A-9B0D-4804-A108-835229DACF58}.All|Win32.Build.0 = Release|Win32
+		{69A7464A-9B0D-4804-A108-835229DACF58}.All|x64.ActiveCfg = Release|x64
+		{69A7464A-9B0D-4804-A108-835229DACF58}.All|x64.Build.0 = Release|x64
+		{69A7464A-9B0D-4804-A108-835229DACF58}.Debug|Win32.ActiveCfg = Debug|Win32
+		{69A7464A-9B0D-4804-A108-835229DACF58}.Debug|Win32.Build.0 = Debug|Win32
+		{69A7464A-9B0D-4804-A108-835229DACF58}.Debug|x64.ActiveCfg = Debug|x64
+		{69A7464A-9B0D-4804-A108-835229DACF58}.Debug|x64.Build.0 = Debug|x64
+		{69A7464A-9B0D-4804-A108-835229DACF58}.Release|Win32.ActiveCfg = Release|Win32
+		{69A7464A-9B0D-4804-A108-835229DACF58}.Release|Win32.Build.0 = Release|Win32
+		{69A7464A-9B0D-4804-A108-835229DACF58}.Release|x64.ActiveCfg = Release|x64
+		{69A7464A-9B0D-4804-A108-835229DACF58}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2901,6 +2929,8 @@ Global
 		{BC1FD72E-1CD5-4525-A7F5-17C5740BFDED} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{1BA65811-5453-46F6-8190-9ECEEFEB7DF2} = {31C2761D-20E0-4BF8-98B9-E32F0D8DD6E1}
 		{0B612F84-7533-4DEC-AEDD-5C9CBCF15EAC} = {31C2761D-20E0-4BF8-98B9-E32F0D8DD6E1}
+		{580675D7-C1C9-4197-AAC5-00F64FAFDE78} = {9388C266-C3FC-468A-92EF-0CBC35941412}
+		{69A7464A-9B0D-4804-A108-835229DACF58} = {9388C266-C3FC-468A-92EF-0CBC35941412}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {09840DE7-9208-45AA-9667-1A71EE93BD1E}

Makefile.am

@@ -586,7 +586,7 @@ libs/libzrtp/libzrtp.a:
 	cd libs/libzrtp && $(MAKE)
 
 libs/libvpx/Makefile: libs/libvpx/.update
-	cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --size-limit=16384x16384 --extra-cflags="$(VISIBILITY_FLAG)"
+	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
 
 libs/libvpx/libvpx.a: libs/libvpx/Makefile libs/libvpx/.update
 	@cd libs/libvpx && $(MAKE)
@@ -684,7 +684,7 @@ is-scm:
 		echo ; echo ; \
 		echo "*****************************************************************************************************" ; \
 		echo "You cannot update a release tarball without a git tree.  Please clone FreeSWITCH as so:              " ; \
-		echo "  git clone https://freeswitch.org/stash/scm/fs/freeswitch.git                                       " ; \
+		echo "  git clone https://github.com/signalwire/freeswitch.git                                             " ; \
 		echo "*****************************************************************************************************" ; \
 		echo ; echo ; \
 		exit 1; \

README.md

@@ -0,0 +1,63 @@
+# FreeSWITCH
+
+FreeSWITCH is a Software Defined Telecom Stack enabling the digital transformation from proprietary telecom switches to a versatile software implementation that runs on any commodity hardware. From a Raspberry PI to a multi-core server, FreeSWITCH can unlock the telecommunications potential of any device. Combined with our hosted cloud platform, SignalWire, FreeSWITCH can interconnect with the outside world and scale to any size.
+
+Visit  [https://signalwire.com](https://signalwire.com/)  or https://github.com/signalwire for more info.
+
+## Getting Started
+
+FreeSWITCH is available on [Github](https://github.com/signalwire/freeswitch) in source code format.  You can checkout the development branch and build for many poplular platforms including Linux, Windows, MacOSX and BSD.  There is an issue tracker and pull request system available as part of the repo online.
+
+See [https://freeswitch.com/#getting-started](https://freeswitch.com/#getting-started) for more detailed instructions.
+
+## Additional Help
+
+If you need assistance or have an interest in using a commercially supported build, you can contact [email protected] to learn about professional services to support your project.
+
+## Voice-over-IP services - SIP / SMS - App Integrations
+
+[SignalWire](https://signalwire.com) is the primary sponsor of the FreeSWITCH project and was founded by the original developers of FreeSWITCH. SignalWire provides scalable services to enhance and scale your project such as SMS, SIP, Serverless Application hosting as well as programmable telecom. mod_signalwire which is distributed in this code base allows you to instantly pair with SignalWire and extend your FreeSWITCH.
+
+## Documentation
+
+The main index for documentation is available at:
+
+  * https://freeswitch.org/confluence/
+
+### Release notes: 
+
+  * https://freeswitch.org/confluence/display/FREESWITCH/Release+Notes 
+
+### Installation
+
+Step by step tutorials to install FreeSWITCH from packages or source code are available at:
+
+  * [Debian 10 Buster](https://freeswitch.org/confluence/display/FREESWITCH/Debian+10+Buster) [<b>Recommended</b>]
+  * [Raspberry Pi](https://freeswitch.org/confluence/display/FREESWITCH/Raspberry+Pi)
+  * [CentOS 7](https://freeswitch.org/confluence/display/FREESWITCH/CentOS+7+and+RHEL+7)
+
+## Downloads
+
+  * [Tarballs](https://files.freeswitch.org/releases/freeswitch/)
+  * [Windows Installer](http://files.freeswitch.org/windows/installer/x64/)
+  * [Windows Sound Packages](http://files.freeswitch.org/windows/installer/x64/sounds/)
+
+## Contributions
+
+GitHub pull requests are the recommended way to contribute to the FreeSWITCH source code:
+
+  * https://github.com/signalwire/freeswitch/pulls
+
+## Community
+
+Slack is our chat system where the developers, the FreeSWITCH team, and the most active users are present.
+This is the place to get answers faster and chat with other users in real time. All you need to do is enter your email and verify it on the Slack signup page and you are ready to join in the discussion!
+
+Slack Community:
+  * https://signalwire.community/
+
+Mailing list:
+
+  * http://lists.freeswitch.org/mailman/listinfo/freeswitch-users
+
+**Thank you for using FreeSWITCH!**

build/Makefile.centos5

@@ -29,7 +29,7 @@ freeswitch.git/configure: freeswitch.git/bootstrap.sh
 	cd freeswitch.git && sh bootstrap.sh
 
 freeswitch.git/bootstrap.sh: has-git
-	test -d freeswitch.git || git clone https://freeswitch.org/stash/scm/fs/freeswitch.git freeswitch.git
+	test -d freeswitch.git || git clone https://github.com/signalwire/freeswitch.git freeswitch.git
 
 install: freeswitch
 	cd freeswitch.git && make install cd-sounds-install cd-moh-install

build/Makefile.centos6

@@ -19,7 +19,7 @@ freeswitch.git/configure: freeswitch.git/bootstrap.sh
 	cd freeswitch.git && sh bootstrap.sh
 
 freeswitch.git/bootstrap.sh: has-git
-	test -d freeswitch.git || git clone https://freeswitch.org/stash/scm/fs/freeswitch.git freeswitch.git
+	test -d freeswitch.git || git clone https://github.com/signalwire/freeswitch.git freeswitch.git
 
 rpmforge:
 	(which rpm && rpm -i http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm) || true

build/Makefile.openbsd

@@ -24,7 +24,7 @@ freeswitch.git/configure: freeswitch.git/bootstrap.sh
 	cd freeswitch.git && AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.14 LIBTOOL=/usr/local/bin/libtoolize sh bootstrap.sh
 
 freeswitch.git/bootstrap.sh: has-git
-	test -d freeswitch.git || git clone https://freeswitch.org/stash/scm/fs/freeswitch.git freeswitch.git
+	test -d freeswitch.git || git clone https://github.com/signalwire/freeswitch.git freeswitch.git
 
 install:
 	cd freeswitch.git && AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.14 LIBTOOL=/usr/local/bin/libtoolize gmake install cd-sounds-install cd-moh-install

build/Makefile.solaris11

@@ -31,7 +31,7 @@ freeswitch.git/configure: freeswitch.git/bootstrap.sh
 	cd freeswitch.git && sh bootstrap.sh
 
 freeswitch.git/bootstrap.sh: has-git
-	test -d freeswitch.git || git clone https://freeswitch.org/stash/scm/fs/freeswitch.git freeswitch.git
+	test -d freeswitch.git || git clone https://github.com/signalwire/freeswitch.git freeswitch.git
 
 install: freeswitch
 	cd freeswitch.git && gmake install cd-sounds-install cd-moh-install

build/next-release.txt

@@ -1 +1 @@
-1.10.1-release
+1.10.2-release

conf/vanilla/autoload_configs/amqp.conf.xml

@@ -57,6 +57,10 @@
 	<param name="exchange-name" value="TAP.Commands"/>
 	<param name="binding_key" value="commandBindingKey"/>
 	<param name="reconnect_interval_ms" value="1000"/>
+	<param name="queue-passive" value="false"/>
+	<param name="queue-durable" value="false"/>
+	<param name="queue-exclusive" value="false"/>
+	<param name="queue-auto-delete" value="true"/>
       </params>
     </profile>
   </commands>

conf/vanilla/autoload_configs/msrp.conf.xml

@@ -1,8 +1,8 @@
 <configuration name="msrp.conf" description="MSRP">
   <settings>
     <param name="listen-ip" value="$${local_ip_v4}"/>
-    <param name="listen-port" value="2855"/>
-    <param name="listen-ssl-port" value="2856"/>
+    <!-- <param name="listen-port" value="2855"/> -->
+    <!-- <param name="listen-ssl-port" value="2856"/> -->
     <!-- <param name="message-buffer-size" value="50"/> -->
     <!-- <param name="debug" value="true"/> -->
     <!-- <param name="secure-cert" value="$${certs_dir}/wss.pem"/> -->

configure.ac

@@ -3,10 +3,10 @@
 
 # Must change all of the below together
 # For a release, set revision for that tagged release as well and uncomment
-AC_INIT([freeswitch], [1.10.1-release], [email protected])
+AC_INIT([freeswitch], [1.10.2-release], [email protected])
 AC_SUBST(SWITCH_VERSION_MAJOR, [1])
 AC_SUBST(SWITCH_VERSION_MINOR, [10])
-AC_SUBST(SWITCH_VERSION_MICRO, [1-release])
+AC_SUBST(SWITCH_VERSION_MICRO, [2-release])
 AC_SUBST(SWITCH_VERSION_REVISION, [])
 AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])
 
@@ -1052,14 +1052,17 @@ fi
 CFLAGS="$saved_CFLAGS"
 
 if test "x${ax_cv_c_compiler_vendor}" = "xclang" ; then
+     saved_CFLAGS="$CFLAGS"
      # Next check added for Xcode 5 and systems with clang 5 llvm 3.3 or above, extended offset must be off
      AC_CACHE_CHECK([whether compiler supports -Wextended-offsetof], [ac_cv_clang_extended_offsetof], [
+       CFLAGS="$CFLAGS -Wno-extended-offsetof"
        AC_TRY_COMPILE([],[return 0;],[ac_cv_clang_extended_offsetof=yes],[ac_cv_clang_extended_offsetof=no])
      ])
      AC_MSG_RESULT($ac_cv_clang_extended_offsetof)
      if test x"$ac_cv_clang_extended_offsetof" = xyes; then
          APR_ADDTO(CFLAGS, -Wno-extended-offsetof)
      fi
+     CFLAGS="$saved_CFLAGS"
 fi
 
 # Tested and fixed lot of modules, but some are untested.  Will be added back when the core team decide it ready
@@ -1661,7 +1664,7 @@ if test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"; then
    PHP=php
    PHP_CONFIG=php-config
    PHP_LDFLAGS="`$PHP_CONFIG --ldflags`"
-   PHP_LIBS="`$PHP_CONFIG --libs | sed -r 's/ ?-l(bz2|pcre|xml2|gssapi_krb5|krb5|k5crypto|com_err|history|z|readline|gmp|ssl|crypto)//g'`"
+   PHP_LIBS="`$PHP_CONFIG --libs | sed -r 's/ ?-l(bz2|pcre2-8|xml2|gssapi_krb5|krb5|k5crypto|com_err|history|z|readline|gmp|ssl|crypto|argon2|sodium)//g'`"
    PHP_EXT_DIR="`$PHP_CONFIG --extension-dir`"
    PHP_INC_DIR="`$PHP -r 'echo ini_get("include_path");' | cut -d: -f2`"
    PHP_INI_DIR="`$PHP_CONFIG --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=`"

debian/README.source

@@ -18,7 +18,7 @@ of a FreeSWITCH git repository.  You can achieve this with:
 
     aptitude update && aptitude install -y git
     mkdir -p /usr/src/freeswitch
-    git clone https://freeswitch.org/stash/scm/fs/freeswitch.git /usr/src/freeswitch/src
+    git clone https://github.com/signalwire/freeswitch.git /usr/src/freeswitch/src
     cd /usr/src/freeswitch/src
 
 Ensuring you have a clean build directory

debian/bootstrap.sh

@@ -338,8 +338,8 @@ Build-Depends:
  $(debian_wrap "${mod_build_depends}")
 Standards-Version: 3.9.3
 Homepage: https://freeswitch.org/
-Vcs-Git: https://freeswitch.org/stash/scm/fs/freeswitch.git
-Vcs-Browser: https://freeswitch.org/stash/projects/FS/repos/freeswitch/browse
+Vcs-Git: https://github.com/signalwire/freeswitch.git
+Vcs-Browser: https://github.com/signalwire/freeswitch
 
 EOF
 }

docker/README → docker/README.md

@@ -31,7 +31,7 @@ The container exposes the following ports:
 
 If you wish to help improve these please submit a pull request at:
 
-https://freeswitch.org/jira
+https://github.com/signalwire/freeswitch
 
 Thanks,
 /b

docker/base_image/README.md

@@ -85,7 +85,7 @@ apt-get install freeswitch-conf-vanilla
 ```
 2) clone freeswitch repo
 ```sh
-git clone https://freeswitch.org/stash/projects/FS/repos/freeswitch/browse
+git clone https://github.com/signalwire/freeswitch.git
 ```
 3) execute ```make_min_archive.sh``` script
 ```sh
@@ -100,4 +100,4 @@ docker build -t freeswitch_custom .
 Read more
 ---------
 
-[Dockerfile of official FreeSwitch container](https://freeswitch.org/stash/projects/FS/repos/freeswitch/browse/docker/release)
+[Dockerfile of official FreeSwitch container](https://github.com/signalwire/freeswitch/tree/master/docker/release)

docs/SubmittingPatches

@@ -4,7 +4,7 @@ How to Contribute Patches to FreeSWITCH
 Download the Source Code
 ------------------------
 
-    git clone https://freeswitch.org/stash/scm/fs/freeswitch.git
+    git clone https://github.com/signalwire/freeswitch.git
     cd freeswitch
 
 Ensure Git is Setup
@@ -42,18 +42,18 @@ Create a Pull Request
 
     # create an account in JIRA and create a new issue
 
-    # navigate to FreeSWITCH Stash
-    chromium https://freeswitch.org/stash
+    # navigate to FreeSWITCH github
+    chromium https://github.com/signalwire/freeswitch
 
-    # Using the same credentials as Jira, login to Stash; create a forked FS repository; read
+    # Using your github credentials, login to github; create a forked FS repository; read
     # the details here:
     chromium https://freeswitch.org/confluence/display/FREESWITCH/Pull+Requests
 
     # add your repository as a remote (change to your username)
-    git remote add stash ssh://git@freeswitch.org:7999/~johndoe/freeswitch.git
+    git remote add fs git@github.com:signalwire/freeswitch.git
 
     # push your changes to a branch
-    git push stash +HEAD:myfeature
+    git push fs +HEAD:myfeature
 
     # create a pull request as described here:
     chromium https://freeswitch.org/confluence/display/FREESWITCH/Pull+Requests

html5/verto/verto_communicator/package.json

@@ -35,6 +35,6 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://freeswitch.org/stash/scm/fs/freeswitch.git"
+    "url": "https://github.com/signalwire/freeswitch.git"
   }
 }

libs/apr/.update

@@ -1 +1 @@
-Fri Apr  8 13:43:12 EDT 2016
+Wed Sep 25 15:25:12 EDT 2019

libs/apr/include/apr_pools.h

@@ -214,6 +214,12 @@ APR_DECLARE(apr_status_t) apr_pool_create_ex_debug(apr_pool_t **newpool,
 #define apr_pool_create_ex(newpool, parent, abort_fn, allocator)  \
     apr_pool_create_ex_debug(newpool, parent, abort_fn, allocator, \
                              APR_POOL__FILE_LINE__)
+
+APR_DECLARE(int) apr_pool_walk_tree_debug(apr_pool_t *pool,
+	int(*fn)(apr_pool_t *pool, void *data),
+	void *data);
+
+APR_DECLARE(void) apr_pool_get_stats(apr_pool_t *pool, unsigned int *alloc, unsigned int *total_alloc, unsigned int *clear);
 #endif
 
 /**