Merge branch 'master' into v1.4.beta

.gitignore

@@ -36,6 +36,7 @@
 *.xz
 *.bz2
 *.tbz2
+*.deb
 *.swp
 aclocal.m4
 autom4te.cache
@@ -43,6 +44,7 @@ config.cache
 configure.lineno
 config.log
 config.status
+test-driver
 core.*
 TAGS
 *.2010.log

acinclude.m4

@@ -6,6 +6,7 @@ m4_include([build/config/ac_gcc_archflag.m4])
 m4_include([build/config/ac_gcc_x86_cpuid.m4])
 m4_include([build/config/ax_lib_mysql.m4])
 m4_include([build/config/ax_check_java.m4])
+m4_include([build/config/uuid.m4])
 m4_include([build/config/erlang.m4])
 m4_include([build/config/odbc.m4])
 m4_include([build/config/sched_setaffinity.m4])

build/config/uuid.m4

@@ -0,0 +1,17 @@
+AC_DEFUN([CHECK_LIBUUID],
+	[
+	PKG_CHECK_MODULES([LIBUUID], [uuid >= 1.41.2],
+			  [LIBUUID_FOUND=yes], [LIBUUID_FOUND=no])
+	if test "$LIBUUID_FOUND" = "no" ; then
+	    PKG_CHECK_MODULES([LIBUUID], [uuid],
+			      [LIBUUID_FOUND=yes], [LIBUUID_FOUND=no])
+	    if test "$LIBUUID_FOUND" = "no" ; then
+		 AC_MSG_WARN([libuuid development package highly recommended!])
+	    else
+		LIBUUID_INCLUDEDIR=$(pkg-config --variable=includedir uuid)
+		LIBUUID_CFLAGS+=" -I$LIBUUID_INCLUDEDIR/uuid "
+	    fi
+	fi
+	AC_SUBST([LIBUUID_CFLAGS])
+	AC_SUBST([LIBUUID_LIBS])
+	])

build/modules.conf.in

@@ -26,10 +26,14 @@ applications/mod_httapi
 #applications/mod_lcr
 #applications/mod_memcache
 #applications/mod_mongo
+#applications/mod_mp4
 #applications/mod_nibblebill
+#applications/mod_oreka
 #applications/mod_osp
+#applications/mod_rad_auth
 #applications/mod_redis
 #applications/mod_rss
+#applications/mod_sonar
 applications/mod_sms
 #applications/mod_snapshot
 #applications/mod_snipe_hunt
@@ -63,17 +67,20 @@ codecs/mod_h26x
 codecs/mod_vp8
 #codecs/mod_ilbc
 #codecs/mod_isac
+#codecs/mod_mp4v
 #codecs/mod_opus
 #codecs/mod_sangoma_codec
 #codecs/mod_silk
 #codecs/mod_siren
 codecs/mod_speex
+#codecs/mod_theora
 dialplans/mod_dialplan_asterisk
 #dialplans/mod_dialplan_directory
 dialplans/mod_dialplan_xml
 #directories/mod_ldap
 #endpoints/mod_alsa
 #endpoints/mod_dingaling
+#endpoints/mod_gsmopen
 #endpoints/mod_h323
 #endpoints/mod_html5
 #endpoints/mod_khomp
@@ -81,9 +88,10 @@ endpoints/mod_loopback
 #endpoints/mod_opal
 #endpoints/mod_portaudio
 #endpoints/mod_rtmp
-#endpoints/mod_skinny
+endpoints/mod_skinny
 #endpoints/mod_skypopen
 endpoints/mod_sofia
+#endpoints/mod_unicall
 event_handlers/mod_cdr_csv
 #event_handlers/mod_cdr_mongodb
 #event_handlers/mod_cdr_pg_csv
@@ -92,6 +100,7 @@ event_handlers/mod_cdr_sqlite
 #event_handlers/mod_event_multicast
 event_handlers/mod_event_socket
 #event_handlers/mod_event_zmq
+#event_handlers/mod_json_cdr
 #event_handlers/mod_radius_cdr
 #event_handlers/mod_rayo
 #event_handlers/mod_snmp
@@ -117,10 +126,13 @@ loggers/mod_syslog
 #say/mod_say_de
 say/mod_say_en
 #say/mod_say_es
+#say/mod_say_fa
 #say/mod_say_fr
 #say/mod_say_he
+#say/mod_say_hr
 #say/mod_say_hu
 #say/mod_say_it
+#say/mod_say_ja
 #say/mod_say_nl
 #say/mod_say_pl
 #say/mod_say_pt
@@ -140,4 +152,4 @@ xml_int/mod_xml_scgi
 #../../libs/openzap/mod_openzap
 
 ## Experimental Modules (don't cry if they're broken)
-#../../contrib/mod/xml_int/mod_xml_odbc
+#../../contrib/mod/xml_int/mod_xml_odbc

conf/rayo/autoload_configs/rayo.conf.xml

@@ -0,0 +1,43 @@
+<configuration name="rayo.conf" description="Rayo server config">
+
+	<!-- rayo params -->
+	<settings>
+		<param name="max-idle-sec" value="300"/>
+		<param name="mixer-conf-profile" value="sla"/>
+	</settings>
+
+	<!-- record component params -->
+	<record>
+		<param name="record-file-prefix" value="$${recordings_dir}/"/>
+	</record>
+
+	<!-- domain to use in from attribute of client messages -->
+	<domain name="$${rayo_domain_name}" shared-secret="ClueCon">
+
+		<!-- Listeners for new Rayo client connections -->
+		<!--listen type="c2s" port="5222" address="$${local_ip_v4}" acl="rayo-clients"/-->
+		<listen type="c2s" port="5222" address="$${rayo_ip}" acl=""/>
+
+		<!-- Listeners for new server connections -->
+		<!--listen type="s2s" port="5269" address="$${local_ip_v4}" acl="rayo-servers"/-->
+
+		<!-- servers to connect to -->
+		<!--connect port="5269" address="node.example.com" domain="example.com"/-->
+
+		<!-- Authorized users -->
+		<users>
+			<user name="usera" password="1"/>
+		</users>
+	</domain>
+
+	<!-- URI mapping to endpoint / gateway -->
+	<dial-gateways>
+		<dial-gateway uriprefix="default" dialprefix="sofia/gateway/outbound/" strip="0"/>
+		<dial-gateway uriprefix="sip:" dialprefix="sofia/external/" strip="0"/>
+		<dial-gateway uriprefix="tel:" dialprefix="sofia/gateway/outbound/" strip="4"/>
+		<!-- pass through user and sofia unaltered -->
+		<dial-gateway uriprefix="user" dialprefix="" strip=""/>
+		<dial-gateway uriprefix="sofia" dialprefix="" strip=""/>
+	</dial-gateways>
+
+</configuration>

conf/vanilla/autoload_configs/lua.conf.xml

@@ -26,5 +26,7 @@
     -->
     <!--<param name="startup-script" value="startup_script_1.lua"/>-->
     <!--<param name="startup-script" value="startup_script_2.lua"/>-->
+    
+    <!--<hook event="CUSTOM" subclass="conference::maintenance" script="catch-event.lua"/>-->
   </settings>
 </configuration>