Merge branch 'master' into v1.4

build/getlib.sh.in

@@ -11,7 +11,7 @@ CURL=@CURL@
 if [ -f "$WGET" ]; then
   DOWNLOAD_CMD=$WGET
 elif [ -f "$CURL" ]; then
-  DOWNLOAD_CMD="$CURL -O"
+  DOWNLOAD_CMD="$CURL -L -O"
 fi
 
 if [ -n "`echo $1 | grep '://'`" ]; then

build/modules.conf.in

@@ -94,6 +94,7 @@ endpoints/mod_skinny
 #endpoints/mod_skypopen
 endpoints/mod_sofia
 #endpoints/mod_unicall
+#event_handlers/mod_amqp
 event_handlers/mod_cdr_csv
 #event_handlers/mod_cdr_mongodb
 #event_handlers/mod_cdr_pg_csv

conf/vanilla/autoload_configs/amqp.conf.xml

+<configuration name="amqp.conf" description="mod_amqp">
+  <producers>
+    <profile name="default">
+      <connections>
+	<connection name="primary">
+	  <param name="hostname" value="localhost"/>
+	  <param name="virtualhost" value="/"/>
+	  <param name="username" value="guest"/>
+	  <param name="password" value="guest"/>	
+	  <param name="port" value="5673"/>
+	  <param name="heartbeat" value="0"/>
+	</connection>
+	<connection name="secondary">
+	  <param name="hostname" value="localhost"/>
+	  <param name="virtualhost" value="/"/>
+	  <param name="username" value="guest"/>
+	  <param name="password" value="guest"/>
+	  <param name="port" value="5672"/>
+	  <param name="heartbeat" value="0"/>
+	</connection>
+      </connections>
+      <params>
+	<param name="exchange" value="TAP.Events"/>
+	<param name="exchange_type" value="topic"/>
+	<param name="circuit_breaker_ms" value="10000"/>
+	<param name="reconnect_interval_ms" value="1000"/>
+	<param name="send_queue_size" value="5000"/>
+	<param name="enable_fallback_format_fields" value="1"/>
+	
+	<!-- The routing key is made from the format string, using the header values in the event specified in the format_fields.-->
+	<!-- Fields that are prefixed with a # are treated as literals rather than doing a header lookup -->
+	<param name="format_fields" value="#FreeSWITCH,FreeSWITCH-Hostname,Event-Name,Event-Subclass,Unique-ID"/>
+
+	<!-- If enable_fallback_format_fields is enabled, then you can | separate event headers, and if the first does not exist
+	     then the system will check additional configured header values.
+	-->
+	<!-- <param name="format_fields" value="#FreeSWITCH,FreeSWITCH-Hostname|#Unknown,Event-Name,Event-Subclass,Unique-ID"/> -->
+	
+	<!--    <param name="eventFilter" value="SWITCH_EVENT_ALL"/> -->
+	<param name="event_filter" value="SWITCH_EVENT_CHANNEL_CREATE,SWITCH_EVENT_CHANNEL_DESTROY,SWITCH_EVENT_HEARTBEAT,SWITCH_EVENT_DTMF"/>
+      </params>
+    </profile>
+  </producers>
+  <commands>
+    <profile name="default">
+      <connections>
+	<connection name="primary">
+	  <param name="hostname" value="localhost"/>
+	  <param name="virtualhost" value="/"/>
+	  <param name="username" value="guest"/>
+	  <param name="password" value="guest"/>	
+	  <param name="port" value="5672"/>
+	  <param name="heartbeat" value="0"/>
+	</connection>
+      </connections>
+      <params>
+	<param name="exchange" value="TAP.Commands"/>
+	<param name="binding_key" value="commandBindingKey"/>
+	<param name="reconnect_interval_ms" value="1000"/>
+      </params>
+    </profile>
+  </commands>
+</configuration>

conf/vanilla/vars.xml

@@ -335,6 +335,7 @@
        if true, the destination number is not included -->
   <X-PRE-PROCESS cmd="set" data="presence_privacy=false"/>
 
