- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6307 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: anthm Date: Fri Nov 16 09:55:18 2007 New Revision: 6307 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: adj Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri Nov 16 09:55:18 2007 @@ -1568,6 +1568,7 @@ char *dialplan = globals.dialplan; char *cid_name = globals.cid_name; char *cid_num = globals.cid_num; + char ip[25] = "0.0.0.0"; switch_core_session_add_stream(session, NULL); if ((tech_pvt = (private_t *) switch_core_session_alloc(session, sizeof(private_t))) != 0) { @@ -1602,10 +1603,12 @@ if (!switch_strlen_zero(argv[5])) { tech_pvt->codec_ms = atoi(argv[5]); } + + switch_find_local_ip(ip, sizeof(ip), AF_INET); if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), NULL, dialplan, cid_name, cid_num, - NULL, NULL, NULL, NULL, modname, NULL, + ip, NULL, NULL, NULL, modname, NULL, dest)) != 0) { char name[128]; snprintf(name, sizeof(name), "PortAudio/%s",

1 0

[commit] r6306 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: brian Date: Fri Nov 16 09:04:43 2007 New Revision: 6306 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: another tweak.. info will answer many questions on a default instal Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Nov 16 09:04:43 2007 @@ -2,7 +2,6 @@ <extension name="global" continue="true"> <condition> <action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> - <action application="info"/> </condition> <!-- This will setup some variables if the user isn't authenticated. numbering_plan is required for the demo to function properly. @@ -10,6 +9,9 @@ <condition field="${numbering_plan}" condition="^1$"> <action application="set_user" data="default@${domain}"/> </condition> + <condition> + <action application="info"/> + </condition> </extension> <!--

1 0

[commit] r6305 - freeswitch/trunk/conf
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: brian Date: Fri Nov 16 09:03:40 2007 New Revision: 6305 Modified: freeswitch/trunk/conf/openmrcp.conf.xml Log: tweak Modified: freeswitch/trunk/conf/openmrcp.conf.xml ============================================================================== --- freeswitch/trunk/conf/openmrcp.conf.xml (original) +++ freeswitch/trunk/conf/openmrcp.conf.xml Fri Nov 16 09:03:40 2007 @@ -1,5 +1,5 @@  -<configuration name="mod_openmrcp.conf" description="mod_openmrcp configuration"> +<configuration name="openmrcp.conf" description="mod_openmrcp configuration"> <settings> <param name="asr_default_profile" value="openmrcp-v2"/> <param name="tts_default_profile" value="openmrcp-v2"/>

1 0

[commit] r6304 - freeswitch/trunk/conf
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: brian Date: Fri Nov 16 09:01:55 2007 New Revision: 6304 Modified: freeswitch/trunk/conf/modules.conf.xml Log: mybad Modified: freeswitch/trunk/conf/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/modules.conf.xml (original) +++ freeswitch/trunk/conf/modules.conf.xml Fri Nov 16 09:01:55 2007 @@ -27,7 +27,7 @@    - <load module="mod_portaudio"/> +   <load module="mod_sofia"/>

1 0

[commit] r6303 - in freeswitch/trunk/conf: . dialplan
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: brian Date: Fri Nov 16 09:01:02 2007 New Revision: 6303 Modified: freeswitch/trunk/conf/cdr.conf.xml freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/modules.conf.xml Log: woops Modified: freeswitch/trunk/conf/cdr.conf.xml ============================================================================== --- freeswitch/trunk/conf/cdr.conf.xml (original) +++ freeswitch/trunk/conf/cdr.conf.xml Fri Nov 16 09:01:02 2007 @@ -1,4 +1,4 @@ -<configuration name="mod_cdr.conf" description="CDR Configuration"> +<configuration name="cdr.conf" description="CDR Configuration"> <pddcdr> <param name="path" value="/work/temp/pddcdr"/>  Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Nov 16 09:01:02 2007 @@ -2,6 +2,7 @@ <extension name="global" continue="true"> <condition> <action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> + <action application="info"/> </condition>  <load module="mod_console"/>  @@ -26,7 +27,7 @@    -  + <load module="mod_portaudio"/>  <load module="mod_sofia"/>

1 0

[commit] r6302 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: brian Date: Fri Nov 16 08:47:33 2007 New Revision: 6302 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: lets actually use the var we set. Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Nov 16 08:47:33 2007 @@ -46,7 +46,7 @@  <extension name="FS_Conf_SIP"> <condition field="destination_number" expression="^888$"> - <action application="bridge" data="sofia/default/888(a)conference.freeswitch.org"/> + <action application="bridge" data="sofia/${use_profile}/888(a)conference.freeswitch.org"/> </condition> </extension>

1 0

[commit] r6301 - in freeswitch/trunk: . w32/Library
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: mikej Date: Fri Nov 16 00:47:25 2007 New Revision: 6301 Modified: freeswitch/trunk/Freeswitch.sln freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: windows build tweaks. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Fri Nov 16 00:47:25 2007 @@ -434,8 +434,6 @@ conf\freeswitch.xml = conf\freeswitch.xml conf\iax.conf.xml = conf\iax.conf.xml conf\ivr.conf.xml = conf\ivr.conf.xml - conf\lang_fr.xml = conf\lang_fr.xml - conf\mod_cdr.conf.xml = conf\mod_cdr.conf.xml conf\modules.conf.xml = conf\modules.conf.xml conf\portaudio.conf.xml = conf\portaudio.conf.xml conf\rss.conf.xml = conf\rss.conf.xml Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Fri Nov 16 00:47:25 2007 @@ -465,6 +465,10 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File + RelativePath="..\..\src\include\SimpleGlob.h" + > + </File> + <File RelativePath="..\..\libs\stfu\stfu.h" > </File> @@ -501,11 +505,11 @@ > </File> <File - RelativePath="..\..\src\include\switch_core.h" + RelativePath="..\..\src\include\private\switch_core.h" > </File> <File - RelativePath="..\..\src\include\private\switch_core.h" + RelativePath="..\..\src\include\switch_core.h" > </File> <File

1 0

[commit] r6300 - freeswitch/trunk/src
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: mikej Date: Fri Nov 16 00:47:00 2007 New Revision: 6300 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: silence some sun-cc build errors. Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Fri Nov 16 00:47:00 2007 @@ -1375,7 +1375,7 @@ return mod; } -#define ALLOC_INTERFACE(_TYPE_) for(;;) { \ +#define ALLOC_INTERFACE(_TYPE_) { \ switch_##_TYPE_##_interface_t *i, *ptr; \ i = switch_core_alloc(mod->pool, sizeof(switch_##_TYPE_##_interface_t)); \ assert(i != NULL); \ @@ -1394,43 +1394,43 @@ switch(iname) { case SWITCH_ENDPOINT_INTERFACE: - ALLOC_INTERFACE(endpoint); + ALLOC_INTERFACE(endpoint) case SWITCH_TIMER_INTERFACE: - ALLOC_INTERFACE(timer); + ALLOC_INTERFACE(timer) case SWITCH_DIALPLAN_INTERFACE: - ALLOC_INTERFACE(dialplan); + ALLOC_INTERFACE(dialplan) case SWITCH_CODEC_INTERFACE: - ALLOC_INTERFACE(codec); + ALLOC_INTERFACE(codec) case SWITCH_APPLICATION_INTERFACE: - ALLOC_INTERFACE(application); + ALLOC_INTERFACE(application) case SWITCH_API_INTERFACE: - ALLOC_INTERFACE(api); + ALLOC_INTERFACE(api) case SWITCH_FILE_INTERFACE: - ALLOC_INTERFACE(file); + ALLOC_INTERFACE(file) case SWITCH_SPEECH_INTERFACE: - ALLOC_INTERFACE(speech); + ALLOC_INTERFACE(speech) case SWITCH_DIRECTORY_INTERFACE: - ALLOC_INTERFACE(directory); + ALLOC_INTERFACE(directory) case SWITCH_CHAT_INTERFACE: - ALLOC_INTERFACE(chat); + ALLOC_INTERFACE(chat) case SWITCH_SAY_INTERFACE: - ALLOC_INTERFACE(say); + ALLOC_INTERFACE(say) case SWITCH_ASR_INTERFACE: - ALLOC_INTERFACE(asr); + ALLOC_INTERFACE(asr) case SWITCH_MANAGEMENT_INTERFACE: - ALLOC_INTERFACE(management); + ALLOC_INTERFACE(management) default: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid Module Type!\n");

1 0

[commit] r6299 - in freeswitch/trunk/libs/js: . nsprpub
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: mikej Date: Fri Nov 16 00:07:35 2007 New Revision: 6299 Modified: freeswitch/trunk/libs/js/Makefile.in freeswitch/trunk/libs/js/configure.ac freeswitch/trunk/libs/js/nsprpub/configure.in Log: add --enable-64 configure flag to build 64 bit with suncc Modified: freeswitch/trunk/libs/js/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/Makefile.in (original) +++ freeswitch/trunk/libs/js/Makefile.in Fri Nov 16 00:07:35 2007 @@ -159,7 +159,7 @@ @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) -version-info 1:6 $(CLI_NAME): $(CLI_OBJS) $(LIB_NAME) - @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CLI_LDFLAGS) -o $(CLI_NAME) $(CLI_OBJS) $(LIB_NAME) $(LIBS) $(CLI_LIBS) + @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CLI_LDFLAGS) $(CFLAGS) -o $(CLI_NAME) $(CLI_OBJS) $(LIB_NAME) $(LIBS) $(CLI_LIBS) src/js.o: src/js.c $(CC) $(CPPFLAGS) $(CLI_CPPFLAGS) $(CFLAGS) $(CLI_CFLAGS) -o $@ -c $< src/perlconnect/jsperl.o: src/perlconnect/jsperl.c @@ -172,7 +172,7 @@ jscpucfg.o: src/jscpucfg.c $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< jscpucfg: jscpucfg.o - @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o jscpucfg jscpucfg.o $(LIBS) + @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o jscpucfg jscpucfg.o $(LIBS) src/jsopcode.h src/jsopcode.c: src/jsopcode.tbl .PHONY: install Modified: freeswitch/trunk/libs/js/configure.ac ============================================================================== --- freeswitch/trunk/libs/js/configure.ac (original) +++ freeswitch/trunk/libs/js/configure.ac Fri Nov 16 00:07:35 2007 @@ -174,6 +174,35 @@ LIBPATH="LD_LIBRARY_PATH=./nsprpub/dist/lib DYLD_LIBRARY_PATH=./nsprpub/dist/lib" fi +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 + ]) +]) + +AX_COMPILER_VENDOR + +# 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"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + CFLAGS="$CFLAGS -m64" + CXXFLAGS="$CXXFLAGS -m64" + fi +fi + AC_SUBST(CLI_CFLAGS) AC_SUBST(CLI_CPPFLAGS) AC_SUBST(CLI_LDFLAGS) Modified: freeswitch/trunk/libs/js/nsprpub/configure.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/configure.in (original) +++ freeswitch/trunk/libs/js/nsprpub/configure.in Fri Nov 16 00:07:35 2007 @@ -223,6 +223,14 @@ USE_64=1 fi ]) +# 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"]) + +if test "${enable_64}" = "yes"; then + USE_64=1 +fi + AC_ARG_ENABLE(mdupdate, [ --enable-mdupdate Enable use of certain compilers' mdupdate feature], [ if test "$enableval" = "yes"; then @@ -2660,6 +2668,7 @@ ;; esac + dnl ======================================================== dnl Substitution of found variables. dnl ========================================================

1 0

[commit] r6298 - freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse
by Freeswitch SVN 16 Nov '07

16 Nov '07

Author: mikej Date: Thu Nov 15 23:38:09 2007 New Revision: 6298 Modified: freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse/Makefile.in Log: add --enable-64 configure flag to build 64 bit with suncc Modified: freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse/Makefile.in ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse/Makefile.in (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/expat/xmlparse/Makefile.in Thu Nov 15 23:38:09 2007 @@ -124,7 +124,8 @@ LIBS = @LIBS@ libxmlrpc_xmlparse_la_LIBADD = libxmlrpc_xmlparse_la_OBJECTS = xmlparse.lo -CFLAGS = @CFLAGS@ +COMPILER_CFLAGS = @COMPILER_CFLAGS@ +CFLAGS = @CFLAGS@ $(COMPILER_CFLAGS) COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC)

1 0