- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6287 - in freeswitch/trunk: . libs/apr libs/apr/build
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: mikej Date: Thu Nov 15 15:07:34 2007 New Revision: 6287 Added: freeswitch/trunk/libs/apr/build/ax_compiler_vendor.m4 Modified: freeswitch/trunk/configure.in freeswitch/trunk/libs/apr/configure.in Log: start adding solaris suncc 64 bit support native in the build system Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Thu Nov 15 15:07:34 2007 @@ -138,7 +138,6 @@ APR_ADDTO(SWITCH_AM_LDFLAGS, -R${prefix}/lib) if test "${enable_64}" = "yes"; then APR_ADDTO(SWITCH_AM_CFLAGS, -m64) - APR_ADDTO(SWITCH_AM_LDFLAGS, -L/opt/csw/lib/amd64) fi elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC) Added: freeswitch/trunk/libs/apr/build/ax_compiler_vendor.m4 ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/apr/build/ax_compiler_vendor.m4 Thu Nov 15 15:07:34 2007 @@ -0,0 +1,15 @@ +AC_DEFUN([AX_COMPILER_VENDOR], +[ +AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown + # note: don't check for gcc first since some other compilers define __GNUC__ + for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do + vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ +#if !($vencpp) + thisisanerror; +#endif +])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break]) + done + ]) +]) Modified: freeswitch/trunk/libs/apr/configure.in ============================================================================== --- freeswitch/trunk/libs/apr/configure.in (original) +++ freeswitch/trunk/libs/apr/configure.in Thu Nov 15 15:07:34 2007 @@ -116,6 +116,9 @@ dnl preload section from invoking the macro to get compiler info. AC_PROG_CC +#Check for compiler vendor +AX_COMPILER_VENDOR + dnl Preload APR_PRELOAD @@ -254,6 +257,18 @@ fi ])dnl +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) +# tweak compiler specific flags +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + APR_ADDTO(CFLAGS, -m64) + fi +fi + + + AC_ARG_ENABLE(maintainer-mode,[ --enable-maintainer-mode Turn on debugging and compile time warnings], [APR_ADDTO(CFLAGS,-g) if test "$GCC" = "yes"; then

1 0

[commit] r6286 - freeswitch/trunk/conf
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:48:03 2007 New Revision: 6286 Modified: freeswitch/trunk/conf/local_stream.conf.xml Log: no comment Modified: freeswitch/trunk/conf/local_stream.conf.xml ============================================================================== --- freeswitch/trunk/conf/local_stream.conf.xml (original) +++ freeswitch/trunk/conf/local_stream.conf.xml Thu Nov 15 13:48:03 2007 @@ -1,5 +1,5 @@ <configuration name="local_stream.conf" description="stream files from local dir"> -<directory name="foo" path="/var/lib/asterisk/moh"> +<directory name="foo" path="/path/to/moh/files"> <param name="rate" value="8000"/> <param name="channels" value="1"/> <param name="interval" value="2"/>

1 0

[commit] r6285 - in freeswitch/trunk/src/mod: asr_tts/mod_openmrcp event_handlers/mod_cdr
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:44:02 2007 New Revision: 6285 Removed: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.conf.xml Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp Log: more cleanup Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Thu Nov 15 13:44:02 2007 @@ -771,7 +771,7 @@ static switch_status_t do_config() { - char *cf = "mod_openmrcp.conf"; + char *cf = "openmrcp.conf"; switch_xml_t cfg, xml, settings, profiles, xprofile, param; openmrcp_profile_t *mrcp_profile; openmrcp_client_options_t *mrcp_options; Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp Thu Nov 15 13:44:02 2007 @@ -48,7 +48,7 @@ queue_paused = 0; - strcpy(configfile,"mod_cdr.conf"); + strcpy(configfile,"cdr.conf"); switch_mod_cdr_newchannel_t *newchannel; // = new switch_mod_cdr_newchannel_t; newchannel = 0;

1 0

[commit] r6284 - freeswitch/trunk/conf
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:43:49 2007 New Revision: 6284 Added: freeswitch/trunk/conf/cdr.conf.xml - copied unchanged from r6281, /freeswitch/trunk/conf/mod_cdr.conf.xml freeswitch/trunk/conf/local_stream.conf.xml - copied unchanged from r6282, /freeswitch/trunk/conf/mod_local_stream.conf.xml freeswitch/trunk/conf/openmrcp.conf.xml - copied unchanged from r6281, /freeswitch/trunk/conf/mod_openmrcp.conf.xml Removed: freeswitch/trunk/conf/mod_cdr.conf.xml freeswitch/trunk/conf/mod_local_stream.conf.xml freeswitch/trunk/conf/mod_openmrcp.conf.xml Modified: freeswitch/trunk/conf/freeswitch.xml Log: cleanup Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Nov 15 13:43:49 2007 @@ -44,7 +44,7 @@   - <XX-PRE-PROCESS cmd="include" data="mod_cdr.conf.xml"/> + <XX-PRE-PROCESS cmd="include" data="cdr.conf.xml"/> <X-PRE-PROCESS cmd="include" data="event_multicast.conf.xml"/> <X-PRE-PROCESS cmd="include" data="event_socket.conf.xml"/> <X-PRE-PROCESS cmd="include" data="zeroconf.conf.xml"/> @@ -88,11 +88,11 @@   <X-PRE-PROCESS cmd="include" data="rss.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="mod_openmrcp.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="openmrcp.conf.xml"/>   - <X-PRE-PROCESS cmd="include" data="mod_local_stream.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="local_stream.conf.xml"/> </section> <section name="dialplan" description="Regex/XML Dialplan">

1 0

[commit] r6283 - in freeswitch/trunk/conf: . autoload_configs noload_configs
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:27:26 2007 New Revision: 6283 Added: freeswitch/trunk/conf/autoload_configs/ freeswitch/trunk/conf/noload_configs/ Modified: freeswitch/trunk/conf/freeswitch.xml Log: more fun Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Nov 15 13:27:26 2007 @@ -21,6 +21,9 @@ <X-PRE-PROCESS cmd="include" data="vars.xml"/> <section name="configuration" description="Various Configuration"> +  + <X-PRE-PROCESS cmd="include" data="autoload_configs/*.xml"/> + <X-PRE-PROCESS cmd="include" data="switch.conf.xml"/> <X-PRE-PROCESS cmd="include" data="modules.conf.xml"/>

1 0

[commit] r6282 - freeswitch/trunk/conf
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:23:03 2007 New Revision: 6282 Added: freeswitch/trunk/conf/mod_local_stream.conf.xml - copied unchanged from r6281, /freeswitch/trunk/conf/local_stream.conf.xml Removed: freeswitch/trunk/conf/local_stream.conf.xml Modified: freeswitch/trunk/conf/freeswitch.xml Log: fixes Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Nov 15 13:23:03 2007 @@ -44,7 +44,6 @@ <XX-PRE-PROCESS cmd="include" data="mod_cdr.conf.xml"/> <X-PRE-PROCESS cmd="include" data="event_multicast.conf.xml"/> <X-PRE-PROCESS cmd="include" data="event_socket.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="xmpp_event.conf.xml"/> <X-PRE-PROCESS cmd="include" data="zeroconf.conf.xml"/>

1 0

[commit] r6281 - in freeswitch/trunk/conf: . dialplan directory lang/de
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:21:22 2007 New Revision: 6281 Added: freeswitch/trunk/conf/lang/de/de.xml Removed: freeswitch/trunk/conf/lang_de.xml freeswitch/trunk/conf/lang_fr.xml freeswitch/trunk/conf/voicemail_de_tts.xml freeswitch/trunk/conf/voicemail_fr.xml Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/directory/default.xml Log: woops Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Nov 15 13:21:22 2007 @@ -1,9 +1,16 @@ <context name="default"> - <extension name="global"> + <extension name="global" continue="true"> <condition> <action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> </condition> +  + <condition field="${numbering_plan}" condition="^1$"> + <action application="set_user" data="default@${domain}"/> + </condition> </extension> +  - <extension name="FS_Conf_IAX"> +  + <extension name="FS_Conf_SIP"> <condition field="destination_number" expression="^888$"> - <action application="bridge" data="iax/guest(a)conference.freeswitch.org/888"/> + <action application="bridge" data="sofia/default/888(a)conference.freeswitch.org"/> </condition> </extension> Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Thu Nov 15 13:21:22 2007 @@ -1,6 +1,15 @@  <domain name="$${domain}">  + <user id="default">  + <variables> +  +  + <variable name="numbering_plan" value="US"/> +  + </variables> + </user> + <user id="brian" mailbox="1000">   <gateways> @@ -71,6 +80,7 @@  </vcard> </user> +  <user id="1000" mailbox="1000"> <params> Added: freeswitch/trunk/conf/lang/de/de.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/lang/de/de.xml Thu Nov 15 13:21:22 2007 @@ -0,0 +1,7 @@ +<include> + <language name="de" sound-path="/snds" tts-engine="cepstral" tts-voice="david"> + <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/> +  + <X-PRE-PROCESS cmd="include" data="vm/tts.xml"/> + </language> +</include>

1 0

[commit] r6280 - freeswitch/trunk/conf
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: intralanman Date: Thu Nov 15 13:08:59 2007 New Revision: 6280 Added: freeswitch/trunk/conf/local_stream.conf.xml (contents, props changed) Log: mod_local_stream example config Added: freeswitch/trunk/conf/local_stream.conf.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/local_stream.conf.xml Thu Nov 15 13:08:59 2007 @@ -0,0 +1,8 @@ +<configuration name="local_stream.conf" description="stream files from local dir"> +<directory name="foo" path="/var/lib/asterisk/moh"> + <param name="rate" value="8000"/> + <param name="channels" value="1"/> + <param name="interval" value="2"/> + <param name="timer_name" value="soft"/> +</directory> +</configuration>

1 0

[commit] r6279 - freeswitch/trunk/conf
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:07:23 2007 New Revision: 6279 Modified: freeswitch/trunk/conf/freeswitch.xml Log: tweak Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Nov 15 13:07:23 2007 @@ -41,7 +41,7 @@   - <X-PRE-PROCESS cmd="include" data="cdr.conf.xml"/> + <XX-PRE-PROCESS cmd="include" data="mod_cdr.conf.xml"/> <X-PRE-PROCESS cmd="include" data="event_multicast.conf.xml"/> <X-PRE-PROCESS cmd="include" data="event_socket.conf.xml"/> <X-PRE-PROCESS cmd="include" data="xmpp_event.conf.xml"/> @@ -90,7 +90,6 @@   - <X-PRE-PROCESS cmd="include" data="mod_cdr.conf.xml"/> <X-PRE-PROCESS cmd="include" data="mod_local_stream.conf.xml"/> </section>

1 0

[commit] r6278 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 12:44:29 2007 New Revision: 6278 Modified: freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/conf/sip_profiles/nat.xml Log: fix Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Thu Nov 15 12:44:29 2007 @@ -45,7 +45,7 @@ <settings> <param name="debug" value="1"/> <param name="rfc2833-pt" value="101"/> - <param name="sip-port" value="5062"/> + <param name="sip-port" value="5060"/> <param name="dialplan" value="XML,enum"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/> Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Thu Nov 15 12:44:29 2007 @@ -2,7 +2,7 @@ <settings> <param name="debug" value="1"/> <param name="rfc2833-pt" value="101"/> - <param name="sip-port" value="5061"/> + <param name="sip-port" value="5070"/> <param name="dialplan" value="XML,enum"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/>

1 0