+  <X-PRE-PROCESS cmd="set" data="au-ring=%(400,200,383,417);%(400,2000,383,417)"/>
   <X-PRE-PROCESS cmd="set" data="be-ring=%(1000,3000,425)"/>
   <X-PRE-PROCESS cmd="set" data="ca-ring=%(2000,4000,440,480)"/>
   <X-PRE-PROCESS cmd="set" data="cn-ring=%(1000,4000,450)"/>

configure.ac

@@ -1227,6 +1227,10 @@ PKG_CHECK_MODULES([MEMCACHED], [libmemcached >= 0.31],[
   AM_CONDITIONAL([HAVE_MEMCACHED],[false])
 ])
 
+PKG_CHECK_MODULES([AMQP], [librabbitmq >= 0.5.2],[
+  AM_CONDITIONAL([HAVE_AMQP],[true])],[
+  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AMQP],[false])])
+
 AC_ARG_ENABLE(core-libedit-support,     
   [AS_HELP_STRING([--disable-core-libedit-support], [Compile without libedit Support])])
 
@@ -1572,6 +1576,7 @@ AC_CONFIG_FILES([Makefile
 		src/mod/endpoints/mod_unicall/Makefile
 		src/mod/endpoints/mod_rtc/Makefile
 		src/mod/endpoints/mod_verto/Makefile
+		src/mod/event_handlers/mod_amqp/Makefile
 		src/mod/event_handlers/mod_cdr_csv/Makefile
 		src/mod/event_handlers/mod_cdr_mongodb/Makefile
 		src/mod/event_handlers/mod_cdr_pg_csv/Makefile

debian/bootstrap.sh

@@ -30,6 +30,7 @@ avoid_mods=(
   endpoints/mod_opal
   endpoints/mod_reference
   endpoints/mod_unicall
+  event_handlers/mod_amqp
   languages/mod_managed
   sdk/autotools
   xml_int/mod_xml_ldap
@@ -46,9 +47,11 @@ avoid_mods_jessie=(
   formats/mod_shout
 )
 avoid_mods_wheezy=(
+  event_handlers/mod_amqp
   languages/mod_java
 )
 avoid_mods_squeeze=(
+  event_handlers/mod_amqp
   formats/mod_vlc
   languages/mod_managed
 )

debian/control-modules

@@ -453,6 +453,11 @@ Build-Depends: libperl-dev
 
 ## mod/event_handlers
 
+Module: event_handlers/mod_amqp
+Description: Event handler to send events to an amqp server
+ AMQP event handler
+Build-Depends: librabbitmq-dev
+
 Module: event_handlers/mod_cdr_csv
 Description: mod_cdr_csv
  Adds mod_cdr_csv.

debian/util.sh

@@ -274,26 +274,30 @@ get_sources () {
   while read type path distro components; do
     test "$type" = deb || continue
     printf "$type $path $tgt_distro $components\n"
-  done < /etc/apt/sources.list
+  done < "$2"
 }
 
 get_mirrors () {
-  get_sources "$1" | tr '\n' '|' | head -c-1; echo
+  file=${2-/etc/apt/sources.list}
+  announce "Using apt sources file: $file"
+  get_sources "$1" "$file" | tr '\n' '|' | head -c-1; echo
 }
 
 build_debs () {
   {
     set -e
     local OPTIND OPTARG debug_hook=false hookdir="" cow_build_opts=""
-    local keep_pbuilder_config=false
+    local keep_pbuilder_config=false keyring="" custom_keyring=""
     local use_system_sources=false
-    while getopts 'Bbdkt' o "$@"; do
+    while getopts 'BbdK:kT:t' o "$@"; do
       case "$o" in
         B) cow_build_opts="--debbuildopts '-B'";;
         b) cow_build_opts="--debbuildopts '-b'";;
         d) debug_hook=true;;
         k) keep_pbuilder_config=true;;
-        t) use_system_sources=true;;
+        K) custom_keyring="$OPTARG";;
+        t) use_system_sources=true; custom_sources_file="/etc/apt/sources.list";;
+        T) use_custom_sources=true; custom_sources_file="$OPTARG";;
       esac
     done
     shift $(($OPTIND-1))
@@ -309,6 +313,12 @@ build_debs () {
     [ -x "$(which cowbuilder)" ] \
       || err "package cowbuilder isn't installed"
     local cow_img=/var/cache/pbuilder/base-$distro-$arch.cow
+    if [ -e "$custom_keyring" ]; then
+      keyring="$custom_keyring"
+    else
+      keyring="$(mktemp /tmp/keyringXXXXXXXX.asc)"
+      apt-key exportall > "$keyring"
+    fi
     cow () {
       if ! $use_system_sources; then
         cowbuilder "$@" \
@@ -316,17 +326,18 @@ build_debs () {
           --architecture $arch \
           --basepath $cow_img
       else
-        local keyring="$(mktemp /tmp/keyringXXXXXXXX.asc)"
-        apt-key exportall > "$keyring"
         cowbuilder "$@" \
           --distribution $distro \
           --architecture $arch \
           --basepath $cow_img \
           --keyring "$keyring" \
-          --othermirror "$(get_mirrors $distro)"
-        rm -f $keyring
+          --othermirror "$(get_mirrors $distro $custom_sources_file)"
       fi
     }
+    if [ ! -e "$custom_keyring" ]; then
+      # Cleanup script created temporary file
+      rm -f $keyring
+    fi
     if ! [ -d $cow_img ]; then
       announce "Creating base $distro-$arch image..."
       local x=30
@@ -466,6 +477,9 @@ commands:
     -i Auto install build deps on host system
     -j Build debs in parallel
     -k Don't override pbuilder image configurations
+    -K [/path/to/keyring.asc]
+       Use custom keyring file for sources.list in build environment 
+       in the format of: apt-key exportall > /path/to/file.asc
     -l <modules>
     -m [ quicktest | non-dfsg ]
       Choose custom list of modules to build
@@ -477,6 +491,8 @@ commands:
     -s [ paranoid | reckless ]
       Set FS bootstrap/build -j flags
     -t Use system /etc/apt/sources.list in build environment
+    -T [/path/to/sources.list]
+       Use custom /etc/apt/sources.list in build environment
     -u <suite-postfix>
       Specify a custom suite postfix
     -v Set version
@@ -490,7 +506,12 @@ commands:
     -b Binary-only build
     -d Enable cowbuilder debug hook
     -k Don't override pbuilder image configurations
+    -K [/path/to/keyring.asc]
+       Use custom keyring file for sources.list in build environment 
+       in the format of: apt-key exportall > /path/to/file.asc
     -t Use system /etc/apt/sources.list in build environment
+    -T [/path/to/sources.list]
+       Use custom /etc/apt/sources.list in build environment
 
   create-dbg-pkgs
 

docs/GivingBack

@@ -30,4 +30,4 @@ company receives priority support.
 
 Encourage your company to sponsor ClueCon; in addition to helping out
 the project, you'll be exposed to a great pool of people to partner
-with, sell to, and recruit from.
+with, sell to, and recruit from. ( https://ClueCon.com )

freeswitch-sounds-en-ca-june.spec

@@ -69,10 +69,10 @@ License: MPL
 Group: Applications/Communications
 Packager: Ken Rice <krice@freeswitch.org>
 URL: http://www.freeswitch.org
-Source0:http://files.freeswitch.org/%{name}-48000-%{version}.tar.gz
-Source1:http://files.freeswitch.org/%{name}-32000-%{version}.tar.gz
-Source2:http://files.freeswitch.org/%{name}-16000-%{version}.tar.gz
-Source3:http://files.freeswitch.org/%{name}-8000-%{version}.tar.gz
+Source0:http://files.freeswitch.org/releases/sounds/%{name}-48000-%{version}.tar.gz
+Source1:http://files.freeswitch.org/releases/sounds/%{name}-32000-%{version}.tar.gz
+Source2:http://files.freeswitch.org/releases/sounds/%{name}-16000-%{version}.tar.gz
+Source3:http://files.freeswitch.org/releases/sounds/%{name}-8000-%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: sox
 Requires: freeswitch

freeswitch-sounds-en-us-callie.spec

@@ -72,10 +72,10 @@ License: MPL
 Group: Applications/Communications
 Packager: Patrick Laimbock <vc-rpms@voipconsulting.nl>
 URL: http://www.freeswitch.org
-Source0:http://files.freeswitch.org/%{name}-48000-%{version}.tar.gz
-Source1:http://files.freeswitch.org/%{name}-32000-%{version}.tar.gz
-Source2:http://files.freeswitch.org/%{name}-16000-%{version}.tar.gz
-Source3:http://files.freeswitch.org/%{name}-8000-%{version}.tar.gz
+Source0:http://files.freeswitch.org/releases/sounds/%{name}-48000-%{version}.tar.gz
+Source1:http://files.freeswitch.org/releases/sounds/%{name}-32000-%{version}.tar.gz
+Source2:http://files.freeswitch.org/releases/sounds/%{name}-16000-%{version}.tar.gz
+Source3:http://files.freeswitch.org/releases/sounds/%{name}-8000-%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: sox
 Requires: freeswitch

freeswitch-sounds-fr-ca-june.spec

@@ -69,10 +69,10 @@ License: MPL
 Group: Applications/Communications
 Packager: Ken Rice <krice@freeswitch.org>
 URL: http://www.freeswitch.org
-Source0:http://files.freeswitch.org/%{name}-48000-%{version}.tar.gz
-Source1:http://files.freeswitch.org/%{name}-32000-%{version}.tar.gz
-Source2:http://files.freeswitch.org/%{name}-16000-%{version}.tar.gz
-Source3:http://files.freeswitch.org/%{name}-8000-%{version}.tar.gz
+Source0:http://files.freeswitch.org/releases/sounds/%{name}-48000-%{version}.tar.gz
+Source1:http://files.freeswitch.org/releases/sounds/%{name}-32000-%{version}.tar.gz
+Source2:http://files.freeswitch.org/releases/sounds/%{name}-16000-%{version}.tar.gz
+Source3:http://files.freeswitch.org/releases/sounds/%{name}-8000-%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: sox
 Requires: freeswitch

freeswitch-sounds-music.spec

@@ -41,10 +41,10 @@ License:	MPL
 Group:		Productivity/Telephony/Servers
 Packager:	Joseph L. Casale <jcasale@activenetwerx.com>
 URL:		http://www.freeswitch.org
-Source0:	http://files.freeswitch.org/%{name}-8000-%{version}.tar.gz
-Source1:        http://files.freeswitch.org/%{name}-16000-%{version}.tar.gz
-Source2:        http://files.freeswitch.org/%{name}-32000-%{version}.tar.gz
-Source3:        http://files.freeswitch.org/%{name}-48000-%{version}.tar.gz
+Source0:	http://files.freeswitch.org/releases/sounds/%{name}-8000-%{version}.tar.gz
+Source1:        http://files.freeswitch.org/releases/sounds/%{name}-16000-%{version}.tar.gz
+Source2:        http://files.freeswitch.org/releases/sounds/%{name}-32000-%{version}.tar.gz
+Source3:        http://files.freeswitch.org/releases/sounds/%{name}-48000-%{version}.tar.gz
 BuildArch:	noarch
 BuildRequires:	bash
 Requires:	freeswitch

freeswitch-sounds-pt-BR-karina.spec

@@ -69,10 +69,10 @@ License: MPL
 Group: Applications/Communications
 Packager: Ken Rice <krice@freeswitch.org>
 URL: http://www.freeswitch.org
-Source0:http://files.freeswitch.org/%{name}-48000-%{version}.tar.gz
-Source1:http://files.freeswitch.org/%{name}-32000-%{version}.tar.gz
-Source2:http://files.freeswitch.org/%{name}-16000-%{version}.tar.gz
-Source3:http://files.freeswitch.org/%{name}-8000-%{version}.tar.gz
+Source0:http://files.freeswitch.org/releases/sounds/%{name}-48000-%{version}.tar.gz
+Source1:http://files.freeswitch.org/releases/sounds/%{name}-32000-%{version}.tar.gz
+Source2:http://files.freeswitch.org/releases/sounds/%{name}-16000-%{version}.tar.gz
+Source3:http://files.freeswitch.org/releases/sounds/%{name}-8000-%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: sox
 Requires: freeswitch

freeswitch-sounds-ru-RU-elena.spec

@@ -75,10 +75,10 @@ License: MPL
 Group: Applications/Communications
 Packager: Michal Bielicki <michal.bielicki@seventhsignal.de>
 URL: http://www.freeswitch.org
-Source0:http://files.freeswitch.org/%{name}-48000-%{version}.tar.gz
-Source1:http://files.freeswitch.org/%{name}-32000-%{version}.tar.gz
-Source2:http://files.freeswitch.org/%{name}-16000-%{version}.tar.gz
-Source3:http://files.freeswitch.org/%{name}-8000-%{version}.tar.gz
+Source0:http://files.freeswitch.org/releases/sounds/%{name}-48000-%{version}.tar.gz
+Source1:http://files.freeswitch.org/releases/sounds/%{name}-32000-%{version}.tar.gz
+Source2:http://files.freeswitch.org/releases/sounds/%{name}-16000-%{version}.tar.gz
+Source3:http://files.freeswitch.org/releases/sounds/%{name}-8000-%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: sox
 Requires: freeswitch

freeswitch-sounds-sv-se-jakob.spec

@@ -67,10 +67,10 @@ License: MPL
 Group: Applications/Communications
 Packager: Ken Rice <krice@freeswitch.org>
 URL: http://www.freeswitch.org
-Source0:http://files.freeswitch.org/%{name}-48000-%{version}.tar.gz
-Source1:http://files.freeswitch.org/%{name}-32000-%{version}.tar.gz
-Source2:http://files.freeswitch.org/%{name}-16000-%{version}.tar.gz
-Source3:http://files.freeswitch.org/%{name}-8000-%{version}.tar.gz
+Source0:http://files.freeswitch.org/releases/sounds/%{name}-48000-%{version}.tar.gz
+Source1:http://files.freeswitch.org/releases/sounds/%{name}-32000-%{version}.tar.gz
+Source2:http://files.freeswitch.org/releases/sounds/%{name}-16000-%{version}.tar.gz
+Source3:http://files.freeswitch.org/releases/sounds/%{name}-8000-%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: sox
 Requires: freeswitch

freeswitch.spec

@@ -1352,6 +1352,7 @@ cp %{SOURCE9} libs/
 cp %{SOURCE10} libs/
 cp %{SOURCE11} libs/
 cp %{SOURCE12} libs/
+cp %{SOURCE13} libs/
 
 ######################################################################################################################
 #
@@ -1804,6 +1805,7 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/abstraction.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/acl.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/alsa.conf.xml
+%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/amqp.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/blacklist.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/callcenter.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/cdr_csv.conf.xml

html5/verto/demo/verto.js

@@ -469,7 +469,8 @@ function init() {
         ringFile: "sounds/bell_ring2.wav",
         videoParams: {
             "minWidth": "1280",
-            "minHeight": "720"
+            "minHeight": "720",
+	    "minFrameRate": 30
         },
 	audioParams: {
 	    googAutoGainControl: false,

html5/verto/js/Makefile

@@ -19,3 +19,9 @@ install-demo: all
 
 install-maxdemo: all verto-max.js
 	cp verto-max.js ../demo/js/verto-min.js
+
+install-video_demo: all
+	cp verto-min.js ../video_demo/js
+
+install-video_maxdemo: all verto-max.js
+	cp verto-max.js ../video_demo/js/verto-min.js

libs/spandsp/configure.ac

@@ -37,6 +37,27 @@ m4_include(m4/ax_c99_features.m4)
 m4_include(m4/ax_check_export_capability.m4)
 m4_include(m4/ax_check_arm_neon.m4)
 
+AC_DEFUN([AC_FUNC_ALIGNED_ALLOC],[
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror"
+  AC_CACHE_CHECK([checking for aligned_alloc],
+               [ac_cv_func_aligned_alloc],
+               [AC_LINK_IFELSE([AC_LANG_PROGRAM([
+												 #define _ISOC11_SOURCE
+                                                 #include <stdlib.h>
+                                                ],
+                                                [
+                                                   aligned_alloc(0,0);
+                                                ])],
+                               [ac_cv_func_aligned_alloc=yes],
+                               [ac_cv_func_aligned_alloc=no])])
+
+  if test "x${ac_cv_func_aligned_alloc}" = "xyes" ; then
+    AC_DEFINE([HAVE_ALIGNED_ALLOC], [1], [Define to 1 if you have the aligned_alloc() function.])
+  fi
+CFLAGS="$saved_CFLAGS"
+])
+
 AC_CONFIG_SRCDIR([src/tone_generate.c])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
@@ -174,7 +195,7 @@ fi
 
 AX_C99_FLEXIBLE_ARRAY
 
-AC_CHECK_FUNCS([aligned_alloc])
+AC_FUNC_ALIGNED_ALLOC
 AC_CHECK_FUNCS([memalign])
 AC_CHECK_FUNCS([posix_memalign])
 AC_CHECK_FUNCS([memmove])
@@ -464,6 +485,13 @@ intel)
     fi
     COMP_VENDOR_LDFLAGS=
     ;;
+clang*)
+    COMP_VENDOR_CFLAGS="-D_XOPEN_SOURCE=700 -std=c99 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS"
+    if test x"$ac_cv_gcc_unused_but_set_variable" = xyes ; then
+        COMP_VENDOR_CFLAGS="-Wunused-but-set-variable $COMP_VENDOR_CFLAGS"
+    fi
+    COMP_VENDOR_LDFLAGS=
+    ;;
 *)
     COMP_VENDOR_CFLAGS="-std=c99 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS"
     if test x"$ac_cv_gcc_unused_but_set_variable" = xyes ; then

libs/spandsp/spandsp/fax-tests.dtd

@@ -19,12 +19,16 @@
   name      CDATA   #IMPLIED
   >
 
-<!ELEMENT test (step|possible-step)* >
+<!ELEMENT test (repeat|step)* >
 <!ATTLIST test
   name      CDATA   #IMPLIED
   >
 
-<!ELEMENT possible-step (step)* >
+<!ELEMENT repeat (step)* >
+<!ATTLIST repeat
+  min       CDATA   #IMPLIED
+  max       CDATA   #IMPLIED
+  >
 
 <!ELEMENT step (check|EMPTY)* >
 <!ATTLIST step
@@ -49,5 +53,6 @@
 <!ATTLIST check
   name      CDATA   #IMPLIED
   desc      CDATA   #IMPLIED
+  cond      CDATA   #IMPLIED
   >
 

libs/spandsp/src/gsm0610_encode.c

@@ -116,12 +116,12 @@ SPAN_DECLARE(gsm0610_state_t *) gsm0610_init(gsm0610_state_t *s, int packing)
 {
     if (s == NULL)
     {
-        if ((s = (gsm0610_state_t *) span_alloc(sizeof (*s))) == NULL)
+        if ((s = (gsm0610_state_t *) span_alloc(sizeof(*s))) == NULL)
             return NULL;
         /*endif*/
     }
     /*endif*/
-    memset((char *) s, '\0', sizeof (gsm0610_state_t));
+    memset((char *) s, '\0', sizeof(gsm0610_state_t));
     s->nrp = 40;
     s->packing = packing;
     return s;