- Freeswitch-branches - FreeSWITCH Mailing Lists

[commit] r6742 - in freeswitch/branches/stkn/sofia-exp/trunk: . build conf/autoload_configs conf/dialplan conf/lang/en conf/lang/en/vm conf/sip_profiles docs/phrase libs/sofia-sip libs/sofia-sip/libsofia-sip-ua/sresolv libs/sofia-sip/libsofia-sip-ua/stun libs/sofia-sip/libsofia-sip-ua/su libs/win32/sofia src src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_iax src/mod/endpoints/mod_portaudio src/mod/endpoints/mod_sofia src/mod/formats/mod_local_stream src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: stkn Date: Thu Dec 13 05:11:23 2007 New Revision: 6742 Modified: freeswitch/branches/stkn/sofia-exp/trunk/Freeswitch.2008.sln freeswitch/branches/stkn/sofia-exp/trunk/build/modules.conf.in freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/local_stream.conf.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/lang/en/en.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/lang/en/vm/sounds.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/nat.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/outbound.xml freeswitch/branches/stkn/sofia-exp/trunk/docs/phrase/phrase_en.xml freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/configure.gnu freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.c freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_global_log.c freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sofia/libsofia_sip_ua_static.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_io.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_session.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_state_machine.c Log: Merge changes from trunk Modified: freeswitch/branches/stkn/sofia-exp/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/Freeswitch.2008.sln (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/Freeswitch.2008.sln Thu Dec 13 05:11:23 2007 @@ -128,6 +128,7 @@ ProjectSection(SolutionItems) = preProject conf\sip_profiles\default.xml = conf\sip_profiles\default.xml conf\sip_profiles\nat.xml = conf\sip_profiles\nat.xml + conf\sip_profiles\outbound.xml = conf\sip_profiles\outbound.xml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lang", "lang", "{09455AA9-C243-4F16-A1A1-A016881A2765}" Modified: freeswitch/branches/stkn/sofia-exp/trunk/build/modules.conf.in ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/build/modules.conf.in (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/build/modules.conf.in Thu Dec 13 05:11:23 2007 @@ -44,7 +44,7 @@ formats/mod_native_file formats/mod_sndfile #formats/mod_shout -#formats/mod_local_stream +formats/mod_local_stream #languages/mod_python languages/mod_spidermonkey languages/mod_spidermonkey_teletone Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/local_stream.conf.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/local_stream.conf.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/local_stream.conf.xml Thu Dec 13 05:11:23 2007 @@ -1,11 +1,11 @@ <configuration name="local_stream.conf" description="stream files from local dir"> -<directory name="moh_8000" path="$${base_dir}/sounds/music/8000"> +<directory name="moh/8000" path="$${base_dir}/sounds/music/8000"> <param name="rate" value="8000"/> <param name="channels" value="1"/> <param name="interval" value="2"/> <param name="timer_name" value="soft"/> </directory> -<directory name="moh_16000" path="$${base_dir}/sounds/music/16000"> +<directory name="moh/16000" path="$${base_dir}/sounds/music/16000"> <param name="rate" value="16000"/> <param name="channels" value="1"/> <param name="interval" value="2"/> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml Thu Dec 13 05:11:23 2007 @@ -184,7 +184,7 @@ <extension name="hold_music"> <condition field="destination_number" expression="^9999$"> <action application="answer"/> - <action application="playback" data="local_stream://moh_${read_rate}"/> + <action application="playback" data="local_stream://moh"/> </condition> </extension> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/lang/en/en.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/lang/en/en.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/lang/en/en.xml Thu Dec 13 05:11:23 2007 @@ -1,7 +1,7 @@ <include> - <language name="en" sound-path="/snds" tts-engine="cepstral" tts-voice="callie"> + <language name="en" sound-path="$${base_dir}/sounds/en/us/callie" tts-engine="cepstral" tts-voice="callie"> <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/>  - <X-PRE-PROCESS cmd="include" data="vm/tts.xml"/> + <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/> </language> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/lang/en/vm/sounds.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/lang/en/vm/sounds.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/lang/en/vm/sounds.xml Thu Dec 13 05:11:23 2007 @@ -200,6 +200,23 @@ </input> </macro> + <macro name="marked-urgent"> + <input pattern="^(.*)$"> + <match> + <action function="play-file" data="voicemail/vm-urgent.wav"/> + <action function="play-file" data="voicemail/vm-message.wav"/> + </match> + </input> + </macro> + + <macro name="saved"> + <input pattern="^(.*)$"> + <match> + <action function="play-file" data="voicemail/vm-saved.wav"/> + </match> + </input> + </macro> + <macro name="voicemail_greeting_selected"> <input pattern="^(.*)$"> <match> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml Thu Dec 13 05:11:23 2007 @@ -16,6 +16,8 @@ <settings> <param name="debug" value="0"/> + <param name="sip-trace" value="no"/> + <param name="log-level" value="0"/> <param name="context" value="public"/> <param name="rfc2833-pt" value="101"/> <param name="sip-port" value="5060"/> @@ -26,7 +28,7 @@ <param name="rtp-timer-name" value="soft"/> <param name="rtp-ip" value="$${local_ip_v4}"/> <param name="sip-ip" value="$${local_ip_v4}"/> - <param name="hold-music" value="local_stream://moh_8000"/> + <param name="hold-music" value="local_stream://moh"/>  <param name="manage-presence" value="true"/>  Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/nat.xml Thu Dec 13 05:11:23 2007 @@ -6,6 +6,8 @@ <settings> <param name="debug" value="0"/> + <param name="sip-trace" value="no"/> + <param name="log-level" value="0"/> <param name="rfc2833-pt" value="101"/> <param name="sip-port" value="5070"/> <param name="dialplan" value="XML"/> @@ -13,7 +15,7 @@ <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/> <param name="use-rtp-timer" value="true"/> - <param name="hold-music" value="local_stream://moh_8000"/> + <param name="hold-music" value="local_stream://moh"/> <param name="rtp-timer-name" value="soft"/> <param name="manage-presence" value="true"/> <param name="inbound-codec-negotiation" value="generous"/> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/outbound.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/outbound.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/outbound.xml Thu Dec 13 05:11:23 2007 @@ -11,13 +11,15 @@ <settings> <param name="debug" value="0"/> + <param name="sip-trace" value="no"/> + <param name="log-level" value="0"/> <param name="rfc2833-pt" value="101"/> <param name="sip-port" value="5080"/> <param name="dialplan" value="XML"/> <param name="context" value="public"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/> - <param name="hold-music" value="local_stream://moh_8000"/> + <param name="hold-music" value="local_stream://moh"/> <param name="use-rtp-timer" value="true"/> <param name="rtp-timer-name" value="soft"/> <param name="manage-presence" value="true"/> Modified: freeswitch/branches/stkn/sofia-exp/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/docs/phrase/phrase_en.xml Thu Dec 13 05:11:23 2007 @@ -211,16 +211,17 @@ <prompt phrase="deleted" filename="vm-deleted.wav"/> <prompt phrase="in folder inbox" filename="vm-in_folder.wav"/> <prompt phrase="to return the call now" filename="vm-return_call.wav"/> + <prompt phrase="urgent" filename="vm-urgent.wav"/> </voicemail> <conference> - <prompt phrase="'TONE'" filename="ack.wav" type="tone"/> - <prompt phrase="'TONE'" filename="nack.wav" type="tone"/> - <prompt phrase="The conference is muted." filename="mute.wav"/> - <prompt phrase="The conference is unmuted." filename="unmuted.wav"/> + <prompt phrase="NULL" filename="ack.wav" type="tone"/> + <prompt phrase="NULL" filename="nack.wav" type="tone"/> + <prompt phrase="You are now muted." filename="mute.wav"/> + <prompt phrase="You are now unmuted." filename="unmuted.wav"/> <prompt phrase="You are currently the only person in this conference." filename="alone.wav"/> - <prompt phrase="'NONE'" filename="perpetual.wav" type="music"/> - <prompt phrase="'NONE'" filename="enter.wav" type="tone"/> - <prompt phrase="'NONE'" filename="exit.wav" type="tone"/> + <prompt phrase="NULL" filename="perpetual.wav" type="music"/> + <prompt phrase="NULL" filename="enter.wav" type="tone"/> + <prompt phrase="NULL" filename="exit.wav" type="tone"/> <prompt phrase="You have been kicked from this conference." filename="kicked.wav"/> <prompt phrase="This conference is locked." filename="locked.wav"/> <prompt phrase="The conference is now locked." filename="is-locked.wav"/> Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/configure.gnu ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/configure.gnu (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/configure.gnu Thu Dec 13 05:11:23 2007 @@ -1,3 +1,3 @@ #! /bin/sh -./configure "$@" --with-pic --with-glib=no --disable-shared +CFLAGS="$CFLAGS -DSU_DEBUG=0" ./configure "$@" --with-pic --with-glib=no --disable-shared Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Thu Dec 13 05:11:23 2007 @@ -567,12 +567,16 @@ extern char const SRESOLV_DEBUG[]; /* dummy declaration for Doxygen */ #endif +#ifndef SU_DEBUG +#define SU_DEBUG 3 +#endif + /**Debug log for @b sresolv module. * * The sresolv_log is the log object used by @b sresolv module. The level of * #sresolv_log is set using #SRESOLV_DEBUG environment variable. */ -su_log_t sresolv_log[] = { SU_LOG_INIT("sresolv", "SRESOLV_DEBUG", 3) }; +su_log_t sresolv_log[] = { SU_LOG_INIT("sresolv", "SRESOLV_DEBUG", SU_DEBUG) }; /** Internal errors */ enum { Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun.c Thu Dec 13 05:11:23 2007 @@ -74,8 +74,12 @@ static char const __func__[] = "stun"; #endif +#ifndef SU_DEBUG +#define SU_DEBUG 3 +#endif + /** STUN log. */ -su_log_t stun_log[] = { SU_LOG_INIT("stun", "STUN_DEBUG", 3) }; +su_log_t stun_log[] = { SU_LOG_INIT("stun", "STUN_DEBUG", SU_DEBUG) }; /**@var STUN_DEBUG * Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_global_log.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_global_log.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_global_log.c Thu Dec 13 05:11:23 2007 @@ -47,7 +47,9 @@ * * @sa <sofia-sip/su_debug.h>, su_log_global */ +#ifdef DOXYGEN extern char const SU_DEBUG[]; +#endif #ifdef SU_DEBUG #define SU_DEBUG_ SU_DEBUG Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sofia/libsofia_sip_ua_static.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sofia/libsofia_sip_ua_static.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sofia/libsofia_sip_ua_static.2008.vcproj Thu Dec 13 05:11:23 2007 @@ -44,7 +44,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""..\..\sofia-sip\win32";"..\..\sofia-sip\libsofia-sip-ua\su";"..\..\sofia-sip\libsofia-sip-ua\ipt";"..\..\sofia-sip\libsofia-sip-ua\sresolv";"..\..\sofia-sip\libsofia-sip-ua\bnf";"..\..\sofia-sip\libsofia-sip-ua\url";"..\..\sofia-sip\libsofia-sip-ua\msg";"..\..\sofia-sip\libsofia-sip-ua\sip";"..\..\sofia-sip\libsofia-sip-ua\nta";"..\..\sofia-sip\libsofia-sip-ua\nua";"..\..\sofia-sip\libsofia-sip-ua\iptsec";"..\..\sofia-sip\libsofia-sip-ua\http";"..\..\sofia-sip\libsofia-sip-ua\nth";"..\..\sofia-sip\libsofia-sip-ua\nea";"..\..\sofia-sip\libsofia-sip-ua\sdp";"..\..\sofia-sip\libsofia-sip-ua\soa";"..\..\sofia-sip\libsofia-sip-ua\stun";"..\..\sofia-sip\libsofia-sip-ua\tport";"..\..\sofia-sip\libsofia-sip-ua\features";"..\..\pthreads-w32-2-7-0-release";." - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -123,7 +123,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories=""..\..\sofia-sip\win32";"..\..\sofia-sip\libsofia-sip-ua\su";"..\..\sofia-sip\libsofia-sip-ua\ipt";"..\..\sofia-sip\libsofia-sip-ua\sresolv";"..\..\sofia-sip\libsofia-sip-ua\bnf";"..\..\sofia-sip\libsofia-sip-ua\url";"..\..\sofia-sip\libsofia-sip-ua\msg";"..\..\sofia-sip\libsofia-sip-ua\sip";"..\..\sofia-sip\libsofia-sip-ua\nta";"..\..\sofia-sip\libsofia-sip-ua\nua";"..\..\sofia-sip\libsofia-sip-ua\iptsec";"..\..\sofia-sip\libsofia-sip-ua\http";"..\..\sofia-sip\libsofia-sip-ua\nth";"..\..\sofia-sip\libsofia-sip-ua\nea";"..\..\sofia-sip\libsofia-sip-ua\sdp";"..\..\sofia-sip\libsofia-sip-ua\soa";"..\..\sofia-sip\libsofia-sip-ua\stun";"..\..\sofia-sip\libsofia-sip-ua\tport";"..\..\sofia-sip\libsofia-sip-ua\features";"..\..\pthreads-w32-2-7-0-release";." - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj Thu Dec 13 05:11:23 2007 @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""..\..\sofia-sip\win32";"..\..\sofia-sip\libsofia-sip-ua\su";"..\..\sofia-sip\libsofia-sip-ua\ipt";"..\..\sofia-sip\libsofia-sip-ua\sresolv";"..\..\sofia-sip\libsofia-sip-ua\bnf";"..\..\sofia-sip\libsofia-sip-ua\url";"..\..\sofia-sip\libsofia-sip-ua\msg";"..\..\sofia-sip\libsofia-sip-ua\sip";"..\..\sofia-sip\libsofia-sip-ua\nta";"..\..\sofia-sip\libsofia-sip-ua\nua";"..\..\sofia-sip\libsofia-sip-ua\iptsec";"..\..\sofia-sip\libsofia-sip-ua\http";"..\..\sofia-sip\libsofia-sip-ua\nth";"..\..\sofia-sip\libsofia-sip-ua\nea";"..\..\sofia-sip\libsofia-sip-ua\sdp";"..\..\sofia-sip\libsofia-sip-ua\soa";"..\..\sofia-sip\libsofia-sip-ua\stun";"..\..\sofia-sip\libsofia-sip-ua\tport";"..\..\sofia-sip\libsofia-sip-ua\features";"..\..\pthreads-w32-2-7-0-release";." - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -122,7 +122,7 @@ Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories=""..\..\sofia-sip\win32";"..\..\sofia-sip\libsofia-sip-ua\su";"..\..\sofia-sip\libsofia-sip-ua\ipt";"..\..\sofia-sip\libsofia-sip-ua\sresolv";"..\..\sofia-sip\libsofia-sip-ua\bnf";"..\..\sofia-sip\libsofia-sip-ua\url";"..\..\sofia-sip\libsofia-sip-ua\msg";"..\..\sofia-sip\libsofia-sip-ua\sip";"..\..\sofia-sip\libsofia-sip-ua\nta";"..\..\sofia-sip\libsofia-sip-ua\nua";"..\..\sofia-sip\libsofia-sip-ua\iptsec";"..\..\sofia-sip\libsofia-sip-ua\http";"..\..\sofia-sip\libsofia-sip-ua\nth";"..\..\sofia-sip\libsofia-sip-ua\nea";"..\..\sofia-sip\libsofia-sip-ua\sdp";"..\..\sofia-sip\libsofia-sip-ua\soa";"..\..\sofia-sip\libsofia-sip-ua\stun";"..\..\sofia-sip\libsofia-sip-ua\tport";"..\..\sofia-sip\libsofia-sip-ua\features";"..\..\pthreads-w32-2-7-0-release";." - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H;SU_DEBUG=0" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Dec 13 05:11:23 2007 @@ -433,7 +433,7 @@ switch (event->event_id) { case SWITCH_EVENT_PRESENCE_PROBE: if (proto) { - char *sql; + char *subsql; char *to = switch_event_get_header(event, "to"); char *f_host = NULL; if (to) { @@ -443,9 +443,9 @@ } if (f_host && (profile = switch_core_hash_find(globals.profile_hash, f_host))) { - if (to && (sql = switch_mprintf("select * from jabber_subscriptions where sub_to='%q' and sub_from='%q'", to, from))) { - mdl_execute_sql_callback(profile, profile->mutex, sql, sin_callback, profile); - switch_safe_free(sql); + if (to && (subsql = switch_mprintf("select * from jabber_subscriptions where sub_to='%q' and sub_from='%q'", to, from))) { + mdl_execute_sql_callback(profile, profile->mutex, subsql, sin_callback, profile); + switch_safe_free(subsql); } } } @@ -1461,6 +1461,10 @@ } } + if (!tech_pvt->read_codec.implementation) { + return SWITCH_STATUS_GENERR; + } + if (!switch_test_flag(tech_pvt, TFLAG_IO)) { return SWITCH_STATUS_SUCCESS; } @@ -1747,9 +1751,9 @@ char *them; them = strdup(tech_pvt->them); if (them) { - char *p; - if ((p = strchr(them, '/'))) { - *p = '\0'; + char *ptr; + if ((ptr = strchr(them, '/'))) { + *ptr = '\0'; } ldl_handle_send_msg(mdl_profile->handle, tech_pvt->us, them, "", cid_msg); } @@ -1853,43 +1857,43 @@ static switch_status_t init_profile(mdl_profile_t *profile, uint8_t login) { - if (profile && profile->login && profile->password && profile->dialplan && profile->message && profile->ip && profile->name && profile->exten) { - ldl_handle_t *handle; + ldl_handle_t *handle; - if (switch_test_flag(profile, TFLAG_TIMER) && !profile->timer_name) { - profile->timer_name = switch_core_strdup(module_pool, "soft"); - } + if (!profile) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Invalid Profile\n"); + return SWITCH_STATUS_FALSE; + } - if (login) { - if (ldl_handle_init(&handle, - profile->login, - profile->password, - profile->server, - profile->user_flags, profile->message, handle_loop, handle_signalling, handle_response, profile) == LDL_STATUS_SUCCESS) { - profile->handle = handle; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Started Thread for %s@%s\n", profile->login, profile->dialplan); - switch_core_hash_insert(globals.profile_hash, profile->name, profile); - handle_thread_launch(handle); - } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created Profile for %s@%s\n", profile->login, profile->dialplan); - switch_core_hash_insert(globals.profile_hash, profile->name, profile); - } - } else { + if (!(profile->login && profile->password && profile->dialplan && profile->message && profile->ip && profile->name && profile->exten)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, - "Invalid Profile\n" - "login[%s]\n" - "pass[%s]\n" - "dialplan[%s]\n" - "message[%s]\n" - "rtp-ip[%s]\n" - "name[%s]\n" - "exten[%s]\n", profile->login, profile->password, profile->dialplan, profile->message, profile->ip, profile->name, - profile->exten); + "Invalid Profile\n" "login[%s]\n" "pass[%s]\n" "dialplan[%s]\n" + "message[%s]\n" "rtp-ip[%s]\n" "name[%s]\n" "exten[%s]\n", + profile->login, profile->password, profile->dialplan, profile->message, profile->ip, profile->name, profile->exten); return SWITCH_STATUS_FALSE; } + if (switch_test_flag(profile, TFLAG_TIMER) && !profile->timer_name) { + profile->timer_name = switch_core_strdup(module_pool, "soft"); + } + + if (!login) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created Profile for %s@%s\n", profile->login, profile->dialplan); + switch_core_hash_insert(globals.profile_hash, profile->name, profile); + return SWITCH_STATUS_SUCCESS; + } + + if (ldl_handle_init(&handle, + profile->login, + profile->password, + profile->server, + profile->user_flags, profile->message, handle_loop, handle_signalling, handle_response, profile) == LDL_STATUS_SUCCESS) { + profile->handle = handle; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Started Thread for %s@%s\n", profile->login, profile->dialplan); + switch_core_hash_insert(globals.profile_hash, profile->name, profile); + handle_thread_launch(handle); + } + return SWITCH_STATUS_SUCCESS; } @@ -1919,6 +1923,7 @@ static void set_profile_val(mdl_profile_t *profile, char *var, char *val) { + if (!var) return; if (!strcasecmp(var, "login")) { profile->login = switch_core_strdup(module_pool, val); @@ -1953,9 +1958,9 @@ } else if (!strcasecmp(var, "message")) { profile->message = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "rtp-ip")) { - profile->ip = switch_core_strdup(module_pool, strcasecmp(val, "auto") ? val : globals.guess_ip); + profile->ip = switch_core_strdup(module_pool, strcasecmp(switch_str_nil(val), "auto") ? switch_str_nil(val) : globals.guess_ip); } else if (!strcasecmp(var, "ext-rtp-ip")) { - profile->extip = switch_core_strdup(module_pool, strcasecmp(val, "auto") ? val : globals.guess_ip); + profile->extip = switch_core_strdup(module_pool, strcasecmp(switch_str_nil(val), "auto") ? switch_str_nil(val) : globals.guess_ip); } else if (!strcasecmp(var, "server")) { profile->server = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "rtp-timer-name")) { @@ -1967,9 +1972,9 @@ profile->user_flags |= LDL_FLAG_TLS; } } else if (!strcasecmp(var, "sasl")) { - if (!strcasecmp(val, "plain")) { + if (val && !strcasecmp(val, "plain")) { profile->user_flags |= LDL_FLAG_SASL_PLAIN; - } else if (!strcasecmp(val, "md5")) { + } else if (val && !strcasecmp(val, "md5")) { profile->user_flags |= LDL_FLAG_SASL_MD5; } } else if (!strcasecmp(var, "exten")) { @@ -1980,7 +1985,7 @@ if (switch_true(val)) { switch_set_flag(profile, TFLAG_AUTO); } - } else if (!strcasecmp(var, "vad")) { + } else if (!strcasecmp(var, "vad") && val) { if (!strcasecmp(val, "in")) { switch_set_flag(profile, TFLAG_VAD_IN); } else if (!strcasecmp(val, "out")) { @@ -2091,7 +2096,7 @@ return SWITCH_STATUS_SUCCESS; } - if (!strncasecmp(argv[0], "profile=", 8)) { + if (argv[0] && !strncasecmp(argv[0], "profile=", 8)) { char *profile_name = argv[0] + 8; profile = switch_core_hash_find(globals.profile_hash, profile_name); @@ -2108,7 +2113,7 @@ for (x = 0; x < argc; x++) { var = argv[x]; - if ((val = strchr(var, '='))) { + if (var && (val = strchr(var, '='))) { *val++ = '\0'; set_profile_val(profile, var, val); } @@ -2182,11 +2187,12 @@ if (!profile) { profile = switch_core_alloc(module_pool, sizeof(*profile)); } + set_profile_val(profile, var, val); } - if (type && !strcasecmp(type, "component")) { + if (profile && type && !strcasecmp(type, "component")) { char dbname[256]; switch_core_db_t *db; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_iax/mod_iax.c Thu Dec 13 05:11:23 2007 @@ -150,7 +150,7 @@ static char *ast2str(int ast) { int x; - for (x = 0; x < 32; x++) { + for (x = 0; x < 19; x++) { if ((1 << x) == ast) { return AST_IANA[x].name; } @@ -216,8 +216,6 @@ unsigned int *format, unsigned int *cababilities, unsigned short *samprate, iax_io_t io) { char *dname = NULL; - //int rate = 8000; - //int codec_ms = 20; switch_channel_t *channel; const switch_codec_implementation_t *codecs[SWITCH_MAX_CODECS]; int num_codecs = 0; @@ -226,11 +224,12 @@ uint32_t interval = 0; if (globals.codec_string) { - if ((num_codecs = switch_loadable_module_get_codecs_sorted(codecs, SWITCH_MAX_CODECS, globals.codec_order, globals.codec_order_last)) <= 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO codecs?\n"); - return SWITCH_STATUS_GENERR; - } - } else if (((num_codecs = switch_loadable_module_get_codecs(codecs, SWITCH_MAX_CODECS))) <= 0) { + num_codecs = switch_loadable_module_get_codecs_sorted(codecs, SWITCH_MAX_CODECS, globals.codec_order, globals.codec_order_last); + } else { + num_codecs = switch_loadable_module_get_codecs(codecs, SWITCH_MAX_CODECS); + } + + if (num_codecs <= 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO codecs?\n"); return SWITCH_STATUS_GENERR; } @@ -246,6 +245,8 @@ } } + switch_assert(codecs[0]); + if (io == IAX_SET) { mixed_cap = (local_cap & *cababilities); } else { @@ -1104,9 +1105,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New Inbound Channel %s!\n", iaxevent->ies.calling_name); if ((session = switch_core_session_request(iax_endpoint_interface, NULL)) != 0) { - private_t *tech_pvt; - switch_channel_t *channel; - switch_core_session_add_stream(session, NULL); if ((tech_pvt = (private_t *) switch_core_session_alloc(session, sizeof(private_t))) != 0) { channel = switch_core_session_get_channel(session); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Dec 13 05:11:23 2007 @@ -1730,6 +1730,11 @@ goto done; } + if (!argv[0]) { + stream->write_function(stream, "Unknown Command\n"); + goto done; + } + if (!strcasecmp(argv[0], "call")) { func = place_call; } else if (!strcasecmp(argv[0], "help")) { Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj Thu Dec 13 05:11:23 2007 @@ -39,7 +39,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\bnf"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\bnf";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\tport"" PreprocessorDefinitions="LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" UsePrecompiledHeader="0" DisableSpecificWarnings="4201" @@ -105,7 +105,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\bnf"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\bnf";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\tport"" PreprocessorDefinitions="LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" UsePrecompiledHeader="0" DisableSpecificWarnings="4201" Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Dec 13 05:11:23 2007 @@ -556,6 +556,10 @@ } } + if (!tech_pvt->read_codec.implementation) { + return SWITCH_STATUS_GENERR; + } + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; } @@ -834,7 +838,7 @@ char *reason = NULL; if (switch_channel_test_flag(channel, CF_ANSWERED)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Call is already answered, Rejecting with hangup\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Call is already answered, Rejecting with hangup\n"); switch_channel_hangup(channel, SWITCH_CAUSE_CALL_REJECTED); } else { @@ -860,11 +864,11 @@ if (switch_strlen_zero(to_host)) { to_host = switch_channel_get_variable(channel, "sip_to_host"); } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Challanging call %s\n", to_uri); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Challenging call %s\n", to_uri); sofia_reg_auth_challange(NULL, tech_pvt->profile, tech_pvt->nh, REG_INVITE, to_host, 0); switch_channel_hangup(channel, SWITCH_CAUSE_USER_CHALLENGE); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Rejecting with %d %s\n", code, reason); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Rejecting with %d %s\n", code, reason); nua_respond(tech_pvt->nh, code, reason, TAG_END()); } } @@ -1356,6 +1360,7 @@ "sofia help\n" "sofia profile <profile_name> [start|stop|restart|flush_inbound_reg|[register|unregister] [<gateway name>|all]] [reloadxml]\n" "sofia status [[profile | gateway] <name>]\n" + "sofia loglevel [0-9]\n" "--------------------------------------------------------------------------------\n"; if (session) { @@ -1372,7 +1377,7 @@ goto done; } - if (!(argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + if (!(argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) || !argv[0]) { stream->write_function(stream, "%s", usage_string); goto done; } @@ -1381,6 +1386,20 @@ func = cmd_profile; } else if (!strcasecmp(argv[0], "status")) { func = cmd_status; + } else if (!strcasecmp(argv[0], "loglevel")) { + if (argc > 1 && argv[1]) { + int level; + level = atoi(argv[1]); + if (level >= 0 && level <= 9) { + su_log_set_level(NULL, atoi(argv[1])); + stream->write_function(stream, "Sofia-sip log level set to [%d]", level); + } else { + stream->write_function(stream, "%s", usage_string); + } + } else { + stream->write_function(stream, "%s", usage_string); + } + goto done; } else if (!strcasecmp(argv[0], "help")) { stream->write_function(stream, "%s", usage_string); goto done; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Thu Dec 13 05:11:23 2007 @@ -149,7 +149,8 @@ TFLAG_INB_NOMEDIA = (1 << 23), TFLAG_LATE_NEGOTIATION = (1 << 24), TFLAG_SDP = (1 << 25), - TFLAG_VIDEO = (1 << 26) + TFLAG_VIDEO = (1 << 26), + TFLAG_TPORT_LOG = (1 << 27) } TFLAGS; struct mod_sofia_globals { Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Dec 13 05:11:23 2007 @@ -36,8 +36,19 @@ #include "mod_sofia.h" #include "sofia-sip/msg_parser.h" #include "sofia-sip/sip_extra.h" +#include "sofia-sip/tport_tag.h" extern su_log_t tport_log[]; +extern su_log_t iptsec_log[]; +extern su_log_t nea_log[]; +extern su_log_t nta_log[]; +extern su_log_t nth_client_log[]; +extern su_log_t nth_server_log[]; +extern su_log_t nua_log[]; +extern su_log_t soa_log[]; +extern su_log_t sresolv_log[]; +extern su_log_t stun_log[]; + static void sofia_handle_sip_i_state(switch_core_session_t *session, int status, char const *phrase, @@ -334,6 +345,7 @@ uint32_t ireg_loops = 0; uint32_t gateway_loops = 0; switch_event_t *s_event; + int tportlog = 0; switch_mutex_lock(mod_sofia_globals.mutex); mod_sofia_globals.threads++; @@ -350,6 +362,10 @@ goto end; } + if (switch_test_flag(profile, TFLAG_TPORT_LOG)) { + tportlog = 1; + } + profile->nua = nua_create(profile->s_root, /* Event loop */ sofia_event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ @@ -357,6 +373,7 @@ TAG_IF(profile->pflags & PFLAG_TLS, NUTAG_SIPS_URL(profile->tls_bindurl)), TAG_IF(profile->pflags & PFLAG_TLS, NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)), NTATAG_UDP_MTU(65536), + TAG_IF(tportlog, TPTAG_LOG(1)), TAG_END()); /* Last tag should always finish the sequence */ if (!profile->nua) { @@ -759,8 +776,6 @@ char *val = (char *) switch_xml_attr_soft(param, "value"); if (!strcasecmp(var, "log-level")) { su_log_set_level(NULL, atoi(val)); - } else if (!strcasecmp(var, "log-level-trace")) { - su_log_set_level(tport_log, atoi(val)); } } } @@ -817,7 +832,8 @@ profile->debug = atoi(val); } else if (!strcasecmp(var, "use-rtp-timer") && switch_true(val)) { switch_set_flag(profile, TFLAG_TIMER); - + } else if (!strcasecmp(var, "sip-trace") && switch_true(val)) { + switch_set_flag(profile, TFLAG_TPORT_LOG); } else if (!strcasecmp(var, "odbc-dsn") && !switch_strlen_zero(val)) { #ifdef SWITCH_HAVE_ODBC profile->odbc_dsn = switch_core_strdup(profile->pool, val); @@ -1049,8 +1065,8 @@ } if (profile->bind_params) { - char *url = profile->bindurl; - profile->bindurl = switch_core_sprintf(profile->pool, "%s;%s", url, profile->bind_params); + char *bindurl = profile->bindurl; + profile->bindurl = switch_core_sprintf(profile->pool, "%s;%s", bindurl, profile->bind_params); } /* Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Dec 13 05:11:23 2007 @@ -1051,6 +1051,7 @@ switch_status_t sofia_glue_tech_set_codec(private_object_t *tech_pvt, int force) { + int ms; if (tech_pvt->read_codec.implementation) { if (!force) { @@ -1085,32 +1086,38 @@ NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); return SWITCH_STATUS_FALSE; - } else { - if (switch_core_codec_init(&tech_pvt->write_codec, - tech_pvt->iananame, - tech_pvt->rm_fmtp, - tech_pvt->rm_rate, - tech_pvt->codec_ms, - 1, - SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE | tech_pvt->profile->codec_flags, - NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); - return SWITCH_STATUS_FALSE; - } else { - int ms; - tech_pvt->read_frame.rate = tech_pvt->rm_rate; - ms = tech_pvt->write_codec.implementation->microseconds_per_frame / 1000; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Codec %s %s/%ld %d ms %d samples\n", - switch_channel_get_name(tech_pvt->channel), tech_pvt->iananame, tech_pvt->rm_rate, tech_pvt->codec_ms, - tech_pvt->read_codec.implementation->samples_per_frame - ); - tech_pvt->read_frame.codec = &tech_pvt->read_codec; - - switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec); - switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec); - tech_pvt->fmtp_out = switch_core_session_strdup(tech_pvt->session, tech_pvt->write_codec.fmtp_out); - } + } + + if (switch_core_codec_init(&tech_pvt->write_codec, + tech_pvt->iananame, + tech_pvt->rm_fmtp, + tech_pvt->rm_rate, + tech_pvt->codec_ms, + 1, + SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE | tech_pvt->profile->codec_flags, + NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); + return SWITCH_STATUS_FALSE; + } + + tech_pvt->read_frame.rate = tech_pvt->rm_rate; + ms = tech_pvt->write_codec.implementation->microseconds_per_frame / 1000; + + if (!tech_pvt->read_codec.implementation) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); + return SWITCH_STATUS_FALSE; } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Codec %s %s/%ld %d ms %d samples\n", + switch_channel_get_name(tech_pvt->channel), tech_pvt->iananame, tech_pvt->rm_rate, tech_pvt->codec_ms, + tech_pvt->read_codec.implementation->samples_per_frame + ); + tech_pvt->read_frame.codec = &tech_pvt->read_codec; + + switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec); + switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec); + tech_pvt->fmtp_out = switch_core_session_strdup(tech_pvt->session, tech_pvt->write_codec.fmtp_out); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Thu Dec 13 05:11:23 2007 @@ -341,23 +341,23 @@ case SWITCH_EVENT_PRESENCE_PROBE: if (proto) { char *to = switch_event_get_header(event, "to"); - char *user, *euser, *host, *p; + char *probe_user, *probe_euser, *probe_host, *p; - if (!to || !(user = strdup(to))) { + if (!to || !(probe_user = strdup(to))) { return; } - if ((host = strchr(user, '@'))) { - *host++ = '\0'; + if ((probe_host = strchr(probe_user, '@'))) { + *probe_host++ = '\0'; } - euser = user; - if ((p = strchr(euser, '+'))) { - euser = (p + 1); + probe_euser = probe_user; + if ((p = strchr(probe_euser, '+'))) { + probe_euser = (p + 1); } - if (euser && host && + if (probe_euser && probe_host && (sql = switch_mprintf("select sip_user,sip_host,status,rpid,'' from sip_registrations where sip_user='%q' and sip_host='%q'", - euser, host)) && (profile = sofia_glue_find_profile(host))) { + probe_euser, probe_host)) && (profile = sofia_glue_find_profile(probe_host))) { sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, @@ -725,17 +725,17 @@ from_host = "n/a"; } - if (strstr(to_user, "ext+") || strstr(to_user, "user+")) { - char proto[80]; + if (to_user && (strstr(to_user, "ext+") || strstr(to_user, "user+"))) { + char protocol[80]; char *p; - switch_copy_string(proto, to_user, sizeof(proto)); - if ((p = strchr(proto, '+'))) { + switch_copy_string(protocol, to_user, sizeof(protocol)); + if ((p = strchr(protocol, '+'))) { *p = '\0'; } if (switch_event_create(&sevent, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(sevent, SWITCH_STACK_BOTTOM, "proto", proto); + switch_event_add_header(sevent, SWITCH_STACK_BOTTOM, "proto", protocol); switch_event_add_header(sevent, SWITCH_STACK_BOTTOM, "login", "%s", profile->name); switch_event_add_header(sevent, SWITCH_STACK_BOTTOM, "from", "%s@%s", to_user, to_host); switch_event_add_header(sevent, SWITCH_STACK_BOTTOM, "rpid", "active"); @@ -754,7 +754,7 @@ } } - if (strchr(to_user, '+')) { + if (to_user && strchr(to_user, '+')) { char *h; if ((proto = (d_user = strdup(to_user)))) { if ((my_to_user = strchr(d_user, '+'))) { Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Dec 13 05:11:23 2007 @@ -89,9 +89,8 @@ NUTAG_CALLSTATE_REF(ss_state), SIPTAG_FROM_STR(gateway_ptr->register_from), TAG_END()))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "registering %s\n", gateway_ptr->name); - if (!(gateway_ptr->sofia_private = malloc(sizeof(*gateway_ptr->sofia_private)))) { - abort(); - } + gateway_ptr->sofia_private = malloc(sizeof(*gateway_ptr->sofia_private)); + switch_assert(gateway_ptr->sofia_private); memset(gateway_ptr->sofia_private, 0, sizeof(*gateway_ptr->sofia_private)); gateway_ptr->sofia_private->gateway = gateway_ptr; @@ -404,7 +403,7 @@ authorization = sip->sip_proxy_authorization; } - if ((profile->pflags & PFLAG_BLIND_REG)) { + if (regtype == REG_REGISTER && (profile->pflags & PFLAG_BLIND_REG)) { goto reg; } @@ -462,7 +461,6 @@ if (!authorization || stale) { sofia_reg_auth_challange(nua, profile, nh, regtype, to_host, stale); - if (regtype == REG_REGISTER) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Requesting Registration from: [%s@%s]\n", to_user, to_host); } @@ -642,7 +640,7 @@ if (expi != sofia_private->gateway->freq) { sofia_private->gateway->freq = expi; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Changing expire time to %d by request of proxy %s\n", expi, sofia_private->gateway->register_proxy); } @@ -841,7 +839,7 @@ dparams = switch_xml_child(domain, "params"); uparams = switch_xml_child(user, "params"); - if (!(dparams && uparams)) { + if (!(dparams || uparams)) { ret = AUTH_OK; goto skip_auth; } @@ -882,9 +880,6 @@ } if (!a1_hash) { - su_md5_t ctx; - char *input; - input = switch_mprintf("%s:%s:%s", username, realm, passwd); su_md5_init(&ctx); su_md5_strupdate(&ctx, input); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Thu Dec 13 05:11:23 2007 @@ -224,7 +224,7 @@ handle->speed = 0; handle->private_info = context; handle->interval = source->interval; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Opening Stream [%s] %dhz\n", path, handle->samplerate); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opening Stream [%s] %dhz\n", path, handle->samplerate); switch_mutex_init(&context->audio_mutex, SWITCH_MUTEX_NESTED, handle->memory_pool); if (switch_buffer_create_dynamic(&context->audio_buffer, 512, 1024, 0) != SWITCH_STATUS_SUCCESS) { Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Thu Dec 13 05:11:23 2007 @@ -780,21 +780,22 @@ ServerAddHandler(&globals.abyssServer, handler_hook); ServerAddHandler(&globals.abyssServer, auth_hook); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Starting HTTP Port %d, DocRoot [%s]\n", globals.port, SWITCH_GLOBAL_dirs.htdocs_dir); - while (globals.running) { - //ServerRunOnce2(&globals.abyssServer, ABYSS_FOREGROUND); - ServerRun(&globals.abyssServer); - } - + ServerRun(&globals.abyssServer); + globals.running = 0; - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_TERM; } SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_rpc_shutdown) { + globals.abyssServer.running = 0; - globals.running = 0; + shutdown(globals.abyssServer.listensock, 2); + while(globals.running) { + switch_yield(100000); + } return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_io.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_io.c Thu Dec 13 05:11:23 2007 @@ -200,6 +200,11 @@ read_frame = &session->raw_read_frame; break; case SWITCH_STATUS_NOOP: + if (session->read_resampler) { + switch_resample_destroy(&session->read_resampler); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deactivating read resampler\n"); + } + status = SWITCH_STATUS_SUCCESS; break; case SWITCH_STATUS_BREAK: @@ -220,6 +225,7 @@ goto done; } } +#if 0 if (session->read_resampler) { short *data = read_frame->data; @@ -232,6 +238,7 @@ read_frame->datalen = session->read_resampler->to_len * 2; read_frame->rate = session->read_resampler->to_rate; } +#endif if (session->bugs) { switch_media_bug_t *bp, *dp, *last = NULL; @@ -518,6 +525,10 @@ case SWITCH_STATUS_BREAK: return SWITCH_STATUS_SUCCESS; case SWITCH_STATUS_NOOP: + if (session->write_resampler) { + switch_resample_destroy(&session->write_resampler); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deactivating write resampler\n"); + } write_frame = frame; status = SWITCH_STATUS_SUCCESS; break; @@ -742,6 +753,10 @@ write_frame = &session->enc_write_frame; break; case SWITCH_STATUS_NOOP: + if (session->read_resampler) { + switch_resample_destroy(&session->read_resampler); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deactivating read resampler\n"); + } enc_frame->codec = session->write_codec; enc_frame->samples = enc_frame->datalen / sizeof(int16_t); enc_frame->timestamp = frame->timestamp; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_session.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_session.c Thu Dec 13 05:11:23 2007 @@ -684,7 +684,7 @@ switch_set_flag(session, SSF_DESTROYED); switch_core_session_rwunlock(session); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Session %"SWITCH_SIZE_T_FMT" (%s) Ended\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Session %"SWITCH_SIZE_T_FMT" (%s) Ended\n", session->id, switch_channel_get_name(session->channel)); switch_core_session_destroy(&session); return NULL; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_state_machine.c Thu Dec 13 05:11:23 2007 @@ -132,7 +132,7 @@ char *expanded = NULL; int nomedia = 0; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Execute %s(%s)\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Execute %s(%s)\n", extension->current_application->application_name, switch_str_nil(extension->current_application->application_data)); if ((application_interface = switch_loadable_module_get_application_interface(extension->current_application->application_name)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Application %s\n", extension->current_application->application_name);

1 0

[commit] r6741 - freeswitch/branches/stkn/sofia-exp/trunk/build
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: stkn Date: Thu Dec 13 05:04:48 2007 New Revision: 6741 Removed: freeswitch/branches/stkn/sofia-exp/trunk/build/getsounds.sh Log: This should not be here...

1 0

12 Dec '07

Author: stkn Date: Wed Dec 12 18:27:30 2007 New Revision: 6715 Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_module_interfaces.h freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_resample.h freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_enum/mod_enum.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_expr/mod_expr.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_limit/mod_limit.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_rss/mod_rss.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_amr/mod_amr.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_native_file/mod_native_file.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_shout/decode_ntom.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_shout/interface.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_shout/mpglib.h freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/loggers/mod_logfile/mod_logfile.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_de/mod_say_de.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_es/mod_say_es.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_fr/mod_say_fr.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_it/mod_say_it.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_nl/mod_say_nl.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_apr.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_caller.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_channel.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_config.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_console.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_codec.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_db.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_session.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_event.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_play_say.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_loadable_module.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_log.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_resample.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_rtp.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_utils.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_xml.cpp Log: Merge changes from trunk Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_module_interfaces.h Wed Dec 12 18:27:30 2007 @@ -40,6 +40,7 @@ #define SWITCH_MODULE_INTERFACES_H #include <switch.h> +#include "switch_resample.h" SWITCH_BEGIN_EXTERN_C /*! \brief A table of functions to execute at various states @@ -262,6 +263,8 @@ unsigned int samples; /*! the current samplerate */ uint32_t samplerate; + /*! the current native samplerate */ + uint32_t native_rate; /*! the number of channels */ uint8_t channels; /*! integer representation of the format */ @@ -289,6 +292,10 @@ uint32_t offset_pos; uint32_t last_pos; int32_t vol; + switch_audio_resampler_t *resampler; + switch_buffer_t *buffer; + switch_byte_t *dbuf; + switch_size_t dbuflen; }; /*! \brief Abstract interface to an asr module */ Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_resample.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_resample.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_resample.h Wed Dec 12 18:27:30 2007 @@ -91,7 +91,7 @@ \brief Destroy an existing resampler handle \param resampler the resampler handle to destroy */ -SWITCH_DECLARE(void) switch_resample_destroy(switch_audio_resampler_t *resampler); +SWITCH_DECLARE(void) switch_resample_destroy(switch_audio_resampler_t **resampler); /*! \brief Resample one float buffer into another using specifications of a given handle Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_commands/mod_commands.c Wed Dec 12 18:27:30 2007 @@ -1610,7 +1610,7 @@ return -1; } - snprintf(id, sizeof(id), "%d", holder->rows); + switch_snprintf(id, sizeof(id), "%d", holder->rows); switch_xml_set_attr(switch_xml_set_flag(row, SWITCH_XML_DUP), strdup("row_id"), strdup(id)); @@ -1743,9 +1743,9 @@ holder.print_title = 0; if ((cmdname = strchr(command, ' ')) != 0) { *cmdname++ = '\0'; - snprintf(sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api' and name = '%s'", cmdname); + switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api' and name = '%s'", cmdname); } else { - snprintf(sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api'"); + switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api'"); } } else { stream->write_function(stream, "-USAGE: %s\n", SHOW_SYNTAX); @@ -1791,7 +1791,7 @@ if (holder.xml) { char count[50]; char *xmlstr; - snprintf(count, sizeof(count), "%d", holder.count); + switch_snprintf(count, sizeof(count), "%d", holder.count); switch_xml_set_attr(switch_xml_set_flag(holder.xml, SWITCH_XML_DUP), strdup("row_count"), strdup(count)); xmlstr = switch_xml_toxml(holder.xml, SWITCH_FALSE); @@ -1817,7 +1817,7 @@ SWITCH_STANDARD_API(version_function) { char version_string[1024]; - snprintf(version_string, sizeof(version_string) - 1, "FreeSwitch Version %s\n", SWITCH_VERSION_FULL); + switch_snprintf(version_string, sizeof(version_string) - 1, "FreeSwitch Version %s\n", SWITCH_VERSION_FULL); stream->write_function(stream, version_string); return SWITCH_STATUS_SUCCESS; @@ -1831,7 +1831,7 @@ sprintf(showcmd, "help"); all = 1; } else { - snprintf(showcmd, sizeof(showcmd) - 1, "help %s", cmd); + switch_snprintf(showcmd, sizeof(showcmd) - 1, "help %s", cmd); } if (all) { Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Dec 12 18:27:30 2007 @@ -560,19 +560,19 @@ if (call_list) { char saymsg[1024]; - snprintf(saymsg, sizeof(saymsg), "Auto Calling %d parties", call_list->itteration); + switch_snprintf(saymsg, sizeof(saymsg), "Auto Calling %d parties", call_list->itteration); conference_member_say(member, saymsg, 0); } else { if (switch_strlen_zero(conference->special_announce)) { /* anounce the total number of members in the conference */ if (conference->count >= conference->anounce_count && conference->anounce_count > 1) { - snprintf(msg, sizeof(msg), "There are %d callers", conference->count); + switch_snprintf(msg, sizeof(msg), "There are %d callers", conference->count); conference_member_say(member, msg, CONF_DEFAULT_LEADIN); } else if (conference->count == 1 && !conference->perpetual_sound) { if (conference->alone_sound) { conference_play_file(conference, conference->alone_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 0); } else { - snprintf(msg, sizeof(msg), "You are currently the only person in this conference."); + switch_snprintf(msg, sizeof(msg), "You are currently the only person in this conference."); conference_member_say(member, msg, CONF_DEFAULT_LEADIN); } } @@ -1093,7 +1093,7 @@ } switch_mutex_unlock(member->flag_mutex); - snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); + switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); conference_member_say(member, msg, 0); @@ -1117,7 +1117,7 @@ } switch_mutex_unlock(member->flag_mutex); - snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); + switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); conference_member_say(member, msg, 0); } @@ -1143,7 +1143,7 @@ } switch_mutex_unlock(member->flag_mutex); - snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); + switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); conference_member_say(member, msg, 0); @@ -1171,7 +1171,7 @@ switch_mutex_unlock(member->flag_mutex); - snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); + switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); conference_member_say(member, msg, 0); } @@ -1196,7 +1196,7 @@ switch_mutex_unlock(member->flag_mutex); - snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); + switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); conference_member_say(member, msg, 0); @@ -1221,7 +1221,7 @@ } switch_mutex_unlock(member->flag_mutex); - snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); + switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); conference_member_say(member, msg, 0); @@ -1248,7 +1248,7 @@ switch_mutex_unlock(member->flag_mutex); - snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); + switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); conference_member_say(member, msg, 0); @@ -1273,7 +1273,7 @@ } switch_mutex_unlock(member->flag_mutex); - snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); + switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); conference_member_say(member, msg, 0); @@ -1301,7 +1301,7 @@ switch_mutex_unlock(member->flag_mutex); - snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); + switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); conference_member_say(member, msg, 0); @@ -1465,6 +1465,9 @@ } } + switch_resample_destroy(&member->read_resampler); + switch_resample_destroy(&member->mux_resampler); + switch_clear_flag_locked(member, MFLAG_ITHREAD); return NULL; @@ -2490,7 +2493,7 @@ } else { char msg[512]; - snprintf(msg, sizeof(msg), "Muted"); + switch_snprintf(msg, sizeof(msg), "Muted"); conference_member_say(member, msg, 0); } if (stream != NULL) { @@ -2524,7 +2527,7 @@ } else { char msg[512]; - snprintf(msg, sizeof(msg), "Un-Muted"); + switch_snprintf(msg, sizeof(msg), "Un-Muted"); conference_member_say(member, msg, 0); } if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { @@ -3689,7 +3692,7 @@ } /* add them to the conference */ if (flags && !strcasecmp(flags, "none")) { - snprintf(appdata, sizeof(appdata), "%s+flags{%s}", conference_name, flags); + switch_snprintf(appdata, sizeof(appdata), "%s+flags{%s}", conference_name, flags); switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, appdata); } else { switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, conference_name); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c Wed Dec 12 18:27:30 2007 @@ -1239,7 +1239,9 @@ int argc; char *mydata, *argv[4] = { 0 }; char *l = NULL; - + const char *tmp; + int rate; + channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -1280,6 +1282,13 @@ } } + if ((tmp = switch_channel_get_variable(channel, "record_rate"))) { + rate = atoi(tmp); + if (rate > 0) { + fh.samplerate = rate; + } + } + args.input_callback = on_dtmf; status = switch_ivr_record_file(session, &fh, path, &args, limit); @@ -1378,7 +1387,7 @@ char cause_num[35] = ""; cause_str = switch_channel_cause2str(cause); - snprintf(cause_num, sizeof(cause_num), "%u", cause); + switch_snprintf(cause_num, sizeof(cause_num), "%u", cause); if (switch_true(continue_on_fail) || switch_stristr(cause_str, continue_on_fail) || strstr(cause_num, continue_on_fail)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Continue on fail [%s]: Cause: %s\n", continue_on_fail, cause_str); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_enum/mod_enum.c Wed Dec 12 18:27:30 2007 @@ -624,17 +624,17 @@ for (rtp = globals.route_order; rtp; rtp = rtp->next) { for (rp = results; rp; rp = rp->next) { if (!strcasecmp(rtp->service, rp->service)) { - snprintf(vbuf, sizeof(vbuf), "enum_route_%d", cnt++); + switch_snprintf(vbuf, sizeof(vbuf), "enum_route_%d", cnt++); switch_channel_set_variable(channel, vbuf, rp->route); - snprintf(rbp, rbl, "%s|", rp->route); + switch_snprintf(rbp, rbl, "%s|", rp->route); l = strlen(rp->route) + 1; rbp += l; rbl -= l; } } } - snprintf(vbuf, sizeof(vbuf), "%d", cnt); + switch_snprintf(vbuf, sizeof(vbuf), "%d", cnt); switch_channel_set_variable(channel, "enum_route_count", vbuf); *(rbuf + strlen(rbuf) - 1) = '\0'; switch_channel_set_variable(channel, "enum_auto_route", rbuf); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_expr/mod_expr.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_expr/mod_expr.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_expr/mod_expr.c Wed Dec 12 18:27:30 2007 @@ -128,7 +128,7 @@ err = exprEval(e, &last_expr); } while (err); - snprintf(val, sizeof(val), "%0.10f", last_expr); + switch_snprintf(val, sizeof(val), "%0.10f", last_expr); for (p = (val + strlen(val) - 1); p != val; p--) { if (*p != '0') { *(p+1) = '\0'; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_fifo/mod_fifo.c Wed Dec 12 18:27:30 2007 @@ -471,9 +471,9 @@ switch_assert(x_fifo); switch_xml_set_attr_d(x_fifo, "name", node->name); - snprintf(tmp, sizeof(buffer), "%d", node->consumer_count); + switch_snprintf(tmp, sizeof(buffer), "%d", node->consumer_count); switch_xml_set_attr_d(x_fifo, "consumer_count", tmp); - snprintf(tmp, sizeof(buffer), "%d", node->caller_count); + switch_snprintf(tmp, sizeof(buffer), "%d", node->caller_count); switch_xml_set_attr_d(x_fifo, "caller_count", tmp); cc_off = xml_hash(x_fifo, node->caller_hash, "callers", "caller", cc_off, verbose); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_limit/mod_limit.c Wed Dec 12 18:27:30 2007 @@ -325,7 +325,7 @@ static int group_callback(void *pArg, int argc, char **argv, char **columnNames) { callback_t *cbt = (callback_t *) pArg; - snprintf(cbt->buf + strlen(cbt->buf), cbt->len - strlen(cbt->buf), "%s%c", argv[0], *argv[1]); + switch_snprintf(cbt->buf + strlen(cbt->buf), cbt->len - strlen(cbt->buf), "%s%c", argv[0], *argv[1]); cbt->matches++; return 0; } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_rss/mod_rss.c Wed Dec 12 18:27:30 2007 @@ -73,7 +73,7 @@ uint32_t len = (uint32_t) strlen(str); for (x = 0; x < max; x++) { - snprintf(tstr, sizeof(tstr), "%u", x); + switch_snprintf(tstr, sizeof(tstr), "%u", x); if (!strncasecmp(str, tstr, len)) { matches++; } @@ -316,28 +316,28 @@ title_txt = description_txt = rights_txt = ""; if (jumpto > -1) { - snprintf(cmd, sizeof(cmd), "%d", jumpto); + switch_snprintf(cmd, sizeof(cmd), "%d", jumpto); jumpto = -1; } else { switch_core_speech_flush_tts(&sh); #ifdef MATCH_COUNT - snprintf(buf + len, sizeof(buf) - len, + switch_snprintf(buf + len, sizeof(buf) - len, ",<break time=\"500ms\"/>Main Menu. <break time=\"600ms\"/> " "Select one of the following news sources, or press 0 to exit. " ",<break time=\"600ms\"/>"); #else - snprintf(buf + len, sizeof(buf) - len, + switch_snprintf(buf + len, sizeof(buf) - len, ",<break time=\"500ms\"/>Main Menu. <break time=\"600ms\"/> " "Select one of the following news sources, followed by the pound key or press 0 to exit. " ",<break time=\"600ms\"/>"); #endif len = (int32_t) strlen(buf); for (idx = 0; idx < feed_index; idx++) { - snprintf(buf + len, sizeof(buf) - len, "%d: %s. <break time=\"600ms\"/>", idx + 1, feed_names[idx]); + switch_snprintf(buf + len, sizeof(buf) - len, "%d: %s. <break time=\"600ms\"/>", idx + 1, feed_names[idx]); len = (int32_t) strlen(buf); } - snprintf(buf + len, sizeof(buf) - len, "<break time=\"2000ms\"/>"); + switch_snprintf(buf + len, sizeof(buf) - len, "<break time=\"2000ms\"/>"); len = (int32_t) strlen(buf); args.input_callback = NULL; @@ -497,7 +497,7 @@ switch_strftime(date, &retsize, sizeof(date), "%I:%M %p", &tm); - snprintf(buf, sizeof(buf), + switch_snprintf(buf, sizeof(buf), ",<break time=\"500ms\"/>%s. %s. %s. local time: %s, Press 0 for options, 5 to change voice, or pound to return to the main menu. ", title_txt, description_txt, rights_txt, date); args.input_callback = NULL; @@ -555,14 +555,14 @@ } if (switch_test_flag(&dtb, SFLAG_INFO)) { switch_clear_flag(&dtb, SFLAG_INFO); - snprintf(buf + len, sizeof(buf) - len, "%s %s. I am speaking at %u words per minute. ", sh.engine, sh.voice, dtb.speed); + switch_snprintf(buf + len, sizeof(buf) - len, "%s %s. I am speaking at %u words per minute. ", sh.engine, sh.voice, dtb.speed); len = (uint32_t) strlen(buf); } if (switch_test_flag(&dtb, SFLAG_INSTRUCT)) { switch_clear_flag(&dtb, SFLAG_INSTRUCT); cont = 1; - snprintf(buf + len, sizeof(buf) - len, + switch_snprintf(buf + len, sizeof(buf) - len, "Press star to pause or resume speech. " "To go to the next item, press six. " "To go back, press 4. " @@ -570,21 +570,21 @@ "To change voices, press five. To restore the original voice press 9. " "To hear these options again, press zero or press pound to return to the main menu. "); } else { - snprintf(buf + len, sizeof(buf) - len, "Story %d. ", dtb.index + 1); + switch_snprintf(buf + len, sizeof(buf) - len, "Story %d. ", dtb.index + 1); len = (uint32_t) strlen(buf); if (entries[dtb.index].subject_txt) { - snprintf(buf + len, sizeof(buf) - len, "Subject: %s. ", entries[dtb.index].subject_txt); + switch_snprintf(buf + len, sizeof(buf) - len, "Subject: %s. ", entries[dtb.index].subject_txt); len = (uint32_t) strlen(buf); } if (entries[dtb.index].dept_txt) { - snprintf(buf + len, sizeof(buf) - len, "From the %s department. ", entries[dtb.index].dept_txt); + switch_snprintf(buf + len, sizeof(buf) - len, "From the %s department. ", entries[dtb.index].dept_txt); len = (uint32_t) strlen(buf); } if (entries[dtb.index].title_txt) { - snprintf(buf + len, sizeof(buf) - len, "%s", entries[dtb.index].title_txt); + switch_snprintf(buf + len, sizeof(buf) - len, "%s", entries[dtb.index].title_txt); len = (uint32_t) strlen(buf); } } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Wed Dec 12 18:27:30 2007 @@ -893,7 +893,7 @@ while(switch_channel_ready(channel)) { - snprintf(key_buf, sizeof(key_buf), "%s:%s:%s", + switch_snprintf(key_buf, sizeof(key_buf), "%s:%s:%s", profile->listen_file_key, profile->save_file_key, profile->record_file_key); @@ -1007,7 +1007,7 @@ cbt.len = sizeof(msg_count); - snprintf(sql, sizeof(sql), + switch_snprintf(sql, sizeof(sql), "select count(*) from voicemail_data where user='%s' and domain='%s' and in_folder='%s' and read_epoch=0", myid, domain_name, @@ -1015,7 +1015,7 @@ vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); *total_new_messages = atoi(msg_count); - snprintf(sql, sizeof(sql), + switch_snprintf(sql, sizeof(sql), "select count(*) from voicemail_data where user='%s' and domain='%s' and in_folder='%s' and read_epoch=0 and read_flags='%s'", myid, domain_name, @@ -1024,7 +1024,7 @@ vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); *total_new_urgent_messages = atoi(msg_count); - snprintf(sql, sizeof(sql), + switch_snprintf(sql, sizeof(sql), "select count(*) from voicemail_data where user='%s' and domain='%s' and in_folder='%s' and read_epoch!=0", myid, domain_name, @@ -1033,7 +1033,7 @@ *total_saved_messages = atoi(msg_count); - snprintf(sql, sizeof(sql), + switch_snprintf(sql, sizeof(sql), "select count(*) from voicemail_data where user='%s' and domain='%s' and in_folder='%s' and read_epoch!=0 and read_flags='%s'", myid, domain_name, @@ -1063,7 +1063,7 @@ args.input_callback = cancel_on_dtmf; - snprintf(key_buf, sizeof(key_buf), "%s:%s:%s:%s:%s", + switch_snprintf(key_buf, sizeof(key_buf), "%s:%s:%s:%s:%s", profile->listen_file_key, profile->save_file_key, profile->delete_file_key, @@ -1071,7 +1071,7 @@ profile->callback_key); - snprintf(input, sizeof(input), "%s:%d", cbt->type == MSG_NEW ? "new" : "saved", cbt->want+1); + switch_snprintf(input, sizeof(input), "%s:%d", cbt->type == MSG_NEW ? "new" : "saved", cbt->want+1); memset(&cc, 0, sizeof(cc)); cc.profile = profile; args.buf = &cc; @@ -1141,13 +1141,13 @@ switch_time_exp_lt(&tm, atoi(cbt->created_epoch) * 1000000); switch_strftime(date, &retsize, sizeof(date), profile->date_fmt, &tm); - snprintf(tmp,sizeof(tmp), "%d", total_new_messages); + switch_snprintf(tmp,sizeof(tmp), "%d", total_new_messages); switch_channel_set_variable(channel, "voicemail_total_new_messages", tmp); - snprintf(tmp,sizeof(tmp), "%d", total_saved_messages); + switch_snprintf(tmp,sizeof(tmp), "%d", total_saved_messages); switch_channel_set_variable(channel, "voicemail_total_saved_messages", tmp); - snprintf(tmp,sizeof(tmp), "%d", total_new_urgent_messages); + switch_snprintf(tmp,sizeof(tmp), "%d", total_new_urgent_messages); switch_channel_set_variable(channel, "voicemail_urgent_new_messages", tmp); - snprintf(tmp,sizeof(tmp), "%d", total_saved_urgent_messages); + switch_snprintf(tmp,sizeof(tmp), "%d", total_saved_urgent_messages); switch_channel_set_variable(channel, "voicemail_urgent_saved_messages", tmp); switch_channel_set_variable(channel, "voicemail_current_folder", cbt->in_folder); switch_channel_set_variable(channel, "voicemail_account", cbt->user); @@ -1157,7 +1157,7 @@ switch_channel_set_variable(channel, "voicemail_file_path", cbt->file_path); switch_channel_set_variable(channel, "voicemail_read_flags", cbt->read_flags); switch_channel_set_variable(channel, "voicemail_time", date); - snprintf(tmp,sizeof(tmp), "%d", priority); + switch_snprintf(tmp,sizeof(tmp), "%d", priority); switch_channel_set_variable(channel, "voicemail_priority", tmp); message_len = atoi(cbt->message_len); @@ -1166,7 +1166,7 @@ duration.day += duration.yr * 365; duration.hr += duration.day * 24; - snprintf(duration_str, sizeof(duration_str), "%.2u:%.2u:%.2u", + switch_snprintf(duration_str, sizeof(duration_str), "%.2u:%.2u:%.2u", duration.hr, duration.min, duration.sec @@ -1310,12 +1310,12 @@ if (total_new_urgent_messages > 0) { - snprintf(msg_count, sizeof(msg_count), "%d:urgent-new", total_new_urgent_messages); + switch_snprintf(msg_count, sizeof(msg_count), "%d:urgent-new", total_new_urgent_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); informed++; } if (total_new_messages > 0 && total_new_messages != total_new_urgent_messages) { - snprintf(msg_count, sizeof(msg_count), "%d:new", total_new_messages); + switch_snprintf(msg_count, sizeof(msg_count), "%d:new", total_new_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); informed++; } @@ -1328,13 +1328,13 @@ } if (total_saved_urgent_messages > 0) { - snprintf(msg_count, sizeof(msg_count), "%d:urgent-saved", total_saved_urgent_messages); + switch_snprintf(msg_count, sizeof(msg_count), "%d:urgent-saved", total_saved_urgent_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); informed++; } if (total_saved_messages > 0 && total_saved_messages != total_saved_urgent_messages) { - snprintf(msg_count, sizeof(msg_count), "%d:saved", total_saved_messages); + switch_snprintf(msg_count, sizeof(msg_count), "%d:saved", total_saved_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); informed++; } @@ -1347,7 +1347,7 @@ } if (!informed) { - snprintf(msg_count, sizeof(msg_count), "0:new"); + switch_snprintf(msg_count, sizeof(msg_count), "0:new"); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); informed++; } @@ -1368,7 +1368,7 @@ switch(play_msg_type) { case MSG_NEW: { - snprintf(sql, sizeof(sql), + switch_snprintf(sql, sizeof(sql), "select * from voicemail_data where user='%s' and domain='%s' and read_epoch=0 order by read_flags", myid, domain_name); total_messages = total_new_messages; heard_auto_new = heard_auto_saved = 1; @@ -1377,7 +1377,7 @@ case MSG_SAVED: default: { - snprintf(sql, sizeof(sql), + switch_snprintf(sql, sizeof(sql), "select * from voicemail_data where user='%s' and domain='%s' and read_epoch !=0 order by read_flags", myid, domain_name); total_messages = total_saved_messages; heard_auto_new = heard_auto_saved = 1; @@ -1394,12 +1394,12 @@ break; } } - snprintf(sql, sizeof(sql), "update voicemail_data set read_epoch=%ld where user='%s' and domain='%s' and flags='save'", + switch_snprintf(sql, sizeof(sql), "update voicemail_data set read_epoch=%ld where user='%s' and domain='%s' and flags='save'", (long)time(NULL), myid, domain_name); vm_execute_sql(profile, sql, profile->mutex); - snprintf(sql, sizeof(sql), "select file_path from voicemail_data where user='%s' and domain='%s' and flags='delete'", myid, domain_name); + switch_snprintf(sql, sizeof(sql), "select file_path from voicemail_data where user='%s' and domain='%s' and flags='delete'", myid, domain_name); vm_execute_sql_callback(profile, profile->mutex, sql, unlink_callback, NULL); - snprintf(sql, sizeof(sql), "delete from voicemail_data where user='%s' and domain='%s' and flags='delete'", myid, domain_name); + switch_snprintf(sql, sizeof(sql), "delete from voicemail_data where user='%s' and domain='%s' and flags='delete'", myid, domain_name); vm_execute_sql(profile, sql, profile->mutex); vm_check_state = VM_CHECK_FOLDER_SUMMARY; } @@ -1425,7 +1425,7 @@ switch_safe_free(sql); } - snprintf(key_buf, sizeof(key_buf), "%s:%s:%s:%s", + switch_snprintf(key_buf, sizeof(key_buf), "%s:%s:%s:%s", profile->record_greeting_key, profile->choose_greeting_key, profile->record_name_key, @@ -1506,7 +1506,7 @@ char key_buf[80] = ""; play_msg_type = MSG_NONE; - snprintf(key_buf, sizeof(key_buf), "%s:%s:%s:%s", + switch_snprintf(key_buf, sizeof(key_buf), "%s:%s:%s:%s", profile->play_new_messages_key, profile->play_saved_messages_key, profile->config_menu_key, @@ -1789,7 +1789,7 @@ } } - snprintf(sql, sizeof(sql), + switch_snprintf(sql, sizeof(sql), "select * from voicemail_prefs where user='%s' and domain='%s'", id, domain_name); @@ -1874,7 +1874,7 @@ if ((status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK) && switch_channel_ready(channel)) { char input[10] = "", key_buf[80] = "", term = 0; - snprintf(key_buf, sizeof(key_buf), "%s:%s", + switch_snprintf(key_buf, sizeof(key_buf), "%s:%s", profile->urgent_key, profile->terminator_key); @@ -1946,13 +1946,13 @@ switch_strftime(date, &retsize, sizeof(date), profile->date_fmt, &tm); switch_channel_set_variable(channel, "voicemail_current_folder", myfolder); - snprintf(tmp,sizeof(tmp), "%d", total_new_messages); + switch_snprintf(tmp,sizeof(tmp), "%d", total_new_messages); switch_channel_set_variable(channel, "voicemail_total_new_messages", tmp); - snprintf(tmp,sizeof(tmp), "%d", total_saved_messages); + switch_snprintf(tmp,sizeof(tmp), "%d", total_saved_messages); switch_channel_set_variable(channel, "voicemail_total_saved_messages", tmp); - snprintf(tmp,sizeof(tmp), "%d", total_new_urgent_messages); + switch_snprintf(tmp,sizeof(tmp), "%d", total_new_urgent_messages); switch_channel_set_variable(channel, "voicemail_urgent_new_messages", tmp); - snprintf(tmp,sizeof(tmp), "%d", total_saved_urgent_messages); + switch_snprintf(tmp,sizeof(tmp), "%d", total_saved_urgent_messages); switch_channel_set_variable(channel, "voicemail_urgent_saved_messages", tmp); switch_channel_set_variable(channel, "voicemail_account", id); switch_channel_set_variable(channel, "voicemail_domain", domain_name); @@ -1961,7 +1961,7 @@ switch_channel_set_variable(channel, "voicemail_file_path", file_path); switch_channel_set_variable(channel, "voicemail_read_flags", read_flags); switch_channel_set_variable(channel, "voicemail_time", date); - snprintf(tmp,sizeof(tmp), "%d", priority); + switch_snprintf(tmp,sizeof(tmp), "%d", priority); switch_channel_set_variable(channel, "voicemail_priority", tmp); switch_channel_set_variable(channel, "voicemail_email", email_vm); @@ -1971,7 +1971,7 @@ switch_core_measure_time(l_duration, &duration); duration.day += duration.yr * 365; duration.hr += duration.day * 24; - snprintf(duration_str, sizeof(duration_str), "%.2u:%.2u:%.2u", + switch_snprintf(duration_str, sizeof(duration_str), "%.2u:%.2u:%.2u", duration.hr, duration.min, duration.sec @@ -2366,7 +2366,7 @@ duration.day += duration.yr * 365; duration.hr += duration.day * 24; - snprintf(duration_str, sizeof(duration_str), "%.2u:%.2u:%.2u", + switch_snprintf(duration_str, sizeof(duration_str), "%.2u:%.2u:%.2u", duration.hr, duration.min, duration.sec @@ -2383,7 +2383,7 @@ switch_strftime(read_date, &retsize, sizeof(read_date), fmt, &tm); } - snprintf(heard, sizeof(heard), *read_date == '\0' ? "never" : read_date); + switch_snprintf(heard, sizeof(heard), *read_date == '\0' ? "never" : read_date); get = switch_mprintf("http://%s:%s%s/get/%s", holder->host, holder->port, holder->uri, fname); del = switch_mprintf("http://%s:%s%s/del/%s", holder->host, holder->port, holder->uri, fname); @@ -2397,7 +2397,7 @@ //"<a href=%s>Delete This Message</a><br><hr noshade size=1>", strcmp(argv[10], URGENT_FLAG_STRING) ? "normal" : "urgent", create_date, heard, duration_str); - snprintf(title_b4, sizeof(title_b4), "%s <%s> %s", argv[5], argv[6], rss_date); + switch_snprintf(title_b4, sizeof(title_b4), "%s <%s> %s", argv[5], argv[6], rss_date); switch_url_encode(title_b4, title_aft, sizeof(title_aft)-1); @@ -2455,7 +2455,7 @@ duration.day += duration.yr * 365; duration.hr += duration.day * 24; - snprintf(duration_str, sizeof(duration_str), "%.2u:%.2u:%.2u", + switch_snprintf(duration_str, sizeof(duration_str), "%.2u:%.2u:%.2u", duration.hr, duration.min, duration.sec @@ -2481,7 +2481,7 @@ x_tmp = switch_xml_add_child_d(holder->x_item, "description", 0); - snprintf(heard, sizeof(heard), *read_date == '\0' ? "never" : read_date); + switch_snprintf(heard, sizeof(heard), *read_date == '\0' ? "never" : read_date); if ((fname = strrchr(argv[8], '/'))) { fname++; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Wed Dec 12 18:27:30 2007 @@ -134,7 +134,7 @@ cepstral->params = swift_params_new(NULL); swift_params_set_string(cepstral->params, "audio/encoding", "pcm16"); - snprintf(srate, sizeof(srate), "%d", rate); + switch_snprintf(srate, sizeof(srate), "%d", rate); swift_params_set_string(cepstral->params, "audio/sampling-rate", srate); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_amr/mod_amr.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_amr/mod_amr.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_amr/mod_amr.c Wed Dec 12 18:27:30 2007 @@ -203,7 +203,7 @@ context->enc_mode = globals.default_bitrate; } - snprintf(fmtptmp, sizeof(fmtptmp), "octet-align=%d; mode-set=%d", switch_test_flag(context, AMR_OPT_OCTET_ALIGN) ? 1 : 0, context->enc_mode); + switch_snprintf(fmtptmp, sizeof(fmtptmp), "octet-align=%d; mode-set=%d", switch_test_flag(context, AMR_OPT_OCTET_ALIGN) ? 1 : 0, context->enc_mode); codec->fmtp_out = switch_core_strdup(codec->memory_pool, fmtptmp); context->enc_mode = AMR_DEFAULT_BITRATE; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Wed Dec 12 18:27:30 2007 @@ -113,9 +113,9 @@ return NULL; } - snprintf(filter, sizeof(filter), "exten=%s", caller_profile->destination_number); + switch_snprintf(filter, sizeof(filter), "exten=%s", caller_profile->destination_number); if (caller_profile->context) { - snprintf(filter + strlen(filter), sizeof(filter) - strlen(filter), "context=%s", caller_profile->context); + switch_snprintf(filter + strlen(filter), sizeof(filter) - strlen(filter), "context=%s", caller_profile->context); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Wed Dec 12 18:27:30 2007 @@ -505,7 +505,7 @@ char *user, *host, *f_user = NULL, *ffrom = NULL, *f_host = NULL, *f_resource = NULL; mdl_profile_t *profile = NULL; - assert(proto != NULL); + switch_assert(proto != NULL); if (from && (f_user = strdup(from))) { if ((f_host = strchr(f_user, '@'))) { @@ -749,8 +749,8 @@ static int get_codecs(struct private_object *tech_pvt) { - assert(tech_pvt != NULL); - assert(tech_pvt->session != NULL); + switch_assert(tech_pvt != NULL); + switch_assert(tech_pvt->session != NULL); if (!tech_pvt->num_codecs) { if (globals.codec_string) { @@ -901,7 +901,7 @@ static int do_candidates(struct private_object *tech_pvt, int force) { switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session); - assert(channel != NULL); + switch_assert(channel != NULL); if (switch_test_flag(tech_pvt, TFLAG_DO_CAND)) { return 1; @@ -1054,10 +1054,10 @@ unsigned int elapsed; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); switch_set_flag_locked(tech_pvt, TFLAG_IO); @@ -1147,10 +1147,10 @@ struct private_object *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt->read_frame.buflen = SWITCH_RTP_MAX_BUF_LEN; @@ -1170,10 +1170,10 @@ struct private_object *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL RING\n", switch_channel_get_name(channel)); @@ -1187,10 +1187,10 @@ struct private_object *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel)); @@ -1204,10 +1204,10 @@ struct private_object *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_clear_flag_locked(tech_pvt, TFLAG_IO); switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); @@ -1310,7 +1310,7 @@ struct private_object *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); return SWITCH_STATUS_SUCCESS; } @@ -1320,7 +1320,7 @@ struct private_object *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); return SWITCH_STATUS_SUCCESS; @@ -1331,7 +1331,7 @@ struct private_object *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF [%s]\n", dtmf); @@ -1346,10 +1346,10 @@ int payload = 0; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (struct private_object *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); while (!(tech_pvt->read_codec.implementation && switch_rtp_ready(tech_pvt->rtp_session))) { if (switch_channel_ready(channel)) { @@ -1376,7 +1376,7 @@ if (switch_test_flag(tech_pvt, TFLAG_IO)) { switch_status_t status; - assert(tech_pvt->rtp_session != NULL); + switch_assert(tech_pvt->rtp_session != NULL); tech_pvt->read_frame.datalen = 0; @@ -1448,10 +1448,10 @@ int bytes = 0, samples = 0, frames = 0; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (struct private_object *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); while (!(tech_pvt->read_codec.implementation && switch_rtp_ready(tech_pvt->rtp_session))) { if (switch_channel_ready(channel)) { @@ -1496,10 +1496,10 @@ switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); @@ -1515,10 +1515,10 @@ struct private_object *tech_pvt; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch (msg->message_id) { case SWITCH_MESSAGE_INDICATE_ANSWER: @@ -1556,10 +1556,10 @@ char *subject, *body; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (!(body = switch_event_get_body(event))) { @@ -1643,7 +1643,7 @@ *p++ = '\0'; u = profile_name; profile_name = p; - snprintf(ubuf, sizeof(ubuf), "%s@%s/talk", u, profile_name); + switch_snprintf(ubuf, sizeof(ubuf), "%s@%s/talk", u, profile_name); user = ubuf; } @@ -1661,10 +1661,10 @@ } if (strchr(id_num, '@')) { - snprintf(ubuf, sizeof(ubuf), "%s/talk", id_num); + switch_snprintf(ubuf, sizeof(ubuf), "%s/talk", id_num); user = ubuf; } else { - snprintf(ubuf, sizeof(ubuf), "%s@%s/talk", id_num, profile_name); + switch_snprintf(ubuf, sizeof(ubuf), "%s@%s/talk", id_num, profile_name); user = ubuf; } } @@ -1713,7 +1713,7 @@ if (outbound_profile) { char name[128]; - snprintf(name, sizeof(name), "DingaLing/%s", outbound_profile->destination_number); + switch_snprintf(name, sizeof(name), "DingaLing/%s", outbound_profile->destination_number); switch_channel_set_name(channel, name); caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); @@ -2198,7 +2198,7 @@ profile->message = ""; profile->user_flags |= LDL_FLAG_COMPONENT; switch_mutex_init(&profile->mutex, SWITCH_MUTEX_NESTED, module_pool); - snprintf(dbname, sizeof(dbname), "dingaling_%s", profile->name); + switch_snprintf(dbname, sizeof(dbname), "dingaling_%s", profile->name); profile->dbname = switch_core_strdup(module_pool, dbname); @@ -2340,7 +2340,7 @@ ldl_status status = LDL_STATUS_SUCCESS; char *sql; - assert(handle != NULL); + switch_assert(handle != NULL); if (!(profile = ldl_handle_get_private(handle))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERROR NO PROFILE!\n"); @@ -2549,10 +2549,10 @@ if ((session = ldl_session_get_private(dlsession))) { tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "using Existing session for %s\n", ldl_session_get_id(dlsession)); @@ -2670,7 +2670,7 @@ context, exten)) != 0) { char name[128]; - snprintf(name, sizeof(name), "DingaLing/%s", tech_pvt->caller_profile->destination_number); + switch_snprintf(name, sizeof(name), "DingaLing/%s", tech_pvt->caller_profile->destination_number); switch_channel_set_name(channel, name); switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_iax/mod_iax.c Wed Dec 12 18:27:30 2007 @@ -338,7 +338,7 @@ } channel = switch_core_session_get_channel(tech_pvt->session); - assert(channel != NULL); + switch_assert(channel != NULL); if (tech_pvt->samprate || *samprate) { @@ -459,10 +459,10 @@ private_t *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); iax_set_private(tech_pvt->iax_session, tech_pvt); @@ -488,10 +488,10 @@ private_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL RING\n", switch_channel_get_name(channel)); @@ -505,10 +505,10 @@ private_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel)); @@ -522,10 +522,10 @@ private_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_clear_flag_locked(tech_pvt, TFLAG_IO); switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); @@ -564,10 +564,10 @@ private_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch (sig) { case SWITCH_SIG_KILL: @@ -603,7 +603,7 @@ private_t *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); return SWITCH_STATUS_SUCCESS; } @@ -613,7 +613,7 @@ private_t *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); return SWITCH_STATUS_SUCCESS; @@ -625,7 +625,7 @@ char *digit; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (tech_pvt->iax_session) { for (digit = dtmf; *digit; digit++) { iax_send_dtmf(tech_pvt->iax_session, *digit); @@ -644,10 +644,10 @@ switch_byte_t *data; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); tech_pvt->read_frame.flags = SFF_NONE; *frame = NULL; @@ -713,10 +713,10 @@ //switch_frame_t *pframe; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (!switch_test_flag(tech_pvt, TFLAG_IO)) { return SWITCH_STATUS_FALSE; @@ -739,10 +739,10 @@ switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { iax_answer(tech_pvt->iax_session); @@ -757,10 +757,10 @@ private_t *tech_pvt; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch (msg->message_id) { case SWITCH_MESSAGE_INDICATE_REJECT: @@ -810,7 +810,7 @@ if (outbound_profile) { char name[128]; - snprintf(name, sizeof(name), "IAX/%s-%04x", outbound_profile->destination_number, rand() & 0xffff); + switch_snprintf(name, sizeof(name), "IAX/%s-%04x", outbound_profile->destination_number, rand() & 0xffff); switch_channel_set_name(channel, name); caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); @@ -857,10 +857,10 @@ char *body; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (!(body = switch_event_get_body(event))) { @@ -1131,7 +1131,7 @@ iaxevent->ies.called_context, iaxevent->ies.called_number)) != 0) { char name[128]; - snprintf(name, sizeof(name), "IAX/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); + switch_snprintf(name, sizeof(name), "IAX/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); switch_channel_set_name(channel, name); switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Wed Dec 12 18:27:30 2007 @@ -174,10 +174,10 @@ int16_t abuf[2048]; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); last = switch_timestamp_now() - waitsec; @@ -249,7 +249,7 @@ char buf[512]; switch_event_t *event; - snprintf(buf, sizeof(buf), "BRRRRING! BRRRRING! call %s\n", tech_pvt->call_id); + switch_snprintf(buf, sizeof(buf), "BRRRRING! BRRRRING! call %s\n", tech_pvt->call_id); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_RINGING) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_info", "%s", buf); @@ -306,10 +306,10 @@ private_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL RING\n", switch_channel_get_name(channel)); @@ -323,10 +323,10 @@ private_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel)); @@ -365,7 +365,7 @@ switch_mutex_lock(globals.pvt_lock); if (switch_strlen_zero(tech_pvt->call_id)) { - snprintf(tech_pvt->call_id, sizeof(tech_pvt->call_id), "%d", ++globals.call_id); + switch_snprintf(tech_pvt->call_id, sizeof(tech_pvt->call_id), "%d", ++globals.call_id); switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt); switch_core_session_set_read_codec(tech_pvt->session, &globals.read_codec); switch_core_session_set_write_codec(tech_pvt->session, &globals.write_codec); @@ -433,10 +433,10 @@ private_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); remove_pvt(tech_pvt); @@ -461,10 +461,10 @@ private_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch (sig) { case SWITCH_SIG_KILL: @@ -492,10 +492,10 @@ private_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n"); @@ -508,7 +508,7 @@ private_t *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); return SWITCH_STATUS_SUCCESS; } @@ -518,7 +518,7 @@ private_t *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); return SWITCH_STATUS_SUCCESS; @@ -529,7 +529,7 @@ private_t *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF ON CALL %s [%s]\n", tech_pvt->call_id, dtmf); @@ -544,10 +544,10 @@ switch_status_t status = SWITCH_STATUS_FALSE; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (!globals.audio_stream) { return SWITCH_STATUS_FALSE; @@ -646,10 +646,10 @@ private_t *tech_pvt = NULL; switch_status_t status = SWITCH_STATUS_FALSE; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (!globals.audio_stream) { return SWITCH_STATUS_FALSE; @@ -681,10 +681,10 @@ switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); return SWITCH_STATUS_SUCCESS; } @@ -695,10 +695,10 @@ private_t *tech_pvt; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch (msg->message_id) { @@ -766,7 +766,7 @@ if (outbound_profile) { char name[128]; const char *id = !switch_strlen_zero(outbound_profile->caller_id_number) ? outbound_profile->caller_id_number : "na"; - snprintf(name, sizeof(name), "PortAudio/%s", id); + switch_snprintf(name, sizeof(name), "PortAudio/%s", id); switch_channel_set_name(channel, name); @@ -1611,7 +1611,7 @@ ip, NULL, NULL, NULL, modname, NULL, dest)) != 0) { char name[128]; - snprintf(name, sizeof(name), "PortAudio/%s", + switch_snprintf(name, sizeof(name), "PortAudio/%s", tech_pvt->caller_profile->destination_number ? tech_pvt->caller_profile->destination_number : modname); switch_channel_set_name(channel, name); @@ -1689,19 +1689,19 @@ if (action) { if (strlen(action) == 1) { - snprintf(cmd_buf, sizeof(cmd_buf), "dtmf %s", action); + switch_snprintf(cmd_buf, sizeof(cmd_buf), "dtmf %s", action); cmd = cmd_buf; } else if (!strcmp(action, "mute")) { - snprintf(cmd_buf, sizeof(cmd_buf), "flags off mouth"); + switch_snprintf(cmd_buf, sizeof(cmd_buf), "flags off mouth"); cmd = cmd_buf; } else if (!strcmp(action, "unmute")) { - snprintf(cmd_buf, sizeof(cmd_buf), "flags on mouth"); + switch_snprintf(cmd_buf, sizeof(cmd_buf), "flags on mouth"); cmd = cmd_buf; } else if (!strcmp(action, "switch")) { - snprintf(cmd_buf, sizeof(cmd_buf), "switch %s", wcmd); + switch_snprintf(cmd_buf, sizeof(cmd_buf), "switch %s", wcmd); cmd = cmd_buf; } else if (!strcmp(action, "call")) { - snprintf(cmd_buf, sizeof(cmd_buf), "call %s", wcmd); + switch_snprintf(cmd_buf, sizeof(cmd_buf), "call %s", wcmd); cmd = cmd_buf; } else if (!strcmp(action, "hangup") || !strcmp(action, "list") || !strcmp(action, "answer")) { cmd = action; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Dec 12 18:27:30 2007 @@ -77,10 +77,10 @@ private_object_t *tech_pvt; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_object_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); tech_pvt->read_frame.buflen = SWITCH_RTP_MAX_BUF_LEN; @@ -107,10 +107,10 @@ private_object_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_object_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SOFIA RING\n"); @@ -123,10 +123,10 @@ private_object_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_object_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SOFIA EXECUTE\n"); @@ -197,10 +197,10 @@ int sip_cause; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_object_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); cause = switch_channel_get_cause(channel); sip_cause = hangup_cause_to_sip(cause); @@ -269,10 +269,10 @@ uint32_t session_timeout = 0; const char *val; - assert(session != NULL); + switch_assert(session != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_object_t *) switch_core_session_get_private(session); @@ -350,10 +350,10 @@ int payload = 0; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_object_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; @@ -378,7 +378,7 @@ return SWITCH_STATUS_GENERR; } - assert(tech_pvt->rtp_session != NULL); + switch_assert(tech_pvt->rtp_session != NULL); tech_pvt->video_read_frame.datalen = 0; while (switch_test_flag(tech_pvt, TFLAG_IO) && tech_pvt->video_read_frame.datalen == 0) { @@ -417,10 +417,10 @@ switch_status_t status = SWITCH_STATUS_SUCCESS; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_object_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); while (!(tech_pvt->video_read_codec.implementation && switch_rtp_ready(tech_pvt->video_rtp_session))) { if (switch_channel_ready(channel)) { @@ -457,10 +457,10 @@ int payload = 0; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_object_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; @@ -484,7 +484,7 @@ return SWITCH_STATUS_GENERR; } - assert(tech_pvt->rtp_session != NULL); + switch_assert(tech_pvt->rtp_session != NULL); tech_pvt->read_frame.datalen = 0; @@ -543,10 +543,10 @@ int bytes = 0, samples = 0, frames = 0; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_object_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); while (!(tech_pvt->read_codec.implementation && switch_rtp_ready(tech_pvt->rtp_session))) { if (switch_channel_ready(channel)) { @@ -595,10 +595,10 @@ switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_object_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch (sig) { @@ -632,10 +632,10 @@ switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_object_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); return SWITCH_STATUS_SUCCESS; } @@ -646,10 +646,10 @@ switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_object_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); return SWITCH_STATUS_SUCCESS; } @@ -659,7 +659,7 @@ private_object_t *tech_pvt; tech_pvt = (private_object_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); return switch_rtp_queue_rfc2833(tech_pvt->rtp_session, digits, tech_pvt->profile->dtmf_duration * (tech_pvt->read_codec.implementation->samples_per_second / 1000)); @@ -672,10 +672,10 @@ switch_status_t status; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_object_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch (msg->message_id) { case SWITCH_MESSAGE_INDICATE_BROADCAST: { @@ -939,10 +939,10 @@ nua_handle_t *msg_nh; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (!(body = switch_event_get_body(event))) { body = ""; @@ -1020,7 +1020,7 @@ } if (!strcasecmp(argv[0], "gateway")) { if ((gp = sofia_reg_find_gateway(argv[1]))) { - assert(gp->state < REG_STATE_LAST); + switch_assert(gp->state < REG_STATE_LAST); stream->write_function(stream, "%s\n", line); stream->write_function(stream, "Name \t%s\n", switch_str_nil(gp->name)); @@ -1108,7 +1108,7 @@ c++; for (gp = profile->gateways; gp; gp = gp->next) { - assert(gp->state < REG_STATE_LAST); + switch_assert(gp->state < REG_STATE_LAST); stream->write_function(stream, "%25s\t%s\t %32s\t%s", gp->name, "gateway", gp->register_to, sofia_state_names[gp->state]); if (gp->state == REG_STATE_FAILED || gp->state == REG_STATE_TRYING) { stream->write_function(stream, " (retry: %ds)", gp->retry - time(NULL)); @@ -1280,7 +1280,7 @@ } data = strdup(cmd); - assert(data); + switch_assert(data); if ((p = strchr(data, '/'))) { profile_name = data; @@ -1323,7 +1323,7 @@ cb.stream = &mystream; sql = switch_mprintf("select contact from sip_registrations where sip_user='%q' and sip_host='%q'", user, domain); - assert(sql); + switch_assert(sql); sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, contact_callback, &cb); switch_safe_free(sql); if (mystream.data) { @@ -1526,7 +1526,7 @@ if ((dest_to = strchr(dest, '^'))) { *dest_to++ = '\0'; tech_pvt->dest_to = switch_core_session_alloc(nsession, strlen(dest_to) + 5); - snprintf(tech_pvt->dest_to, strlen(dest_to) + 5, "sip:%s", dest_to); + switch_snprintf(tech_pvt->dest_to, strlen(dest_to) + 5, "sip:%s", dest_to); } if ((host = strchr(dest, '%'))) { @@ -1559,7 +1559,7 @@ } } else { tech_pvt->dest = switch_core_session_alloc(nsession, strlen(dest) + 5); - snprintf(tech_pvt->dest, strlen(dest) + 5, "sip:%s", dest); + switch_snprintf(tech_pvt->dest, strlen(dest) + 5, "sip:%s", dest); } } @@ -1593,7 +1593,7 @@ */ private_object_t *ctech_pvt; ctech_pvt = switch_core_session_get_private(session); - assert(ctech_pvt != NULL); + switch_assert(ctech_pvt != NULL); tech_pvt->bte = ctech_pvt->te; tech_pvt->bcng_pt = ctech_pvt->cng_pt; } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Dec 12 18:27:30 2007 @@ -66,7 +66,7 @@ } channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (!switch_channel_test_flag(channel, CF_OUTBOUND)) { switch_channel_answer(channel); switch_channel_set_variable(channel, "auto_answer_destination", switch_channel_get_variable(channel, "destination_number")); @@ -713,7 +713,7 @@ } skip: - assert(gateway_tag); + switch_assert(gateway_tag); } } @@ -745,7 +745,7 @@ return status; } - snprintf(url, sizeof(url), "profile=%s", switch_str_nil(profile_name)); + switch_snprintf(url, sizeof(url), "profile=%s", switch_str_nil(profile_name)); if (!(xml = switch_xml_open_cfg(cf, &cfg, url))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); @@ -800,7 +800,7 @@ profile->user_agent = SOFIA_USER_AGENT; profile->name = switch_core_strdup(profile->pool, xprofilename); - snprintf(url, sizeof(url), "sofia_reg_%s", xprofilename); + switch_snprintf(url, sizeof(url), "sofia_reg_%s", xprofilename); profile->dbname = switch_core_strdup(profile->pool, url); switch_core_hash_init(&profile->chat_hash, profile->pool); @@ -1178,11 +1178,11 @@ if (session) { channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); - assert(tech_pvt->nh != NULL); + switch_assert(tech_pvt != NULL); + switch_assert(tech_pvt->nh != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel %s entering state [%s]\n", switch_channel_get_name(channel), nua_callstate_name(ss_state)); @@ -1299,7 +1299,7 @@ if (replaces_str) { home = su_home_new(sizeof(*home)); - assert(home != NULL); + switch_assert(home != NULL); if ((replaces = sip_replaces_make(home, replaces_str)) && (bnh = nua_handle_by_replaces(nua, replaces))) { sofia_private_t *b_private; @@ -1500,7 +1500,7 @@ if (switch_test_flag(tech_pvt, TFLAG_NOHUP)) { switch_clear_flag_locked(tech_pvt, TFLAG_NOHUP); } else { - snprintf(st, sizeof(st), "%d", status); + switch_snprintf(st, sizeof(st), "%d", status); switch_channel_set_variable(channel, "sip_term_status", st); switch_channel_hangup(channel, sofia_glue_sip_cause_to_freeswitch(status)); } @@ -1590,7 +1590,7 @@ } home = su_home_new(sizeof(*home)); - assert(home != NULL); + switch_assert(home != NULL); if ((replaces = sip_replaces_make(home, rep)) && (bnh = nua_handle_by_replaces(nua, replaces))) { @@ -1807,13 +1807,13 @@ channel = switch_core_session_get_channel(session); /* Barf if we didn't get it */ - assert(channel != NULL); + switch_assert(channel != NULL); /* make sure we have our privates */ tech_pvt = switch_core_session_get_private(session); /* Barf if we didn't get it */ - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); /* move signal_ptr where we need it (right past Signal=) */ signal_ptr = signal_ptr + 7; @@ -2098,7 +2098,7 @@ if (sip->sip_max_forwards) { char max_forwards[32]; - snprintf(max_forwards, sizeof(max_forwards), "%lu", sip->sip_max_forwards->mf_count); + switch_snprintf(max_forwards, sizeof(max_forwards), "%lu", sip->sip_max_forwards->mf_count); switch_channel_set_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE, max_forwards); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Dec 12 18:27:30 2007 @@ -81,7 +81,7 @@ tech_pvt->session_id++; - snprintf(buf, sizeof(buf), + switch_snprintf(buf, sizeof(buf), "v=0\n" "o=FreeSWITCH %010u %010u IN IP4 %s\n" "s=FreeSWITCH\n" @@ -90,7 +90,7 @@ "m=audio %d RTP/AVP", tech_pvt->owner_id, tech_pvt->session_id, ip, ip, sr, port); if (tech_pvt->rm_encoding) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->pt); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->pt); } else if (tech_pvt->num_codecs) { int i; int already_did[128] = { 0 }; @@ -109,7 +109,7 @@ already_did[imp->ianacode] = 1; } - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", imp->ianacode); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", imp->ianacode); if (!ptime) { ptime = imp->microseconds_per_frame / 1000; } @@ -117,20 +117,20 @@ } if (tech_pvt->te > 95) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->te); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->te); } if (tech_pvt->cng_pt && use_cng) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->cng_pt); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->cng_pt); } - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "\n"); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "\n"); if (tech_pvt->rm_encoding) { rate = tech_pvt->rm_rate; - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", tech_pvt->pt, tech_pvt->rm_encoding, rate); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", tech_pvt->pt, tech_pvt->rm_encoding, rate); if (tech_pvt->fmtp_out) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->pt, tech_pvt->fmtp_out); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->pt, tech_pvt->fmtp_out); } if (tech_pvt->read_codec.implementation && !ptime) { ptime = tech_pvt->read_codec.implementation->microseconds_per_frame / 1000; @@ -159,38 +159,38 @@ if (ptime && ptime != imp->microseconds_per_frame / 1000) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "ptime %u != advertised ptime %u\n", imp->microseconds_per_frame / 1000, ptime); } - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, rate); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, rate); if (imp->fmtp) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, imp->fmtp); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, imp->fmtp); } } } if (tech_pvt->te > 95) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d telephone-event/8000\na=fmtp:%d 0-16\n", tech_pvt->te, tech_pvt->te); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d telephone-event/8000\na=fmtp:%d 0-16\n", tech_pvt->te, tech_pvt->te); } if (tech_pvt->cng_pt && use_cng) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/8000\n", tech_pvt->cng_pt); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/8000\n", tech_pvt->cng_pt); if (!tech_pvt->rm_encoding) { tech_pvt->cng_pt = 0; } } else { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=silenceSupp:off - - - -\n"); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=silenceSupp:off - - - -\n"); } if (ptime) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", ptime); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", ptime); } if (switch_test_flag(tech_pvt, TFLAG_VIDEO) && tech_pvt->video_rm_encoding) { sofia_glue_tech_choose_video_port(tech_pvt); if ((v_port = tech_pvt->adv_sdp_video_port)) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "m=video %d RTP/AVP", v_port); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "m=video %d RTP/AVP", v_port); sofia_glue_tech_set_video_codec(tech_pvt, 0); /*****************************/ if (tech_pvt->video_rm_encoding) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->video_pt); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->video_pt); } else if (tech_pvt->num_codecs) { int i; int already_did[128] = { 0 }; @@ -208,20 +208,20 @@ already_did[imp->ianacode] = 1; } - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", imp->ianacode); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", imp->ianacode); if (!ptime) { ptime = imp->microseconds_per_frame / 1000; } } } - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "\n"); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "\n"); if (tech_pvt->rm_encoding) { rate = tech_pvt->video_rm_rate; - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%ld\n", tech_pvt->video_pt, tech_pvt->video_rm_encoding, tech_pvt->video_rm_rate); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%ld\n", tech_pvt->video_pt, tech_pvt->video_rm_encoding, tech_pvt->video_rm_rate); if (tech_pvt->video_fmtp_out) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->video_pt, tech_pvt->video_fmtp_out); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->video_pt, tech_pvt->video_fmtp_out); } } else if (tech_pvt->num_codecs) { int i; @@ -244,9 +244,9 @@ rate = imp->samples_per_second; } - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, imp->samples_per_second); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, imp->samples_per_second); if (imp->fmtp) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, imp->fmtp); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, imp->fmtp); } } } @@ -269,7 +269,7 @@ goto end; } - assert(tech_pvt->session != NULL); + switch_assert(tech_pvt->session != NULL); if ((abs = switch_channel_get_variable(tech_pvt->channel, "absolute_codec_string"))) { codec_string = abs; @@ -327,9 +327,9 @@ { char name[256]; - assert(session != NULL); - assert(profile != NULL); - assert(tech_pvt != NULL); + switch_assert(session != NULL); + switch_assert(profile != NULL); + switch_assert(tech_pvt != NULL); switch_core_session_add_stream(session, NULL); @@ -358,7 +358,7 @@ switch_core_session_set_private(session, tech_pvt); - snprintf(name, sizeof(name), "sofia/%s/%s", profile->name, channame); + switch_snprintf(name, sizeof(name), "sofia/%s/%s", profile->name, channame); switch_channel_set_name(tech_pvt->channel, name); } @@ -414,7 +414,7 @@ tech_pvt->adv_sdp_audio_ip = switch_core_session_strdup(tech_pvt->session, ip); tech_pvt->adv_sdp_audio_port = sdp_port; - snprintf(tmp, sizeof(tmp), "%d", sdp_port); + switch_snprintf(tmp, sizeof(tmp), "%d", sdp_port); switch_channel_set_variable(tech_pvt->channel, SWITCH_LOCAL_MEDIA_IP_VARIABLE, tech_pvt->adv_sdp_audio_ip); switch_channel_set_variable(tech_pvt->channel, SWITCH_LOCAL_MEDIA_PORT_VARIABLE, tmp); @@ -446,7 +446,7 @@ tech_pvt->adv_sdp_video_port = sdp_port; - snprintf(tmp, sizeof(tmp), "%d", sdp_port); + switch_snprintf(tmp, sizeof(tmp), "%d", sdp_port); switch_channel_set_variable(tech_pvt->channel, SWITCH_LOCAL_VIDEO_IP_VARIABLE, tech_pvt->adv_sdp_audio_ip); switch_channel_set_variable(tech_pvt->channel, SWITCH_LOCAL_VIDEO_PORT_VARIABLE, tmp); @@ -680,12 +680,12 @@ const char *rep; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER); tech_pvt = (private_object_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_clear_flag_locked(tech_pvt, TFLAG_SDP); @@ -838,13 +838,13 @@ char hash_key[256] = ""; e_dest = strdup(tech_pvt->e_dest); - assert(e_dest != NULL); + switch_assert(e_dest != NULL); user = e_dest; if ((host = strchr(user, '@'))) { *host++ = '\0'; } - snprintf(hash_key, sizeof(hash_key), "%s%s%s", user, host, cid_num); + switch_snprintf(hash_key, sizeof(hash_key), "%s%s%s", user, host, cid_num); tech_pvt->chat_from = tech_pvt->from_str; tech_pvt->chat_to = tech_pvt->dest; @@ -906,10 +906,10 @@ switch_caller_profile_t *caller_profile; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_object_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); caller_profile = switch_channel_get_caller_profile(channel); @@ -1124,7 +1124,7 @@ char tmp[50]; uint32_t rtp_timeout_sec = tech_pvt->profile->rtp_timeout_sec; - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (switch_channel_test_flag(tech_pvt->channel, CF_BYPASS_MEDIA)) { @@ -1175,7 +1175,7 @@ tech_pvt->agreed_pt, tech_pvt->read_codec.implementation->microseconds_per_frame / 1000); - snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_audio_port); + switch_snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_audio_port); switch_channel_set_variable(tech_pvt->channel, SWITCH_LOCAL_MEDIA_IP_VARIABLE, tech_pvt->adv_sdp_audio_ip); switch_channel_set_variable(tech_pvt->channel, SWITCH_LOCAL_MEDIA_PORT_VARIABLE, tmp); @@ -1318,8 +1318,8 @@ sdp_session_t *sdp; uint8_t match = 0; - assert(tech_pvt != NULL); - assert(r_sdp != NULL); + switch_assert(tech_pvt != NULL); + switch_assert(r_sdp != NULL); parser = sdp_parse(NULL, r_sdp, (int) strlen(r_sdp), 0); @@ -1368,10 +1368,10 @@ const char *val; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); greedy = !!(tech_pvt->profile->pflags & PFLAG_GREEDY); @@ -1542,7 +1542,7 @@ char tmp[80]; int num; - snprintf(tmp, sizeof(tmp), "%s@%uk@%ui", near_match->iananame, near_match->samples_per_second, ptime); + switch_snprintf(tmp, sizeof(tmp), "%s@%uk@%ui", near_match->iananame, near_match->samples_per_second, ptime); prefs[0] = tmp; num = switch_loadable_module_get_codecs_sorted(search, 1, prefs, 1); @@ -1569,7 +1569,7 @@ tech_pvt->rm_fmtp = switch_core_session_strdup(session, (char *) map->rm_fmtp); tech_pvt->remote_sdp_audio_port = (switch_port_t) m->m_port; tech_pvt->agreed_pt = (switch_payload_t) map->rm_pt; - snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_audio_port); + switch_snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_audio_port); switch_channel_set_variable(tech_pvt->channel, SWITCH_REMOTE_MEDIA_IP_VARIABLE, tech_pvt->remote_sdp_audio_ip); switch_channel_set_variable(tech_pvt->channel, SWITCH_REMOTE_MEDIA_PORT_VARIABLE, tmp); @@ -1651,7 +1651,7 @@ tech_pvt->video_rm_fmtp = switch_core_session_strdup(session, (char *) map->rm_fmtp); tech_pvt->remote_sdp_video_port = (switch_port_t) m->m_port; tech_pvt->video_agreed_pt = (switch_payload_t) map->rm_pt; - snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_video_port); + switch_snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_video_port); switch_channel_set_variable(tech_pvt->channel, SWITCH_REMOTE_VIDEO_IP_VARIABLE, tech_pvt->remote_sdp_audio_ip); switch_channel_set_variable(tech_pvt->channel, SWITCH_REMOTE_VIDEO_PORT_VARIABLE, tmp); } else { @@ -1740,7 +1740,7 @@ if ((val = switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (other_session = switch_core_session_locate(val))) { other_channel = switch_core_session_get_channel(other_session); - assert(other_channel != NULL); + switch_assert(other_channel != NULL); switch_channel_set_variable(other_channel, SWITCH_B_SDP_VARIABLE, sdp); if (!switch_test_flag(tech_pvt, TFLAG_CHANGE_MEDIA) && (switch_channel_test_flag(other_channel, CF_OUTBOUND) && Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Wed Dec 12 18:27:30 2007 @@ -53,7 +53,7 @@ } user = strdup(to); - assert(user); + switch_assert(user); if ((host = strchr(user, '@'))) { *host++ = '\0'; @@ -183,7 +183,7 @@ switch_stream_handle_t stream = { 0 }; switch_event_header_t *hp; - assert(event != NULL); + switch_assert(event != NULL); if (!(account = switch_event_get_header(event, "mwi-message-account"))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing required Header 'MWI-Message-Account'\n"); @@ -196,7 +196,7 @@ } dup_account = strdup(account); - assert(dup_account != NULL); + switch_assert(dup_account != NULL); sofia_glue_get_user_host(dup_account, &user, &host); if (!host || !(profile = sofia_glue_find_profile(host))) { @@ -226,7 +226,7 @@ switch_safe_free(stream.data); - assert (sql != NULL); + switch_assert (sql != NULL); sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, @@ -292,7 +292,7 @@ sql = switch_mprintf("select *,1,'%q','%q' from sip_subscriptions where event='presence'", status, rpid); } - assert(sql != NULL); + switch_assert(sql != NULL); switch_mutex_lock(mod_sofia_globals.hash_mutex); for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); @@ -792,7 +792,7 @@ to_host, event ); - assert(sql != NULL); + switch_assert(sql != NULL); sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, NULL); free(sql); @@ -803,7 +803,7 @@ sql = switch_mprintf("insert into sip_subscriptions values ('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q',%ld)", proto, from_user, from_host, to_user, to_host, event, contact_str, call_id, full_from, full_via, exp); - assert(sql != NULL); + switch_assert(sql != NULL); sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, NULL); free(sql); @@ -958,7 +958,7 @@ { url_t *to = sip->sip_to->a_url; url_t *from = sip->sip_from->a_url; - snprintf(hash_key, len, "%s%s%s", from->url_user, from->url_host, to->url_user); + switch_snprintf(hash_key, len, "%s%s%s", from->url_user, from->url_host, to->url_user); } void sofia_presence_handle_sip_i_message(int status, @@ -1081,7 +1081,7 @@ if (sofia_reg_find_reg_url(tech_pvt->profile, sip->sip_from->a_url->url_user, sip->sip_from->a_url->url_host, buf, sizeof(buf))) { home = su_home_new(sizeof(*home)); - assert(home != NULL); + switch_assert(home != NULL); tech_pvt->chat_from = sip_header_as_string(home, (const sip_header_t *) sip->sip_to); tech_pvt->chat_to = switch_core_session_strdup(tech_pvt->session, buf); sofia_presence_set_hash_key(hash_key, sizeof(hash_key), sip); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Wed Dec 12 18:27:30 2007 @@ -159,7 +159,7 @@ char *contact = NULL; char to[128] = ""; - snprintf(to, sizeof(to), "%s@%s", argv[1], argv[2]); + switch_snprintf(to, sizeof(to), "%s@%s", argv[1], argv[2]); contact = sofia_glue_get_url_from_contact(argv[3], 1); nh = nua_handle(profile->nua, NULL, SIPTAG_FROM_STR(profile->url), SIPTAG_TO_STR(to), NUTAG_URL(contact), SIPTAG_CONTACT_STR(profile->url), TAG_END()); @@ -211,9 +211,9 @@ #endif if (now) { - snprintf(sql, sizeof(sql), "select '%s',* from sip_registrations where expires > 0 and expires <= %ld", profile->name, (long) now); + switch_snprintf(sql, sizeof(sql), "select '%s',* from sip_registrations where expires > 0 and expires <= %ld", profile->name, (long) now); } else { - snprintf(sql, sizeof(sql), "select '%s',* from sip_registrations where expires > 0", profile->name); + switch_snprintf(sql, sizeof(sql), "select '%s',* from sip_registrations where expires > 0", profile->name); } switch_mutex_lock(profile->ireg_mutex); @@ -224,26 +224,26 @@ sofia_reg_del_callback, NULL); if (now) { - snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0 and expires <= %ld", (long) now); + switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0 and expires <= %ld", (long) now); } else { - snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0"); + switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0"); } sofia_glue_execute_sql(profile, SWITCH_TRUE, sql, NULL); if (now) { - snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0 and expires <= %ld", (long) now); + switch_snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0 and expires <= %ld", (long) now); } else { - snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0"); + switch_snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0"); } sofia_glue_execute_sql(profile, SWITCH_TRUE, sql, NULL); if (now) { - snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0 and expires <= %ld", (long) now); + switch_snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0 and expires <= %ld", (long) now); } else { - snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0"); + switch_snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0"); } sofia_glue_execute_sql(profile, SWITCH_TRUE, sql, NULL); if (now) { - snprintf(sql, sizeof(sql), "select * from sip_registrations where status like '%%NATHACK%%'"); + switch_snprintf(sql, sizeof(sql), "select * from sip_registrations where status like '%%NATHACK%%'"); sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, @@ -269,9 +269,9 @@ cbt.len = len; if (host) { - snprintf(val, len, "select contact from sip_registrations where sip_user='%s' and sip_host='%s'", user, host); + switch_snprintf(val, len, "select contact from sip_registrations where sip_user='%s' and sip_host='%s'", user, host); } else { - snprintf(val, len, "select contact from sip_registrations where sip_user='%s'", user); + switch_snprintf(val, len, "select contact from sip_registrations where sip_user='%s'", user); } @@ -303,7 +303,7 @@ switch_mutex_lock(profile->ireg_mutex); sql = switch_mprintf("insert into sip_authentication (nonce, expires) values('%q', %ld)", uuid_str, time(NULL) + profile->nonce_ttl); - assert(sql != NULL); + switch_assert(sql != NULL); sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, NULL); switch_safe_free(sql); switch_mutex_unlock(profile->ireg_mutex); @@ -346,7 +346,7 @@ const char *call_id = NULL; /* all callers must confirm that sip, sip->sip_request and sip->sip_contact are not NULL */ - assert(sip != NULL && sip->sip_contact != NULL && sip->sip_request != NULL); + switch_assert(sip != NULL && sip->sip_contact != NULL && sip->sip_request != NULL); get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_addr); network_port = ntohs(((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_port); @@ -385,10 +385,10 @@ } if (contact->m_url->url_params) { - snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%s;%s>", + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%s;%s>", display, contact->m_url->url_user, contact->m_url->url_host, port, contact->m_url->url_params); } else { - snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%s>", display, contact->m_url->url_user, contact->m_url->url_host, port); + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%s>", display, contact->m_url->url_user, contact->m_url->url_host, port); } } @@ -423,10 +423,10 @@ if ((v_contact_str = switch_event_get_header(*v_event, "sip-force-contact"))) { if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction")) { if (contact->m_url->url_params) { - snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>", + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>", display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params); } else { - snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>", display, contact->m_url->url_user, network_ip, network_port); + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>", display, contact->m_url->url_user, network_ip, network_port); } cd = 1; exptime = 20; @@ -475,7 +475,7 @@ } call_id = sip->sip_call_id->i_id; //sip_header_as_string(profile->home, (void *) sip->sip_call_id); - assert(call_id); + switch_assert(call_id); if (exptime) { @@ -709,7 +709,7 @@ goto cancel; } - snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, realm, gateway->register_username, gateway->register_password); + switch_snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, realm, gateway->register_username, gateway->register_password); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Authenticating '%s' with '%s'.\n", profile->username, authentication); @@ -810,7 +810,7 @@ if (switch_strlen_zero(np)) { first = 1; sql = switch_mprintf("select nonce from sip_authentication where nonce='%q'", nonce); - assert(sql != NULL); + switch_assert(sql != NULL); if (!sofia_glue_execute_sql2str(profile, profile->ireg_mutex, sql, np, nplen)) { free(sql); ret = AUTH_STALE; @@ -992,7 +992,7 @@ char *mydata, *argv[50]; mydata = strdup(val); - assert(mydata != NULL); + switch_assert(mydata != NULL); argc = switch_separate_string(mydata, ',', argv, (sizeof(argv) / sizeof(argv[0]))); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Wed Dec 12 18:27:30 2007 @@ -205,10 +205,10 @@ int rate = 8000; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt->frame.data = tech_pvt->databuf; @@ -248,10 +248,10 @@ struct private_object *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s WOOMERA RING\n", switch_channel_get_name(channel)); @@ -265,10 +265,10 @@ struct private_object *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s WOOMERA EXECUTE\n", switch_channel_get_name(channel)); @@ -282,10 +282,10 @@ struct private_object *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_core_codec_destroy(&tech_pvt->read_codec); switch_core_codec_destroy(&tech_pvt->write_codec); @@ -320,10 +320,10 @@ struct private_object *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (!tech_pvt->udp_socket) { return SWITCH_STATUS_FALSE; @@ -366,7 +366,7 @@ struct private_object *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); return switch_socket_waitfor(tech_pvt->read_poll, ms) ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS; } @@ -376,7 +376,7 @@ struct private_object *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); return SWITCH_STATUS_SUCCESS; // return switch_socket_waitfor(tech_pvt->write_poll, ms); @@ -390,10 +390,10 @@ switch_size_t len; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); for(;;) { if (switch_test_flag(tech_pvt, TFLAG_ABORT) || !tech_pvt->udp_socket) { @@ -436,10 +436,10 @@ //switch_frame_t *pframe; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (switch_test_flag(tech_pvt, TFLAG_ABORT) || !tech_pvt->udp_socket) { return SWITCH_STATUS_GENERR; @@ -506,7 +506,7 @@ char name[128]; switch_caller_profile_t *caller_profile; - snprintf(name, sizeof(name), "Woomera/%s-%04x", outbound_profile->destination_number, rand() & 0xffff); + switch_snprintf(name, sizeof(name), "Woomera/%s-%04x", outbound_profile->destination_number, rand() & 0xffff); switch_channel_set_name(channel, name); caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); @@ -953,13 +953,13 @@ woomera_message wmsg; int res = 0; - assert(session != NULL); + switch_assert(session != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (!tech_pvt->udp_socket) { tech_create_read_socket(tech_pvt); @@ -1089,7 +1089,7 @@ NULL, exten)) != 0) { char name[128]; - snprintf(name, sizeof(name), "Woomera/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); + switch_snprintf(name, sizeof(name), "Woomera/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); switch_channel_set_name(channel, name); switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Wed Dec 12 18:27:30 2007 @@ -217,24 +217,24 @@ tt_created = (time_t) (caller_profile->times->created / 1000000); mtt_created = (time_t) (caller_profile->times->created / 1000); - snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_created); + switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_created); switch_channel_set_variable(channel, "start_epoch", tmp); - snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->created); + switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->created); switch_channel_set_variable(channel, "start_uepoch", tmp); tt_answered = (time_t) (caller_profile->times->answered / 1000000); mtt_answered = (time_t) (caller_profile->times->answered / 1000); - snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_answered); + switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_answered); switch_channel_set_variable(channel, "answer_epoch", tmp); - snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->answered); + switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->answered); switch_channel_set_variable(channel, "answer_uepoch", tmp); tt_hungup = (time_t) (caller_profile->times->hungup / 1000000); mtt_hungup = (time_t) (caller_profile->times->hungup / 1000); - snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_hungup); + switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_hungup); switch_channel_set_variable(channel, "end_epoch", tmp); - snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->hungup); + switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->hungup); switch_channel_set_variable(channel, "end_uepoch", tmp); uduration = caller_profile->times->hungup - caller_profile->times->created; @@ -253,22 +253,22 @@ switch_channel_set_variable(channel, "last_arg", last_arg); switch_channel_set_variable(channel, "caller_id", cid_buf); - snprintf(tmp, sizeof(tmp), "%d", duration); + switch_snprintf(tmp, sizeof(tmp), "%d", duration); switch_channel_set_variable(channel, "duration", tmp); - snprintf(tmp, sizeof(tmp), "%d", billsec); + switch_snprintf(tmp, sizeof(tmp), "%d", billsec); switch_channel_set_variable(channel, "billsec", tmp); - snprintf(tmp, sizeof(tmp), "%d", mduration); + switch_snprintf(tmp, sizeof(tmp), "%d", mduration); switch_channel_set_variable(channel, "mduration", tmp); - snprintf(tmp, sizeof(tmp), "%d", billmsec); + switch_snprintf(tmp, sizeof(tmp), "%d", billmsec); switch_channel_set_variable(channel, "billmsec", tmp); - snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, uduration); + switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, uduration); switch_channel_set_variable(channel, "uduration", tmp); - snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, billusec); + switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, billusec); switch_channel_set_variable(channel, "billusec", tmp); if (globals.debug) { @@ -395,7 +395,7 @@ size_t len = strlen(param->txt) + 2; if (end_of(param->txt) != '\n') { tpl = switch_core_alloc(pool, len); - snprintf(tpl, len, "%s\n", param->txt); + switch_snprintf(tpl, len, "%s\n", param->txt); } else { tpl = switch_core_strdup(pool, param->txt); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Wed Dec 12 18:27:30 2007 @@ -290,7 +290,7 @@ term++; } } - snprintf(tmpname, sizeof(tmpname), "Orig-%s", var); + switch_snprintf(tmpname, sizeof(tmpname), "Orig-%s", var); switch_event_add_header(local_event, SWITCH_STACK_BOTTOM, tmpname, "%s", val); var = term + 1; } else { Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Wed Dec 12 18:27:30 2007 @@ -450,7 +450,7 @@ if (data) { - snprintf(buf, sizeof(buf), "Content-Type: log/data\nContent-Length: %" SWITCH_SSIZE_T_FMT "\n\n", strlen(data)); + switch_snprintf(buf, sizeof(buf), "Content-Type: log/data\nContent-Length: %" SWITCH_SSIZE_T_FMT "\n\n", strlen(data)); len = strlen(buf); switch_socket_send(listener->sock, buf, &len); len = strlen(data); @@ -487,7 +487,7 @@ len = strlen(listener->ebuf); - snprintf(hbuf, sizeof(hbuf), "Content-Length: %" SWITCH_SSIZE_T_FMT "\n" "Content-Type: text/event-%s\n" "\n", len, etype); + switch_snprintf(hbuf, sizeof(hbuf), "Content-Length: %" SWITCH_SSIZE_T_FMT "\n" "Content-Type: text/event-%s\n" "\n", len, etype); len = strlen(hbuf); switch_socket_send(listener->sock, hbuf, &len); @@ -558,7 +558,7 @@ switch_size_t rlen, blen; char buf[1024] = ""; rlen = strlen(reply); - snprintf(buf, sizeof(buf), "Content-Type: api/response\nContent-Length: %" SWITCH_SSIZE_T_FMT "\n\n", rlen); + switch_snprintf(buf, sizeof(buf), "Content-Type: api/response\nContent-Length: %" SWITCH_SSIZE_T_FMT "\n\n", rlen); blen = strlen(buf); switch_socket_send(acs->listener->sock, buf, &blen); switch_socket_send(acs->listener->sock, reply, &rlen); @@ -590,7 +590,7 @@ if (!strncasecmp(cmd, "exit", 4)) { switch_clear_flag_locked(listener, LFLAG_RUNNING); - snprintf(reply, reply_len, "+OK bye"); + switch_snprintf(reply, reply_len, "+OK bye"); goto done; } @@ -603,9 +603,9 @@ if (!strcmp(prefs.password, pass)) { switch_set_flag_locked(listener, LFLAG_AUTHED); - snprintf(reply, reply_len, "+OK accepted"); + switch_snprintf(reply, reply_len, "+OK accepted"); } else { - snprintf(reply, reply_len, "-ERR invalid"); + switch_snprintf(reply, reply_len, "-ERR invalid"); switch_clear_flag_locked(listener, LFLAG_RUNNING); } @@ -621,18 +621,18 @@ assert(channel != NULL); if (!strncasecmp(cmd, "connect", 7)) { - snprintf(reply, reply_len, "+OK"); + switch_snprintf(reply, reply_len, "+OK"); goto done; } else if (!strncasecmp(cmd, "sendmsg", 7)) { if (switch_test_flag(listener, LFLAG_ASYNC)) { if ((status = switch_core_session_queue_private_event(listener->session, &event)) == SWITCH_STATUS_SUCCESS) { - snprintf(reply, reply_len, "+OK"); + switch_snprintf(reply, reply_len, "+OK"); } else { - snprintf(reply, reply_len, "-ERR memory error"); + switch_snprintf(reply, reply_len, "-ERR memory error"); } } else { switch_ivr_parse_event(listener->session, event); - snprintf(reply, reply_len, "+OK"); + switch_snprintf(reply, reply_len, "+OK"); } goto done; } else if (!strncasecmp(cmd, "getvar", 6)) { @@ -648,7 +648,7 @@ } } - snprintf(reply, reply_len, "%s", val); + switch_snprintf(reply, reply_len, "%s", val); goto done; } else if (!strncasecmp(cmd, "myevents", 8)) { listener->event_list[SWITCH_EVENT_CHANNEL_CREATE] = 1; @@ -674,7 +674,7 @@ if (strstr(cmd, "xml") || strstr(cmd, "XML")) { listener->format = EVENT_FORMAT_XML; } - snprintf(reply, reply_len, "+OK Events Enabled"); + switch_snprintf(reply, reply_len, "+OK Events Enabled"); goto done; } @@ -705,7 +705,7 @@ } switch_event_fire(&event); - snprintf(reply, reply_len, "+OK"); + switch_snprintf(reply, reply_len, "+OK"); goto done; } else if (!strncasecmp(cmd, "sendmsg", 7)) { switch_core_session_t *session; @@ -737,13 +737,13 @@ if (session) { if ((status = switch_core_session_queue_private_event(session, &event)) == SWITCH_STATUS_SUCCESS) { - snprintf(reply, reply_len, "+OK"); + switch_snprintf(reply, reply_len, "+OK"); } else { - snprintf(reply, reply_len, "-ERR memory error"); + switch_snprintf(reply, reply_len, "-ERR memory error"); } switch_core_session_rwunlock(session); } else { - snprintf(reply, reply_len, "-ERR invalid session id [%s]", uuid); + switch_snprintf(reply, reply_len, "-ERR invalid session id [%s]", uuid); } goto done; @@ -764,7 +764,7 @@ acs.bg = 0; api_exec(NULL, (void *) &acs); - //snprintf(reply, reply_len, "+OK"); + //switch_snprintf(reply, reply_len, "+OK"); return SWITCH_STATUS_SUCCESS; } else if (!strncasecmp(cmd, "bgapi ", 6)) { @@ -805,7 +805,7 @@ switch_uuid_get(&uuid); switch_uuid_format(acs->uuid_str, &uuid); } - snprintf(reply, reply_len, "+OK Job-UUID: %s", acs->uuid_str); + switch_snprintf(reply, reply_len, "+OK Job-UUID: %s", acs->uuid_str); return SWITCH_STATUS_SUCCESS; } else if (!strncasecmp(cmd, "log", 3)) { @@ -832,9 +832,9 @@ if (ltype && ltype != SWITCH_LOG_INVALID) { listener->level = ltype; switch_set_flag(listener, LFLAG_LOG); - snprintf(reply, reply_len, "+OK log level %s [%d]", level_s, listener->level); + switch_snprintf(reply, reply_len, "+OK log level %s [%d]", level_s, listener->level); } else { - snprintf(reply, reply_len, "-ERR invalid log level"); + switch_snprintf(reply, reply_len, "-ERR invalid log level"); } } else if (!strncasecmp(cmd, "nolog", 5)) { void *pop; @@ -842,9 +842,9 @@ if (switch_test_flag(listener, LFLAG_LOG)) { switch_clear_flag_locked(listener, LFLAG_LOG); - snprintf(reply, reply_len, "+OK no longer logging"); + switch_snprintf(reply, reply_len, "+OK no longer logging"); } else { - snprintf(reply, reply_len, "-ERR not loging"); + switch_snprintf(reply, reply_len, "-ERR not loging"); } } else if (!strncasecmp(cmd, "event", 5)) { char *next, *cur; @@ -894,7 +894,7 @@ } if (!key_count) { - snprintf(reply, reply_len, "-ERR no keywords supplied"); + switch_snprintf(reply, reply_len, "-ERR no keywords supplied"); goto done; } @@ -902,7 +902,7 @@ switch_set_flag_locked(listener, LFLAG_EVENTS); } - snprintf(reply, reply_len, "+OK event listener enabled %s", listener->format == EVENT_FORMAT_XML ? "xml" : "plain"); + switch_snprintf(reply, reply_len, "+OK event listener enabled %s", listener->format == EVENT_FORMAT_XML ? "xml" : "plain"); } else if (!strncasecmp(cmd, "nixevent", 8)) { char *next, *cur; @@ -948,7 +948,7 @@ } if (!key_count) { - snprintf(reply, reply_len, "-ERR no keywords supplied"); + switch_snprintf(reply, reply_len, "-ERR no keywords supplied"); goto done; } @@ -956,7 +956,7 @@ switch_set_flag_locked(listener, LFLAG_EVENTS); } - snprintf(reply, reply_len, "+OK events nixed"); + switch_snprintf(reply, reply_len, "+OK events nixed"); } else if (!strncasecmp(cmd, "noevents", 8)) { void *pop; @@ -971,9 +971,9 @@ /* wipe the hash */ switch_core_hash_destroy(&listener->event_hash); switch_core_hash_init(&listener->event_hash, listener->pool); - snprintf(reply, reply_len, "+OK no longer listening for events"); + switch_snprintf(reply, reply_len, "+OK no longer listening for events"); } else { - snprintf(reply, reply_len, "-ERR not listening for events"); + switch_snprintf(reply, reply_len, "-ERR not listening for events"); } } @@ -983,7 +983,7 @@ } if (switch_strlen_zero(reply)) { - snprintf(reply, reply_len, "-ERR command not found"); + switch_snprintf(reply, reply_len, "-ERR command not found"); } return status; @@ -1060,7 +1060,7 @@ switch_safe_free(event_str); } else { - snprintf(buf, sizeof(buf), "Content-Type: auth/request\n\n"); + switch_snprintf(buf, sizeof(buf), "Content-Type: auth/request\n\n"); len = strlen(buf); switch_socket_send(listener->sock, buf, &len); @@ -1079,7 +1079,7 @@ goto done; } if (*reply != '\0') { - snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); + switch_snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); len = strlen(buf); switch_socket_send(listener->sock, buf, &len); } @@ -1108,7 +1108,7 @@ } if (*reply != '\0') { - snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); + switch_snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); len = strlen(buf); switch_socket_send(listener->sock, buf, &len); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c Wed Dec 12 18:27:30 2007 @@ -145,7 +145,7 @@ return; } - snprintf(data, len, "%s=%s", hp->name, hp->value); + switch_snprintf(data, len, "%s=%s", hp->name, hp->value); if (sw_text_record_add_string(text_record, data) != SW_OKAY) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to add service text: %s\n", data); free(data); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Wed Dec 12 18:27:30 2007 @@ -79,7 +79,7 @@ local_stream_context_t *cp; char file_buf[128] = "", path_buf[512] = ""; switch_timer_t timer = {0}; - + int fd = -1; if (switch_core_timer_init(&timer, source->timer_name, source->interval, source->samples, source->pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Can't start timer.\n"); @@ -89,7 +89,7 @@ while(RUNNING) { const char *fname; - + if (switch_dir_open(&source->dir_handle, source->location, source->pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Can't open directory: %s\n", source->location); return NULL; @@ -98,27 +98,37 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "open directory: %s\n", source->location); switch_yield(1000000); - while(RUNNING && (fname = switch_dir_next_file(source->dir_handle, file_buf, sizeof(file_buf)))) { + while(RUNNING) { switch_size_t olen; uint8_t abuf[SWITCH_RECOMMENDED_BUFFER_SIZE] = {0}; - snprintf(path_buf, sizeof(path_buf), "%s%s%s", source->location, SWITCH_PATH_SEPARATOR, fname); - if (switch_stristr(".loc", path_buf)) { - int fd, bytes; + if (fd > -1) { char *p; + if (switch_fd_read_line(fd, path_buf, sizeof(path_buf))) { + if ((p = strchr(path_buf, '\r')) || + (p = strchr(path_buf, '\n'))) { + *p = '\0'; + } + } else { + close(fd); + fd = -1; + continue; + } + } else { + if (!(fname = switch_dir_next_file(source->dir_handle, file_buf, sizeof(file_buf)))) { + break; + } + + switch_snprintf(path_buf, sizeof(path_buf), "%s%s%s", source->location, SWITCH_PATH_SEPARATOR, fname); - if ((fd = open(path_buf, O_RDONLY)) < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open %s\n", fname); - switch_yield(1000000); + if (switch_stristr(".loc", path_buf)) { + if ((fd = open(path_buf, O_RDONLY)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open %s\n", fname); + switch_yield(1000000); + } continue; } - bytes = read(fd, path_buf, sizeof(path_buf)); - if ((p = strchr(path_buf, '\r')) || - (p = strchr(path_buf, '\n'))) { - *p = '\0'; - } - close(fd); } fname = path_buf; @@ -139,6 +149,7 @@ while (RUNNING) { switch_core_timer_next(&timer); olen = source->samples; + if (switch_core_file_read(&fh, abuf, &olen) != SWITCH_STATUS_SUCCESS || !olen) { switch_core_file_close(&fh); break; @@ -156,8 +167,13 @@ } switch_dir_close(source->dir_handle); + source->dir_handle = NULL; } + + if (fd > -1) { + close(fd); + } switch_core_destroy_memory_pool(&source->pool); @@ -168,25 +184,37 @@ { local_stream_context_t *context; local_stream_source_t *source; + char *alt_path = NULL; + switch_status_t status = SWITCH_STATUS_SUCCESS; if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This format does not support writing!\n"); return SWITCH_STATUS_FALSE; } + alt_path = switch_mprintf("%s/%d", path, handle->samplerate); + switch_mutex_lock(globals.mutex); - source = switch_core_hash_find(globals.source_hash, path); + if ((source = switch_core_hash_find(globals.source_hash, alt_path))) { + path = alt_path; + } else { + source = switch_core_hash_find(globals.source_hash, path); + } switch_mutex_unlock(globals.mutex); if (!source) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unknown source %s\n", path); - return SWITCH_STATUS_FALSE; + status = SWITCH_STATUS_FALSE; + goto end; } if ((context = switch_core_alloc(handle->memory_pool, sizeof(*context))) == 0) { - return SWITCH_STATUS_MEMERR; + status = SWITCH_STATUS_MEMERR; + goto end; } + + handle->samples = 0; handle->samplerate = source->rate; handle->channels = source->channels; @@ -201,7 +229,8 @@ switch_mutex_init(&context->audio_mutex, SWITCH_MUTEX_NESTED, handle->memory_pool); if (switch_buffer_create_dynamic(&context->audio_buffer, 512, 1024, 0) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); - return SWITCH_STATUS_MEMERR; + status = SWITCH_STATUS_MEMERR; + goto end; } context->source = source; @@ -211,8 +240,9 @@ source->context_list = context; switch_mutex_unlock(source->mutex); - - return SWITCH_STATUS_SUCCESS; + end: + switch_safe_free(alt_path); + return status; } static switch_status_t local_stream_file_close(switch_file_handle_t *handle) @@ -350,6 +380,7 @@ } source->samples = switch_bytes_per_frame(source->rate, source->interval); + switch_core_hash_insert(globals.source_hash, source->name, source); switch_mutex_init(&source->mutex, SWITCH_MUTEX_NESTED, source->pool); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_native_file/mod_native_file.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_native_file/mod_native_file.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_native_file/mod_native_file.c Wed Dec 12 18:27:30 2007 @@ -26,7 +26,7 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * * - * mod_native_file.c -- Framework Demo Module + * mod_native_file.c -- Native Files * */ #include <switch.h> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_shout/decode_ntom.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_shout/decode_ntom.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_shout/decode_ntom.c Wed Dec 12 18:27:30 2007 @@ -20,12 +20,12 @@ else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \ else { *(samples) = sum; } -#define NTOM_MUL (32768) -static unsigned long ntom_val[2] = { NTOM_MUL >> 1, NTOM_MUL >> 1 }; -static unsigned long ntom_step = NTOM_MUL; +//static unsigned long ntom_val[2] = { NTOM_MUL >> 1, NTOM_MUL >> 1 }; +//static unsigned long ntom_step = NTOM_MUL; -int synth_ntom_set_step(long m, long n) + +int synth_ntom_set_step(struct mpstr *mp, long m, long n) { if (param.verbose > 1) debug_printf("Init rate converter: %ld->%ld\n", m, n); @@ -36,14 +36,14 @@ } n *= NTOM_MUL; - ntom_step = n / m; + mp->ntom_step = n / m; - if (ntom_step > 8 * NTOM_MUL) { + if (mp->ntom_step > 8 * NTOM_MUL) { debug_printf("%d max. 1:8 conversion allowed!\n", __LINE__); return (1); } - ntom_val[0] = ntom_val[1] = NTOM_MUL >> 1; + mp->ntom_val[0] = mp->ntom_val[1] = NTOM_MUL >> 1; return (0); @@ -89,12 +89,12 @@ bo--; bo &= 0xf; buf = mp->synth_buffs[0]; - ntom = ntom_val[1] = ntom_val[0]; + ntom = mp->ntom_val[1] = mp->ntom_val[0]; } else { samples++; out += 2; /* to compute the right *pnt value */ buf = mp->synth_buffs[1]; - ntom = ntom_val[1]; + ntom = mp->ntom_val[1]; } if (bo & 0x1) { @@ -116,7 +116,7 @@ for (j = 16; j; j--, window += 0x10) { real sum; - ntom += ntom_step; + ntom += mp->ntom_step; if (ntom < NTOM_MUL) { window += 16; b0 += 16; @@ -147,7 +147,7 @@ } } - ntom += ntom_step; + ntom += mp->ntom_step; if (ntom >= NTOM_MUL) { real sum; sum = window[0x0] * b0[0x0]; @@ -172,7 +172,7 @@ for (j = 15; j; j--, b0 -= 0x20, window -= 0x10) { real sum; - ntom += ntom_step; + ntom += mp->ntom_step; if (ntom < NTOM_MUL) { window -= 16; b0 += 16; @@ -204,7 +204,7 @@ } } - ntom_val[channel] = ntom; + mp->ntom_val[channel] = ntom; *pnt = ((unsigned char *) samples - out); return clip; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_shout/interface.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_shout/interface.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_shout/interface.c Wed Dec 12 18:27:30 2007 @@ -27,6 +27,9 @@ mp->bsnum = 0; mp->synth_bo = 1; mp->outsamplerate = samplerate; + mp->ntom_val[0] = NTOM_MUL >> 1; + mp->ntom_val[1] = NTOM_MUL >> 1; + mp->ntom_step = NTOM_MUL; make_decode_tables_scale(mp, outscale); @@ -241,7 +244,7 @@ m = n; } - if (synth_ntom_set_step(n, m)) + if (synth_ntom_set_step(mp, n, m)) return MP3_ERR; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_shout/mpglib.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_shout/mpglib.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_shout/mpglib.h Wed Dec 12 18:27:30 2007 @@ -3,6 +3,7 @@ #else #define debug_printf(fmt,...) #endif +#define NTOM_MUL (32768) struct buf { unsigned char *pnt; @@ -39,7 +40,8 @@ int longLimit[9][23]; /*sample limits re setting volume */ int shortLimit[9][14]; real decwin[512 + 32]; /* scale table */ - + unsigned long ntom_val[2]; + unsigned long ntom_step; }; #define BOOL int @@ -54,7 +56,7 @@ int decodeMP3(struct mpstr *mp, char *inmemory, int inmemsize, char *outmemory, int outmemsize, int *done); void ExitMP3(struct mpstr *mp); -extern int synth_ntom_set_step(long, long); +extern int synth_ntom_set_step(struct mpstr *mp, long, long); extern int synth_ntom(struct mpstr *mp, real * bandPtr, int channel, unsigned char *out, int *pnt); extern int synth_ntom_mono(struct mpstr *mp, real * bandPtr, unsigned char *samples, int *pnt); extern int synth_ntom_8bit(real *, int, unsigned char *, int *); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Wed Dec 12 18:27:30 2007 @@ -61,6 +61,9 @@ int mode = 0; char *ext; struct format_map *map = NULL; + switch_status_t status = SWITCH_STATUS_SUCCESS; + char *alt_path = NULL, *next, *last, *ldup = NULL; + size_t alt_len = 0; if ((ext = strrchr(path, '.')) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Format\n"); @@ -141,11 +144,28 @@ if ((mode & SFM_WRITE) && sf_format_check(&context->sfinfo) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error : file format is invalid (0x%08X).\n", context->sfinfo.format); return SWITCH_STATUS_GENERR; - }; + } - if ((context->handle = sf_open(path, mode, &context->sfinfo)) == 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening File [%s] [%s]\n", path, sf_strerror(context->handle)); - return SWITCH_STATUS_GENERR; + alt_len = strlen(path) + 10; + switch_zmalloc(alt_path, alt_len); + + switch_copy_string(alt_path, path, alt_len); + if ((last = strrchr(alt_path, *SWITCH_PATH_SEPARATOR))) { + next = ++last; + ldup = strdup(last); + switch_assert(ldup); + switch_snprintf(next, alt_len - (last - alt_path), "%d%s%s", handle->samplerate, SWITCH_PATH_SEPARATOR, ldup); + if ((context->handle = sf_open(alt_path, mode, &context->sfinfo))) { + path = alt_path; + } + } + + if (!context->handle) { + if ((context->handle = sf_open(path, mode, &context->sfinfo)) == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening File [%s] [%s]\n", path, sf_strerror(context->handle)); + status = SWITCH_STATUS_GENERR; + goto end; + } } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opening File [%s] %dhz\n", path, context->sfinfo.samplerate); @@ -157,8 +177,15 @@ handle->seekable = context->sfinfo.seekable; handle->speed = 0; handle->private_info = context; + - return SWITCH_STATUS_SUCCESS; + end: + + switch_safe_free(alt_path); + switch_safe_free(ldup); + + + return status; } static switch_status_t sndfile_file_close(switch_file_handle_t *handle) @@ -300,9 +327,7 @@ if (!skip) { char *p; struct format_map *map = switch_core_permanent_alloc(sizeof(*map)); - if (!map) { - abort(); - } + switch_assert(map); map->ext = switch_core_permanent_strdup(info.extension); map->uext = switch_core_permanent_strdup(info.extension); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Dec 12 18:27:30 2007 @@ -403,7 +403,7 @@ subst_string = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); len = (uint32_t) (strlen(pcre_obj->string) + strlen(subst_string) + 10); substituted = malloc(len); - assert(substituted != NULL); + switch_assert(substituted != NULL); switch_perform_substitution(pcre_obj->re, pcre_obj->proceed, subst_string, pcre_obj->string, substituted, len, pcre_obj->ovector); *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, substituted)); free(substituted); @@ -800,7 +800,7 @@ const char *err = NULL; char derr[512] = ""; - assert(filename != NULL); + switch_assert(filename != NULL); status = switch_dso_load(&dso, filename, module_manager.pool); @@ -880,13 +880,13 @@ len += strlen(file); len += 4; path = (char *) switch_core_alloc(module_manager.pool, len); - snprintf(path, len, "%s%s%s", dir, SWITCH_PATH_SEPARATOR, file); + switch_snprintf(path, len, "%s%s%s", dir, SWITCH_PATH_SEPARATOR, file); } else { len = strlen(dir); len += strlen(file); len += 8; path = (char *) switch_core_alloc(module_manager.pool, len); - snprintf(path, len, "%s%s%s%s", dir, SWITCH_PATH_SEPARATOR, file, ext); + switch_snprintf(path, len, "%s%s%s%s", dir, SWITCH_PATH_SEPARATOR, file, ext); } } @@ -1215,7 +1215,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); while ((has = switch_channel_has_dtmf(channel))) { switch_channel_dequeue_dtmf(channel, buf, sizeof(buf)); @@ -1237,7 +1237,7 @@ } channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); while (switch_core_session_dequeue_event(jss->session, &event) == SWITCH_STATUS_SUCCESS) { @@ -1266,7 +1266,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); CHANNEL_SANITY_CHECK(); @@ -1341,7 +1341,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); CHANNEL_SANITY_CHECK(); @@ -1400,7 +1400,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); CHANNEL_SANITY_CHECK(); @@ -1481,7 +1481,7 @@ switch_channel_state_t state; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); state = switch_channel_get_state(channel); @@ -1506,7 +1506,7 @@ if (argc > 0) { if ((function = JS_ValueToFunction(cx, argv[0]))) { switch_channel_t *channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); jss->on_hangup = function; jss->hook_state = switch_channel_get_state(channel); switch_channel_set_private(channel, "jss", jss); @@ -1538,7 +1538,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); CHANNEL_SANITY_CHECK(); @@ -1592,7 +1592,7 @@ JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; - snprintf(posbuf, sizeof(posbuf), "%u", fh.offset_pos); + switch_snprintf(posbuf, sizeof(posbuf), "%u", fh.offset_pos); switch_channel_set_variable(channel, "last_file_position", posbuf); return JS_TRUE; @@ -1606,7 +1606,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); if (argc > 1) { char *var, *val; @@ -1633,7 +1633,7 @@ } channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); if (argc > 0) { const char *var, *val; @@ -1720,7 +1720,7 @@ *rval = BOOLEAN_TO_JSVAL(JS_FALSE); channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); CHANNEL_SANITY_CHECK(); @@ -1752,7 +1752,7 @@ switch_core_speech_text_param_tts(&jss->speech->sh, "voice", voice_name); } else { jss->speech = switch_core_session_alloc(jss->session, sizeof(*jss->speech)); - assert(jss->speech != NULL); + switch_assert(jss->speech != NULL); if (init_speech_engine(jss, tts_name, voice_name) != SWITCH_STATUS_SUCCESS) { eval_some_js("~throw new Error(\"Cannot allocate speech engine!\");", cx, obj, rval); jss->speech = NULL; @@ -1804,7 +1804,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); CHANNEL_SANITY_CHECK(); @@ -1862,7 +1862,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); CHANNEL_SANITY_CHECK_ANSWER(); @@ -1878,7 +1878,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); CHANNEL_SANITY_CHECK_ANSWER(); @@ -1916,7 +1916,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); *rval = BOOLEAN_TO_JSVAL(switch_channel_ready(channel) ? JS_TRUE : JS_FALSE); @@ -1936,7 +1936,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); started = switch_time_now(); @@ -1975,7 +1975,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); started = switch_time_now(); @@ -2010,7 +2010,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); /* you can execute some apps before you answer */ /* CHANNEL_SANITY_CHECK(); */ @@ -2020,7 +2020,6 @@ const switch_application_interface_t *application_interface; char *app_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); char *app_arg = NULL; - struct js_session *jss = JS_GetPrivate(cx, obj); jsrefcount saveDepth; METHOD_SANITY_CHECK(); @@ -2109,7 +2108,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); CHANNEL_SANITY_CHECK(); @@ -2175,7 +2174,7 @@ for (p = val + strlen(val) - 1; *p == ' '; p--) *p = '\0'; - snprintf(code, sizeof(code), "~%s[\"%s\"] = \"%s\"", config_data->name, line, val); + switch_snprintf(code, sizeof(code), "~%s[\"%s\"] = \"%s\"", config_data->name, line, val); eval_some_js(code, config_data->cx, config_data->obj, &rval); } @@ -2374,7 +2373,7 @@ *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, config_data.buffer)); } else { char errmsg[256]; - snprintf(errmsg, 256, "~throw new Error(\"Curl returned error %u.\");", (unsigned)code); + switch_snprintf(errmsg, 256, "~throw new Error(\"Curl returned error %u.\");", (unsigned)code); eval_some_js(errmsg, cx, obj, rval); } @@ -2454,7 +2453,7 @@ if (jss && jss->session) { channel = switch_core_session_get_channel(jss->session); - assert(channel != NULL); + switch_assert(channel != NULL); caller_profile = switch_channel_get_caller_profile(channel); } @@ -2470,7 +2469,9 @@ if (!channel) { switch (param) { case SESSION_CAUSE: - *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_cause2str(jss->cause))); + if (jss) { + *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_cause2str(jss->cause))); + } break; default: *vp = BOOLEAN_TO_JSVAL(JS_FALSE); @@ -2548,7 +2549,7 @@ JSObject *session_obj; if ((session_obj = JS_DefineObject(cx, obj, name, &session_class, NULL, 0))) { *jss = malloc(sizeof(**jss)); - assert(*jss); + switch_assert(*jss); memset(*jss, 0, sizeof(**jss)); (*jss)->session = session; @@ -2580,7 +2581,7 @@ struct js_session *jss = NULL; jss = malloc(sizeof(*jss)); - assert(jss); + switch_assert(jss); memset(jss, 0, sizeof(*jss)); jss->cx = cx; jss->obj = obj; @@ -2974,7 +2975,7 @@ char *supplied_error, code_buf[256] = ""; if (argc > 0 && (supplied_error = JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) { - snprintf(code_buf, sizeof(code_buf), "~throw new Error(\"%s\");", supplied_error); + switch_snprintf(code_buf, sizeof(code_buf), "~throw new Error(\"%s\");", supplied_error); eval_some_js(code_buf, cx, obj, rval); } @@ -3271,7 +3272,7 @@ /* Emaculent conception of session object into the script if one is available */ if (!(session && new_js_session(cx, javascript_global_object, session, &jss, "session", flags))) { - snprintf(buf, sizeof(buf), "~var session = false;"); + switch_snprintf(buf, sizeof(buf), "~var session = false;"); eval_some_js(buf, cx, javascript_global_object, &rval); } if (ro) { @@ -3291,17 +3292,17 @@ } if (!argc) { - snprintf(buf, sizeof(buf), "~var argv = new Array();"); + switch_snprintf(buf, sizeof(buf), "~var argv = new Array();"); eval_some_js(buf, cx, javascript_global_object, &rval); } else { /* create a js doppleganger of this argc/argv */ - snprintf(buf, sizeof(buf), "~var argv = new Array(%d);", argc); + switch_snprintf(buf, sizeof(buf), "~var argv = new Array(%d);", argc); eval_some_js(buf, cx, javascript_global_object, &rval); - snprintf(buf, sizeof(buf), "~var argc = %d", argc); + switch_snprintf(buf, sizeof(buf), "~var argc = %d", argc); eval_some_js(buf, cx, javascript_global_object, &rval); for (y = 0; y < argc; y++) { - snprintf(buf, sizeof(buf), "~argv[%d] = \"%s\";", x++, argv[y]); + switch_snprintf(buf, sizeof(buf), "~argv[%d] = \"%s\";", x++, argv[y]); eval_some_js(buf, cx, javascript_global_object, &rval); } } @@ -3398,11 +3399,11 @@ char *path, *cmd; path = switch_mprintf("%s%smwi.js", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); - assert(path != NULL); + switch_assert(path != NULL); if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) { cmd = switch_mprintf("%s %s", path, account); - assert(cmd != NULL); + switch_assert(cmd != NULL); js_thread_launch(cmd); switch_safe_free(cmd); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c Wed Dec 12 18:27:30 2007 @@ -113,18 +113,18 @@ jsval rval; int x = 0; - snprintf(code, sizeof(code), "~var _Db_RoW_ = {}"); + switch_snprintf(code, sizeof(code), "~var _Db_RoW_ = {}"); eval_some_js(code, dbo->cx, dbo->obj, &rval); for (x = 0; x < argc; x++) { - snprintf(code, sizeof(code), "~_Db_RoW_[\"%s\"] = \"%s\"", columnNames[x], argv[x]); + switch_snprintf(code, sizeof(code), "~_Db_RoW_[\"%s\"] = \"%s\"", columnNames[x], argv[x]); eval_some_js(code, dbo->cx, dbo->obj, &rval); } - snprintf(code, sizeof(code), "~%s(_Db_RoW_)", dbo->code_buffer); + switch_snprintf(code, sizeof(code), "~%s(_Db_RoW_)", dbo->code_buffer); eval_some_js(code, dbo->cx, dbo->obj, &rval); - snprintf(code, sizeof(code), "~delete _Db_RoW_"); + switch_snprintf(code, sizeof(code), "~delete _Db_RoW_"); eval_some_js(code, dbo->cx, dbo->obj, &rval); return 0; @@ -208,13 +208,13 @@ return JS_FALSE; } - snprintf(code, sizeof(code), "~var _dB_RoW_DaTa_ = {}"); + switch_snprintf(code, sizeof(code), "~var _dB_RoW_DaTa_ = {}"); eval_some_js(code, dbo->cx, dbo->obj, rval); if (*rval == JS_FALSE) { return JS_TRUE; } for (x = 0; x < colcount; x++) { - snprintf(code, sizeof(code), "~_dB_RoW_DaTa_[\"%s\"] = \"%s\"", + switch_snprintf(code, sizeof(code), "~_dB_RoW_DaTa_[\"%s\"] = \"%s\"", (char *) switch_core_db_column_name(dbo->stmt, x), (char *) switch_core_db_column_text(dbo->stmt, x)); eval_some_js(code, dbo->cx, dbo->obj, rval); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Wed Dec 12 18:27:30 2007 @@ -357,10 +357,8 @@ if (odbc_obj->stmt) { SQLSMALLINT c = 0, x = 0; SQLLEN m = 0; - char code[66560]; - snprintf(code, sizeof(code), "~var _oDbC_dB_RoW_DaTa_ = {}"); - eval_some_js(code, cx, obj, rval); + eval_some_js("~var _oDbC_dB_RoW_DaTa_ = {}", cx, obj, rval); if (*rval == JS_FALSE) { return JS_TRUE; } @@ -383,7 +381,7 @@ data = esc; } - snprintf((char *) odbc_obj->code, odbc_obj->codelen, "~_oDbC_dB_RoW_DaTa_[\"%s\"] = \"%s\"", name, data); + switch_snprintf((char *) odbc_obj->code, odbc_obj->codelen, "~_oDbC_dB_RoW_DaTa_[\"%s\"] = \"%s\"", name, data); switch_safe_free(esc); eval_some_js((char *) odbc_obj->code, cx, obj, rval); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Wed Dec 12 18:27:30 2007 @@ -137,7 +137,7 @@ p = malloc(strlen(profile->logfile)+WARM_FUZZY_OFFSET); - assert(p); + switch_assert(p); memset(p, '\0', strlen(profile->logfile)+WARM_FUZZY_OFFSET); @@ -283,7 +283,7 @@ if (switch_strlen_zero(new_profile->logfile)) { char logfile[512]; - snprintf(logfile, sizeof(logfile), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, "freeswitch.log"); + switch_snprintf(logfile, sizeof(logfile), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, "freeswitch.log"); new_profile->logfile = strdup(logfile); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_de/mod_say_de.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_de/mod_say_de.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_de/mod_say_de.c Wed Dec 12 18:27:30 2007 @@ -53,18 +53,18 @@ #define say_num(num, t) { \ char tmp[80];\ - switch_status_t status;\ - snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ - if ((status = de_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\ - return status;\ + switch_status_t tstatus;\ + switch_snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ + if ((tstatus = de_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\ + return tstatus;\ }}\ #define say_file(...) {\ char tmp[80];\ - switch_status_t status;\ - snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ - if ((status = switch_ivr_play_file(session, NULL, tmp, args)) != SWITCH_STATUS_SUCCESS){ \ - return status;\ + switch_status_t tstatus;\ + switch_snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ + if ((tstatus = switch_ivr_play_file(session, NULL, tmp, args)) != SWITCH_STATUS_SUCCESS){ \ + return tstatus;\ }\ if (!switch_channel_ready(switch_core_session_get_channel(session))) {\ return SWITCH_STATUS_FALSE;\ Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_en/mod_say_en.c Wed Dec 12 18:27:30 2007 @@ -53,18 +53,18 @@ #define say_num(num, t) { \ char tmp[80];\ - switch_status_t status;\ - snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ - if ((status = en_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\ - return status;\ + switch_status_t tstatus;\ + switch_snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ + if ((tstatus = en_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\ + return tstatus;\ }}\ #define say_file(...) {\ char tmp[80];\ - switch_status_t status;\ - snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ - if ((status = switch_ivr_play_file(session, NULL, tmp, args)) != SWITCH_STATUS_SUCCESS){ \ - return status;\ + switch_status_t tstatus;\ + switch_snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ + if ((tstatus = switch_ivr_play_file(session, NULL, tmp, args)) != SWITCH_STATUS_SUCCESS){ \ + return tstatus;\ }\ if (!switch_channel_ready(switch_core_session_get_channel(session))) {\ return SWITCH_STATUS_FALSE;\ Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_es/mod_say_es.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_es/mod_say_es.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_es/mod_say_es.c Wed Dec 12 18:27:30 2007 @@ -53,18 +53,18 @@ #define say_num(num, t) { \ char tmp[80];\ - switch_status_t status;\ - snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ - if ((status = es_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\ - return status;\ + switch_status_t tstatus;\ + switch_snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ + if ((tstatus = es_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\ + return tstatus;\ }}\ #define say_file(...) {\ char tmp[80];\ - switch_status_t status;\ - snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ - if ((status = switch_ivr_play_file(session, NULL, tmp, args)) != SWITCH_STATUS_SUCCESS){ \ - return status;\ + switch_status_t tstatus;\ + switch_snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ + if ((tstatus = switch_ivr_play_file(session, NULL, tmp, args)) != SWITCH_STATUS_SUCCESS){ \ + return tstatus;\ }\ if (!switch_channel_ready(switch_core_session_get_channel(session))) {\ return SWITCH_STATUS_FALSE;\ Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_fr/mod_say_fr.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_fr/mod_say_fr.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_fr/mod_say_fr.c Wed Dec 12 18:27:30 2007 @@ -53,18 +53,18 @@ #define say_num(num, t) { \ char tmp[80];\ - switch_status_t status;\ - snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ - if ((status = fr_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\ - return status;\ + switch_status_t tstatus;\ + switch_snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ + if ((tstatus = fr_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\ + return tstatus;\ }}\ #define say_file(...) {\ char tmp[80];\ - switch_status_t status;\ - snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ - if ((status = switch_ivr_play_file(session, NULL, tmp, args)) != SWITCH_STATUS_SUCCESS){ \ - return status;\ + switch_status_t tstatus;\ + switch_snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ + if ((tstatus = switch_ivr_play_file(session, NULL, tmp, args)) != SWITCH_STATUS_SUCCESS){ \ + return tstatus;\ }\ if (!switch_channel_ready(switch_core_session_get_channel(session))) {\ return SWITCH_STATUS_FALSE;\ Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_it/mod_say_it.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_it/mod_say_it.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_it/mod_say_it.c Wed Dec 12 18:27:30 2007 @@ -53,18 +53,18 @@ #define say_num(num, t) { \ char tmp[80];\ - switch_status_t status;\ - snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ - if ((status = it_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\ - return status;\ + switch_status_t tstatus;\ + switch_snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ + if ((tstatus = it_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\ + return tstatus;\ }}\ #define say_file(...) {\ char tmp[80];\ - switch_status_t status;\ - snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ - if ((status = switch_ivr_play_file(session, NULL, tmp, args)) != SWITCH_STATUS_SUCCESS){ \ - return status;\ + switch_status_t tstatus;\ + switch_snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ + if ((tstatus = switch_ivr_play_file(session, NULL, tmp, args)) != SWITCH_STATUS_SUCCESS){ \ + return tstatus;\ }\ if (!switch_channel_ready(switch_core_session_get_channel(session))) {\ return SWITCH_STATUS_FALSE;\ Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_nl/mod_say_nl.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_nl/mod_say_nl.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_nl/mod_say_nl.c Wed Dec 12 18:27:30 2007 @@ -53,18 +53,18 @@ #define say_num(num, t) { \ char tmp[80];\ - switch_status_t status;\ - snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ - if ((status = nl_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\ - return status;\ + switch_status_t tstatus;\ + switch_snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ + if ((tstatus = nl_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\ + return tstatus;\ }}\ #define say_file(...) {\ char tmp[80];\ - switch_status_t status;\ - snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ - if ((status = switch_ivr_play_file(session, NULL, tmp, args)) != SWITCH_STATUS_SUCCESS){ \ - return status;\ + switch_status_t tstatus;\ + switch_snprintf(tmp, sizeof(tmp), __VA_ARGS__);\ + if ((tstatus = switch_ivr_play_file(session, NULL, tmp, args)) != SWITCH_STATUS_SUCCESS){ \ + return tstatus;\ }\ if (!switch_channel_ready(switch_core_session_get_channel(session))) {\ return SWITCH_STATUS_FALSE;\ Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Wed Dec 12 18:27:30 2007 @@ -74,132 +74,134 @@ switch_channel_t *channel = switch_core_session_get_channel(session); switch_status_t status = SWITCH_STATUS_FALSE; - if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { - /* build the XML */ - if (!(xml_text = switch_xml_toxml(cdr, SWITCH_TRUE))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - goto error; - } + if (switch_ivr_generate_xml_cdr(session, &cdr) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Generating Data!\n"); + return SWITCH_STATUS_FALSE; + } - if (!(logdir = switch_channel_get_variable(channel, "xml_cdr_base"))) { - logdir = globals.log_dir; - } + /* build the XML */ + xml_text = switch_xml_toxml(cdr, SWITCH_TRUE); + if (!xml_text) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + goto error; + } - if (!switch_strlen_zero(logdir)) { - if ((path = switch_mprintf("%s%s%s.cdr.xml", - logdir, - SWITCH_PATH_SEPARATOR, - switch_core_session_get_uuid(session)))) { - if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { - int wrote; - wrote = write(fd, xml_text, (unsigned) strlen(xml_text)); - close(fd); - fd = -1; - } else { - char ebuf[512] = { 0 }; + if (!(logdir = switch_channel_get_variable(channel, "xml_cdr_base"))) { + logdir = globals.log_dir; + } + + if (!switch_strlen_zero(logdir)) { + if ((path = switch_mprintf("%s%s%s.cdr.xml", + logdir, + SWITCH_PATH_SEPARATOR, + switch_core_session_get_uuid(session)))) { + if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { + int wrote; + wrote = write(fd, xml_text, (unsigned) strlen(xml_text)); + close(fd); + fd = -1; + } else { + char ebuf[512] = { 0 }; #ifdef WIN32 - strerror_s(ebuf, sizeof(ebuf), errno); + strerror_s(ebuf, sizeof(ebuf), errno); #else - strerror_r(errno, ebuf, sizeof(ebuf)); + strerror_r(errno, ebuf, sizeof(ebuf)); #endif - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error writing [%s][%s]\n", path, ebuf); - } - switch_safe_free(path); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error writing [%s][%s]\n", path, ebuf); } + switch_safe_free(path); } + } - /* try to post it to the web server */ - if (!switch_strlen_zero(globals.url)) { - struct curl_slist *headers = NULL; - curl_handle = curl_easy_init(); - - if (globals.encode) { - switch_size_t need_bytes = strlen(xml_text) * 3; - - xml_text_escaped = malloc(need_bytes); - assert(xml_text_escaped); - memset(xml_text_escaped, 0, sizeof(xml_text_escaped)); - if (globals.encode == 1) { - headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded"); - switch_url_encode(xml_text, xml_text_escaped, need_bytes - 1); - } else { - headers = curl_slist_append(headers, "Content-Type: application/x-www-form-base64-encoded"); - switch_b64_encode((unsigned char *)xml_text, need_bytes / 3, (unsigned char *)xml_text_escaped, need_bytes); - } - switch_safe_free(xml_text); - xml_text = xml_text_escaped; + /* try to post it to the web server */ + if (!switch_strlen_zero(globals.url)) { + struct curl_slist *headers = NULL; + curl_handle = curl_easy_init(); + + if (globals.encode) { + switch_size_t need_bytes = strlen(xml_text) * 3; + + xml_text_escaped = malloc(need_bytes); + switch_assert(xml_text_escaped); + memset(xml_text_escaped, 0, sizeof(xml_text_escaped)); + if (globals.encode == 1) { + headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded"); + switch_url_encode(xml_text, xml_text_escaped, need_bytes - 1); } else { - headers = curl_slist_append(headers, "Content-Type: application/x-www-form-plaintext"); - } - - if (!(curl_xml_text = switch_mprintf("cdr=%s", xml_text))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - goto error; + headers = curl_slist_append(headers, "Content-Type: application/x-www-form-base64-encoded"); + switch_b64_encode((unsigned char *)xml_text, need_bytes / 3, (unsigned char *)xml_text_escaped, need_bytes); } + switch_safe_free(xml_text); + xml_text = xml_text_escaped; + } else { + headers = curl_slist_append(headers, "Content-Type: application/x-www-form-plaintext"); + } + + if (!(curl_xml_text = switch_mprintf("cdr=%s", xml_text))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + goto error; + } - if (!switch_strlen_zero(globals.cred)) { - curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY); - curl_easy_setopt(curl_handle, CURLOPT_USERPWD, globals.cred); - } + if (!switch_strlen_zero(globals.cred)) { + curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY); + curl_easy_setopt(curl_handle, CURLOPT_USERPWD, globals.cred); + } - curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers); - curl_easy_setopt(curl_handle, CURLOPT_POST, 1); - curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, curl_xml_text); - curl_easy_setopt(curl_handle, CURLOPT_URL, globals.url); - curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); - curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, httpCallBack); - - if (globals.ignore_cacert_check) { - curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, FALSE); - } + curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers); + curl_easy_setopt(curl_handle, CURLOPT_POST, 1); + curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, curl_xml_text); + curl_easy_setopt(curl_handle, CURLOPT_URL, globals.url); + curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); + curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, httpCallBack); + + if (globals.ignore_cacert_check) { + curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, FALSE); + } - /* these were used for testing, optionally they may be enabled if someone desires - curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 120); // tcp timeout - curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); // 302 recursion level - */ - - for (cur_try = 0; cur_try < globals.retries; cur_try++) { - if (cur_try > 0) { - switch_yield(globals.delay * 1000000); - } - curl_easy_perform(curl_handle); - curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); - if (httpRes == 200) { - goto success; - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Got error [%ld] posting to web server [%s]\n",httpRes, globals.url); - } - + /* these were used for testing, optionally they may be enabled if someone desires + curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 120); // tcp timeout + curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); // 302 recursion level + */ + + for (cur_try = 0; cur_try < globals.retries; cur_try++) { + if (cur_try > 0) { + switch_yield(globals.delay * 1000000); } - curl_easy_cleanup(curl_handle); - curl_slist_free_all(headers); - curl_handle = NULL; - - /* if we are here the web post failed for some reason */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to post to web server, writing to file\n"); - - if ((path = switch_mprintf("%s%s%s.cdr.xml", - globals.err_log_dir, - SWITCH_PATH_SEPARATOR, - switch_core_session_get_uuid(session)))) { - if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { - int wrote; - wrote = write(fd, xml_text, (unsigned) strlen(xml_text)); - close(fd); - fd = -1; - } else { - char ebuf[512] = { 0 }; + curl_easy_perform(curl_handle); + curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); + if (httpRes == 200) { + goto success; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Got error [%ld] posting to web server [%s]\n",httpRes, globals.url); + } + + } + curl_easy_cleanup(curl_handle); + curl_slist_free_all(headers); + curl_handle = NULL; + + /* if we are here the web post failed for some reason */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to post to web server, writing to file\n"); + + if ((path = switch_mprintf("%s%s%s.cdr.xml", + globals.err_log_dir, + SWITCH_PATH_SEPARATOR, + switch_core_session_get_uuid(session)))) { + if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { + int wrote; + wrote = write(fd, xml_text, (unsigned) strlen(xml_text)); + close(fd); + fd = -1; + } else { + char ebuf[512] = { 0 }; #ifdef WIN32 - strerror_s(ebuf, sizeof(ebuf), errno); + strerror_s(ebuf, sizeof(ebuf), errno); #else - strerror_r(errno, ebuf, sizeof(ebuf)); + strerror_r(errno, ebuf, sizeof(ebuf)); #endif - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error![%s]\n", ebuf); - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error![%s]\n", ebuf); } } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Generating Data!\n"); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Wed Dec 12 18:27:30 2007 @@ -138,7 +138,7 @@ switch_uuid_get(&uuid); switch_uuid_format(uuid_str, &uuid); - snprintf(filename, sizeof(filename), "%s%s.tmp.xml", SWITCH_GLOBAL_dirs.temp_dir, uuid_str); + switch_snprintf(filename, sizeof(filename), "%s%s.tmp.xml", SWITCH_GLOBAL_dirs.temp_dir, uuid_str); curl_handle = curl_easy_init(); headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded"); @@ -194,7 +194,9 @@ if(keep_files_around) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "XML response is in %s\n", filename); } else { - unlink(filename); + if (unlink(filename) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "XML response file [%s] delete failed\n", filename); + } } return xml; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Wed Dec 12 18:27:30 2007 @@ -190,7 +190,7 @@ goto fail; } - snprintf(z, sizeof(z), "%s:%s", globals.user, globals.pass); + switch_snprintf(z, sizeof(z), "%s:%s", globals.user, globals.pass); Base64Encode(z, t); if (!strcmp(p, t)) { @@ -241,9 +241,9 @@ } else { if (mypass1) { if (at) { - snprintf(z, sizeof(z), "%s@%s:%s", user, domain_name, mypass1); + switch_snprintf(z, sizeof(z), "%s@%s:%s", user, domain_name, mypass1); } else { - snprintf(z, sizeof(z), "%s:%s", user, mypass1); + switch_snprintf(z, sizeof(z), "%s:%s", user, mypass1); } Base64Encode(z, t); @@ -255,9 +255,9 @@ if (mypass2) { if (at) { - snprintf(z, sizeof(z), "%s@%s:%s", user, domain_name, mypass2); + switch_snprintf(z, sizeof(z), "%s@%s:%s", user, domain_name, mypass2); } else { - snprintf(z, sizeof(z), "%s:%s", user, mypass2); + switch_snprintf(z, sizeof(z), "%s:%s", user, mypass2); } Base64Encode(z, t); @@ -270,9 +270,9 @@ if (box) { if (mypass1) { if (at) { - snprintf(z, sizeof(z), "%s@%s:%s", box, domain_name, mypass1); + switch_snprintf(z, sizeof(z), "%s@%s:%s", box, domain_name, mypass1); } else { - snprintf(z, sizeof(z), "%s:%s", box, mypass1); + switch_snprintf(z, sizeof(z), "%s:%s", box, mypass1); } Base64Encode(z, t); @@ -284,9 +284,9 @@ if (mypass2) { if (at) { - snprintf(z, sizeof(z), "%s@%s:%s", box, domain_name, mypass2); + switch_snprintf(z, sizeof(z), "%s@%s:%s", box, domain_name, mypass2); } else { - snprintf(z, sizeof(z), "%s:%s", box, mypass2); + switch_snprintf(z, sizeof(z), "%s:%s", box, mypass2); } Base64Encode(z, t); @@ -321,7 +321,7 @@ switch_xml_free(x_domain_root); } - snprintf(z, sizeof(z), "Basic realm=\"%s\"", domain_name ? domain_name : globals.realm); + switch_snprintf(z, sizeof(z), "Basic realm=\"%s\"", domain_name ? domain_name : globals.realm); ResponseAddField(r, "WWW-Authenticate", z); ResponseStatus(r, 401); return FALSE; @@ -362,7 +362,7 @@ new_uri = "/"; } - snprintf(tmp, sizeof(tmp), "%s%s", + switch_snprintf(tmp, sizeof(tmp), "%s%s", SWITCH_GLOBAL_dirs.htdocs_dir, new_uri ); @@ -370,7 +370,7 @@ if (switch_directory_exists(tmp, NULL) == SWITCH_STATUS_SUCCESS) { for (x = 0; x < 2; x++) { - snprintf(tmp, sizeof(tmp), "%s%s%s%s", + switch_snprintf(tmp, sizeof(tmp), "%s%s%s%s", SWITCH_GLOBAL_dirs.htdocs_dir, new_uri, end_of(new_uri) == *SWITCH_PATH_SEPARATOR ? "" : SWITCH_PATH_SEPARATOR, @@ -378,7 +378,7 @@ ); if (switch_file_exists(tmp, NULL) == SWITCH_STATUS_SUCCESS) { - snprintf(tmp, sizeof(tmp), "%s%s%s", + switch_snprintf(tmp, sizeof(tmp), "%s%s%s", new_uri, end_of(new_uri) == '/' ? "" : "/", list[x] @@ -624,7 +624,7 @@ } - snprintf(buf, sizeof(buf), "Connection: close\r\n"); + switch_snprintf(buf, sizeof(buf), "Connection: close\r\n"); ConnWrite(r->conn, buf, (uint32_t) strlen(buf)); if (html) { @@ -712,16 +712,16 @@ if (switch_core_management_exec(relative_oid, action, buf, sizeof(buf)) == SWITCH_STATUS_SUCCESS) { if (action == SMA_SET) { if (*buf != '\0') { - snprintf(buf, sizeof(buf), "OK\n"); + switch_snprintf(buf, sizeof(buf), "OK\n"); } } } else { if (*buf != '\0') { - snprintf(buf, sizeof(buf), "ERROR\n"); + switch_snprintf(buf, sizeof(buf), "ERROR\n"); } } } else { - snprintf(buf, sizeof(buf), "Invalid Action %s\n", s_action); + switch_snprintf(buf, sizeof(buf), "Invalid Action %s\n", s_action); } /* Return our result. */ @@ -765,7 +765,7 @@ } } - snprintf(logfile, sizeof(logfile), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, "freeswitch_http.log"); + switch_snprintf(logfile, sizeof(logfile), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, "freeswitch_http.log"); ServerCreate(&globals.abyssServer, "XmlRpcServer", globals.port, SWITCH_GLOBAL_dirs.htdocs_dir, logfile); xmlrpc_server_abyss_set_handler(&env, &globals.abyssServer, "/RPC2", registryP); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_apr.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_apr.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_apr.c Wed Dec 12 18:27:30 2007 @@ -502,9 +502,11 @@ const char *name; while (apr_dir_read(&(thedir->finfo), finfo_flags, thedir->dir_handle) == SWITCH_STATUS_SUCCESS) { + if (thedir->finfo.filetype != APR_REG) { continue; } + if (!(name = thedir->finfo.fname)) { name = thedir->finfo.name; } @@ -516,6 +518,7 @@ if (name) { switch_copy_string(buf, name, len); fname = buf; + break; } else { continue; } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_caller.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_caller.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_caller.c Wed Dec 12 18:27:30 2007 @@ -200,75 +200,75 @@ if (!switch_strlen_zero(caller_profile->username)) { - snprintf(header_name, sizeof(header_name), "%s-Username", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Username", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->username); } if (!switch_strlen_zero(caller_profile->dialplan)) { - snprintf(header_name, sizeof(header_name), "%s-Dialplan", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Dialplan", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->dialplan); } if (!switch_strlen_zero(caller_profile->caller_id_name)) { - snprintf(header_name, sizeof(header_name), "%s-Caller-ID-Name", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Caller-ID-Name", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->caller_id_name); } if (!switch_strlen_zero(caller_profile->caller_id_number)) { - snprintf(header_name, sizeof(header_name), "%s-Caller-ID-Number", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Caller-ID-Number", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->caller_id_number); } if (!switch_strlen_zero(caller_profile->network_addr)) { - snprintf(header_name, sizeof(header_name), "%s-Network-Addr", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Network-Addr", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->network_addr); } if (!switch_strlen_zero(caller_profile->ani)) { - snprintf(header_name, sizeof(header_name), "%s-ANI", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-ANI", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->ani); } if (!switch_strlen_zero(caller_profile->aniii)) { - snprintf(header_name, sizeof(header_name), "%s-ANI-II", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-ANI-II", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->aniii); } if (!switch_strlen_zero(caller_profile->destination_number)) { - snprintf(header_name, sizeof(header_name), "%s-Destination-Number", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Destination-Number", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->destination_number); } if (!switch_strlen_zero(caller_profile->uuid)) { - snprintf(header_name, sizeof(header_name), "%s-Unique-ID", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Unique-ID", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->uuid); } if (!switch_strlen_zero(caller_profile->source)) { - snprintf(header_name, sizeof(header_name), "%s-Source", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Source", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->source); } if (!switch_strlen_zero(caller_profile->context)) { - snprintf(header_name, sizeof(header_name), "%s-Context", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Context", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->context); } if (!switch_strlen_zero(caller_profile->rdnis)) { - snprintf(header_name, sizeof(header_name), "%s-RDNIS", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-RDNIS", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->rdnis); } if (!switch_strlen_zero(caller_profile->chan_name)) { - snprintf(header_name, sizeof(header_name), "%s-Channel-Name", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Name", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->chan_name); } if (caller_profile->times) { - snprintf(header_name, sizeof(header_name), "%s-Channel-Created-Time", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Created-Time", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, caller_profile->times->created); - snprintf(header_name, sizeof(header_name), "%s-Channel-Answered-Time", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Answered-Time", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, caller_profile->times->answered); - snprintf(header_name, sizeof(header_name), "%s-Channel-Hangup-Time", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Hangup-Time", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, caller_profile->times->hungup); - snprintf(header_name, sizeof(header_name), "%s-Channel-Transfer-Time", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Transfer-Time", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, caller_profile->times->transferred); } - snprintf(header_name, sizeof(header_name), "%s-Screen-Bit", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Screen-Bit", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_SCREEN) ? "yes" : "no"); - snprintf(header_name, sizeof(header_name), "%s-Privacy-Hide-Name", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Privacy-Hide-Name", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME) ? "yes" : "no"); - snprintf(header_name, sizeof(header_name), "%s-Privacy-Hide-Number", prefix); + switch_snprintf(header_name, sizeof(header_name), "%s-Privacy-Hide-Number", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER) ? "yes" : "no"); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_channel.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_channel.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_channel.c Wed Dec 12 18:27:30 2007 @@ -595,7 +595,7 @@ switch_channel_event_set_data(channel, event); } else { char state_num[25]; - snprintf(state_num, sizeof(state_num), "%d", channel->state); + switch_snprintf(state_num, sizeof(state_num), "%d", channel->state); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State", "%s", (char *) switch_channel_state_name(channel->state)); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State-Number", "%s", (char *) state_num); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Name", "%s", channel->name); @@ -830,7 +830,7 @@ } switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State", "%s", switch_channel_state_name(channel->state)); - snprintf(state_num, sizeof(state_num), "%d", channel->state); + switch_snprintf(state_num, sizeof(state_num), "%d", channel->state); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State-Number", "%s", state_num); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Name", "%s", switch_channel_get_name(channel)); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Unique-ID", "%s", switch_core_session_get_uuid(channel->session)); @@ -870,7 +870,7 @@ x++; switch_assert(vvar && vval); - snprintf(buf, sizeof(buf), "variable_%s", vvar); + switch_snprintf(buf, sizeof(buf), "variable_%s", vvar); switch_event_add_header(event, SWITCH_STACK_BOTTOM, buf, "%s", vval); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_config.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_config.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_config.c Wed Dec 12 18:27:30 2007 @@ -41,7 +41,7 @@ if (switch_is_file_path(file_path)) { path = file_path; } else { - snprintf(path_buf, sizeof(path_buf), "%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, file_path); + switch_snprintf(path_buf, sizeof(path_buf), "%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, file_path); path = path_buf; } @@ -57,7 +57,7 @@ int last = -1; char *var, *val; - snprintf(path_buf, sizeof(path_buf), "%s%sfreeswitch.conf", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR); + switch_snprintf(path_buf, sizeof(path_buf), "%s%sfreeswitch.conf", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR); path = path_buf; if ((f = fopen(path, "r")) == 0) { Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_console.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_console.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_console.c Wed Dec 12 18:27:30 2007 @@ -94,7 +94,7 @@ ret = -1; } else { ret = 0; - snprintf(end, remaining, "%s", data); + switch_snprintf(end, remaining, "%s", data); handle->data_len = strlen(buf); handle->end = (uint8_t *) (handle->data) + handle->data_len; } @@ -204,7 +204,7 @@ char * prompt(EditLine *e) { if (*prompt_str == '\0') { gethostname(hostname, sizeof(hostname)); - snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s> ", hostname); + switch_snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s> ", hostname); } return prompt_str; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core.c Wed Dec 12 18:27:30 2007 @@ -534,7 +534,7 @@ if (bg) { bg = 0; #ifdef WIN32 - snprintf(path, sizeof(path), "Global\\Freeswitch.%d", getpid()); + switch_snprintf(path, sizeof(path), "Global\\Freeswitch.%d", getpid()); shutdown_event = CreateEvent(NULL, FALSE, FALSE, path); if (shutdown_event) { WaitForSingleObject(shutdown_event, INFINITE); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_codec.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_codec.c Wed Dec 12 18:27:30 2007 @@ -54,7 +54,7 @@ } switch_channel_set_variable(channel, "read_codec", codec->implementation->iananame); - snprintf(tmp, sizeof(tmp), "%d", codec->implementation->actual_samples_per_second); + switch_snprintf(tmp, sizeof(tmp), "%d", codec->implementation->actual_samples_per_second); switch_channel_set_variable(channel, "read_rate", tmp); session->read_codec = codec; @@ -92,7 +92,7 @@ } switch_channel_set_variable(channel, "write_codec", codec->implementation->iananame); - snprintf(tmp, sizeof(tmp), "%d", codec->implementation->actual_samples_per_second); + switch_snprintf(tmp, sizeof(tmp), "%d", codec->implementation->actual_samples_per_second); switch_channel_set_variable(channel, "write_rate", tmp); session->write_codec = codec; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_db.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_db.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_db.c Wed Dec 12 18:27:30 2007 @@ -42,7 +42,7 @@ if (switch_is_file_path(dbname)) { strncpy(buf, dbname, size); } else { - snprintf(buf, size, "%s%s%s.db", SWITCH_GLOBAL_dirs.db_dir, SWITCH_PATH_SEPARATOR, dbname); + switch_snprintf(buf, size, "%s%s%s.db", SWITCH_GLOBAL_dirs.db_dir, SWITCH_PATH_SEPARATOR, dbname); } } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c Wed Dec 12 18:27:30 2007 @@ -73,10 +73,10 @@ fh->handler = switch_core_strdup(fh->memory_pool, rhs); } - if (rate) { - fh->samplerate = rate; - } else { - rate = 8000; + if (!fh->samplerate) { + if (!(fh->samplerate = rate)) { + fh->samplerate = 8000; + } } if (channels) { @@ -85,25 +85,130 @@ fh->channels = 1; } - if ((status = fh->file_interface->file_open(fh, file_path)) == SWITCH_STATUS_SUCCESS) { - switch_set_flag(fh, SWITCH_FILE_OPEN); + if ((status = fh->file_interface->file_open(fh, file_path)) != SWITCH_STATUS_SUCCESS) { + return status; + } + + if ((flags & SWITCH_FILE_FLAG_READ)) { + fh->native_rate = fh->samplerate; + } else { + fh->native_rate = rate; + } + + if (fh->samplerate != rate) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Sample rate doesn't match\n"); + if ((flags & SWITCH_FILE_FLAG_READ)) { + fh->samplerate = rate; + } } + switch_set_flag(fh, SWITCH_FILE_OPEN); + return status; } SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh, void *data, switch_size_t *len) { + switch_status_t status; + switch_size_t orig_len = *len; + switch_assert(fh != NULL); switch_assert(fh->file_interface != NULL); - return fh->file_interface->file_read(fh, data, len); + if (fh->buffer && switch_buffer_inuse(fh->buffer)) { + *len = switch_buffer_read(fh->buffer, data, orig_len); + return SWITCH_STATUS_SUCCESS; + } + + if ((status = fh->file_interface->file_read(fh, data, len)) != SWITCH_STATUS_SUCCESS) { + goto done; + } + + if (!switch_test_flag(fh, SWITCH_FILE_NATIVE) && fh->native_rate != fh->samplerate) { + if (!fh->resampler) { + if (switch_resample_create(&fh->resampler, + fh->native_rate, + orig_len * 10, + fh->samplerate, + orig_len * 10, + fh->memory_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to create resampler!\n"); + return SWITCH_STATUS_GENERR; + } + } + + fh->resampler->from_len = switch_short_to_float(data, fh->resampler->from, (int) *len); + fh->resampler->to_len = + switch_resample_process(fh->resampler, fh->resampler->from, fh->resampler->from_len, fh->resampler->to, fh->resampler->to_size, 0); + + if (fh->resampler->to_len > orig_len) { + if (!fh->buffer) { + switch_buffer_create_dynamic(&fh->buffer, fh->resampler->to_len * 2, fh->resampler->to_len * 4, fh->resampler->to_len * 8); + switch_assert(fh->buffer); + } + if (!fh->dbuf) { + fh->dbuflen = fh->resampler->to_len * 2; + fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); + } + switch_assert(fh->resampler->to_len <= fh->dbuflen); + + switch_float_to_short(fh->resampler->to, (int16_t *) fh->dbuf, fh->resampler->to_len); + switch_buffer_write(fh->buffer, fh->dbuf, fh->resampler->to_len * 2); + *len = switch_buffer_read(fh->buffer, data, orig_len); + } else { + switch_float_to_short(fh->resampler->to, data, fh->resampler->to_len); + *len = fh->resampler->to_len; + } + + } + + done: + + return status; } SWITCH_DECLARE(switch_status_t) switch_core_file_write(switch_file_handle_t *fh, void *data, switch_size_t *len) { + switch_size_t orig_len = *len; + switch_assert(fh != NULL); switch_assert(fh->file_interface != NULL); + + if (!switch_test_flag(fh, SWITCH_FILE_NATIVE) && fh->native_rate != fh->samplerate) { + if (!fh->resampler) { + if (switch_resample_create(&fh->resampler, + fh->native_rate, + orig_len * 10, + fh->samplerate, + orig_len * 10, + fh->memory_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to create resampler!\n"); + return SWITCH_STATUS_GENERR; + } + } + + fh->resampler->from_len = switch_short_to_float(data, fh->resampler->from, (int) *len); + fh->resampler->to_len = + switch_resample_process(fh->resampler, fh->resampler->from, fh->resampler->from_len, fh->resampler->to, fh->resampler->to_size, 0); + if (fh->resampler->to_len > orig_len) { + if (!fh->dbuf) { + fh->dbuflen = fh->resampler->to_len * 2; + fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); + } + switch_assert(fh->resampler->to_len <= fh->dbuflen); + switch_float_to_short(fh->resampler->to, (int16_t *) fh->dbuf, fh->resampler->to_len); + data = fh->dbuf; + } else { + switch_float_to_short(fh->resampler->to, data, fh->resampler->to_len); + } + + *len = fh->resampler->to_len; + + } + + if (!*len) { + return SWITCH_STATUS_SUCCESS; + } return fh->file_interface->file_write(fh, data, len); } @@ -151,6 +256,13 @@ switch_clear_flag(fh, SWITCH_FILE_OPEN); status = fh->file_interface->file_close(fh); + if (fh->buffer) { + switch_buffer_destroy(&fh->buffer); + } + + switch_resample_destroy(&fh->resampler); + + if (switch_test_flag(fh, SWITCH_FILE_FLAG_FREE_POOL)) { switch_core_destroy_memory_pool(&fh->memory_pool); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_session.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_session.c Wed Dec 12 18:27:30 2007 @@ -566,11 +566,9 @@ char buf[256]; switch_size_t has; - /* sweep theese under the rug, they wont be leaked they will be reclaimed - when the session ends. - */ - session->read_resampler = NULL; - session->write_resampler = NULL; + /* clear resamplers*/ + switch_resample_destroy(&session->read_resampler); + switch_resample_destroy(&session->write_resampler); /* clear indications */ switch_core_session_flush_message(session); @@ -808,7 +806,7 @@ switch_queue_create(&session->event_queue, SWITCH_EVENT_QUEUE_LEN, session->pool); switch_queue_create(&session->private_event_queue, SWITCH_EVENT_QUEUE_LEN, session->pool); - snprintf(session->name, sizeof(session->name), "%"SWITCH_SIZE_T_FMT, session->id); + switch_snprintf(session->name, sizeof(session->name), "%"SWITCH_SIZE_T_FMT, session->id); switch_mutex_lock(runtime.throttle_mutex); session->id = session_manager.session_id++; switch_core_hash_insert(session_manager.session_table, session->uuid_str, session); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_event.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_event.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_event.c Wed Dec 12 18:27:30 2007 @@ -761,7 +761,7 @@ if (encode) { switch_url_encode(hp->value, encode_buf, encode_len - 1); } else { - snprintf(encode_buf, encode_len, "[%s]", hp->value); + switch_snprintf(encode_buf, encode_len, "[%s]", hp->value); } llen = strlen(hp->name) + strlen(encode_buf) + 8; @@ -779,7 +779,7 @@ } } - snprintf(buf + len, dlen - len, "%s: %s\n", hp->name, switch_strlen_zero(encode_buf) ? "_undef_" : encode_buf); + switch_snprintf(buf + len, dlen - len, "%s: %s\n", hp->name, switch_strlen_zero(encode_buf) ? "_undef_" : encode_buf); len = strlen(buf); } @@ -809,12 +809,12 @@ } if (blen) { - snprintf(buf + len, dlen - len, "Content-Length: %d\n\n%s", blen, event->body); + switch_snprintf(buf + len, dlen - len, "Content-Length: %d\n\n%s", blen, event->body); } else { - snprintf(buf + len, dlen - len, "\n"); + switch_snprintf(buf + len, dlen - len, "\n"); } } else { - snprintf(buf + len, dlen - len, "\n"); + switch_snprintf(buf + len, dlen - len, "\n"); } *str = buf; @@ -877,7 +877,7 @@ if (body) { int blen = (int) strlen(body); char blena[25]; - snprintf(blena, sizeof(blena), "%d", blen); + switch_snprintf(blena, sizeof(blena), "%d", blen); if (blen) { switch_xml_t xbody = NULL; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr.c Wed Dec 12 18:27:30 2007 @@ -1456,25 +1456,25 @@ if (!(time_tag = switch_xml_add_child_d(x_times, "created_time", t_off++))) { goto error; } - snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->created); + switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->created); switch_xml_set_txt_d(time_tag, tmp); if (!(time_tag = switch_xml_add_child_d(x_times, "answered_time", t_off++))) { goto error; } - snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->answered); + switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->answered); switch_xml_set_txt_d(time_tag, tmp); if (!(time_tag = switch_xml_add_child_d(x_times, "hangup_time", t_off++))) { goto error; } - snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->hungup); + switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->hungup); switch_xml_set_txt_d(time_tag, tmp); if (!(time_tag = switch_xml_add_child_d(x_times, "transfer_time", t_off++))) { goto error; } - snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->transferred); + switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->transferred); switch_xml_set_txt_d(time_tag, tmp); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_play_say.c Wed Dec 12 18:27:30 2007 @@ -127,7 +127,7 @@ } switch_url_encode(data, enc_hint, sizeof(enc_hint)); - snprintf(hint_data, sizeof(hint_data), "macro_name=%s&lang=%s&data=%s&destination_number=%s", macro_name, chan_lang, enc_hint, switch_channel_get_variable(channel,"destination_number")); + switch_snprintf(hint_data, sizeof(hint_data), "macro_name=%s&lang=%s&data=%s&destination_number=%s", macro_name, chan_lang, enc_hint, switch_channel_get_variable(channel,"destination_number")); if (switch_xml_locate("phrases", NULL, NULL, NULL, &xml, &cfg, hint_data) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of phrases failed.\n"); @@ -348,8 +348,6 @@ const char *vval; time_t start = 0; uint32_t org_silence_hits = 0; - switch_audio_resampler_t *resampler = NULL; - int16_t resamp_out[2048]; if (!fh) { fh = &lfh; @@ -362,27 +360,13 @@ switch_assert(read_codec != NULL); fh->channels = read_codec->implementation->number_of_channels; + fh->native_rate = read_codec->implementation->actual_samples_per_second; - if (fh->samplerate) { - if (fh->samplerate != read_codec->implementation->actual_samples_per_second) { - if (switch_resample_create(&resampler, - read_codec->implementation->actual_samples_per_second, - read_codec->implementation->actual_samples_per_second * 20, - fh->samplerate, - fh->samplerate * 20, - switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to create resampler!\n"); - return SWITCH_STATUS_GENERR; - } - } - } else { - fh->samplerate = read_codec->implementation->actual_samples_per_second; - } if (switch_core_file_open(fh, file, fh->channels, - fh->samplerate, + read_codec->implementation->actual_samples_per_second, SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); switch_core_session_reset(session); @@ -553,18 +537,10 @@ } } - if (!switch_test_flag(fh, SWITCH_FILE_PAUSE)) { + if (!switch_test_flag(fh, SWITCH_FILE_PAUSE) && !switch_test_flag(read_frame, SFF_CNG)) { int16_t *data = read_frame->data; len = (switch_size_t) read_frame->datalen / 2; - if (resampler) { - resampler->from_len = switch_short_to_float(read_frame->data, resampler->from, (int) len); - resampler->to_len = switch_resample_process(resampler, resampler->from, resampler->from_len, resampler->to, resampler->to_size, 0); - switch_float_to_short(resampler->to, resamp_out, read_frame->datalen); - len = resampler->to_len; - data = resamp_out; - } - if (switch_core_file_write(fh, data, &len) != SWITCH_STATUS_SUCCESS) { break; } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_loadable_module.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_loadable_module.c Wed Dec 12 18:27:30 2007 @@ -784,7 +784,7 @@ len += strlen(file); len += 8; path = (char *) switch_core_alloc(loadable_modules.pool, len); - snprintf(path, len, "%s%s%s%s", dir, SWITCH_PATH_SEPARATOR, file, ext); + switch_snprintf(path, len, "%s%s%s%s", dir, SWITCH_PATH_SEPARATOR, file, ext); } switch_mutex_lock(loadable_modules.mutex); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_log.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_log.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_log.c Wed Dec 12 18:27:30 2007 @@ -222,7 +222,7 @@ len = (uint32_t) (strlen(extra_fmt) + strlen(date) + strlen(filep) + 32 + strlen(funcp) + strlen(fmt)); new_fmt = malloc(len + 1); switch_assert(new_fmt); - snprintf(new_fmt, len, extra_fmt, date, switch_log_level2str(level), filep, line, funcp, 128, fmt); + switch_snprintf(new_fmt, len, extra_fmt, date, switch_log_level2str(level), filep, line, funcp, 128, fmt); fmt = new_fmt; } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_resample.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_resample.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_resample.c Wed Dec 12 18:27:30 2007 @@ -111,11 +111,17 @@ #endif } -SWITCH_DECLARE(void) switch_resample_destroy(switch_audio_resampler_t *resampler) +SWITCH_DECLARE(void) switch_resample_destroy(switch_audio_resampler_t **resampler) { + + if (resampler && *resampler) { #ifndef DISABLE_RESAMPLE - resample_close(resampler->resampler); + if ((*resampler)->resampler) { + resample_close((*resampler)->resampler); + } #endif + *resampler = NULL; + } } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_rtp.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_rtp.c Wed Dec 12 18:27:30 2007 @@ -652,8 +652,8 @@ char ice_user[80]; char user_ice[80]; - snprintf(ice_user, sizeof(ice_user), "%s%s", login, rlogin); - snprintf(user_ice, sizeof(user_ice), "%s%s", rlogin, login); + switch_snprintf(ice_user, sizeof(ice_user), "%s%s", login, rlogin); + switch_snprintf(user_ice, sizeof(user_ice), "%s%s", rlogin, login); rtp_session->ice_user = switch_core_strdup(rtp_session->pool, ice_user); rtp_session->user_ice = switch_core_strdup(rtp_session->pool, user_ice); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_utils.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_utils.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_utils.c Wed Dec 12 18:27:30 2007 @@ -229,7 +229,7 @@ unsigned char in[B64BUFFLEN]; unsigned char out[B64BUFFLEN + 512]; - snprintf(filename, 80, "%smail.%d%04x", SWITCH_GLOBAL_dirs.temp_dir, (int)time(NULL), rand() & 0xffff); + switch_snprintf(filename, 80, "%smail.%d%04x", SWITCH_GLOBAL_dirs.temp_dir, (int)time(NULL), rand() & 0xffff); if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644))) { if (file) { @@ -237,7 +237,7 @@ return SWITCH_FALSE; } - snprintf(buf, B64BUFFLEN, "MIME-Version: 1.0\nContent-Type: multipart/mixed; boundary=\"%s\"\n", bound); + switch_snprintf(buf, B64BUFFLEN, "MIME-Version: 1.0\nContent-Type: multipart/mixed; boundary=\"%s\"\n", bound); if (!write_buf(fd, buf)) { return SWITCH_FALSE; } @@ -251,9 +251,9 @@ if (file) { if (body && switch_stristr("content-type", body)) { - snprintf(buf, B64BUFFLEN, "--%s\n", bound); + switch_snprintf(buf, B64BUFFLEN, "--%s\n", bound); } else { - snprintf(buf, B64BUFFLEN, "--%s\nContent-Type: text/plain\n\n", bound); + switch_snprintf(buf, B64BUFFLEN, "--%s\nContent-Type: text/plain\n\n", bound); } if (!write_buf(fd, buf)) return SWITCH_FALSE; @@ -277,7 +277,7 @@ } } - snprintf(buf, B64BUFFLEN, + switch_snprintf(buf, B64BUFFLEN, "\n\n--%s\nContent-Type: %s; name=\"%s\"\n" "Content-ID: <ATTACHED(a)freeswitch.org>\n" "Content-Transfer-Encoding: base64\n" @@ -322,7 +322,7 @@ if (file) { - snprintf(buf, B64BUFFLEN, "\n\n--%s--\n.\n", bound); + switch_snprintf(buf, B64BUFFLEN, "\n\n--%s--\n.\n", bound); if (!write_buf(fd, buf)) return SWITCH_FALSE; } @@ -334,7 +334,7 @@ if (ifd) { close(ifd); } - snprintf(buf, B64BUFFLEN, "/bin/cat %s | %s %s %s", filename, runtime.mailer_app, runtime.mailer_app_args, to); + switch_snprintf(buf, B64BUFFLEN, "/bin/cat %s | %s %s %s", filename, runtime.mailer_app, runtime.mailer_app_args, to); if(system(buf)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to execute command: %s\n", buf); } @@ -826,7 +826,7 @@ static const char fmt[] = "%u.%u.%u.%u"; char tmp[sizeof "255.255.255.255"]; - if (snprintf(tmp, sizeof tmp, fmt, + if (switch_snprintf(tmp, sizeof tmp, fmt, src[0], src[1], src[2], src[3]) >= (int)size) { return NULL; } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_xml.cpp (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_xml.cpp Wed Dec 12 18:27:30 2007 @@ -294,7 +294,7 @@ for (t = root->s; t && t < s; t++) if (*t == '\n') line++; - snprintf(fmt, SWITCH_XML_ERRL, "[error near line %d]: %s", line, err); + switch_snprintf(fmt, SWITCH_XML_ERRL, "[error near line %d]: %s", line, err); va_start(ap, err); vsnprintf(root->err, SWITCH_XML_ERRL, fmt, ap); @@ -1288,7 +1288,7 @@ *domain = NULL; if (!params) { - snprintf(my_params, sizeof(my_params), "domain=%s", domain_name); + switch_snprintf(my_params, sizeof(my_params), "domain=%s", domain_name); params = my_params; } @@ -1312,10 +1312,10 @@ *domain = NULL; if (!switch_strlen_zero(xtra_params)) { - snprintf(params, sizeof(params), "key=%s&user=%s&domain=%s&ip=%s&%s", key, + switch_snprintf(params, sizeof(params), "key=%s&user=%s&domain=%s&ip=%s&%s", key, switch_str_nil(user_name), switch_str_nil(domain_name), switch_str_nil(ip), xtra_params); } else { - snprintf(params, sizeof(params), "key=%s&user=%s&domain=%s&ip=%s", key, + switch_snprintf(params, sizeof(params), "key=%s&user=%s&domain=%s&ip=%s", key, switch_str_nil(user_name), switch_str_nil(domain_name), switch_str_nil(ip)); xtra_params = ""; } @@ -1374,7 +1374,7 @@ switch_thread_rwlock_wrlock(RWLOCK); } - snprintf(path_buf, sizeof(path_buf), "%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, "freeswitch.xml"); + switch_snprintf(path_buf, sizeof(path_buf), "%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, "freeswitch.xml"); if ((new_main = switch_xml_parse_file(path_buf))) { *err = switch_xml_error(new_main); switch_copy_string(not_so_threadsafe_error_buffer, *err, sizeof(not_so_threadsafe_error_buffer));

1 0

[commit] r6702 - in freeswitch/branches/stkn/sofia-exp/trunk: . build conf conf/autoload_configs conf/dialplan conf/directory conf/directory/default conf/jingle_profiles conf/sip_profiles docs libs/codec/g726 libs/codec/g7xx libs/codec/gsm libs/codec/ilbc libs/iax libs/libdingaling libs/libteletone libs/portaudio/build/msvc libs/srtp libs/win32/apr libs/win32/apr-iconv libs/win32/apr-util libs/win32/curl libs/win32/howl libs/win32/iksemel libs/win32/js libs/win32/libresample libs/win32
by Freeswitch SVN 12 Dec '07

12 Dec '07

Author: stkn Date: Wed Dec 12 13:58:47 2007 New Revision: 6702 Added: freeswitch/branches/stkn/sofia-exp/trunk/Freeswitch.2008.sln freeswitch/branches/stkn/sofia-exp/trunk/build/getsounds.sh freeswitch/branches/stkn/sofia-exp/trunk/conf/jingle_profiles/client.noload freeswitch/branches/stkn/sofia-exp/trunk/conf/jingle_profiles/client.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/jingle_profiles/server.noload freeswitch/branches/stkn/sofia-exp/trunk/conf/jingle_profiles/server.xml freeswitch/branches/stkn/sofia-exp/trunk/docs/docs.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/g726/libg726.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/g7xx/libg7xx.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/gsm/libgsm.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/ilbc/libilbc.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/iax/libiax2.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/libdingaling/libdingaling.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/libteletone/libteletone.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/portaudio/build/msvc/portaudio.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/srtp/libsrtp.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/apr-iconv/libapriconv.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/apr-util/libaprutil.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/apr-util/xml.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/apr/libapr.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/curl/curllib.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/howl/libhowl.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/howl/libmDNSResponder.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/iksemel/iksemel.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/js/js.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/libresample/libresample.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/libsndfile/libsndfile.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/pcre/libpcre.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/pthread/pthread.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sofia/libsofia_sip_ua_static.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/speex/libspeex.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sqlite/sqlite.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/udns/libudns.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/xmlrpc/Abyss.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/xmlrpc/xmlrpc.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_commands/mod_commands.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_conference/mod_conference.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_enum/mod_enum.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_esf/mod_esf.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_fifo/mod_fifo.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_limit/mod_limit.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_rss/mod_rss.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_voicemail/mod_voicemail.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_amr/mod_amr.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_g711/mod_g711.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_g722/mod_g722.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_g726/mod_g726.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_g729/mod_g729.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_gsm/mod_gsm.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_h26x/mod_h26x.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_l16/mod_l16.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_speex/mod_speex.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/directories/mod_ldap/mod_ldap.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_woomera/mod_woomera.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_native_file/mod_native_file.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_sndfile/mod_sndfile.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/loggers/mod_console/mod_console.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/loggers/mod_logfile/mod_logfile.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_de/mod_say_de.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_en/mod_say_en.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_es/mod_say_es.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_fr/mod_say_fr.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_it/mod_say_it.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_nl/mod_say_nl.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/w32/Console/FreeSwitchConsole.2008.vcproj freeswitch/branches/stkn/sofia-exp/trunk/w32/Library/FreeSwitchCore.2008.vcproj Modified: freeswitch/branches/stkn/sofia-exp/trunk/Makefile.am freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/dingaling.conf.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/local_stream.conf.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/modules.conf.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1000.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/nat.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/outbound.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/vars.xml freeswitch/branches/stkn/sofia-exp/trunk/freeswitch.spec freeswitch/branches/stkn/sofia-exp/trunk/libs/srtp/configure.gnu freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_event.h freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_platform.h freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_expr/mod_expr.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_limit/mod_limit.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_asr.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_directory.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_port_allocator.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_event.c freeswitch/branches/stkn/sofia-exp/trunk/w32/module_debug.vsprops freeswitch/branches/stkn/sofia-exp/trunk/w32/module_release.vsprops Log: Merge changes from trunk Added: freeswitch/branches/stkn/sofia-exp/trunk/Freeswitch.2008.sln ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/Freeswitch.2008.sln Wed Dec 12 13:58:47 2007 @@ -0,0 +1,1619 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Codecs", "Codecs", "{F881ADA2-2F1A-4046-9FEB-191D9422D781}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Endpoints", "Endpoints", "{9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Applications", "Applications", "{E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dialplans", "Dialplans", "{C5F182F9-754A-4EC5-B50F-76ED02BE13F4}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Event Handlers", "Event Handlers", "{9ADF1E48-2F5C-4ED7-A893-596259FABFE0}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Formats", "Formats", "{A5A27244-AD24-46E5-B01B-840CD296C91D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{CBD81696-EFB4-4D2F-8451-1B8DAA86155A}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Directories", "Directories", "{B8F5B47B-8568-46EB-B320-64C17D2A98BC}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Languages", "Languages", "{0C808854-54D1-4230-BFF5-77B5FD905000}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Loggers", "Loggers", "{A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XML Interfaces", "XML Interfaces", "{F69A4A6B-9360-4EBB-A280-22AA3C455AC5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", "{EB910B0D-F27D-4B62-B67B-DE834C99AC5B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "say", "say", "{6CD61A1D-797C-470A-BE08-8C31B68BB336}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Config", "_Config", "{57D119DC-484F-420F-B9E9-8589FD9A8DF8}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Default", "Default", "{3B08FEFD-4D3D-4C16-BA94-EE83509E32A0}" + ProjectSection(SolutionItems) = preProject + conf\freeswitch.xml = conf\freeswitch.xml + conf\vars.xml = conf\vars.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Release", "Release", "{7BFD517E-7F8F-4A40-A78E-8D3632738227}" + ProjectSection(SolutionItems) = preProject + release\conf\freeswitch.xml = release\conf\freeswitch.xml + release\conf\vars.xml = release\conf\vars.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debug", "Debug", "{6374D55C-FABE-4A02-9CF1-4145308A56C5}" + ProjectSection(SolutionItems) = preProject + debug\conf\freeswitch.xml = debug\conf\freeswitch.xml + debug\conf\vars.xml = debug\conf\vars.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Build System", "_Build System", "{DB1024A8-41BF-4AD7-9AE6-13202230D1F3}" + ProjectSection(SolutionItems) = preProject + acsite.m4 = acsite.m4 + bootstrap.sh = bootstrap.sh + build\buildlib.sh = build\buildlib.sh + configure.in = configure.in + Makefile.am = Makefile.am + build\modmake.rules.in = build\modmake.rules.in + build\modules.conf.in = build\modules.conf.in + libs\win32\util.vbs = libs\win32\util.vbs + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "m4", "m4", "{CDE9B06A-3C27-4987-8FAE-DF1006BC705D}" + ProjectSection(SolutionItems) = preProject + build\config\ac_cflags_gcc_option.m4 = build\config\ac_cflags_gcc_option.m4 + build\config\ac_cflags_sun_option.m4 = build\config\ac_cflags_sun_option.m4 + build\config\ac_gcc_archflag.m4 = build\config\ac_gcc_archflag.m4 + build\config\ac_gcc_x86_cpuid.m4 = build\config\ac_gcc_x86_cpuid.m4 + build\config\ac_prog_gzip.m4 = build\config\ac_prog_gzip.m4 + build\config\ac_prog_wget.m4 = build\config\ac_prog_wget.m4 + build\config\ax_cc_maxopt.m4 = build\config\ax_cc_maxopt.m4 + build\config\ax_cflags_warn_all_ansi.m4 = build\config\ax_cflags_warn_all_ansi.m4 + build\config\ax_check_compiler_flags.m4 = build\config\ax_check_compiler_flags.m4 + build\config\ax_compiler_vendor.m4 = build\config\ax_compiler_vendor.m4 + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "openmrcp", "openmrcp", "{ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoload_configs", "{3C90CCF0-2CDD-4A7A-ACFF-208C1E271692}" + ProjectSection(SolutionItems) = preProject + conf\autoload_configs\alsa.conf.xml = conf\autoload_configs\alsa.conf.xml + conf\autoload_configs\cdr.conf.xml = conf\autoload_configs\cdr.conf.xml + conf\autoload_configs\conference.conf.xml = conf\autoload_configs\conference.conf.xml + conf\autoload_configs\console.conf.xml = conf\autoload_configs\console.conf.xml + conf\autoload_configs\dialplan_directory.conf.xml = conf\autoload_configs\dialplan_directory.conf.xml + conf\autoload_configs\dingaling.conf.xml = conf\autoload_configs\dingaling.conf.xml + conf\autoload_configs\enum.conf.xml = conf\autoload_configs\enum.conf.xml + conf\autoload_configs\event_multicast.conf.xml = conf\autoload_configs\event_multicast.conf.xml + conf\autoload_configs\event_socket.conf.xml = conf\autoload_configs\event_socket.conf.xml + conf\autoload_configs\iax.conf.xml = conf\autoload_configs\iax.conf.xml + conf\autoload_configs\ivr.conf.xml = conf\autoload_configs\ivr.conf.xml + conf\autoload_configs\java.conf.xml = conf\autoload_configs\java.conf.xml + conf\autoload_configs\limit.conf.xml = conf\autoload_configs\limit.conf.xml + conf\autoload_configs\local_stream.conf.xml = conf\autoload_configs\local_stream.conf.xml + conf\autoload_configs\logfile.conf.xml = conf\autoload_configs\logfile.conf.xml + conf\autoload_configs\modules.conf.xml = conf\autoload_configs\modules.conf.xml + conf\autoload_configs\openmrcp.conf.xml = conf\autoload_configs\openmrcp.conf.xml + conf\autoload_configs\portaudio.conf.xml = conf\autoload_configs\portaudio.conf.xml + conf\autoload_configs\rss.conf.xml = conf\autoload_configs\rss.conf.xml + conf\autoload_configs\sofia.conf.xml = conf\autoload_configs\sofia.conf.xml + conf\autoload_configs\spidermonkey.conf.xml = conf\autoload_configs\spidermonkey.conf.xml + conf\autoload_configs\switch.conf.xml = conf\autoload_configs\switch.conf.xml + conf\autoload_configs\syslog.conf.xml = conf\autoload_configs\syslog.conf.xml + conf\autoload_configs\voicemail.conf.xml = conf\autoload_configs\voicemail.conf.xml + conf\autoload_configs\wanpipe.conf.xml = conf\autoload_configs\wanpipe.conf.xml + conf\autoload_configs\woomera.conf.xml = conf\autoload_configs\woomera.conf.xml + conf\autoload_configs\xml_cdr.conf.xml = conf\autoload_configs\xml_cdr.conf.xml + conf\autoload_configs\xml_curl.conf.xml = conf\autoload_configs\xml_curl.conf.xml + conf\autoload_configs\xml_rpc.conf.xml = conf\autoload_configs\xml_rpc.conf.xml + conf\autoload_configs\zeroconf.conf.xml = conf\autoload_configs\zeroconf.conf.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dialplan", "dialplan", "{C7E2382E-2C22-4D18-BF93-80C6A1FFA7AC}" + ProjectSection(SolutionItems) = preProject + conf\dialplan\default.xml = conf\dialplan\default.xml + conf\dialplan\US.conf.xml = conf\dialplan\US.conf.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "directory", "directory", "{FC71C66E-E268-4EAD-B1F5-F008DC382E83}" + ProjectSection(SolutionItems) = preProject + conf\directory\default.xml = conf\directory\default.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sip_profiles", "sip_profiles", "{8E2E8798-8B6F-4A55-8E4F-4E6FDE40ED26}" + ProjectSection(SolutionItems) = preProject + conf\sip_profiles\default.xml = conf\sip_profiles\default.xml + conf\sip_profiles\nat.xml = conf\sip_profiles\nat.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lang", "lang", "{09455AA9-C243-4F16-A1A1-A016881A2765}" + ProjectSection(SolutionItems) = preProject + conf\directory\default.xml = conf\directory\default.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "en", "en", "{57199684-EC63-4A60-9DC6-11815AF6B413}" + ProjectSection(SolutionItems) = preProject + conf\lang\en\en.xml = conf\lang\en\en.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "de", "de", "{2DED4BA2-D6B0-4064-BB2A-76DE3AA49E7C}" + ProjectSection(SolutionItems) = preProject + conf\lang\de\de.xml = conf\lang\de\de.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fr", "fr", "{D4A12E4C-DBDA-4614-BA26-3425AE9F60F5}" + ProjectSection(SolutionItems) = preProject + conf\lang\fr\fr.xml = conf\lang\fr\fr.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{D3E5C8ED-3A6A-4FEA-92A2-48A0BA865358}" + ProjectSection(SolutionItems) = preProject + conf\lang\de\demo\demo.xml = conf\lang\de\demo\demo.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{CC3E7F48-2590-49CB-AD8B-BE3650F55462}" + ProjectSection(SolutionItems) = preProject + conf\lang\de\vm\tts.xml = conf\lang\de\vm\tts.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{765EF1B9-5027-4820-BC37-A44466A51631}" + ProjectSection(SolutionItems) = preProject + conf\lang\en\demo\demo.xml = conf\lang\en\demo\demo.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{713E4747-1126-40B1-BD84-58F9A7745423}" + ProjectSection(SolutionItems) = preProject + conf\lang\en\vm\sounds.xml = conf\lang\en\vm\sounds.xml + conf\lang\en\vm\tts.xml = conf\lang\en\vm\tts.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{F1B71990-EB04-4EB5-B28A-BC3EB6F7E843}" + ProjectSection(SolutionItems) = preProject + conf\lang\fr\demo\demo.xml = conf\lang\fr\demo\demo.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{3DAF028C-AB5B-4183-A01B-DCC43F5A87F0}" + ProjectSection(SolutionItems) = preProject + conf\lang\fr\vm\sounds.xml = conf\lang\fr\vm\sounds.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoload_configs", "{4833F8E3-ABBF-4260-9DB1-B34015676CFC}" + ProjectSection(SolutionItems) = preProject + debug\conf\autoload_configs\alsa.conf.xml = debug\conf\autoload_configs\alsa.conf.xml + debug\conf\autoload_configs\cdr.conf.xml = debug\conf\autoload_configs\cdr.conf.xml + debug\conf\autoload_configs\conference.conf.xml = debug\conf\autoload_configs\conference.conf.xml + debug\conf\autoload_configs\console.conf.xml = debug\conf\autoload_configs\console.conf.xml + debug\conf\autoload_configs\dialplan_directory.conf.xml = debug\conf\autoload_configs\dialplan_directory.conf.xml + debug\conf\autoload_configs\dingaling.conf.xml = debug\conf\autoload_configs\dingaling.conf.xml + debug\conf\autoload_configs\enum.conf.xml = debug\conf\autoload_configs\enum.conf.xml + debug\conf\autoload_configs\event_multicast.conf.xml = debug\conf\autoload_configs\event_multicast.conf.xml + debug\conf\autoload_configs\event_socket.conf.xml = debug\conf\autoload_configs\event_socket.conf.xml + debug\conf\autoload_configs\iax.conf.xml = debug\conf\autoload_configs\iax.conf.xml + debug\conf\autoload_configs\ivr.conf.xml = debug\conf\autoload_configs\ivr.conf.xml + debug\conf\autoload_configs\java.conf.xml = debug\conf\autoload_configs\java.conf.xml + debug\conf\autoload_configs\limit.conf.xml = debug\conf\autoload_configs\limit.conf.xml + debug\conf\autoload_configs\local_stream.conf.xml = debug\conf\autoload_configs\local_stream.conf.xml + debug\conf\autoload_configs\logfile.conf.xml = debug\conf\autoload_configs\logfile.conf.xml + debug\conf\autoload_configs\modules.conf.xml = debug\conf\autoload_configs\modules.conf.xml + debug\conf\autoload_configs\openmrcp.conf.xml = debug\conf\autoload_configs\openmrcp.conf.xml + debug\conf\autoload_configs\portaudio.conf.xml = debug\conf\autoload_configs\portaudio.conf.xml + debug\conf\autoload_configs\rss.conf.xml = debug\conf\autoload_configs\rss.conf.xml + debug\conf\autoload_configs\sofia.conf.xml = debug\conf\autoload_configs\sofia.conf.xml + debug\conf\autoload_configs\spidermonkey.conf.xml = debug\conf\autoload_configs\spidermonkey.conf.xml + debug\conf\autoload_configs\switch.conf.xml = debug\conf\autoload_configs\switch.conf.xml + debug\conf\autoload_configs\syslog.conf.xml = debug\conf\autoload_configs\syslog.conf.xml + debug\conf\autoload_configs\voicemail.conf.xml = debug\conf\autoload_configs\voicemail.conf.xml + debug\conf\autoload_configs\wanpipe.conf.xml = debug\conf\autoload_configs\wanpipe.conf.xml + debug\conf\autoload_configs\woomera.conf.xml = debug\conf\autoload_configs\woomera.conf.xml + debug\conf\autoload_configs\xml_cdr.conf.xml = debug\conf\autoload_configs\xml_cdr.conf.xml + debug\conf\autoload_configs\xml_curl.conf.xml = debug\conf\autoload_configs\xml_curl.conf.xml + debug\conf\autoload_configs\xml_rpc.conf.xml = debug\conf\autoload_configs\xml_rpc.conf.xml + debug\conf\autoload_configs\zeroconf.conf.xml = debug\conf\autoload_configs\zeroconf.conf.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dialplan", "dialplan", "{D44DD429-FE98-42AA-B5B7-4B4EBE33AEFD}" + ProjectSection(SolutionItems) = preProject + debug\conf\dialplan\default.xml = debug\conf\dialplan\default.xml + debug\conf\dialplan\US.conf.xml = debug\conf\dialplan\US.conf.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "directory", "directory", "{471110C9-A7ED-4966-98E1-8EA667BF0EEA}" + ProjectSection(SolutionItems) = preProject + debug\conf\directory\default.xml = debug\conf\directory\default.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sip_profiles", "sip_profiles", "{4DF5199E-F7F5-4347-97DD-22078FCDB371}" + ProjectSection(SolutionItems) = preProject + debug\conf\sip_profiles\default.xml = debug\conf\sip_profiles\default.xml + debug\conf\sip_profiles\nat.xml = debug\conf\sip_profiles\nat.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lang", "lang", "{B487BEBE-4A5C-434F-8D30-39465412F84F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "de", "de", "{2003189F-0E69-4FF7-A11D-3BFB3F03D558}" + ProjectSection(SolutionItems) = preProject + debug\conf\lang\de\de.xml = debug\conf\lang\de\de.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "en", "en", "{C8EA69FA-365E-4897-9BB0-08022509E18B}" + ProjectSection(SolutionItems) = preProject + debug\conf\lang\en\en.xml = debug\conf\lang\en\en.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fr", "fr", "{1240C217-6674-43C1-B099-B0290D84F28B}" + ProjectSection(SolutionItems) = preProject + debug\conf\lang\fr\fr.xml = debug\conf\lang\fr\fr.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{03517B06-98A1-46DD-9347-BFFFED7DD8A4}" + ProjectSection(SolutionItems) = preProject + debug\conf\lang\de\demo\demo.xml = debug\conf\lang\de\demo\demo.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{1D339A14-FFC2-4F6E-BEF2-D5D6DF14AC88}" + ProjectSection(SolutionItems) = preProject + debug\conf\lang\de\vm\tts.xml = debug\conf\lang\de\vm\tts.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{B4C6D0B5-5F39-4546-820D-4BCAA6C3E301}" + ProjectSection(SolutionItems) = preProject + debug\conf\lang\en\demo\demo.xml = debug\conf\lang\en\demo\demo.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{3041F86C-51D4-4D9E-8A00-91BA4B7C51D4}" + ProjectSection(SolutionItems) = preProject + debug\conf\lang\en\vm\sounds.xml = debug\conf\lang\en\vm\sounds.xml + debug\conf\lang\en\vm\tts.xml = debug\conf\lang\en\vm\tts.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{DFE96A6E-5C9A-4C74-959A-9C485A7AD95C}" + ProjectSection(SolutionItems) = preProject + debug\conf\lang\fr\demo\demo.xml = debug\conf\lang\fr\demo\demo.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{80A4CA5C-7208-4134-8EFD-C147B03C8AA1}" + ProjectSection(SolutionItems) = preProject + debug\conf\lang\fr\vm\sounds.xml = debug\conf\lang\fr\vm\sounds.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoload_configs", "{8D29085B-952D-4594-9BB9-5781CE552D0A}" + ProjectSection(SolutionItems) = preProject + release\conf\autoload_configs\alsa.conf.xml = release\conf\autoload_configs\alsa.conf.xml + release\conf\autoload_configs\cdr.conf.xml = release\conf\autoload_configs\cdr.conf.xml + release\conf\autoload_configs\conference.conf.xml = release\conf\autoload_configs\conference.conf.xml + release\conf\autoload_configs\console.conf.xml = release\conf\autoload_configs\console.conf.xml + release\conf\autoload_configs\dialplan_directory.conf.xml = release\conf\autoload_configs\dialplan_directory.conf.xml + release\conf\autoload_configs\dingaling.conf.xml = release\conf\autoload_configs\dingaling.conf.xml + release\conf\autoload_configs\enum.conf.xml = release\conf\autoload_configs\enum.conf.xml + release\conf\autoload_configs\event_multicast.conf.xml = release\conf\autoload_configs\event_multicast.conf.xml + release\conf\autoload_configs\event_socket.conf.xml = release\conf\autoload_configs\event_socket.conf.xml + release\conf\autoload_configs\iax.conf.xml = release\conf\autoload_configs\iax.conf.xml + release\conf\autoload_configs\ivr.conf.xml = release\conf\autoload_configs\ivr.conf.xml + release\conf\autoload_configs\java.conf.xml = release\conf\autoload_configs\java.conf.xml + release\conf\autoload_configs\limit.conf.xml = release\conf\autoload_configs\limit.conf.xml + release\conf\autoload_configs\local_stream.conf.xml = release\conf\autoload_configs\local_stream.conf.xml + release\conf\autoload_configs\logfile.conf.xml = release\conf\autoload_configs\logfile.conf.xml + release\conf\autoload_configs\modules.conf.xml = release\conf\autoload_configs\modules.conf.xml + release\conf\autoload_configs\openmrcp.conf.xml = release\conf\autoload_configs\openmrcp.conf.xml + release\conf\autoload_configs\portaudio.conf.xml = release\conf\autoload_configs\portaudio.conf.xml + release\conf\autoload_configs\rss.conf.xml = release\conf\autoload_configs\rss.conf.xml + release\conf\autoload_configs\sofia.conf.xml = release\conf\autoload_configs\sofia.conf.xml + release\conf\autoload_configs\spidermonkey.conf.xml = release\conf\autoload_configs\spidermonkey.conf.xml + release\conf\autoload_configs\switch.conf.xml = release\conf\autoload_configs\switch.conf.xml + release\conf\autoload_configs\syslog.conf.xml = release\conf\autoload_configs\syslog.conf.xml + release\conf\autoload_configs\voicemail.conf.xml = release\conf\autoload_configs\voicemail.conf.xml + release\conf\autoload_configs\wanpipe.conf.xml = release\conf\autoload_configs\wanpipe.conf.xml + release\conf\autoload_configs\woomera.conf.xml = release\conf\autoload_configs\woomera.conf.xml + release\conf\autoload_configs\xml_cdr.conf.xml = release\conf\autoload_configs\xml_cdr.conf.xml + release\conf\autoload_configs\xml_curl.conf.xml = release\conf\autoload_configs\xml_curl.conf.xml + release\conf\autoload_configs\xml_rpc.conf.xml = release\conf\autoload_configs\xml_rpc.conf.xml + release\conf\autoload_configs\zeroconf.conf.xml = release\conf\autoload_configs\zeroconf.conf.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dialplan", "dialplan", "{23874F4B-C0AF-4587-9F7E-DB0F06DE8CB4}" + ProjectSection(SolutionItems) = preProject + conf\dialplan\default.xml = conf\dialplan\default.xml + conf\dialplan\US.conf.xml = conf\dialplan\US.conf.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "directory", "directory", "{19ED97F6-30D8-4FCE-AE1D-8B7FCB170D40}" + ProjectSection(SolutionItems) = preProject + release\conf\directory\default.xml = release\conf\directory\default.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sip_profiles", "sip_profiles", "{99E79D76-FCFC-466B-965B-273CCACF99B0}" + ProjectSection(SolutionItems) = preProject + release\conf\sip_profiles\default.xml = release\conf\sip_profiles\default.xml + release\conf\sip_profiles\nat.xml = release\conf\sip_profiles\nat.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lang", "lang", "{8FADAC7F-CA9E-49D9-B957-A5F5605D238C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "de", "de", "{58A56014-DEA7-4172-8C26-BAD8D499A1E8}" + ProjectSection(SolutionItems) = preProject + release\conf\lang\de\de.xml = release\conf\lang\de\de.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "en", "en", "{EB577858-8284-4DEA-ADDA-DD046BCA0126}" + ProjectSection(SolutionItems) = preProject + release\conf\lang\en\en.xml = release\conf\lang\en\en.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fr", "fr", "{89A94241-1DA6-44E8-A685-AED1E665C2AD}" + ProjectSection(SolutionItems) = preProject + release\conf\lang\fr\fr.xml = release\conf\lang\fr\fr.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{2D74F635-AB18-43B3-A87E-A71F3EA24DDB}" + ProjectSection(SolutionItems) = preProject + release\conf\lang\de\demo\demo.xml = release\conf\lang\de\demo\demo.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{A721E646-07E9-4E16-A92D-B97F654B2BAC}" + ProjectSection(SolutionItems) = preProject + release\conf\lang\de\vm\tts.xml = release\conf\lang\de\vm\tts.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{50331CA0-7038-4341-B92D-C34E1601EFF0}" + ProjectSection(SolutionItems) = preProject + release\conf\lang\en\demo\demo.xml = release\conf\lang\en\demo\demo.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{FC0DB2A2-B1A3-426E-9E37-BE28FE8FE01B}" + ProjectSection(SolutionItems) = preProject + release\conf\lang\en\vm\sounds.xml = release\conf\lang\en\vm\sounds.xml + release\conf\lang\en\vm\tts.xml = release\conf\lang\en\vm\tts.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{91C6DEDE-CE4A-47D1-A84B-3E828F82E2B0}" + ProjectSection(SolutionItems) = preProject + release\conf\lang\fr\demo\demo.xml = release\conf\lang\fr\demo\demo.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{8F5A511B-F716-4D07-9657-55B9E4F1D3E9}" + ProjectSection(SolutionItems) = preProject + release\conf\lang\fr\vm\sounds.xml = release\conf\lang\fr\vm\sounds.xml + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\Console\FreeSwitchConsole.2008.vcproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.2008.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}" + ProjectSection(ProjectDependencies) = postProject + {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} + {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} + {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g729", "src\mod\codecs\mod_g729\mod_g729.2008.vcproj", "{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_gsm", "src\mod\codecs\mod_gsm\mod_gsm.2008.vcproj", "{4926323F-4EA8-4B7D-A3D3-65488725988F}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {8FD2E297-4096-47E5-9258-C48FF1841523} = {8FD2E297-4096-47E5-9258-C48FF1841523} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "src\mod\formats\mod_sndfile\mod_sndfile.2008.vcproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g711", "src\mod\codecs\mod_g711\mod_g711.2008.vcproj", "{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iax", "src\mod\endpoints\mod_iax\mod_iax.2008.vcproj", "{3A5B9131-F20C-4A85-9447-6C1610941CEE}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "src\mod\endpoints\mod_portaudio\mod_PortAudio.2008.vcproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {0A18A071-125E-442F-AFF7-A3F68ABECF99} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_l16", "src\mod\codecs\mod_l16\mod_l16.2008.vcproj", "{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_speex", "src\mod\codecs\mod_speex\mod_speex.2008.vcproj", "{5580D60E-0F77-4716-9CD4-B8E5986FA375}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomera", "src\mod\endpoints\mod_woomera\mod_woomera.2008.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "docs", "docs\docs.2008.vcproj", "{1A1FF289-4FD6-4285-A422-D31DD67A4723}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_xml", "src\mod\dialplans\mod_dialplan_xml\mod_dialplan_xml.2008.vcproj", "{07113B25-D3AF-4E04-BA77-4CD1171F022C}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "FreeSwitchSetup", "w32\Setup\Setup.vdproj", "{B17FFBE6-A942-4056-8346-B624FB5D995B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ldap", "src\mod\directories\mod_ldap\mod_ldap.2008.vcproj", "{EC3E5C7F-EE09-47E2-80FE-546363D14A98}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_directory", "src\mod\dialplans\mod_dialplan_directory\mod_dialplan_directory.2008.vcproj", "{A27CCA23-1541-4337-81A4-F0A6413078A0}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_zeroconf", "src\mod\event_handlers\mod_zeroconf\mod_zeroconf.2008.vcproj", "{C7705DC4-2088-493E-AF8D-65BC6D65C125}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_multicast", "src\mod\event_handlers\mod_event_multicast\mod_event_multicast.2008.vcproj", "{784113EF-44D9-4949-835D-7065D3C7AD08}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libteletone\libteletone.2008.vcproj", "{89385C74-5860-4174-9CAF-A39E7C48909C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "src\mod\languages\mod_spidermonkey\mod_spidermonkey.2008.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cepstral", "src\mod\asr_tts\mod_cepstral\mod_cepstral.2008.vcproj", "{692F6330-4D87-4C82-81DF-40DB5892636E}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ilbc", "src\mod\codecs\mod_ilbc\mod_ilbc.2008.vcproj", "{D3EC0AFF-76FC-4210-A825-9A17410660A3}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {989BB874-7AF1-44CB-8E5C-CC8113D267E8} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dingaling", "src\mod\endpoints\mod_dingaling\mod_dingaling.2008.vcproj", "{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}" + ProjectSection(ProjectDependencies) = postProject + {1906D736-08BD-4EE1-924F-B536249B9A54} = {1906D736-08BD-4EE1-924F-B536249B9A54} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_commands", "src\mod\applications\mod_commands\mod_commands.2008.vcproj", "{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_console", "src\mod\loggers\mod_console\mod_console.2008.vcproj", "{1C453396-D912-4213-89FD-9B489162B7B5}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_int\mod_xml_rpc\mod_xml_rpc.2008.vcproj", "{CBEC7225-0C21-4DA8-978E-1F158F8AD950}" + ProjectSection(ProjectDependencies) = postProject + {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "src\mod\applications\mod_rss\mod_rss.2008.vcproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_conference", "src\mod\applications\mod_conference\mod_conference.2008.vcproj", "{C24FB505-05D7-4319-8485-7540B44C8603}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dptools", "src\mod\applications\mod_dptools\mod_dptools.2008.vcproj", "{B5881A85-FE70-4F64-8607-2CAAE52669C6}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_socket", "src\mod\event_handlers\mod_event_socket\mod_event_socket.2008.vcproj", "{05515420-16DE-4E63-BE73-85BE85BA5142}" + ProjectSection(ProjectDependencies) = postProject + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgsm", "libs\codec\gsm\libgsm.2008.vcproj", "{8FD2E297-4096-47E5-9258-C48FF1841523}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilbc", "libs\codec\ilbc\libilbc.2008.vcproj", "{989BB874-7AF1-44CB-8E5C-CC8113D267E8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiax2", "libs\iax\libiax2.2008.vcproj", "{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdingaling", "libs\libdingaling\libdingaling.2008.vcproj", "{1906D736-08BD-4EE1-924F-B536249B9A54}" + ProjectSection(ProjectDependencies) = postProject + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsrtp", "libs\srtp\libsrtp.2008.vcproj", "{EEF031CB-FED8-451E-A471-91EC8D4F6750}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsqlite", "libs\win32\sqlite\sqlite.2008.vcproj", "{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "libs\win32\pcre\libpcre.2008.vcproj", "{8D04B550-D240-4A44-8A18-35DA3F7038D9}" + ProjectSection(ProjectDependencies) = postProject + {1CED5987-A529-46DC-B30F-870D85FF9C94} = {1CED5987-A529-46DC-B30F-870D85FF9C94} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre Generate pcre_chartables.c", "libs\win32\pcre\pcre_chartables.c.2008.vcproj", "{1CED5987-A529-46DC-B30F-870D85FF9C94}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresample", "libs\win32\libresample\libresample.2008.vcproj", "{50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "libs\win32\apr\libapr.2008.vcproj", "{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapriconv", "libs\win32\apr-iconv\libapriconv.2008.vcproj", "{101130D1-3EA6-4ED2-B65D-CEB5243A20ED}" + ProjectSection(ProjectDependencies) = postProject + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\apr-util\libaprutil.2008.vcproj", "{F057DA7F-79E5-4B00-845C-EF446EF055E3}" + ProjectSection(ProjectDependencies) = postProject + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libs\win32\speex\libspeex.2008.vcproj", "{1C469CDD-A3AF-4A94-A592-B2CF12F2D918}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iksemel", "libs\win32\iksemel\iksemel.2008.vcproj", "{E727E8F6-935D-46FE-8B0E-37834748A0E3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download HOWL", "libs\win32\Download HOWL.2008.vcproj", "{5927104D-C14C-4AC8-925C-4AB681762E75}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "howl static library", "libs\win32\howl\libhowl.2008.vcproj", "{0D826AF5-0506-4C50-BB8B-7DB019AC21AE}" + ProjectSection(ProjectDependencies) = postProject + {5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mDNSResponder static library", "libs\win32\howl\libmDNSResponder.2008.vcproj", "{49C34584-B6DA-448F-83CF-27584DC9FC90}" + ProjectSection(ProjectDependencies) = postProject + {5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75} + {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsndfile", "libs\win32\libsndfile\libsndfile.2008.vcproj", "{3D0370CA-BED2-4657-A475-32375CBCB6E4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curllib", "libs\win32\curl\curllib.2008.vcproj", "{87EE9DA4-DE1E-4448-8324-183C98DCA588}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpc", "libs\win32\xmlrpc\xmlrpc.2008.vcproj", "{A3FE0076-B366-429D-A238-D7304DA7D3C1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Abyss", "libs\win32\xmlrpc\Abyss.2008.vcproj", "{356EC96D-4C9F-47B5-9083-FC328B87BA94}" + ProjectSection(ProjectDependencies) = postProject + {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.2008.vcproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js", "libs\win32\js\js.2008.vcproj", "{204FA0DE-305D-4414-AE2E-F195A23F390D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.2008.vcproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}" + ProjectSection(ProjectDependencies) = postProject + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg726", "libs\codec\g726\libg726.2008.vcproj", "{5A6A281A-AA50-470A-8305-202BDA1CD1BF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g726", "src\mod\codecs\mod_g726\mod_g726.2008.vcproj", "{486369EB-F150-4B56-BCC8-77B9E18FF5F5}" + ProjectSection(ProjectDependencies) = postProject + {5A6A281A-AA50-470A-8305-202BDA1CD1BF} = {5A6A281A-AA50-470A-8305-202BDA1CD1BF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg7xx", "libs\codec\g7xx\libg7xx.2008.vcproj", "{D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g722", "src\mod\codecs\mod_g722\mod_g722.2008.vcproj", "{D42518CC-7475-454D-B392-0E132C07D761}" + ProjectSection(ProjectDependencies) = postProject + {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsofia_sip_ua_static", "libs\win32\sofia\libsofia_sip_ua_static.2008.vcproj", "{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}" + ProjectSection(ProjectDependencies) = postProject + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} + {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PTHREAD", "libs\win32\Download PTHREAD.2008.vcproj", "{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthread", "libs\win32\pthread\pthread.2008.vcproj", "{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}" + ProjectSection(ProjectDependencies) = postProject + {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g723_1", "src\mod\codecs\mod_g723_1\mod_g723_1.2008.vcproj", "{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\formats\mod_native_file\mod_native_file.2008.vcproj", "{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey_core_db\mod_spidermonkey_core_db.2008.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}" + ProjectSection(ProjectDependencies) = postProject + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey_teletone\mod_spidermonkey_teletone.2008.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}" + ProjectSection(ProjectDependencies) = postProject + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libudns", "libs\win32\udns\libudns.2008.vcproj", "{4043FC6A-9A30-4577-8AD5-9B233C9575D8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applications\mod_enum\mod_enum.2008.vcproj", "{71A967D5-0E99-4CEF-A587-98836EE6F2EF}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {4043FC6A-9A30-4577-8AD5-9B233C9575D8} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey_odbc\mod_spidermonkey_odbc.2008.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}" + ProjectSection(ProjectDependencies) = postProject + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.2008.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}" + ProjectSection(ProjectDependencies) = postProject + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_en", "src\mod\say\mod_say_en\mod_say_en.2008.vcproj", "{988CACF7-3FCB-4992-BE69-77872AE67DC8}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "libs\portaudio\build\msvc\portaudio.2008.vcproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_cdr", "src\mod\xml_int\mod_xml_cdr\mod_xml_cdr.2008.vcproj", "{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}" + ProjectSection(ProjectDependencies) = postProject + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_amr", "src\mod\codecs\mod_amr\mod_amr.2008.vcproj", "{8DEB383C-4091-4F42-A56F-C9E46D552D79}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_h26x", "src\mod\codecs\mod_h26x\mod_h26x.2008.vcproj", "{2C3C2423-234B-4772-8899-D3B137E5CA35}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_esf", "src\mod\applications\mod_esf\mod_esf.2008.vcproj", "{3850D93A-5F24-4922-BC1C-74D08C37C256}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_local_stream", "src\mod\formats\mod_local_stream\mod_local_stream.2008.vcproj", "{2CA40887-1622-46A1-A7F9-17FD7E7E545B}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mediaframe", "libs\openmrcp\mediaframe\mediaframe.2008.vcproj", "{AA91F0AC-6562-435E-814C-5C94689FEFA2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpcore", "libs\openmrcp\mrcpcore\mrcpcore.2008.vcproj", "{829A9309-3B94-43C0-846B-7EC9D6D35F8B}" + ProjectSection(ProjectDependencies) = postProject + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {AA91F0AC-6562-435E-814C-5C94689FEFA2} = {AA91F0AC-6562-435E-814C-5C94689FEFA2} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtspcore", "libs\openmrcp\rtspcore\rtspcore.2008.vcproj", "{EB751DC4-87BD-4766-B78D-DFB64BA9F988}" + ProjectSection(ProjectDependencies) = postProject + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpmediaframe", "libs\openmrcp\module\mrcpmediaframe\mrcpmediaframe.2008.vcproj", "{9EA22C31-BB7E-4C40-A698-2C6792D1E0C6}" + ProjectSection(ProjectDependencies) = postProject + {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcprtsp", "libs\openmrcp\module\mrcprtsp\mrcprtsp.2008.vcproj", "{CF78E84D-8456-44F2-8197-0E0E88D30A3C}" + ProjectSection(ProjectDependencies) = postProject + {EB751DC4-87BD-4766-B78D-DFB64BA9F988} = {EB751DC4-87BD-4766-B78D-DFB64BA9F988} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "libs\openmrcp\module\mrcpsofiasip\mrcpsofiasip.2008.vcproj", "{819C7242-6184-46FE-BC7B-C7E25C0581EE}" + ProjectSection(ProjectDependencies) = postProject + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} + {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2agent", "libs\openmrcp\module\mrcpv2agent\mrcpv2agent.2008.vcproj", "{FB64EA08-3BC0-48AE-BE4B-74F1024B756E}" + ProjectSection(ProjectDependencies) = postProject + {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmrcpclient", "libs\openmrcp\platform\openmrcpclient\libopenmrcpclient.2008.vcproj", "{A407B661-D7DC-4E30-B268-FFF3296C35E6}" + ProjectSection(ProjectDependencies) = postProject + {CF78E84D-8456-44F2-8197-0E0E88D30A3C} = {CF78E84D-8456-44F2-8197-0E0E88D30A3C} + {819C7242-6184-46FE-BC7B-C7E25C0581EE} = {819C7242-6184-46FE-BC7B-C7E25C0581EE} + {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} + {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} = {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_openmrcp", "src\mod\asr_tts\mod_openmrcp\mod_openmrcp.2008.vcproj", "{E7116F50-2B10-472F-92BD-C8667AA9C1AE}" + ProjectSection(ProjectDependencies) = postProject + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {A407B661-D7DC-4E30-B268-FFF3296C35E6} = {A407B661-D7DC-4E30-B268-FFF3296C35E6} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey_socket\mod_spidermonkey_socket.2008.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}" + ProjectSection(ProjectDependencies) = postProject + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voicemail", "src\mod\applications\mod_voicemail\mod_voicemail.2008.vcproj", "{D7F1E3F2-A3F4-474C-8555-15122571AF52}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_de", "src\mod\say\mod_say_de\mod_say_de.2008.vcproj", "{5BC072DB-3826-48EA-AF34-FE32AA01E83B}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_es", "src\mod\say\mod_say_es\mod_say_es.2008.vcproj", "{FA429E98-8B03-45E6-A096-A4BC5E821DE4}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_fr", "src\mod\say\mod_say_fr\mod_say_fr.2008.vcproj", "{06E3A538-AB32-44F2-B477-755FF9CB5D37}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_it", "src\mod\say\mod_say_it\mod_say_it.2008.vcproj", "{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_nl", "src\mod\say\mod_say_nl\mod_say_nl.2008.vcproj", "{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_fifo", "src\mod\applications\mod_fifo\mod_fifo.2008.vcproj", "{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_limit", "src\mod\applications\mod_limit\mod_limit.2008.vcproj", "{F6A33240-8F29-48BD-98F0-826995911799}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_expr", "src\mod\applications\mod_expr\mod_expr.2008.vcproj", "{65A6273D-FCAB-4C55-B09E-65100141A5D4}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_asterisk", "src\mod\dialplans\mod_dialplan_asterisk\mod_dialplan_asterisk.2008.vcproj", "{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_logfile", "src\mod\loggers\mod_logfile\mod_logfile.2008.vcproj", "{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cdr_csv", "src\mod\event_handlers\mod_cdr_csv\mod_cdr_csv.2008.vcproj", "{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug|Win32.ActiveCfg = Debug|Win32 + {1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug|Win32.Build.0 = Debug|Win32 + {1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Debug|x64.ActiveCfg = Debug|Win32 + {1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release|Win32.ActiveCfg = Release|Win32 + {1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release|Win32.Build.0 = Release|Win32 + {1AF3A893-F7BE-43DD-B697-8AB2397C0D67}.Release|x64.ActiveCfg = Release|Win32 + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug|Win32.ActiveCfg = Debug|Win32 + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug|Win32.Build.0 = Debug|Win32 + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug|x64.ActiveCfg = Debug|Win32 + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|Win32.ActiveCfg = Release|Win32 + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|Win32.Build.0 = Release|Win32 + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|x64.ActiveCfg = Release|Win32 + {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Debug|Win32.ActiveCfg = Debug Passthrough|Win32 + {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Debug|Win32.Build.0 = Debug Passthrough|Win32 + {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Debug|x64.ActiveCfg = Debug|Win32 + {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|Win32.ActiveCfg = Release Passthrough|Win32 + {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|Win32.Build.0 = Release Passthrough|Win32 + {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|x64.ActiveCfg = Release|Win32 + {4926323F-4EA8-4B7D-A3D3-65488725988F}.Debug|Win32.ActiveCfg = Debug|Win32 + {4926323F-4EA8-4B7D-A3D3-65488725988F}.Debug|Win32.Build.0 = Debug|Win32 + {4926323F-4EA8-4B7D-A3D3-65488725988F}.Debug|x64.ActiveCfg = Debug|Win32 + {4926323F-4EA8-4B7D-A3D3-65488725988F}.Release|Win32.ActiveCfg = Release|Win32 + {4926323F-4EA8-4B7D-A3D3-65488725988F}.Release|Win32.Build.0 = Release|Win32 + {4926323F-4EA8-4B7D-A3D3-65488725988F}.Release|x64.ActiveCfg = Release|Win32 + {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Debug|Win32.ActiveCfg = Debug|Win32 + {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Debug|Win32.Build.0 = Debug|Win32 + {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Debug|x64.ActiveCfg = Debug|Win32 + {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|Win32.ActiveCfg = Release|Win32 + {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|Win32.Build.0 = Release|Win32 + {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}.Release|x64.ActiveCfg = Release|Win32 + {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|Win32.ActiveCfg = Debug|Win32 + {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|Win32.Build.0 = Debug|Win32 + {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Debug|x64.ActiveCfg = Debug|Win32 + {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|Win32.ActiveCfg = Release|Win32 + {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|Win32.Build.0 = Release|Win32 + {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}.Release|x64.ActiveCfg = Release|Win32 + {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Debug|Win32.ActiveCfg = Debug|Win32 + {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Debug|Win32.Build.0 = Debug|Win32 + {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Debug|x64.ActiveCfg = Debug|Win32 + {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Release|Win32.ActiveCfg = Release|Win32 + {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Release|Win32.Build.0 = Release|Win32 + {3A5B9131-F20C-4A85-9447-6C1610941CEE}.Release|x64.ActiveCfg = Release|Win32 + {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|Win32.ActiveCfg = Debug|Win32 + {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|Win32.Build.0 = Debug|Win32 + {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Debug|x64.ActiveCfg = Debug|Win32 + {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|Win32.ActiveCfg = Release|Win32 + {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|Win32.Build.0 = Release|Win32 + {5FD31A25-5D83-4794-8BEE-904DAD84CE71}.Release|x64.ActiveCfg = Release|Win32 + {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug|Win32.ActiveCfg = Debug|Win32 + {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug|Win32.Build.0 = Debug|Win32 + {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Debug|x64.ActiveCfg = Debug|Win32 + {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release|Win32.ActiveCfg = Release|Win32 + {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release|Win32.Build.0 = Release|Win32 + {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}.Release|x64.ActiveCfg = Release|Win32 + {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|Win32.ActiveCfg = Debug|Win32 + {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|Win32.Build.0 = Debug|Win32 + {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Debug|x64.ActiveCfg = Debug|Win32 + {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|Win32.ActiveCfg = Release|Win32 + {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|Win32.Build.0 = Release|Win32 + {5580D60E-0F77-4716-9CD4-B8E5986FA375}.Release|x64.ActiveCfg = Release|Win32 + {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.ActiveCfg = Debug|Win32 + {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.Build.0 = Debug|Win32 + {FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|x64.ActiveCfg = Debug|Win32 + {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.ActiveCfg = Release|Win32 + {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.Build.0 = Release|Win32 + {FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|x64.ActiveCfg = Release|Win32 + {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|Win32.ActiveCfg = Debug|Win32 + {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Debug|x64.ActiveCfg = Debug|Win32 + {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Release|Win32.ActiveCfg = Release|Win32 + {1A1FF289-4FD6-4285-A422-D31DD67A4723}.Release|x64.ActiveCfg = Release|Win32 + {07113B25-D3AF-4E04-BA77-4CD1171F022C}.Debug|Win32.ActiveCfg = Debug|Win32 + {07113B25-D3AF-4E04-BA77-4CD1171F022C}.Debug|Win32.Build.0 = Debug|Win32 + {07113B25-D3AF-4E04-BA77-4CD1171F022C}.Debug|x64.ActiveCfg = Debug|Win32 + {07113B25-D3AF-4E04-BA77-4CD1171F022C}.Release|Win32.ActiveCfg = Release|Win32 + {07113B25-D3AF-4E04-BA77-4CD1171F022C}.Release|Win32.Build.0 = Release|Win32 + {07113B25-D3AF-4E04-BA77-4CD1171F022C}.Release|x64.ActiveCfg = Release|Win32 + {B17FFBE6-A942-4056-8346-B624FB5D995B}.Debug|Win32.ActiveCfg = Debug + {B17FFBE6-A942-4056-8346-B624FB5D995B}.Debug|x64.ActiveCfg = Debug with MySql + {B17FFBE6-A942-4056-8346-B624FB5D995B}.Debug|x64.Build.0 = Debug with MySql + {B17FFBE6-A942-4056-8346-B624FB5D995B}.Release|Win32.ActiveCfg = Release + {B17FFBE6-A942-4056-8346-B624FB5D995B}.Release|x64.ActiveCfg = Release with MySql + {B17FFBE6-A942-4056-8346-B624FB5D995B}.Release|x64.Build.0 = Release with MySql + {EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Debug|Win32.ActiveCfg = Debug MS-LDAP|Win32 + {EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Debug|Win32.Build.0 = Debug MS-LDAP|Win32 + {EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Debug|x64.ActiveCfg = Debug|Win32 + {EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Release|Win32.ActiveCfg = Release MS-LDAP|Win32 + {EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Release|Win32.Build.0 = Release MS-LDAP|Win32 + {EC3E5C7F-EE09-47E2-80FE-546363D14A98}.Release|x64.ActiveCfg = Release|Win32 + {A27CCA23-1541-4337-81A4-F0A6413078A0}.Debug|Win32.ActiveCfg = Debug|Win32 + {A27CCA23-1541-4337-81A4-F0A6413078A0}.Debug|Win32.Build.0 = Debug|Win32 + {A27CCA23-1541-4337-81A4-F0A6413078A0}.Debug|x64.ActiveCfg = Debug|Win32 + {A27CCA23-1541-4337-81A4-F0A6413078A0}.Release|Win32.ActiveCfg = Release|Win32 + {A27CCA23-1541-4337-81A4-F0A6413078A0}.Release|Win32.Build.0 = Release|Win32 + {A27CCA23-1541-4337-81A4-F0A6413078A0}.Release|x64.ActiveCfg = Release|Win32 + {C7705DC4-2088-493E-AF8D-65BC6D65C125}.Debug|Win32.ActiveCfg = Debug|Win32 + {C7705DC4-2088-493E-AF8D-65BC6D65C125}.Debug|Win32.Build.0 = Debug|Win32 + {C7705DC4-2088-493E-AF8D-65BC6D65C125}.Debug|x64.ActiveCfg = Debug|Win32 + {C7705DC4-2088-493E-AF8D-65BC6D65C125}.Release|Win32.ActiveCfg = Release|Win32 + {C7705DC4-2088-493E-AF8D-65BC6D65C125}.Release|Win32.Build.0 = Release|Win32 + {C7705DC4-2088-493E-AF8D-65BC6D65C125}.Release|x64.ActiveCfg = Release|Win32 + {784113EF-44D9-4949-835D-7065D3C7AD08}.Debug|Win32.ActiveCfg = Debug|Win32 + {784113EF-44D9-4949-835D-7065D3C7AD08}.Debug|Win32.Build.0 = Debug|Win32 + {784113EF-44D9-4949-835D-7065D3C7AD08}.Debug|x64.ActiveCfg = Debug|Win32 + {784113EF-44D9-4949-835D-7065D3C7AD08}.Release|Win32.ActiveCfg = Release|Win32 + {784113EF-44D9-4949-835D-7065D3C7AD08}.Release|Win32.Build.0 = Release|Win32 + {784113EF-44D9-4949-835D-7065D3C7AD08}.Release|x64.ActiveCfg = Release|Win32 + {89385C74-5860-4174-9CAF-A39E7C48909C}.Debug|Win32.ActiveCfg = Debug|Win32 + {89385C74-5860-4174-9CAF-A39E7C48909C}.Debug|Win32.Build.0 = Debug|Win32 + {89385C74-5860-4174-9CAF-A39E7C48909C}.Debug|x64.ActiveCfg = Debug|Win32 + {89385C74-5860-4174-9CAF-A39E7C48909C}.Release|Win32.ActiveCfg = Release|Win32 + {89385C74-5860-4174-9CAF-A39E7C48909C}.Release|Win32.Build.0 = Release|Win32 + {89385C74-5860-4174-9CAF-A39E7C48909C}.Release|x64.ActiveCfg = Release|Win32 + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.ActiveCfg = Debug|Win32 + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.Build.0 = Debug|Win32 + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64.ActiveCfg = Debug|Win32 + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.ActiveCfg = Release|Win32 + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.Build.0 = Release|Win32 + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64.ActiveCfg = Release|Win32 + {692F6330-4D87-4C82-81DF-40DB5892636E}.Debug|Win32.ActiveCfg = Debug|Win32 + {692F6330-4D87-4C82-81DF-40DB5892636E}.Debug|x64.ActiveCfg = Debug|Win32 + {692F6330-4D87-4C82-81DF-40DB5892636E}.Release|Win32.ActiveCfg = Release|Win32 + {692F6330-4D87-4C82-81DF-40DB5892636E}.Release|x64.ActiveCfg = Release|Win32 + {D3EC0AFF-76FC-4210-A825-9A17410660A3}.Debug|Win32.ActiveCfg = Debug|Win32 + {D3EC0AFF-76FC-4210-A825-9A17410660A3}.Debug|Win32.Build.0 = Debug|Win32 + {D3EC0AFF-76FC-4210-A825-9A17410660A3}.Debug|x64.ActiveCfg = Debug|Win32 + {D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|Win32.ActiveCfg = Release|Win32 + {D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|Win32.Build.0 = Release|Win32 + {D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|x64.ActiveCfg = Release|Win32 + {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|Win32.ActiveCfg = Debug|Win32 + {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|Win32.Build.0 = Debug|Win32 + {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|x64.ActiveCfg = Debug|Win32 + {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|Win32.ActiveCfg = Release|Win32 + {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|Win32.Build.0 = Release|Win32 + {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|x64.ActiveCfg = Release|Win32 + {30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Debug|Win32.ActiveCfg = Debug|Win32 + {30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Debug|Win32.Build.0 = Debug|Win32 + {30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Debug|x64.ActiveCfg = Debug|Win32 + {30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Release|Win32.ActiveCfg = Release|Win32 + {30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Release|Win32.Build.0 = Release|Win32 + {30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.Release|x64.ActiveCfg = Release|Win32 + {1C453396-D912-4213-89FD-9B489162B7B5}.Debug|Win32.ActiveCfg = Debug|Win32 + {1C453396-D912-4213-89FD-9B489162B7B5}.Debug|Win32.Build.0 = Debug|Win32 + {1C453396-D912-4213-89FD-9B489162B7B5}.Debug|x64.ActiveCfg = Debug|Win32 + {1C453396-D912-4213-89FD-9B489162B7B5}.Release|Win32.ActiveCfg = Release|Win32 + {1C453396-D912-4213-89FD-9B489162B7B5}.Release|Win32.Build.0 = Release|Win32 + {1C453396-D912-4213-89FD-9B489162B7B5}.Release|x64.ActiveCfg = Release|Win32 + {CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Debug|Win32.ActiveCfg = Debug|Win32 + {CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Debug|Win32.Build.0 = Debug|Win32 + {CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Debug|x64.ActiveCfg = Debug|Win32 + {CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|Win32.ActiveCfg = Release|Win32 + {CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|Win32.Build.0 = Release|Win32 + {CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|x64.ActiveCfg = Release|Win32 + {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|Win32.ActiveCfg = Debug|Win32 + {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|Win32.Build.0 = Debug|Win32 + {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|x64.ActiveCfg = Debug|Win32 + {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|Win32.ActiveCfg = Release|Win32 + {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|Win32.Build.0 = Release|Win32 + {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|x64.ActiveCfg = Release|Win32 + {C24FB505-05D7-4319-8485-7540B44C8603}.Debug|Win32.ActiveCfg = Debug|Win32 + {C24FB505-05D7-4319-8485-7540B44C8603}.Debug|Win32.Build.0 = Debug|Win32 + {C24FB505-05D7-4319-8485-7540B44C8603}.Debug|x64.ActiveCfg = Debug|Win32 + {C24FB505-05D7-4319-8485-7540B44C8603}.Release|Win32.ActiveCfg = Release|Win32 + {C24FB505-05D7-4319-8485-7540B44C8603}.Release|Win32.Build.0 = Release|Win32 + {C24FB505-05D7-4319-8485-7540B44C8603}.Release|x64.ActiveCfg = Release|Win32 + {B5881A85-FE70-4F64-8607-2CAAE52669C6}.Debug|Win32.ActiveCfg = Debug|Win32 + {B5881A85-FE70-4F64-8607-2CAAE52669C6}.Debug|Win32.Build.0 = Debug|Win32 + {B5881A85-FE70-4F64-8607-2CAAE52669C6}.Debug|x64.ActiveCfg = Debug|Win32 + {B5881A85-FE70-4F64-8607-2CAAE52669C6}.Release|Win32.ActiveCfg = Release|Win32 + {B5881A85-FE70-4F64-8607-2CAAE52669C6}.Release|Win32.Build.0 = Release|Win32 + {B5881A85-FE70-4F64-8607-2CAAE52669C6}.Release|x64.ActiveCfg = Release|Win32 + {05515420-16DE-4E63-BE73-85BE85BA5142}.Debug|Win32.ActiveCfg = Debug|Win32 + {05515420-16DE-4E63-BE73-85BE85BA5142}.Debug|Win32.Build.0 = Debug|Win32 + {05515420-16DE-4E63-BE73-85BE85BA5142}.Debug|x64.ActiveCfg = Debug|Win32 + {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.ActiveCfg = Release|Win32 + {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.Build.0 = Release|Win32 + {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|x64.ActiveCfg = Release|Win32 + {8FD2E297-4096-47E5-9258-C48FF1841523}.Debug|Win32.ActiveCfg = Debug|Win32 + {8FD2E297-4096-47E5-9258-C48FF1841523}.Debug|Win32.Build.0 = Debug|Win32 + {8FD2E297-4096-47E5-9258-C48FF1841523}.Debug|x64.ActiveCfg = Debug|Win32 + {8FD2E297-4096-47E5-9258-C48FF1841523}.Release|Win32.ActiveCfg = Release|Win32 + {8FD2E297-4096-47E5-9258-C48FF1841523}.Release|Win32.Build.0 = Release|Win32 + {8FD2E297-4096-47E5-9258-C48FF1841523}.Release|x64.ActiveCfg = Release|Win32 + {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Debug|Win32.ActiveCfg = Debug|Win32 + {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Debug|Win32.Build.0 = Debug|Win32 + {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Debug|x64.ActiveCfg = Debug|Win32 + {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Release|Win32.ActiveCfg = Release|Win32 + {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Release|Win32.Build.0 = Release|Win32 + {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Release|x64.ActiveCfg = Release|Win32 + {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.ActiveCfg = Debug|Win32 + {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.Build.0 = Debug|Win32 + {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|x64.ActiveCfg = Debug|Win32 + {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.ActiveCfg = Release|Win32 + {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.Build.0 = Release|Win32 + {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|x64.ActiveCfg = Release|Win32 + {1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.ActiveCfg = Debug|Win32 + {1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.Build.0 = Debug|Win32 + {1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|x64.ActiveCfg = Debug|Win32 + {1906D736-08BD-4EE1-924F-B536249B9A54}.Release|Win32.ActiveCfg = Release|Win32 + {1906D736-08BD-4EE1-924F-B536249B9A54}.Release|Win32.Build.0 = Release|Win32 + {1906D736-08BD-4EE1-924F-B536249B9A54}.Release|x64.ActiveCfg = Release|Win32 + {EEF031CB-FED8-451E-A471-91EC8D4F6750}.Debug|Win32.ActiveCfg = Debug|Win32 + {EEF031CB-FED8-451E-A471-91EC8D4F6750}.Debug|Win32.Build.0 = Debug|Win32 + {EEF031CB-FED8-451E-A471-91EC8D4F6750}.Debug|x64.ActiveCfg = Debug|Win32 + {EEF031CB-FED8-451E-A471-91EC8D4F6750}.Release|Win32.ActiveCfg = Release|Win32 + {EEF031CB-FED8-451E-A471-91EC8D4F6750}.Release|Win32.Build.0 = Release|Win32 + {EEF031CB-FED8-451E-A471-91EC8D4F6750}.Release|x64.ActiveCfg = Release|Win32 + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Debug|Win32.ActiveCfg = Debug|Win32 + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Debug|Win32.Build.0 = Debug|Win32 + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Debug|x64.ActiveCfg = Debug|Win32 + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Release|Win32.ActiveCfg = Release|Win32 + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Release|Win32.Build.0 = Release|Win32 + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}.Release|x64.ActiveCfg = Release|Win32 + {8D04B550-D240-4A44-8A18-35DA3F7038D9}.Debug|Win32.ActiveCfg = Debug|Win32 + {8D04B550-D240-4A44-8A18-35DA3F7038D9}.Debug|Win32.Build.0 = Debug|Win32 + {8D04B550-D240-4A44-8A18-35DA3F7038D9}.Debug|x64.ActiveCfg = Debug|Win32 + {8D04B550-D240-4A44-8A18-35DA3F7038D9}.Release|Win32.ActiveCfg = Release|Win32 + {8D04B550-D240-4A44-8A18-35DA3F7038D9}.Release|Win32.Build.0 = Release|Win32 + {8D04B550-D240-4A44-8A18-35DA3F7038D9}.Release|x64.ActiveCfg = Release|Win32 + {1CED5987-A529-46DC-B30F-870D85FF9C94}.Debug|Win32.ActiveCfg = Debug|Win32 + {1CED5987-A529-46DC-B30F-870D85FF9C94}.Debug|Win32.Build.0 = Debug|Win32 + {1CED5987-A529-46DC-B30F-870D85FF9C94}.Debug|x64.ActiveCfg = Debug|Win32 + {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.ActiveCfg = Release|Win32 + {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.Build.0 = Release|Win32 + {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|x64.ActiveCfg = Release|Win32 + {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Debug|Win32.ActiveCfg = Debug|Win32 + {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Debug|Win32.Build.0 = Debug|Win32 + {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Debug|x64.ActiveCfg = Debug|Win32 + {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Release|Win32.ActiveCfg = Release|Win32 + {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Release|Win32.Build.0 = Release|Win32 + {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Release|x64.ActiveCfg = Release|Win32 + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|Win32.ActiveCfg = Debug|Win32 + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|Win32.Build.0 = Debug|Win32 + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|x64.ActiveCfg = Debug|Win32 + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|Win32.ActiveCfg = Release|Win32 + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|Win32.Build.0 = Release|Win32 + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|x64.ActiveCfg = Release|Win32 + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Debug|Win32.ActiveCfg = Debug|Win32 + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Debug|Win32.Build.0 = Debug|Win32 + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Debug|x64.ActiveCfg = Debug|Win32 + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Release|Win32.ActiveCfg = Release|Win32 + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Release|Win32.Build.0 = Release|Win32 + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Release|x64.ActiveCfg = Release|Win32 + {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.ActiveCfg = Debug|Win32 + {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.Build.0 = Debug|Win32 + {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|x64.ActiveCfg = Debug|Win32 + {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.ActiveCfg = Release|Win32 + {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.Build.0 = Release|Win32 + {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|x64.ActiveCfg = Release|Win32 + {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Debug|Win32.ActiveCfg = Debug|Win32 + {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Debug|Win32.Build.0 = Debug|Win32 + {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Debug|x64.ActiveCfg = Debug|Win32 + {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Release|Win32.ActiveCfg = Release|Win32 + {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Release|Win32.Build.0 = Release|Win32 + {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Release|x64.ActiveCfg = Release|Win32 + {E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|Win32.ActiveCfg = Debug|Win32 + {E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|Win32.Build.0 = Debug|Win32 + {E727E8F6-935D-46FE-8B0E-37834748A0E3}.Debug|x64.ActiveCfg = Debug|Win32 + {E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|Win32.ActiveCfg = Release|Win32 + {E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|Win32.Build.0 = Release|Win32 + {E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|x64.ActiveCfg = Release|Win32 + {5927104D-C14C-4AC8-925C-4AB681762E75}.Debug|Win32.ActiveCfg = Debug|Win32 + {5927104D-C14C-4AC8-925C-4AB681762E75}.Debug|Win32.Build.0 = Debug|Win32 + {5927104D-C14C-4AC8-925C-4AB681762E75}.Debug|x64.ActiveCfg = Debug|Win32 + {5927104D-C14C-4AC8-925C-4AB681762E75}.Release|Win32.ActiveCfg = Release|Win32 + {5927104D-C14C-4AC8-925C-4AB681762E75}.Release|Win32.Build.0 = Release|Win32 + {5927104D-C14C-4AC8-925C-4AB681762E75}.Release|x64.ActiveCfg = Release|Win32 + {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}.Debug|Win32.ActiveCfg = Debug|Win32 + {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}.Debug|Win32.Build.0 = Debug|Win32 + {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}.Debug|x64.ActiveCfg = Debug|Win32 + {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}.Release|Win32.ActiveCfg = Release|Win32 + {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}.Release|Win32.Build.0 = Release|Win32 + {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}.Release|x64.ActiveCfg = Release|Win32 + {49C34584-B6DA-448F-83CF-27584DC9FC90}.Debug|Win32.ActiveCfg = Debug|Win32 + {49C34584-B6DA-448F-83CF-27584DC9FC90}.Debug|Win32.Build.0 = Debug|Win32 + {49C34584-B6DA-448F-83CF-27584DC9FC90}.Debug|x64.ActiveCfg = Debug|Win32 + {49C34584-B6DA-448F-83CF-27584DC9FC90}.Release|Win32.ActiveCfg = Release|Win32 + {49C34584-B6DA-448F-83CF-27584DC9FC90}.Release|Win32.Build.0 = Release|Win32 + {49C34584-B6DA-448F-83CF-27584DC9FC90}.Release|x64.ActiveCfg = Release|Win32 + {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Debug|Win32.ActiveCfg = Debug|Win32 + {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Debug|Win32.Build.0 = Debug|Win32 + {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Debug|x64.ActiveCfg = Debug|Win32 + {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|Win32.ActiveCfg = Release|Win32 + {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|Win32.Build.0 = Release|Win32 + {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|x64.ActiveCfg = Release|Win32 + {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|Win32.ActiveCfg = Debug|Win32 + {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|Win32.Build.0 = Debug|Win32 + {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|x64.ActiveCfg = Debug|Win32 + {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|Win32.ActiveCfg = Release|Win32 + {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|Win32.Build.0 = Release|Win32 + {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|x64.ActiveCfg = Release|Win32 + {A3FE0076-B366-429D-A238-D7304DA7D3C1}.Debug|Win32.ActiveCfg = Debug|Win32 + {A3FE0076-B366-429D-A238-D7304DA7D3C1}.Debug|Win32.Build.0 = Debug|Win32 + {A3FE0076-B366-429D-A238-D7304DA7D3C1}.Debug|x64.ActiveCfg = Debug|Win32 + {A3FE0076-B366-429D-A238-D7304DA7D3C1}.Release|Win32.ActiveCfg = Release|Win32 + {A3FE0076-B366-429D-A238-D7304DA7D3C1}.Release|Win32.Build.0 = Release|Win32 + {A3FE0076-B366-429D-A238-D7304DA7D3C1}.Release|x64.ActiveCfg = Release|Win32 + {356EC96D-4C9F-47B5-9083-FC328B87BA94}.Debug|Win32.ActiveCfg = Debug|Win32 + {356EC96D-4C9F-47B5-9083-FC328B87BA94}.Debug|Win32.Build.0 = Debug|Win32 + {356EC96D-4C9F-47B5-9083-FC328B87BA94}.Debug|x64.ActiveCfg = Debug|Win32 + {356EC96D-4C9F-47B5-9083-FC328B87BA94}.Release|Win32.ActiveCfg = Release|Win32 + {356EC96D-4C9F-47B5-9083-FC328B87BA94}.Release|Win32.Build.0 = Release|Win32 + {356EC96D-4C9F-47B5-9083-FC328B87BA94}.Release|x64.ActiveCfg = Release|Win32 + {155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|Win32.ActiveCfg = Debug|Win32 + {155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|Win32.Build.0 = Debug|Win32 + {155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|x64.ActiveCfg = Debug|Win32 + {155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|Win32.ActiveCfg = Release|Win32 + {155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|Win32.Build.0 = Release|Win32 + {155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.ActiveCfg = Release|Win32 + {204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.ActiveCfg = Debug|Win32 + {204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|Win32.Build.0 = Debug|Win32 + {204FA0DE-305D-4414-AE2E-F195A23F390D}.Debug|x64.ActiveCfg = Debug|Win32 + {204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.ActiveCfg = Release|Win32 + {204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|Win32.Build.0 = Release|Win32 + {204FA0DE-305D-4414-AE2E-F195A23F390D}.Release|x64.ActiveCfg = Release|Win32 + {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Debug|Win32.ActiveCfg = Debug|Win32 + {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Debug|Win32.Build.0 = Debug|Win32 + {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Debug|x64.ActiveCfg = Debug|Win32 + {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.ActiveCfg = Release|Win32 + {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.Build.0 = Release|Win32 + {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|x64.ActiveCfg = Release|Win32 + {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Debug|Win32.ActiveCfg = Debug|Win32 + {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Debug|Win32.Build.0 = Debug|Win32 + {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Debug|x64.ActiveCfg = Debug|Win32 + {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Release|Win32.ActiveCfg = Release|Win32 + {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Release|Win32.Build.0 = Release|Win32 + {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Release|x64.ActiveCfg = Release|Win32 + {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Debug|Win32.ActiveCfg = Debug|Win32 + {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Debug|Win32.Build.0 = Debug|Win32 + {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Debug|x64.ActiveCfg = Debug|Win32 + {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Release|Win32.ActiveCfg = Release|Win32 + {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Release|Win32.Build.0 = Release|Win32 + {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Release|x64.ActiveCfg = Release|Win32 + {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Debug|Win32.ActiveCfg = Debug|Win32 + {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Debug|Win32.Build.0 = Debug|Win32 + {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Debug|x64.ActiveCfg = Debug|Win32 + {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Release|Win32.ActiveCfg = Release|Win32 + {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Release|Win32.Build.0 = Release|Win32 + {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}.Release|x64.ActiveCfg = Release|Win32 + {D42518CC-7475-454D-B392-0E132C07D761}.Debug|Win32.ActiveCfg = Debug|Win32 + {D42518CC-7475-454D-B392-0E132C07D761}.Debug|Win32.Build.0 = Debug|Win32 + {D42518CC-7475-454D-B392-0E132C07D761}.Debug|x64.ActiveCfg = Debug|Win32 + {D42518CC-7475-454D-B392-0E132C07D761}.Release|Win32.ActiveCfg = Release|Win32 + {D42518CC-7475-454D-B392-0E132C07D761}.Release|Win32.Build.0 = Release|Win32 + {D42518CC-7475-454D-B392-0E132C07D761}.Release|x64.ActiveCfg = Release|Win32 + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.ActiveCfg = Debug|Win32 + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|Win32.Build.0 = Debug|Win32 + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Debug|x64.ActiveCfg = Debug|Win32 + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Release|Win32.ActiveCfg = Release|Win32 + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Release|Win32.Build.0 = Release|Win32 + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0}.Release|x64.ActiveCfg = Release|Win32 + {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|Win32.ActiveCfg = Debug|Win32 + {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|Win32.Build.0 = Debug|Win32 + {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Debug|x64.ActiveCfg = Debug|Win32 + {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|Win32.ActiveCfg = Release|Win32 + {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|Win32.Build.0 = Release|Win32 + {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}.Release|x64.ActiveCfg = Release|Win32 + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.ActiveCfg = Debug DLL|Win32 + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|Win32.Build.0 = Debug DLL|Win32 + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Debug|x64.ActiveCfg = Debug DLL|Win32 + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Release|Win32.ActiveCfg = Release DLL|Win32 + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Release|Win32.Build.0 = Release DLL|Win32 + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}.Release|x64.ActiveCfg = Release|Win32 + {FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Debug|Win32.ActiveCfg = Debug Passthrough|Win32 + {FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Debug|Win32.Build.0 = Debug Passthrough|Win32 + {FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Debug|x64.ActiveCfg = Debug|Win32 + {FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|Win32.ActiveCfg = Release Passthrough|Win32 + {FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|Win32.Build.0 = Release Passthrough|Win32 + {FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|x64.ActiveCfg = Release|Win32 + {9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Debug|Win32.ActiveCfg = Debug|Win32 + {9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Debug|Win32.Build.0 = Debug|Win32 + {9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Debug|x64.ActiveCfg = Debug|Win32 + {9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|Win32.ActiveCfg = Release|Win32 + {9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|Win32.Build.0 = Release|Win32 + {9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.Release|x64.ActiveCfg = Release|Win32 + {ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.ActiveCfg = Debug|Win32 + {ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.Build.0 = Debug|Win32 + {ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64.ActiveCfg = Debug|Win32 + {ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.ActiveCfg = Release|Win32 + {ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.Build.0 = Release|Win32 + {ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64.ActiveCfg = Release|Win32 + {8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.ActiveCfg = Debug|Win32 + {8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.Build.0 = Debug|Win32 + {8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64.ActiveCfg = Debug|Win32 + {8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.ActiveCfg = Release|Win32 + {8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.Build.0 = Release|Win32 + {8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64.ActiveCfg = Release|Win32 + {4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Debug|Win32.ActiveCfg = Debug|Win32 + {4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Debug|Win32.Build.0 = Debug|Win32 + {4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Debug|x64.ActiveCfg = Debug|Win32 + {4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Release|Win32.ActiveCfg = Release|Win32 + {4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Release|Win32.Build.0 = Release|Win32 + {4043FC6A-9A30-4577-8AD5-9B233C9575D8}.Release|x64.ActiveCfg = Release|Win32 + {71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Debug|Win32.ActiveCfg = Debug|Win32 + {71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Debug|Win32.Build.0 = Debug|Win32 + {71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Debug|x64.ActiveCfg = Debug|Win32 + {71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|Win32.ActiveCfg = Release|Win32 + {71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|Win32.Build.0 = Release|Win32 + {71A967D5-0E99-4CEF-A587-98836EE6F2EF}.Release|x64.ActiveCfg = Release|Win32 + {0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.ActiveCfg = Debug|Win32 + {0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.Build.0 = Debug|Win32 + {0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64.ActiveCfg = Debug|Win32 + {0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.ActiveCfg = Release|Win32 + {0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.Build.0 = Release|Win32 + {0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64.ActiveCfg = Release|Win32 + {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|Win32.ActiveCfg = Debug|Win32 + {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|Win32.Build.0 = Debug|Win32 + {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|x64.ActiveCfg = Debug|Win32 + {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|Win32.ActiveCfg = Release|Win32 + {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|Win32.Build.0 = Release|Win32 + {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|x64.ActiveCfg = Release|Win32 + {988CACF7-3FCB-4992-BE69-77872AE67DC8}.Debug|Win32.ActiveCfg = Debug|Win32 + {988CACF7-3FCB-4992-BE69-77872AE67DC8}.Debug|Win32.Build.0 = Debug|Win32 + {988CACF7-3FCB-4992-BE69-77872AE67DC8}.Debug|x64.ActiveCfg = Debug|Win32 + {988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|Win32.ActiveCfg = Release|Win32 + {988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|Win32.Build.0 = Release|Win32 + {988CACF7-3FCB-4992-BE69-77872AE67DC8}.Release|x64.ActiveCfg = Release|Win32 + {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.ActiveCfg = Debug|Win32 + {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.Build.0 = Debug|Win32 + {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.ActiveCfg = Debug|Win32 + {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.ActiveCfg = Release|Win32 + {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|Win32.Build.0 = Release|Win32 + {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.ActiveCfg = Release|Win32 + {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Debug|Win32.ActiveCfg = Debug|Win32 + {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Debug|Win32.Build.0 = Debug|Win32 + {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Debug|x64.ActiveCfg = Debug|Win32 + {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Release|Win32.ActiveCfg = Release|Win32 + {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Release|Win32.Build.0 = Release|Win32 + {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}.Release|x64.ActiveCfg = Release|Win32 + {8DEB383C-4091-4F42-A56F-C9E46D552D79}.Debug|Win32.ActiveCfg = Debug Passthrough|Win32 + {8DEB383C-4091-4F42-A56F-C9E46D552D79}.Debug|Win32.Build.0 = Debug Passthrough|Win32 + {8DEB383C-4091-4F42-A56F-C9E46D552D79}.Debug|x64.ActiveCfg = Debug|Win32 + {8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|Win32.ActiveCfg = Release Passthrough|Win32 + {8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|Win32.Build.0 = Release Passthrough|Win32 + {8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|x64.ActiveCfg = Release|Win32 + {2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|Win32.ActiveCfg = Debug|Win32 + {2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|Win32.Build.0 = Debug|Win32 + {2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|x64.ActiveCfg = Debug|Win32 + {2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|Win32.ActiveCfg = Release|Win32 + {2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|Win32.Build.0 = Release|Win32 + {2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|x64.ActiveCfg = Release|Win32 + {3850D93A-5F24-4922-BC1C-74D08C37C256}.Debug|Win32.ActiveCfg = Debug|Win32 + {3850D93A-5F24-4922-BC1C-74D08C37C256}.Debug|Win32.Build.0 = Debug|Win32 + {3850D93A-5F24-4922-BC1C-74D08C37C256}.Debug|x64.ActiveCfg = Debug|Win32 + {3850D93A-5F24-4922-BC1C-74D08C37C256}.Release|Win32.ActiveCfg = Release|Win32 + {3850D93A-5F24-4922-BC1C-74D08C37C256}.Release|Win32.Build.0 = Release|Win32 + {3850D93A-5F24-4922-BC1C-74D08C37C256}.Release|x64.ActiveCfg = Release|Win32 + {2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Debug|Win32.ActiveCfg = Debug|Win32 + {2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Debug|Win32.Build.0 = Debug|Win32 + {2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Debug|x64.ActiveCfg = Debug|Win32 + {2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|Win32.ActiveCfg = Release|Win32 + {2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|Win32.Build.0 = Release|Win32 + {2CA40887-1622-46A1-A7F9-17FD7E7E545B}.Release|x64.ActiveCfg = Release|Win32 + {AA91F0AC-6562-435E-814C-5C94689FEFA2}.Debug|Win32.ActiveCfg = Debug|Win32 + {AA91F0AC-6562-435E-814C-5C94689FEFA2}.Debug|Win32.Build.0 = Debug|Win32 + {AA91F0AC-6562-435E-814C-5C94689FEFA2}.Debug|x64.ActiveCfg = Debug|Win32 + {AA91F0AC-6562-435E-814C-5C94689FEFA2}.Release|Win32.ActiveCfg = Release|Win32 + {AA91F0AC-6562-435E-814C-5C94689FEFA2}.Release|Win32.Build.0 = Release|Win32 + {AA91F0AC-6562-435E-814C-5C94689FEFA2}.Release|x64.ActiveCfg = Release|Win32 + {829A9309-3B94-43C0-846B-7EC9D6D35F8B}.Debug|Win32.ActiveCfg = Debug|Win32 + {829A9309-3B94-43C0-846B-7EC9D6D35F8B}.Debug|Win32.Build.0 = Debug|Win32 + {829A9309-3B94-43C0-846B-7EC9D6D35F8B}.Debug|x64.ActiveCfg = Debug|Win32 + {829A9309-3B94-43C0-846B-7EC9D6D35F8B}.Release|Win32.ActiveCfg = Release|Win32 + {829A9309-3B94-43C0-846B-7EC9D6D35F8B}.Release|Win32.Build.0 = Release|Win32 + {829A9309-3B94-43C0-846B-7EC9D6D35F8B}.Release|x64.ActiveCfg = Release|Win32 + {EB751DC4-87BD-4766-B78D-DFB64BA9F988}.Debug|Win32.ActiveCfg = Debug|Win32 + {EB751DC4-87BD-4766-B78D-DFB64BA9F988}.Debug|Win32.Build.0 = Debug|Win32 + {EB751DC4-87BD-4766-B78D-DFB64BA9F988}.Debug|x64.ActiveCfg = Debug|Win32 + {EB751DC4-87BD-4766-B78D-DFB64BA9F988}.Release|Win32.ActiveCfg = Release|Win32 + {EB751DC4-87BD-4766-B78D-DFB64BA9F988}.Release|Win32.Build.0 = Release|Win32 + {EB751DC4-87BD-4766-B78D-DFB64BA9F988}.Release|x64.ActiveCfg = Release|Win32 + {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6}.Debug|Win32.ActiveCfg = Debug|Win32 + {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6}.Debug|Win32.Build.0 = Debug|Win32 + {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6}.Debug|x64.ActiveCfg = Debug|Win32 + {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6}.Release|Win32.ActiveCfg = Release|Win32 + {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6}.Release|Win32.Build.0 = Release|Win32 + {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6}.Release|x64.ActiveCfg = Release|Win32 + {CF78E84D-8456-44F2-8197-0E0E88D30A3C}.Debug|Win32.ActiveCfg = Debug Static|Win32 + {CF78E84D-8456-44F2-8197-0E0E88D30A3C}.Debug|Win32.Build.0 = Debug Static|Win32 + {CF78E84D-8456-44F2-8197-0E0E88D30A3C}.Debug|x64.ActiveCfg = Debug|Win32 + {CF78E84D-8456-44F2-8197-0E0E88D30A3C}.Release|Win32.ActiveCfg = Release Static|Win32 + {CF78E84D-8456-44F2-8197-0E0E88D30A3C}.Release|Win32.Build.0 = Release Static|Win32 + {CF78E84D-8456-44F2-8197-0E0E88D30A3C}.Release|x64.ActiveCfg = Release|Win32 + {819C7242-6184-46FE-BC7B-C7E25C0581EE}.Debug|Win32.ActiveCfg = Debug Static|Win32 + {819C7242-6184-46FE-BC7B-C7E25C0581EE}.Debug|Win32.Build.0 = Debug Static|Win32 + {819C7242-6184-46FE-BC7B-C7E25C0581EE}.Debug|x64.ActiveCfg = Debug|Win32 + {819C7242-6184-46FE-BC7B-C7E25C0581EE}.Release|Win32.ActiveCfg = Release Static|Win32 + {819C7242-6184-46FE-BC7B-C7E25C0581EE}.Release|Win32.Build.0 = Release Static|Win32 + {819C7242-6184-46FE-BC7B-C7E25C0581EE}.Release|x64.ActiveCfg = Release|Win32 + {FB64EA08-3BC0-48AE-BE4B-74F1024B756E}.Debug|Win32.ActiveCfg = Debug|Win32 + {FB64EA08-3BC0-48AE-BE4B-74F1024B756E}.Debug|Win32.Build.0 = Debug|Win32 + {FB64EA08-3BC0-48AE-BE4B-74F1024B756E}.Debug|x64.ActiveCfg = Debug|Win32 + {FB64EA08-3BC0-48AE-BE4B-74F1024B756E}.Release|Win32.ActiveCfg = Release|Win32 + {FB64EA08-3BC0-48AE-BE4B-74F1024B756E}.Release|Win32.Build.0 = Release|Win32 + {FB64EA08-3BC0-48AE-BE4B-74F1024B756E}.Release|x64.ActiveCfg = Release|Win32 + {A407B661-D7DC-4E30-B268-FFF3296C35E6}.Debug|Win32.ActiveCfg = Debug|Win32 + {A407B661-D7DC-4E30-B268-FFF3296C35E6}.Debug|Win32.Build.0 = Debug|Win32 + {A407B661-D7DC-4E30-B268-FFF3296C35E6}.Debug|x64.ActiveCfg = Debug|Win32 + {A407B661-D7DC-4E30-B268-FFF3296C35E6}.Release|Win32.ActiveCfg = Release|Win32 + {A407B661-D7DC-4E30-B268-FFF3296C35E6}.Release|Win32.Build.0 = Release|Win32 + {A407B661-D7DC-4E30-B268-FFF3296C35E6}.Release|x64.ActiveCfg = Release|Win32 + {E7116F50-2B10-472F-92BD-C8667AA9C1AE}.Debug|Win32.ActiveCfg = Debug|Win32 + {E7116F50-2B10-472F-92BD-C8667AA9C1AE}.Debug|Win32.Build.0 = Debug|Win32 + {E7116F50-2B10-472F-92BD-C8667AA9C1AE}.Debug|x64.ActiveCfg = Debug|Win32 + {E7116F50-2B10-472F-92BD-C8667AA9C1AE}.Release|Win32.ActiveCfg = Release|Win32 + {E7116F50-2B10-472F-92BD-C8667AA9C1AE}.Release|Win32.Build.0 = Release|Win32 + {E7116F50-2B10-472F-92BD-C8667AA9C1AE}.Release|x64.ActiveCfg = Release|Win32 + {028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.ActiveCfg = Debug|Win32 + {028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.Build.0 = Debug|Win32 + {028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64.ActiveCfg = Debug|Win32 + {028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.ActiveCfg = Release|Win32 + {028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.Build.0 = Release|Win32 + {028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64.ActiveCfg = Release|Win32 + {D7F1E3F2-A3F4-474C-8555-15122571AF52}.Debug|Win32.ActiveCfg = Debug|Win32 + {D7F1E3F2-A3F4-474C-8555-15122571AF52}.Debug|Win32.Build.0 = Debug|Win32 + {D7F1E3F2-A3F4-474C-8555-15122571AF52}.Debug|x64.ActiveCfg = Debug|Win32 + {D7F1E3F2-A3F4-474C-8555-15122571AF52}.Release|Win32.ActiveCfg = Release|Win32 + {D7F1E3F2-A3F4-474C-8555-15122571AF52}.Release|Win32.Build.0 = Release|Win32 + {D7F1E3F2-A3F4-474C-8555-15122571AF52}.Release|x64.ActiveCfg = Release|Win32 + {5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Debug|Win32.ActiveCfg = Debug|Win32 + {5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Debug|Win32.Build.0 = Debug|Win32 + {5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Debug|x64.ActiveCfg = Debug|Win32 + {5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Release|Win32.ActiveCfg = Release|Win32 + {5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Release|Win32.Build.0 = Release|Win32 + {5BC072DB-3826-48EA-AF34-FE32AA01E83B}.Release|x64.ActiveCfg = Release|Win32 + {FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Debug|Win32.ActiveCfg = Debug|Win32 + {FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Debug|Win32.Build.0 = Debug|Win32 + {FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Debug|x64.ActiveCfg = Debug|Win32 + {FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Release|Win32.ActiveCfg = Release|Win32 + {FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Release|Win32.Build.0 = Release|Win32 + {FA429E98-8B03-45E6-A096-A4BC5E821DE4}.Release|x64.ActiveCfg = Release|Win32 + {06E3A538-AB32-44F2-B477-755FF9CB5D37}.Debug|Win32.ActiveCfg = Debug|Win32 + {06E3A538-AB32-44F2-B477-755FF9CB5D37}.Debug|Win32.Build.0 = Debug|Win32 + {06E3A538-AB32-44F2-B477-755FF9CB5D37}.Debug|x64.ActiveCfg = Debug|Win32 + {06E3A538-AB32-44F2-B477-755FF9CB5D37}.Release|Win32.ActiveCfg = Release|Win32 + {06E3A538-AB32-44F2-B477-755FF9CB5D37}.Release|Win32.Build.0 = Release|Win32 + {06E3A538-AB32-44F2-B477-755FF9CB5D37}.Release|x64.ActiveCfg = Release|Win32 + {6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Debug|Win32.ActiveCfg = Debug|Win32 + {6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Debug|Win32.Build.0 = Debug|Win32 + {6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Debug|x64.ActiveCfg = Debug|Win32 + {6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Release|Win32.ActiveCfg = Release|Win32 + {6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Release|Win32.Build.0 = Release|Win32 + {6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}.Release|x64.ActiveCfg = Release|Win32 + {A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Debug|Win32.ActiveCfg = Debug|Win32 + {A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Debug|Win32.Build.0 = Debug|Win32 + {A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Debug|x64.ActiveCfg = Debug|Win32 + {A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Release|Win32.ActiveCfg = Release|Win32 + {A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Release|Win32.Build.0 = Release|Win32 + {A4B122CF-5196-476B-8C0E-D8BD59AC3C14}.Release|x64.ActiveCfg = Release|Win32 + {75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Debug|Win32.ActiveCfg = Debug|Win32 + {75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Debug|Win32.Build.0 = Debug|Win32 + {75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Debug|x64.ActiveCfg = Debug|Win32 + {75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Release|Win32.ActiveCfg = Release|Win32 + {75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Release|Win32.Build.0 = Release|Win32 + {75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}.Release|x64.ActiveCfg = Release|Win32 + {F6A33240-8F29-48BD-98F0-826995911799}.Debug|Win32.ActiveCfg = Debug|Win32 + {F6A33240-8F29-48BD-98F0-826995911799}.Debug|Win32.Build.0 = Debug|Win32 + {F6A33240-8F29-48BD-98F0-826995911799}.Debug|x64.ActiveCfg = Debug|Win32 + {F6A33240-8F29-48BD-98F0-826995911799}.Release|Win32.ActiveCfg = Release|Win32 + {F6A33240-8F29-48BD-98F0-826995911799}.Release|Win32.Build.0 = Release|Win32 + {F6A33240-8F29-48BD-98F0-826995911799}.Release|x64.ActiveCfg = Release|Win32 + {65A6273D-FCAB-4C55-B09E-65100141A5D4}.Debug|Win32.ActiveCfg = Debug|Win32 + {65A6273D-FCAB-4C55-B09E-65100141A5D4}.Debug|Win32.Build.0 = Debug|Win32 + {65A6273D-FCAB-4C55-B09E-65100141A5D4}.Debug|x64.ActiveCfg = Debug|Win32 + {65A6273D-FCAB-4C55-B09E-65100141A5D4}.Release|Win32.ActiveCfg = Release|Win32 + {65A6273D-FCAB-4C55-B09E-65100141A5D4}.Release|Win32.Build.0 = Release|Win32 + {65A6273D-FCAB-4C55-B09E-65100141A5D4}.Release|x64.ActiveCfg = Release|Win32 + {E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Debug|Win32.ActiveCfg = Debug|Win32 + {E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Debug|Win32.Build.0 = Debug|Win32 + {E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Debug|x64.ActiveCfg = Debug|Win32 + {E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Release|Win32.ActiveCfg = Release|Win32 + {E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Release|Win32.Build.0 = Release|Win32 + {E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}.Release|x64.ActiveCfg = Release|Win32 + {D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Debug|Win32.ActiveCfg = Debug|Win32 + {D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Debug|Win32.Build.0 = Debug|Win32 + {D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Debug|x64.ActiveCfg = Debug|Win32 + {D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Release|Win32.ActiveCfg = Release|Win32 + {D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Release|Win32.Build.0 = Release|Win32 + {D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}.Release|x64.ActiveCfg = Release|Win32 + {44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Debug|Win32.ActiveCfg = Debug|Win32 + {44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Debug|Win32.Build.0 = Debug|Win32 + {44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Debug|x64.ActiveCfg = Debug|Win32 + {44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Release|Win32.ActiveCfg = Release|Win32 + {44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Release|Win32.Build.0 = Release|Win32 + {44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}.Release|x64.ActiveCfg = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} + {4926323F-4EA8-4B7D-A3D3-65488725988F} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} + {B1FE4613-3F4B-4DAF-9714-2472BF8F56AE} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} + {5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} + {5580D60E-0F77-4716-9CD4-B8E5986FA375} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} + {D3EC0AFF-76FC-4210-A825-9A17410660A3} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} + {486369EB-F150-4B56-BCC8-77B9E18FF5F5} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} + {D42518CC-7475-454D-B392-0E132C07D761} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} + {FEA1EEF7-876F-48DE-88BF-C0E3E606D758} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} + {8DEB383C-4091-4F42-A56F-C9E46D552D79} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} + {2C3C2423-234B-4772-8899-D3B137E5CA35} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} + {3A5B9131-F20C-4A85-9447-6C1610941CEE} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} + {5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} + {FE3540C5-3303-46E0-A69E-D92F775687F1} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} + {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} + {0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} + {30A5B29C-983E-4580-9FD0-D647CCDCC7EB} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {C24FB505-05D7-4319-8485-7540B44C8603} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {B5881A85-FE70-4F64-8607-2CAAE52669C6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {71A967D5-0E99-4CEF-A587-98836EE6F2EF} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {3850D93A-5F24-4922-BC1C-74D08C37C256} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {D7F1E3F2-A3F4-474C-8555-15122571AF52} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {F6A33240-8F29-48BD-98F0-826995911799} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {65A6273D-FCAB-4C55-B09E-65100141A5D4} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} + {07113B25-D3AF-4E04-BA77-4CD1171F022C} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} + {A27CCA23-1541-4337-81A4-F0A6413078A0} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} + {E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} + {C7705DC4-2088-493E-AF8D-65BC6D65C125} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} + {784113EF-44D9-4949-835D-7065D3C7AD08} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} + {05515420-16DE-4E63-BE73-85BE85BA5142} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} + {44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} + {AFAC0568-7548-42D5-9F6A-8D3400A1E4F6} = {A5A27244-AD24-46E5-B01B-840CD296C91D} + {9254C4B0-6F60-42B6-BB3A-36D63FC001C7} = {A5A27244-AD24-46E5-B01B-840CD296C91D} + {2CA40887-1622-46A1-A7F9-17FD7E7E545B} = {A5A27244-AD24-46E5-B01B-840CD296C91D} + {1A1FF289-4FD6-4285-A422-D31DD67A4723} = {CBD81696-EFB4-4D2F-8451-1B8DAA86155A} + {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC} + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000} + {ACFFF684-4D19-4D48-AF12-88EA1D778BDF} = {0C808854-54D1-4230-BFF5-77B5FD905000} + {8F992C49-6C51-412F-B2A3-34EAB708EB65} = {0C808854-54D1-4230-BFF5-77B5FD905000} + {0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF} = {0C808854-54D1-4230-BFF5-77B5FD905000} + {028C7278-05D7-4E18-82FE-BE231B844F41} = {0C808854-54D1-4230-BFF5-77B5FD905000} + {692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0} + {E7116F50-2B10-472F-92BD-C8667AA9C1AE} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0} + {1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A} + {D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A} + {CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} + {AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} + {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} + {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {89385C74-5860-4174-9CAF-A39E7C48909C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {8FD2E297-4096-47E5-9258-C48FF1841523} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {1906D736-08BD-4EE1-924F-B536249B9A54} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {1CED5987-A529-46DC-B30F-870D85FF9C94} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {49C34584-B6DA-448F-83CF-27584DC9FC90} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {3D0370CA-BED2-4657-A475-32375CBCB6E4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {5A6A281A-AA50-470A-8305-202BDA1CD1BF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D} + {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D} + {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} + {5BC072DB-3826-48EA-AF34-FE32AA01E83B} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} + {FA429E98-8B03-45E6-A096-A4BC5E821DE4} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} + {06E3A538-AB32-44F2-B477-755FF9CB5D37} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} + {6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} + {A4B122CF-5196-476B-8C0E-D8BD59AC3C14} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} + {3B08FEFD-4D3D-4C16-BA94-EE83509E32A0} = {57D119DC-484F-420F-B9E9-8589FD9A8DF8} + {7BFD517E-7F8F-4A40-A78E-8D3632738227} = {57D119DC-484F-420F-B9E9-8589FD9A8DF8} + {6374D55C-FABE-4A02-9CF1-4145308A56C5} = {57D119DC-484F-420F-B9E9-8589FD9A8DF8} + {3C90CCF0-2CDD-4A7A-ACFF-208C1E271692} = {3B08FEFD-4D3D-4C16-BA94-EE83509E32A0} + {C7E2382E-2C22-4D18-BF93-80C6A1FFA7AC} = {3B08FEFD-4D3D-4C16-BA94-EE83509E32A0} + {FC71C66E-E268-4EAD-B1F5-F008DC382E83} = {3B08FEFD-4D3D-4C16-BA94-EE83509E32A0} + {8E2E8798-8B6F-4A55-8E4F-4E6FDE40ED26} = {3B08FEFD-4D3D-4C16-BA94-EE83509E32A0} + {09455AA9-C243-4F16-A1A1-A016881A2765} = {3B08FEFD-4D3D-4C16-BA94-EE83509E32A0} + {8D29085B-952D-4594-9BB9-5781CE552D0A} = {7BFD517E-7F8F-4A40-A78E-8D3632738227} + {23874F4B-C0AF-4587-9F7E-DB0F06DE8CB4} = {7BFD517E-7F8F-4A40-A78E-8D3632738227} + {19ED97F6-30D8-4FCE-AE1D-8B7FCB170D40} = {7BFD517E-7F8F-4A40-A78E-8D3632738227} + {99E79D76-FCFC-466B-965B-273CCACF99B0} = {7BFD517E-7F8F-4A40-A78E-8D3632738227} + {8FADAC7F-CA9E-49D9-B957-A5F5605D238C} = {7BFD517E-7F8F-4A40-A78E-8D3632738227} + {4833F8E3-ABBF-4260-9DB1-B34015676CFC} = {6374D55C-FABE-4A02-9CF1-4145308A56C5} + {D44DD429-FE98-42AA-B5B7-4B4EBE33AEFD} = {6374D55C-FABE-4A02-9CF1-4145308A56C5} + {471110C9-A7ED-4966-98E1-8EA667BF0EEA} = {6374D55C-FABE-4A02-9CF1-4145308A56C5} + {4DF5199E-F7F5-4347-97DD-22078FCDB371} = {6374D55C-FABE-4A02-9CF1-4145308A56C5} + {B487BEBE-4A5C-434F-8D30-39465412F84F} = {6374D55C-FABE-4A02-9CF1-4145308A56C5} + {CDE9B06A-3C27-4987-8FAE-DF1006BC705D} = {DB1024A8-41BF-4AD7-9AE6-13202230D1F3} + {AA91F0AC-6562-435E-814C-5C94689FEFA2} = {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} + {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} + {EB751DC4-87BD-4766-B78D-DFB64BA9F988} = {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} + {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} + {CF78E84D-8456-44F2-8197-0E0E88D30A3C} = {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} + {819C7242-6184-46FE-BC7B-C7E25C0581EE} = {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} + {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} = {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} + {A407B661-D7DC-4E30-B268-FFF3296C35E6} = {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} + {57199684-EC63-4A60-9DC6-11815AF6B413} = {09455AA9-C243-4F16-A1A1-A016881A2765} + {2DED4BA2-D6B0-4064-BB2A-76DE3AA49E7C} = {09455AA9-C243-4F16-A1A1-A016881A2765} + {D4A12E4C-DBDA-4614-BA26-3425AE9F60F5} = {09455AA9-C243-4F16-A1A1-A016881A2765} + {765EF1B9-5027-4820-BC37-A44466A51631} = {57199684-EC63-4A60-9DC6-11815AF6B413} + {713E4747-1126-40B1-BD84-58F9A7745423} = {57199684-EC63-4A60-9DC6-11815AF6B413} + {D3E5C8ED-3A6A-4FEA-92A2-48A0BA865358} = {2DED4BA2-D6B0-4064-BB2A-76DE3AA49E7C} + {CC3E7F48-2590-49CB-AD8B-BE3650F55462} = {2DED4BA2-D6B0-4064-BB2A-76DE3AA49E7C} + {F1B71990-EB04-4EB5-B28A-BC3EB6F7E843} = {D4A12E4C-DBDA-4614-BA26-3425AE9F60F5} + {3DAF028C-AB5B-4183-A01B-DCC43F5A87F0} = {D4A12E4C-DBDA-4614-BA26-3425AE9F60F5} + {2003189F-0E69-4FF7-A11D-3BFB3F03D558} = {B487BEBE-4A5C-434F-8D30-39465412F84F} + {C8EA69FA-365E-4897-9BB0-08022509E18B} = {B487BEBE-4A5C-434F-8D30-39465412F84F} + {1240C217-6674-43C1-B099-B0290D84F28B} = {B487BEBE-4A5C-434F-8D30-39465412F84F} + {03517B06-98A1-46DD-9347-BFFFED7DD8A4} = {2003189F-0E69-4FF7-A11D-3BFB3F03D558} + {1D339A14-FFC2-4F6E-BEF2-D5D6DF14AC88} = {2003189F-0E69-4FF7-A11D-3BFB3F03D558} + {B4C6D0B5-5F39-4546-820D-4BCAA6C3E301} = {C8EA69FA-365E-4897-9BB0-08022509E18B} + {3041F86C-51D4-4D9E-8A00-91BA4B7C51D4} = {C8EA69FA-365E-4897-9BB0-08022509E18B} + {DFE96A6E-5C9A-4C74-959A-9C485A7AD95C} = {1240C217-6674-43C1-B099-B0290D84F28B} + {80A4CA5C-7208-4134-8EFD-C147B03C8AA1} = {1240C217-6674-43C1-B099-B0290D84F28B} + {58A56014-DEA7-4172-8C26-BAD8D499A1E8} = {8FADAC7F-CA9E-49D9-B957-A5F5605D238C} + {EB577858-8284-4DEA-ADDA-DD046BCA0126} = {8FADAC7F-CA9E-49D9-B957-A5F5605D238C} + {89A94241-1DA6-44E8-A685-AED1E665C2AD} = {8FADAC7F-CA9E-49D9-B957-A5F5605D238C} + {2D74F635-AB18-43B3-A87E-A71F3EA24DDB} = {58A56014-DEA7-4172-8C26-BAD8D499A1E8} + {A721E646-07E9-4E16-A92D-B97F654B2BAC} = {58A56014-DEA7-4172-8C26-BAD8D499A1E8} + {50331CA0-7038-4341-B92D-C34E1601EFF0} = {EB577858-8284-4DEA-ADDA-DD046BCA0126} + {FC0DB2A2-B1A3-426E-9E37-BE28FE8FE01B} = {EB577858-8284-4DEA-ADDA-DD046BCA0126} + {91C6DEDE-CE4A-47D1-A84B-3E828F82E2B0} = {89A94241-1DA6-44E8-A685-AED1E665C2AD} + {8F5A511B-F716-4D07-9657-55B9E4F1D3E9} = {89A94241-1DA6-44E8-A685-AED1E665C2AD} + EndGlobalSection +EndGlobal Modified: freeswitch/branches/stkn/sofia-exp/trunk/Makefile.am ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/Makefile.am (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/Makefile.am Wed Dec 12 13:58:47 2007 @@ -175,7 +175,9 @@ dir=`echo $$conffile | sed -e 's|/[^/]*$$||'`; \ filename=`echo $$conffile | sed -e 's|^.*/||'`; \ test -d $(DESTDIR)$(PREFIX)/$$dir || $(mkinstalldirs) $(DESTDIR)$(prefix)/$$dir ; \ - test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename || $(INSTALL) $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir; \ + test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename || \ + test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename.noload || \ + $(INSTALL) $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir; \ done ; for htdocsfile in `find htdocs -name \* | grep -v .svn` ; do \ dir=`echo $$htdocsfile | sed -e 's|/[^/]*$$||'`; \ Added: freeswitch/branches/stkn/sofia-exp/trunk/build/getsounds.sh ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/build/getsounds.sh Wed Dec 12 13:58:47 2007 @@ -0,0 +1,36 @@ +#!/bin/sh + +TAR=/bin/tar +ZCAT=/bin/gunzip +WGET=/usr/bin/wget +CURL= + +DIR=`pwd` + +if [ -f $WGET ] ; then + DOWNLOAD_CMD=$WGET +else + if [ -f $CURL ] ; then + DOWNLOAD_CMD="$CURL -O" + fi +fi + +base=http://files.freeswitch.org/ +tarfile=$1 +install=$2 + +if [ ! -f $tarfile ] ; then + $DOWNLOAD_CMD $base$tarfile + if [ ! -f $tarfile ] ; then + echo cannot find $tarfile + exit 1 + fi +fi + +if [ ! -z $install ] ; then + test -d $install || mkdir $install + cd $install && $ZCAT -c -d $DIR/$tarfile | $TAR x +fi + +exit 0 + Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/dingaling.conf.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/dingaling.conf.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/dingaling.conf.xml Wed Dec 12 13:58:47 2007 @@ -4,53 +4,6 @@ <param name="codec-prefs" value="PCMU"/> </settings> -  - -  - <x-profile type="client"> - <param name="name" value="$${xmpp_client_profile}"/> - <param name="login" value="myjid(a)myserver.com/talk"/> - <param name="password" value="mypass"/> - <param name="dialplan" value="XML"/> - <param name="context" value="public"/> - <param name="message" value="Jingle all the way"/> - <param name="rtp-ip" value="$${bind_server_ip}"/> -  - <param name="auto-login" value="true"/> -  - <param name="sasl" value="plain"/> -  -  -  - <param name="tls" value="true"/> -  - <param name="use-rtp-timer" value="true"/> -  - <param name="exten" value="888"/> -  -  -  - <param name="vad" value="both"/> -  - </x-profile> - -  - <x-profile type="component"> - <param name="name" value="$${xmpp_server_profile}"/> - <param name="password" value="secret"/> - <param name="dialplan" value="XML"/> - <param name="context" value="public"/> - <param name="rtp-ip" value="$${bind_server_ip}"/> - <param name="server" value="jabber.server.org:5347"/> -  - <param name="use-rtp-timer" value="true"/> -  - <param name="exten" value="_auto_"/> -  -  -  -  - - </x-profile> + <X-PRE-PROCESS cmd="include" data="../jingle_profiles/*.xml"/> </configuration> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/local_stream.conf.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/local_stream.conf.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/local_stream.conf.xml Wed Dec 12 13:58:47 2007 @@ -1,8 +1,14 @@ <configuration name="local_stream.conf" description="stream files from local dir"> -<directory name="demo_moh" path="$${base_dir}/sounds/moh"> +<directory name="moh_8000" path="$${base_dir}/sounds/music/8000"> <param name="rate" value="8000"/> <param name="channels" value="1"/> <param name="interval" value="2"/> <param name="timer_name" value="soft"/> </directory> +<directory name="moh_16000" path="$${base_dir}/sounds/music/16000"> + <param name="rate" value="16000"/> + <param name="channels" value="1"/> + <param name="interval" value="2"/> + <param name="timer_name" value="soft"/> +</directory> </configuration> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/modules.conf.xml Wed Dec 12 13:58:47 2007 @@ -66,7 +66,7 @@    -  + <load module="mod_local_stream"/>  Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml Wed Dec 12 13:58:47 2007 @@ -105,7 +105,7 @@ <anti-action application="set" data="continue_on_fail=true"/> <anti-action application="db" data="insert/call_return/${dialed_ext}/${caller_id_number}"/> <anti-action application="db" data="insert/last_dial_ext/${dialed_ext}/${uuid}"/> - <anti-action application="bridge" data="sofia/$${domain}/${dialed_ext}"/> + <anti-action application="bridge" data="USER/${dialed_ext}@$${domain}"/> <anti-action application="voicemail" data="default $${domain} ${dialed_ext}"/> </condition> </extension> @@ -147,19 +147,6 @@ </condition> </extension> -  - <extension name="FWD"> - <condition field="destination_number" expression="^\*393([\*\d]+)$"> -  - <action application="export" data="rtp_disable_vad_out=true"/> - <action application="export" data="absolute_codec_string=PCMU@20i,PCMA@20i"/> - <action application="bridge" data="sofia/gateway/fwd/$1"/> - </condition> - </extension> -  <extension name="IVR_Demo"> <condition field="destination_number" expression="5000"> @@ -194,6 +181,12 @@ </extension> --> + <extension name="hold_music"> + <condition field="destination_number" expression="^9999$"> + <action application="answer"/> + <action application="playback" data="local_stream://moh_${read_rate}"/> + </condition> + </extension> <X-PRE-PROCESS cmd="include" data="extensions/*.xml"/> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default.xml Wed Dec 12 13:58:47 2007 @@ -1,6 +1,10 @@ <include>  <domain name="$${domain}"> + <params> + <param name="dial-string" value="sofia/${dialed_domain}/${dialed_user}"/> + </params> + <X-PRE-PROCESS cmd="include" data="default/*.xml"/> </domain> </include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/1000.xml Wed Dec 12 13:58:47 2007 @@ -5,7 +5,6 @@ <param name="vm-password" value="1234"/>   - <param name="dial-string" value="sofia/${use_profile}/888(a)conference.freeswitch.org"/> </params> <variables> <variable name="user_context" value="default"/> Added: freeswitch/branches/stkn/sofia-exp/trunk/conf/jingle_profiles/client.noload ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/jingle_profiles/client.noload Wed Dec 12 13:58:47 2007 @@ -0,0 +1,29 @@ +<include> +  + <profile type="client"> + <param name="name" value="%JABBERCLIENTNAME%"/> + <param name="login" value="%JABBERLOGIN%/%JABBERRESOURCE%"/> + <param name="password" value="%JABBERPASSWORD%"/> + <param name="dialplan" value="XML"/> + <param name="context" value="public"/> + <param name="message" value="Jingle all the way"/> + <param name="rtp-ip" value="$${bind_server_ip}"/> +  + <param name="auto-login" value="true"/> +  + <param name="sasl" value="plain"/> +  +  +  + <param name="tls" value="true"/> +  + <param name="use-rtp-timer" value="true"/> +  + <param name="exten" value="888"/> +  +  +  + <param name="vad" value="both"/> +  + </profile> +</include> Added: freeswitch/branches/stkn/sofia-exp/trunk/conf/jingle_profiles/client.xml ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/jingle_profiles/client.xml Wed Dec 12 13:58:47 2007 @@ -0,0 +1,29 @@ +<include> +  + <x-profile type="client"> + <param name="name" value="$${xmpp_client_profile}"/> + <param name="login" value="myjid(a)myserver.com/talk"/> + <param name="password" value="mypass"/> + <param name="dialplan" value="XML"/> + <param name="context" value="public"/> + <param name="message" value="Jingle all the way"/> + <param name="rtp-ip" value="$${bind_server_ip}"/> +  + <param name="auto-login" value="true"/> +  + <param name="sasl" value="plain"/> +  +  +  + <param name="tls" value="true"/> +  + <param name="use-rtp-timer" value="true"/> +  + <param name="exten" value="888"/> +  +  +  + <param name="vad" value="both"/> +  + </x-profile> +</include> Added: freeswitch/branches/stkn/sofia-exp/trunk/conf/jingle_profiles/server.noload ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/jingle_profiles/server.noload Wed Dec 12 13:58:47 2007 @@ -0,0 +1,19 @@ +<include> +  + <profile type="component"> + <param name="name" value="%JABBERPROFILENAME%"/> + <param name="password" value="secret"/> + <param name="dialplan" value="XML"/> + <param name="context" value="public"/> + <param name="rtp-ip" value="$${bind_server_ip}"/> + <param name="server" value="%JABBERSERVER%:%JABBERPORT%"/> +  + <param name="use-rtp-timer" value="true"/> +  + <param name="exten" value="_auto_"/> +  +  +  +  + </profile> +</include> Added: freeswitch/branches/stkn/sofia-exp/trunk/conf/jingle_profiles/server.xml ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/jingle_profiles/server.xml Wed Dec 12 13:58:47 2007 @@ -0,0 +1,19 @@ +<include> +  + <x-profile type="component"> + <param name="name" value="$${xmpp_server_profile}"/> + <param name="password" value="secret"/> + <param name="dialplan" value="XML"/> + <param name="context" value="public"/> + <param name="rtp-ip" value="$${bind_server_ip}"/> + <param name="server" value="jabber.server.org:5347"/> +  + <param name="use-rtp-timer" value="true"/> +  + <param name="exten" value="_auto_"/> +  +  +  +  + </x-profile> +</include> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml Wed Dec 12 13:58:47 2007 @@ -26,7 +26,7 @@ <param name="rtp-timer-name" value="soft"/> <param name="rtp-ip" value="$${local_ip_v4}"/> <param name="sip-ip" value="$${local_ip_v4}"/> - <param name="hold-music" value="local_stream://demo_moh"/> + <param name="hold-music" value="local_stream://moh_8000"/>  <param name="manage-presence" value="true"/>  Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/nat.xml Wed Dec 12 13:58:47 2007 @@ -13,7 +13,7 @@ <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/> <param name="use-rtp-timer" value="true"/> - <param name="hold-music" value="local_stream://demo_moh"/> + <param name="hold-music" value="local_stream://moh_8000"/> <param name="rtp-timer-name" value="soft"/> <param name="manage-presence" value="true"/> <param name="inbound-codec-negotiation" value="generous"/> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/outbound.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/outbound.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/outbound.xml Wed Dec 12 13:58:47 2007 @@ -17,7 +17,7 @@ <param name="context" value="public"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/> - <param name="hold-music" value="local_stream://demo_moh"/> + <param name="hold-music" value="local_stream://moh_8000"/> <param name="use-rtp-timer" value="true"/> <param name="rtp-timer-name" value="soft"/> <param name="manage-presence" value="true"/> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/vars.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/vars.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/vars.xml Wed Dec 12 13:58:47 2007 @@ -15,7 +15,7 @@ containing the "subscriptions" table. used by: dingaling.conf.xml enum.conf.xml --> - <X-PRE-PROCESS cmd="set" data="global_codec_prefs=PCMU@20i,PCMA@20i"/> + <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU@20i,PCMA@20i"/> <X-PRE-PROCESS cmd="set" data="xmpp_client_profile=xmppc"/> <X-PRE-PROCESS cmd="set" data="xmpp_server_profile=xmpps"/> <!-- bind_server_ip Added: freeswitch/branches/stkn/sofia-exp/trunk/docs/docs.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/docs/docs.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,173 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="docs" + ProjectGUID="{1A1FF289-4FD6-4285-A422-D31DD67A4723}" + RootNamespace="docs" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + BuildLogFile="" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + CommandLine="" + AdditionalDependencies="" + Outputs="" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\src\include; ..\libs\include" + PreprocessorDefinitions="WIN32" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + OutputDocumentFile="" + /> + <Tool + Name="VCBscMakeTool" + OutputFile="" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + BuildLogFile="" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + CommandLine="" + AdditionalDependencies="" + Outputs="" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\src\include; ..\libs\include" + PreprocessorDefinitions="WIN32" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + OutputDocumentFile="" + /> + <Tool + Name="VCBscMakeTool" + OutputFile="" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\Doxygen.conf" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="doxygen $(InputPath)
" + AdditionalDependencies="..\src\include\switch.h;..\src\include\switch_apr.h;..\src\include\switch_buffer.h;..\src\include\switch_caller.h;..\src\include\switch_channel.h;..\src\include\switch_config.h;..\src\include\switch_console.h;..\src\include\switch_core.h;..\src\include\switch_event.h;..\src\include\switch_frame.h;..\src\include\switch_loadable_module.h;..\src\include\switch_module_interface.h;..\src\include\switch_mutex.h;..\src\include\switch_platform.h;..\src\include\switch_resample.h;..\src\include\switch_sqlite.h;..\src\include\switch_types.h;..\src\include\switch_utils.h" + Outputs="html/index.html" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="doxygen $(InputPath)
" + AdditionalDependencies="..\src\include\switch.h;..\src\include\switch_apr.h;..\src\include\switch_buffer.h;..\src\include\switch_caller.h;..\src\include\switch_channel.h;..\src\include\switch_config.h;..\src\include\switch_console.h;..\src\include\switch_core.h;..\src\include\switch_event.h;..\src\include\switch_frame.h;..\src\include\switch_loadable_module.h;..\src\include\switch_module_interface.h;..\src\include\switch_mutex.h;..\src\include\switch_platform.h;..\src\include\switch_resample.h;..\src\include\switch_sqlite.h;..\src\include\switch_types.h;..\src\include\switch_utils.h" + Outputs="html/index.html" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/freeswitch.spec ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/freeswitch.spec (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/freeswitch.spec Wed Dec 12 13:58:47 2007 @@ -272,8 +272,10 @@ %dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs %dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/dialplan %dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/directory +%dir %attr(750,freeswitch.daemon) /opt/freeswitch/conf/directory/default %dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang %dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/sip_profiles +%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/jingle_profiles %config(noreplace) %attr(644,freeswitch,daemon) /etc/monit.d/freeswitch.monitrc %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/mime.types %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/*.tpl @@ -312,7 +314,9 @@ %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/zeroconf.conf.xml %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/dialplan/*.xml %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/directory/*.xml +%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/directory/default/* %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/sip_profiles/*.xml +%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/jingle_profiles/*.xml %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/htdocs/* /etc/ld.so.conf.d/* /opt/freeswitch/bin/freeswitch Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/g726/libg726.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/g726/libg726.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,200 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libg726" + ProjectGUID="{5A6A281A-AA50-470A-8305-202BDA1CD1BF}" + RootNamespace="libg726" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\src\g711.c" + > + </File> + <File + RelativePath=".\src\g726_16.c" + > + </File> + <File + RelativePath=".\src\g726_24.c" + > + </File> + <File + RelativePath=".\src\g726_32.c" + > + </File> + <File + RelativePath=".\src\g726_40.c" + > + </File> + <File + RelativePath=".\src\g72x.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\src\g72x.h" + > + </File> + <File + RelativePath=".\src\private.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/g7xx/libg7xx.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/g7xx/libg7xx.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,197 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libg7xx" + ProjectGUID="{D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}" + RootNamespace="libg7xx" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="src/include" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="src/include" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\src\g711.c" + > + </File> + <File + RelativePath=".\src\g722_decode.c" + > + </File> + <File + RelativePath=".\src\g722_encode.c" + > + </File> + <File + RelativePath=".\src\g726.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="./src/include/g7xx/g711.h" + > + </File> + <File + RelativePath="./src/include/g7xx/g722.h" + > + </File> + <File + RelativePath="./src/include/g7xx/g726.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/gsm/libgsm.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/gsm/libgsm.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,240 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libgsm" + ProjectGUID="{8FD2E297-4096-47E5-9258-C48FF1841523}" + RootNamespace="libgsm" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="inc" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + DisableSpecificWarnings="4131;4100" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="inc" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + DisableSpecificWarnings="4131;4100" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\src\add.c" + > + </File> + <File + RelativePath=".\src\code.c" + > + </File> + <File + RelativePath=".\src\decode.c" + > + </File> + <File + RelativePath=".\src\gsm_create.c" + > + </File> + <File + RelativePath=".\src\gsm_decode.c" + > + </File> + <File + RelativePath=".\src\gsm_destroy.c" + > + </File> + <File + RelativePath=".\src\gsm_encode.c" + > + </File> + <File + RelativePath=".\src\gsm_lpc.c" + > + </File> + <File + RelativePath=".\src\gsm_option.c" + > + </File> + <File + RelativePath=".\src\long_term.c" + > + </File> + <File + RelativePath=".\src\preprocess.c" + > + </File> + <File + RelativePath=".\src\rpe.c" + > + </File> + <File + RelativePath=".\src\short_term.c" + > + </File> + <File + RelativePath=".\src\table.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\inc\config.h" + > + </File> + <File + RelativePath=".\inc\gsm.h" + > + </File> + <File + RelativePath=".\inc\private.h" + > + </File> + <File + RelativePath=".\inc\proto.h" + > + </File> + <File + RelativePath=".\inc\unproto.h" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/ilbc/libilbc.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/codec/ilbc/libilbc.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,354 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libilbc" + ProjectGUID="{989BB874-7AF1-44CB-8E5C-CC8113D267E8}" + RootNamespace="libilbc" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\src\anaFilter.c" + > + </File> + <File + RelativePath=".\src\constants.c" + > + </File> + <File + RelativePath=".\src\createCB.c" + > + </File> + <File + RelativePath=".\src\doCPLC.c" + > + </File> + <File + RelativePath=".\src\enhancer.c" + > + </File> + <File + RelativePath=".\src\filter.c" + > + </File> + <File + RelativePath=".\src\FrameClassify.c" + > + </File> + <File + RelativePath=".\src\gainquant.c" + > + </File> + <File + RelativePath=".\src\getCBvec.c" + > + </File> + <File + RelativePath=".\src\helpfun.c" + > + </File> + <File + RelativePath=".\src\hpInput.c" + > + </File> + <File + RelativePath=".\src\hpOutput.c" + > + </File> + <File + RelativePath=".\src\iCBConstruct.c" + > + </File> + <File + RelativePath=".\src\iCBSearch.c" + > + </File> + <File + RelativePath=".\src\iLBC_decode.c" + > + </File> + <File + RelativePath=".\src\iLBC_encode.c" + > + </File> + <File + RelativePath=".\src\LPCdecode.c" + > + </File> + <File + RelativePath=".\src\LPCencode.c" + > + </File> + <File + RelativePath=".\src\lsf.c" + > + </File> + <File + RelativePath=".\src\packing.c" + > + </File> + <File + RelativePath=".\src\StateConstructW.c" + > + </File> + <File + RelativePath=".\src\StateSearchW.c" + > + </File> + <File + RelativePath=".\src\syntFilter.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\src\anaFilter.h" + > + </File> + <File + RelativePath=".\src\constants.h" + > + </File> + <File + RelativePath=".\src\createCB.h" + > + </File> + <File + RelativePath=".\src\doCPLC.h" + > + </File> + <File + RelativePath=".\src\enhancer.h" + > + </File> + <File + RelativePath=".\src\filter.h" + > + </File> + <File + RelativePath=".\src\FrameClassify.h" + > + </File> + <File + RelativePath=".\src\gainquant.h" + > + </File> + <File + RelativePath=".\src\getCBvec.h" + > + </File> + <File + RelativePath=".\src\helpfun.h" + > + </File> + <File + RelativePath=".\src\hpInput.h" + > + </File> + <File + RelativePath=".\src\hpOutput.h" + > + </File> + <File + RelativePath=".\src\iCBConstruct.h" + > + </File> + <File + RelativePath=".\src\iCBSearch.h" + > + </File> + <File + RelativePath=".\src\iLBC_decode.h" + > + </File> + <File + RelativePath=".\src\iLBC_define.h" + > + </File> + <File + RelativePath=".\src\iLBC_encode.h" + > + </File> + <File + RelativePath=".\src\LPCdecode.h" + > + </File> + <File + RelativePath=".\src\LPCencode.h" + > + </File> + <File + RelativePath=".\src\lsf.h" + > + </File> + <File + RelativePath=".\src\packing.h" + > + </File> + <File + RelativePath=".\src\StateConstructW.h" + > + </File> + <File + RelativePath=".\src\StateSearchW.h" + > + </File> + <File + RelativePath=".\src\syntFilter.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/iax/libiax2.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/iax/libiax2.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,251 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libiax2" + ProjectGUID="{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}" + RootNamespace="libiax2" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + InlineFunctionExpansion="0" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LIBIAX;DEBUG_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;NEWJB;WIN32_TIME_GET_TIME" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LIBIAX;DEBUG_SUPPORT;WIN32_TIME_GET_TIME;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\src\iax-mutex.c" + > + </File> + <File + RelativePath=".\src\iax.c" + > + </File> + <File + RelativePath=".\src\iax2-parser.c" + > + </File> + <File + RelativePath=".\src\jitterbuf.c" + > + </File> + <File + RelativePath=".\src\md5.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\src\answer.h" + > + </File> + <File + RelativePath=".\src\busy.h" + > + </File> + <File + RelativePath=".\src\dialtone.h" + > + </File> + <File + RelativePath=".\src\frame.h" + > + </File> + <File + RelativePath=".\src\iax-client.h" + > + </File> + <File + RelativePath=".\src\iax-mutex.h" + > + </File> + <File + RelativePath=".\src\iax.h" + > + </File> + <File + RelativePath=".\src\iax2-parser.h" + > + </File> + <File + RelativePath=".\src\iax2.h" + > + </File> + <File + RelativePath=".\src\jitterbuf.h" + > + </File> + <File + RelativePath=".\src\md5.h" + > + </File> + <File + RelativePath=".\src\miniphone.h" + > + </File> + <File + RelativePath=".\src\options.h" + > + </File> + <File + RelativePath=".\src\ring10.h" + > + </File> + <File + RelativePath=".\src\ringtone.h" + > + </File> + <File + RelativePath=".\src\winpoop.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/libdingaling/libdingaling.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/libdingaling/libdingaling.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,342 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libdingaling" + ProjectGUID="{1906D736-08BD-4EE1-924F-B536249B9A54}" + RootNamespace="libdingaling" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=".;.\src;..\iksemel\include;..\include;..\apr\include;"..\iksemel-1.2\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + DisableSpecificWarnings="4100;4706" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".;.\src;..\iksemel\include;..\include;..\apr\include;"..\iksemel-1.2\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + DisableSpecificWarnings="4100" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug DLL|Win32" + OutputDirectory="$(SolutionDir)Debug" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=".;.\src;..\iksemel\include;..\include;..\apr\include;"..\iksemel-1.2\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;APR_DECLARE_STATIC;APU_DECLARE_STATIC" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + DisableSpecificWarnings="4100" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libapr-1.lib libaprutil-1.lib iksemel.lib Ws2_32.lib" + AdditionalLibraryDirectories="..\apr\Debug;..\apr-util\Debug;..\iksemel\Debug" + ModuleDefinitionFile=".\src\dingaling.def" + GenerateDebugInformation="true" + OptimizeReferences="1" + EnableCOMDATFolding="1" + OptimizeForWindows98="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release DLL|Win32" + OutputDirectory="$(SolutionDir)Release" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".;.\src;..\iksemel\include;..\include;..\apr\include;"..\iksemel-1.2\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;APR_DECLARE_STATIC;APU_DECLARE_STATIC" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + DisableSpecificWarnings="4100" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libapr-1.lib libaprutil-1.lib iksemel.lib Ws2_32.lib" + AdditionalLibraryDirectories="..\apr\Release;..\apr-util\Release;..\iksemel\Release" + ModuleDefinitionFile=".\src\dingaling.def" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\src\libdingaling.c" + > + </File> + <File + RelativePath=".\src\sha1.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\src\ldl_compat.h" + > + </File> + <File + RelativePath=".\src\libdingaling.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + <File + RelativePath=".\src\dingaling.def" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/libteletone/libteletone.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/libteletone/libteletone.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,213 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libteletone" + ProjectGUID="{89385C74-5860-4174-9CAF-A39E7C48909C}" + RootNamespace="libteletone" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)Debug" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="src" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + ModuleDefinitionFile="$(InputDir)teletone.def" + OptimizeReferences="1" + EnableCOMDATFolding="1" + OptimizeForWindows98="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(IntDir)/$(TargetName).lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)Release" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="src" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + ModuleDefinitionFile="$(InputDir)teletone.def" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(IntDir)/$(TargetName).lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\src\libteletone_detect.c" + > + </File> + <File + RelativePath=".\src\libteletone_generate.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\src\libteletone.h" + > + </File> + <File + RelativePath=".\src\libteletone_detect.h" + > + </File> + <File + RelativePath=".\src\libteletone_generate.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/portaudio/build/msvc/portaudio.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/portaudio/build/msvc/portaudio.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,2718 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="portaudio" + ProjectGUID="{0A18A071-125E-442F-AFF7-A3F68ABECF99}" + RootNamespace="portaudio" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Release|Win32" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Release_x86/portaudio.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + InlineFunctionExpansion="0" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" + PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch" + AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\" + ObjectFile="$(PlatformName)\$(ConfigurationName)\" + ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="3" + TypeLibraryName=".\Release_x86/portaudio.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" + PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch" + AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\" + ObjectFile="$(PlatformName)\$(ConfigurationName)\" + ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + ModuleDefinitionFile=".\portaudio.def" + ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(PlatformName)\$(ConfigurationName)/portaudio_x64.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Debug_x86/portaudio.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" + PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch" + AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\" + ObjectFile="$(PlatformName)\$(ConfigurationName)\" + ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="3" + TypeLibraryName=".\Debug_x86/portaudio.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" + PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch" + AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\" + ObjectFile="$(PlatformName)\$(ConfigurationName)\" + ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll" + LinkIncremental="2" + SuppressStartupBanner="true" + ModuleDefinitionFile=".\portaudio.def" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x64.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug DirectSound|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Debug_x86/portaudio.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" + PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch" + AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\" + ObjectFile="$(PlatformName)\$(ConfigurationName)\" + ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.dll" + LinkIncremental="2" + SuppressStartupBanner="true" + ModuleDefinitionFile=".\portaudio.def" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x86.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug DirectSound|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="3" + TypeLibraryName=".\Debug_x86/portaudio.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" + PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch" + AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\" + ObjectFile="$(PlatformName)\$(ConfigurationName)\" + ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll" + LinkIncremental="2" + SuppressStartupBanner="true" + ModuleDefinitionFile=".\portaudio.def" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x64.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release DirectSound|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Release_x86/portaudio.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" + PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/portaudio.pch" + AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\" + ObjectFile="$(PlatformName)\$(ConfigurationName)\" + ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + ModuleDefinitionFile=".\portaudio.def" + ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(PlatformName)\$(ConfigurationName)\portaudio_x86.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release DirectSound|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="3" + TypeLibraryName=".\Release_x86/portaudio.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\" + PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)\portaudio.pch" + AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)\" + ObjectFile="$(PlatformName)\$(ConfigurationName)\" + ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + ModuleDefinitionFile=".\portaudio.def" + ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/portaudio_x64.pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(PlatformName)\$(ConfigurationName)/portaudio_x64.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + <Filter + Name="common" + > + <File + RelativePath="..\..\src\common\pa_allocation.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\common\pa_converters.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\common\pa_cpuload.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\common\pa_debugprint.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\common\pa_dither.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\common\pa_front.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\common\pa_process.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\common\pa_skeleton.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\common\pa_stream.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\common\pa_trace.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="hostapi" + > + <Filter + Name="ASIO" + > + <File + RelativePath="..\..\src\hostapi\asio\pa_asio.cpp" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <Filter + Name="ASIOSDK" + > + <File + RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\asio.cpp" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\combase.cpp" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\hostapi\asio\ASIOSDK\common\register.cpp" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + </Filter> + <Filter + Name="dsound" + > + <File + RelativePath="..\..\src\hostapi\dsound\pa_win_ds.c" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\hostapi\dsound\pa_win_ds_dynlink.c" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="wmme" + > + <File + RelativePath="..\..\src\hostapi\wmme\pa_win_wmme.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="wasapi" + > + <File + RelativePath="..\..\src\hostapi\wasapi\pa_win_wasapi.cpp" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + </Filter> + <Filter + Name="os" + > + <Filter + Name="win" + > + <File + RelativePath="..\..\src\os\win\pa_win_hostapis.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\os\win\pa_win_util.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\os\win\pa_x86_plain_converters.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DirectSound|x64" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + </Filter> + </Filter> + <Filter + Name="Resource Files" + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + <File + RelativePath="portaudio.def" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/srtp/configure.gnu ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/srtp/configure.gnu (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/srtp/configure.gnu Wed Dec 12 13:58:47 2007 @@ -1,3 +1,3 @@ #! /bin/sh -./configure "$@" --disable-shared +./configure "$@" --disable-shared --with-pic Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/srtp/libsrtp.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/srtp/libsrtp.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,591 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libsrtp" + ProjectGUID="{EEF031CB-FED8-451E-A471-91EC8D4F6750}" + RootNamespace="libsrtp" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + Description="Creating config.h from config.hw" + CommandLine="copy /Y "$(InputDir)config.hw" "$(InputDir)crypto\include\config.h" > NUL" + /> + <Tool + Name="VCCustomBuildTool" + Description="" + CommandLine="" + Outputs="" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="crypto/include;include" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + StructMemberAlignment="0" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + Description="Creating config.h from config.hw" + CommandLine="copy /Y "$(InputDir)config.hw" "$(InputDir)crypto\include\config.h" > NUL" + /> + <Tool + Name="VCCustomBuildTool" + Description="" + CommandLine="" + Outputs="" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="crypto/include;include" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H" + RuntimeLibrary="2" + StructMemberAlignment="0" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug Dll|Win32" + OutputDirectory="$(SolutionDir)Debug" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + Description="Creating config.h from config.hw" + CommandLine="copy /Y "$(InputDir)config.hw" "$(InputDir)crypto\include\config.h" > NUL" + /> + <Tool + Name="VCCustomBuildTool" + Description="" + CommandLine="" + Outputs="" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="crypto/include;include" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + StructMemberAlignment="0" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="Ws2_32.lib" + ModuleDefinitionFile="srtp.def" + OptimizeReferences="1" + EnableCOMDATFolding="1" + OptimizeForWindows98="1" + LinkTimeCodeGeneration="0" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release Dll|Win32" + OutputDirectory="$(SolutionDir)Release" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + Description="Creating config.h from config.hw" + CommandLine="copy /Y "$(InputDir)config.hw" "$(InputDir)crypto\include\config.h" > NUL" + /> + <Tool + Name="VCCustomBuildTool" + Description="" + CommandLine="" + Outputs="" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="crypto/include;include" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H" + RuntimeLibrary="2" + StructMemberAlignment="0" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="Ws2_32.lib" + ModuleDefinitionFile="srtp.def" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\srtp\srtp.c" + > + </File> + <Filter + Name="Kernel" + > + <File + RelativePath=".\crypto\kernel\alloc.c" + > + </File> + <File + RelativePath=".\crypto\kernel\crypto_kernel.c" + > + </File> + <File + RelativePath=".\crypto\rng\ctr_prng.c" + > + </File> + <File + RelativePath=".\crypto\kernel\err.c" + > + </File> + <File + RelativePath=".\crypto\kernel\key.c" + > + </File> + <File + RelativePath=".\crypto\rng\prng.c" + > + </File> + <File + RelativePath=".\crypto\rng\rand_source.c" + > + </File> + </Filter> + <Filter + Name="Ciphers" + > + <File + RelativePath=".\crypto\cipher\aes.c" + > + <FileConfiguration + Name="Debug Dll|Win32" + > + <Tool + Name="VCCLCompilerTool" + InlineFunctionExpansion="0" + EnableIntrinsicFunctions="false" + EnableFunctionLevelLinking="false" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\crypto\cipher\aes_cbc.c" + > + </File> + <File + RelativePath=".\crypto\cipher\aes_icm.c" + > + </File> + <File + RelativePath=".\crypto\cipher\cipher.c" + > + </File> + <File + RelativePath=".\crypto\cipher\null_cipher.c" + > + </File> + </Filter> + <Filter + Name="Hashes" + > + <File + RelativePath=".\crypto\hash\auth.c" + > + </File> + <File + RelativePath=".\crypto\hash\hmac.c" + > + </File> + <File + RelativePath=".\crypto\hash\null_auth.c" + > + </File> + <File + RelativePath=".\crypto\hash\sha1.c" + > + </File> + </Filter> + <Filter + Name="Replay" + > + <File + RelativePath=".\crypto\replay\rdb.c" + > + </File> + <File + RelativePath=".\crypto\replay\rdbx.c" + > + </File> + <File + RelativePath=".\crypto\replay\ut_sim.c" + > + </File> + </Filter> + <Filter + Name="Math" + > + <File + RelativePath=".\crypto\math\datatypes.c" + > + </File> + <File + RelativePath=".\crypto\math\stat.c" + > + </File> + </Filter> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\crypto\include\aes.h" + > + </File> + <File + RelativePath=".\crypto\include\aes_cbc.h" + > + </File> + <File + RelativePath=".\crypto\include\aes_icm.h" + > + </File> + <File + RelativePath=".\crypto\include\alloc.h" + > + </File> + <File + RelativePath=".\crypto\include\auth.h" + > + </File> + <File + RelativePath=".\crypto\include\cipher.h" + > + </File> + <File + RelativePath=".\crypto\include\config.h" + > + </File> + <File + RelativePath=".\crypto\include\crypto.h" + > + </File> + <File + RelativePath=".\crypto\include\crypto_kernel.h" + > + </File> + <File + RelativePath=".\crypto\include\crypto_math.h" + > + </File> + <File + RelativePath=".\crypto\include\crypto_types.h" + > + </File> + <File + RelativePath=".\crypto\include\cryptoalg.h" + > + </File> + <File + RelativePath=".\crypto\include\datatypes.h" + > + </File> + <File + RelativePath=".\crypto\include\err.h" + > + </File> + <File + RelativePath=".\crypto\include\gf2_8.h" + > + </File> + <File + RelativePath=".\crypto\include\hmac.h" + > + </File> + <File + RelativePath=".\crypto\include\integers.h" + > + </File> + <File + RelativePath=".\crypto\include\kernel_compat.h" + > + </File> + <File + RelativePath=".\crypto\include\key.h" + > + </File> + <File + RelativePath=".\crypto\include\null_auth.h" + > + </File> + <File + RelativePath=".\crypto\include\null_cipher.h" + > + </File> + <File + RelativePath=".\crypto\include\prng.h" + > + </File> + <File + RelativePath=".\crypto\include\rand_source.h" + > + </File> + <File + RelativePath=".\crypto\include\rdb.h" + > + </File> + <File + RelativePath=".\crypto\include\rdbx.h" + > + </File> + <File + RelativePath=".\include\rtp.h" + > + </File> + <File + RelativePath=".\crypto\include\sha1.h" + > + </File> + <File + RelativePath=".\include\srtp.h" + > + </File> + <File + RelativePath=".\crypto\include\stat.h" + > + </File> + <File + RelativePath=".\include\ut_sim.h" + > + </File> + <File + RelativePath=".\crypto\include\xfm.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + <File + RelativePath=".\srtp.def" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/apr-iconv/libapriconv.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/apr-iconv/libapriconv.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,427 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libapriconv" + ProjectGUID="{101130D1-3EA6-4ED2-B65D-CEB5243A20ED}" + RootNamespace="libapriconv" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)Debug" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\apr-iconv-1.1.1\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Debug/libapriconv.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""..\..\apr-iconv-1.1.1\include";..\..\apr\include" + PreprocessorDefinitions="_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS" + RuntimeLibrary="3" + PrecompiledHeaderFile=".\Debug/libapriconv.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName="Debug\libapriconv_src" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG,API_VERSION_ONLY" + Culture="1033" + AdditionalIncludeDirectories="..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName).dll" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Debug/libapriconv-1.pdb" + SubSystem="2" + BaseAddress="0x6EE50000" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary=".\Debug/libapriconv-1.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Debug/libapriconv.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)Release" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\apr-iconv-1.1.1\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Release/libapriconv.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories=""..\..\apr-iconv-1.1.1\include";..\..\apr\include" + PreprocessorDefinitions="NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\Release/libapriconv.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName="Release\libapriconv_src" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG,API_VERSION_ONLY" + Culture="1033" + AdditionalIncludeDirectories="..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName).dll" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Release/libapriconv-1.pdb" + SubSystem="2" + OptimizeReferences="2" + BaseAddress="0x6EE50000" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary=".\Release/libapriconv-1.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Release/libapriconv.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter=".c" + > + <Filter + Name="lib" + > + <File + RelativePath="..\..\apr-iconv-1.1.1\lib\iconv.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-iconv-1.1.1\lib\iconv_ces.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-iconv-1.1.1\lib\iconv_ces_euc.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-iconv-1.1.1\lib\iconv_ces_iso2022.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-iconv-1.1.1\lib\iconv_int.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-iconv-1.1.1\lib\iconv_module.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-iconv-1.1.1\lib\iconv_uc.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + </Filter> + <Filter + Name="Header Files" + Filter=".h" + > + <File + RelativePath="..\..\apr-iconv-1.1.1\include\api_version.h" + > + </File> + <File + RelativePath="..\..\apr-iconv-1.1.1\include\apr_iconv.h" + > + </File> + <File + RelativePath="..\..\apr-iconv-1.1.1\lib\charset_alias.h" + > + </File> + <File + RelativePath="..\..\apr-iconv-1.1.1\lib\iconv.h" + > + </File> + </Filter> + <File + RelativePath="..\..\apr-iconv-1.1.1\libapriconv.rc" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/apr-util/libaprutil.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/apr-util/libaprutil.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,1482 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libaprutil" + ProjectGUID="{F057DA7F-79E5-4B00-845C-EF446EF055E3}" + RootNamespace="libaprutil" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)Debug" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr-util\include\apr_ldap.h" type "$(ProjectDir)..\..\apr-util\include\apr_ldap.hw" > "$(ProjectDir)..\..\apr-util\include\apr_ldap.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu.h" type "$(ProjectDir)..\..\apr-util\include\apu.hw" > "$(ProjectDir)..\..\apr-util\include\apu.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu_config.h" type "$(ProjectDir)..\..\apr-util\include\apu_config.hw" > "$(ProjectDir)..\..\apr-util\include\apu_config.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h" type "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.hw" > "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir)..\..\apr-util\include\apu_want.hw" > "$(ProjectDir)..\..\apr-util\include\apu_want.h"
xcopy "$(ProjectDir)..\..\apr-util\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Debug/libaprutil.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/EHsc " + Optimization="0" + AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include" + PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" + RuntimeLibrary="3" + PrecompiledHeaderFile=".\Debug/libaprutil.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName="Debug\libaprutil_src" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG,APU_VERSION_ONLY" + Culture="1033" + AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib mswsock.lib wldap32.lib" + OutputFile="$(OutDir)\$(ProjectName).dll" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Debug/libaprutil-1.pdb" + SubSystem="2" + BaseAddress="0x6EE60000" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary=".\Debug/libaprutil-1.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Debug/libaprutil.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="
" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)Release" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr-util\include\apr_ldap.h" type "$(ProjectDir)..\..\apr-util\include\apr_ldap.hw" > "$(ProjectDir)..\..\apr-util\include\apr_ldap.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu.h" type "$(ProjectDir)..\..\apr-util\include\apu.hw" > "$(ProjectDir)..\..\apr-util\include\apu.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu_config.h" type "$(ProjectDir)..\..\apr-util\include\apu_config.hw" > "$(ProjectDir)..\..\apr-util\include\apu_config.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h" type "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.hw" > "$(ProjectDir)..\..\apr-util\include\apu_select_dbm.h"
if not exist "$(ProjectDir)..\..\apr-util\include\apu_want.h" type "$(ProjectDir)..\..\apr-util\include\apu_want.hw" > "$(ProjectDir)..\..\apr-util\include\apu_want.h"
xcopy "$(ProjectDir)..\..\apr-util\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Release/libaprutil.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include" + PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\Release/libaprutil.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName="Release\libaprutil_src" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG,APU_VERSION_ONLY" + Culture="1033" + AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib mswsock.lib wldap32.lib" + OutputFile="$(OutDir)\$(ProjectName).dll" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Release/libaprutil-1.pdb" + SubSystem="2" + OptimizeReferences="2" + BaseAddress="0x6EE60000" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary=".\Release/libaprutil-1.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Release/libaprutil.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="
" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + > + <Filter + Name="buckets" + > + <File + RelativePath="..\..\apr-util\buckets\apr_brigade.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\buckets\apr_buckets.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\buckets\apr_buckets_alloc.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\buckets\apr_buckets_eos.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\buckets\apr_buckets_file.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\buckets\apr_buckets_flush.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\buckets\apr_buckets_heap.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\buckets\apr_buckets_mmap.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\buckets\apr_buckets_pipe.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\buckets\apr_buckets_pool.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\buckets\apr_buckets_refcount.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\buckets\apr_buckets_simple.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\buckets\apr_buckets_socket.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="crypto" + > + <File + RelativePath="..\..\apr-util\crypto\apr_md4.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\crypto\apr_md5.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\crypto\apr_sha1.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\crypto\getuuid.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\crypto\uuid.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="dbd" + > + <File + RelativePath="..\..\apr-util\dbd\apr_dbd.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\dbd\apr_dbd_pgsql.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\dbd\apr_dbd_sqlite2.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\dbd\apr_dbd_sqlite3.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="dbm" + > + <File + RelativePath="..\..\apr-util\dbm\apr_dbm.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\dbm\apr_dbm_berkeleydb.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\dbm\apr_dbm_gdbm.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\dbm\apr_dbm_sdbm.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="encoding" + > + <File + RelativePath="..\..\apr-util\encoding\apr_base64.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="hooks" + > + <File + RelativePath="..\..\apr-util\hooks\apr_hooks.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="ldap" + > + <File + RelativePath="..\..\apr-util\ldap\apr_ldap_init.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\ldap\apr_ldap_option.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\ldap\apr_ldap_url.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="misc" + > + <File + RelativePath="..\..\apr-util\misc\apr_date.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\misc\apr_queue.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\misc\apr_reslist.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\misc\apr_rmm.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="sdbm" + > + <File + RelativePath="..\..\apr-util\dbm\sdbm\sdbm.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\dbm\sdbm\sdbm_hash.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\dbm\sdbm\sdbm_lock.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\dbm\sdbm\sdbm_pair.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\dbm\sdbm\sdbm_pair.h" + > + </File> + <File + RelativePath="..\..\apr-util\dbm\sdbm\sdbm_private.h" + > + </File> + <File + RelativePath="..\..\apr-util\dbm\sdbm\sdbm_tune.h" + > + </File> + </Filter> + <Filter + Name="strmatch" + > + <File + RelativePath="..\..\apr-util\strmatch\apr_strmatch.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="uri" + > + <File + RelativePath="..\..\apr-util\uri\apr_uri.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="xlate" + > + <File + RelativePath="..\..\apr-util\xlate\xlate.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + </Filter> + <Filter + Name="Generated Files" + > + <File + RelativePath="..\..\apr-util\include\apr_ldap.h.in" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_ldap.hnw" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_ldap.hw" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Creating apr_ldap.h from apr_ldap.hw" + CommandLine="if not exist ..\..\apr-util\include\apr_ldap.h type ..\..\apr-util\include\apr_ldap.hw > ..\..\apr-util\include\apr_ldap.h
" + Outputs="..\..\apr-util\include\apr_ldap.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Creating apr_ldap.h from apr_ldap.hw" + CommandLine="if not exist ..\..\apr-util\include\apr_ldap.h type ..\..\apr-util\include\apr_ldap.hw > ..\..\apr-util\include\apr_ldap.h
" + Outputs="..\..\apr-util\include\apr_ldap.h" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\include\apu.h.in" + > + </File> + <File + RelativePath="..\..\apr-util\include\apu.hnw" + > + </File> + <File + RelativePath="..\..\apr-util\include\apu.hw" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Creating apu.h from apu.hw" + CommandLine="if not exist ..\..\apr-util\include\apu.h type ..\..\apr-util\include\apu.hw > ..\..\apr-util\include\apu.h
" + Outputs="..\..\apr-util\include\apu.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Creating apu.h from apu.hw" + CommandLine="if not exist ..\..\apr-util\include\apu.h type ..\..\apr-util\include\apu.hw > ..\..\apr-util\include\apu.h
" + Outputs="..\..\apr-util\include\apu.h" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\include\private\apu_config.h.in" + > + </File> + <File + RelativePath="..\..\apr-util\include\private\apu_config.hw" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Creating apu_config.h from apu_config.hw" + CommandLine="if not exist ..\..\apr-util\include\private\apu_config.h type ..\..\apr-util\include\private\apu_config.hw > ..\..\apr-util\include\private\apu_config.h
" + Outputs="..\..\apr-util\include\private\apu_config.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Creating apu_config.h from apu_config.hw" + CommandLine="if not exist ..\..\apr-util\include\private\apu_config.h type ..\..\apr-util\include\private\apu_config.hw > ..\..\apr-util\include\private\apu_config.h
" + Outputs="..\..\apr-util\include\private\apu_config.h" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\include\private\apu_select_dbm.h.in" + > + </File> + <File + RelativePath="..\..\apr-util\include\private\apu_select_dbm.hw" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Creating apu_select_dbm.h from apu_select_dbm.hw" + CommandLine="if not exist ..\..\apr-util\include\private\apu_select_dbm.h type ..\..\apr-util\include\private\apu_select_dbm.hw > ..\..\apr-util\include\private\apu_select_dbm.h
" + Outputs="..\..\apr-util\include\private\apu_select_dbm.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Creating apu_select_dbm.h from apu_select_dbm.hw" + CommandLine="if not exist ..\..\apr-util\include\private\apu_select_dbm.h type ..\..\apr-util\include\private\apu_select_dbm.hw > ..\..\apr-util\include\private\apu_select_dbm.h
" + Outputs="..\..\apr-util\include\private\apu_select_dbm.h" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\include\apu_want.h.in" + > + </File> + <File + RelativePath="..\..\apr-util\include\apu_want.hnw" + > + </File> + <File + RelativePath="..\..\apr-util\include\apu_want.hw" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Creating apu_want.h from apu_want.hw" + CommandLine="if not exist ..\..\apr-util\include\apu_want.h type ..\..\apr-util\include\apu_want.hw > ..\..\apr-util\include\apu_want.h
" + Outputs="..\..\apr-util\include\apu_want.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Creating apu_want.h from apu_want.hw" + CommandLine="if not exist ..\..\apr-util\include\apu_want.h type ..\..\apr-util\include\apu_want.hw > ..\..\apr-util\include\apu_want.h
" + Outputs="..\..\apr-util\include\apu_want.h" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Public Header Files" + > + <File + RelativePath="..\..\apr-util\include\apr_anylock.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_base64.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_buckets.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_date.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_dbm.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_hooks.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_ldap_url.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_md4.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_md5.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_optional.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_optional_hooks.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_queue.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_reslist.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_rmm.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_sdbm.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_sha1.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_strmatch.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_uri.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_uuid.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_xlate.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apr_xml.h" + > + </File> + <File + RelativePath="..\..\apr-util\include\apu_version.h" + > + </File> + </Filter> + <File + RelativePath="..\..\apr-util\libaprutil.rc" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/apr-util/xml.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/apr-util/xml.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,395 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="xml" + ProjectGUID="{155844C3-EC5F-407F-97A4-A2DDADED9B2F}" + RootNamespace="xml" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;VERSION=\"expat_1.95.2\"" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\LibR/xml.pch" + AssemblerListingLocation=".\LibR/" + ObjectFile=".\LibR/" + ProgramDataBaseFileName="LibR\xml_src" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\$(ProjectName).lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\LibR/xml.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/EHsc " + Optimization="0" + AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;VERSION=\"expat_1.95.2\"" + RuntimeLibrary="3" + PrecompiledHeaderFile=".\LibD/xml.pch" + AssemblerListingLocation=".\LibD/" + ObjectFile=".\LibD/" + ProgramDataBaseFileName="LibD\xml_src" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\$(ProjectName).lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\LibD/xml.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + <File + RelativePath="..\..\apr-util\xml\expat\lib\xmlparse.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\xml\expat\lib\xmlrole.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\xml\expat\lib\xmltok.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\xml\expat\lib\xmltok_impl.c" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\xml\expat\lib\xmltok_ns.c" + > + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl" + > + <File + RelativePath="..\..\apr-util\xml\expat\lib\ascii.h" + > + </File> + <File + RelativePath="..\..\apr-util\xml\expat\lib\asciitab.h" + > + </File> + <File + RelativePath="..\..\apr-util\xml\expat\lib\config.h" + > + </File> + <File + RelativePath="..\..\apr-util\xml\expat\lib\expat.h" + > + </File> + <File + RelativePath="..\..\apr-util\xml\expat\lib\iasciitab.h" + > + </File> + <File + RelativePath="..\..\apr-util\xml\expat\lib\latin1tab.h" + > + </File> + <File + RelativePath="..\..\apr-util\xml\expat\lib\nametab.h" + > + </File> + <File + RelativePath="..\..\apr-util\xml\expat\lib\utf8tab.h" + > + </File> + <File + RelativePath="..\..\apr-util\xml\expat\lib\xmlrole.h" + > + </File> + <File + RelativePath="..\..\apr-util\xml\expat\lib\xmltok.h" + > + </File> + <File + RelativePath="..\..\apr-util\xml\expat\lib\xmltok_impl.h" + > + </File> + </Filter> + <Filter + Name="Generated Header Files" + > + <File + RelativePath="..\..\apr-util\xml\expat\lib\expat.h.in" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Creating expat.h from expat.h.in" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h"
" + Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Creating expat.h from expat.h.in" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h"
" + Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\xml\expat\lib\winconfig.h" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Creating config.h from winconfig.h" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h"
" + Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Creating config.h from winconfig.h" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h"
" + Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" + /> + </FileConfiguration> + </File> + </Filter> + <File + RelativePath="..\..\apr-util\xml\expat\lib\ReadMe.txt" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/apr/libapr.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/apr/libapr.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,759 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libapr" + ProjectGUID="{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}" + RootNamespace="libapr" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)Debug" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr\include\apr.h" type "$(ProjectDir)apr.hw" > "$(ProjectDir)..\..\apr\include\apr.h"
xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Debug/libapr.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/EHsc " + Optimization="0" + AdditionalIncludeDirectories=""..\..\apr\include";"..\..\apr\include/arch";"..\..\apr\include/arch/win32";"..\..\apr\include/arch/unix"" + PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS" + RuntimeLibrary="3" + PrecompiledHeaderFile=".\Debug/libapr.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName="Debug\libapr_src" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG,APR_VERSION_ONLY" + Culture="1033" + AdditionalIncludeDirectories="..\..\apr\include" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib mswsock.lib rpcrt4.lib advapi32.lib" + OutputFile="$(OutDir)\$(ProjectName).dll" + LinkIncremental="1" + SuppressStartupBanner="true" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Debug/libapr-1.pdb" + SubSystem="2" + BaseAddress="0x6EEC0000" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary=".\Debug/libapr-1.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Debug/libapr.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)Release" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr\include\apr.h" type "$(ProjectDir)apr.hw" > "$(ProjectDir)..\..\apr\include\apr.h"
xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Release/libapr.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories=""..\..\apr\include";"..\..\apr\include/arch";"..\..\apr\include/arch/win32";"..\..\apr\include/arch/unix"" + PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\Release/libapr.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName="Release\libapr_src" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG,APR_VERSION_ONLY" + Culture="1033" + AdditionalIncludeDirectories="..\..\apr\" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib mswsock.lib rpcrt4.lib advapi32.lib" + OutputFile="$(OutDir)\$(ProjectName).dll" + LinkIncremental="1" + SuppressStartupBanner="true" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Release/libapr-1.pdb" + SubSystem="2" + OptimizeReferences="2" + BaseAddress="0x6EEC0000" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary=".\Release/libapr-1.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Release/libapr.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter=".c" + > + <Filter + Name="atomic" + > + <File + RelativePath="..\..\apr\atomic\win32\apr_atomic.c" + > + </File> + </Filter> + <Filter + Name="dso" + > + <File + RelativePath="..\..\apr\dso\win32\dso.c" + > + </File> + </Filter> + <Filter + Name="file_io" + > + <File + RelativePath="..\..\apr\file_io\unix\copy.c" + > + </File> + <File + RelativePath="..\..\apr\file_io\win32\dir.c" + > + </File> + <File + RelativePath="..\..\apr\file_io\unix\fileacc.c" + > + </File> + <File + RelativePath="..\..\apr\file_io\win32\filedup.c" + > + </File> + <File + RelativePath="..\..\apr\file_io\win32\filepath.c" + > + </File> + <File + RelativePath="..\..\apr\file_io\unix\filepath_util.c" + > + </File> + <File + RelativePath="..\..\apr\file_io\win32\filestat.c" + > + </File> + <File + RelativePath="..\..\apr\file_io\win32\filesys.c" + > + </File> + <File + RelativePath="..\..\apr\file_io\win32\flock.c" + > + </File> + <File + RelativePath="..\..\apr\file_io\unix\fullrw.c" + > + </File> + <File + RelativePath="..\..\apr\file_io\unix\mktemp.c" + > + </File> + <File + RelativePath="..\..\apr\file_io\win32\open.c" + > + </File> + <File + RelativePath="..\..\apr\file_io\win32\pipe.c" + > + </File> + <File + RelativePath="..\..\apr\file_io\win32\readwrite.c" + > + </File> + <File + RelativePath="..\..\apr\file_io\win32\seek.c" + > + </File> + <File + RelativePath="..\..\apr\file_io\unix\tempdir.c" + > + </File> + </Filter> + <Filter + Name="locks" + > + <File + RelativePath="..\..\apr\locks\win32\proc_mutex.c" + > + </File> + <File + RelativePath="..\..\apr\locks\win32\thread_cond.c" + > + </File> + <File + RelativePath="..\..\apr\locks\win32\thread_mutex.c" + > + </File> + <File + RelativePath="..\..\apr\locks\win32\thread_rwlock.c" + > + </File> + </Filter> + <Filter + Name="memory" + > + <File + RelativePath="..\..\apr\memory\unix\apr_pools.c" + > + </File> + </Filter> + <Filter + Name="misc" + > + <File + RelativePath="..\..\apr\misc\win32\charset.c" + > + </File> + <File + RelativePath="..\..\apr\misc\win32\env.c" + > + </File> + <File + RelativePath="..\..\apr\misc\unix\errorcodes.c" + > + </File> + <File + RelativePath="..\..\apr\misc\unix\getopt.c" + > + </File> + <File + RelativePath="..\..\apr\misc\win32\internal.c" + > + </File> + <File + RelativePath="..\..\apr\misc\win32\misc.c" + > + </File> + <File + RelativePath="..\..\apr\misc\unix\otherchild.c" + > + </File> + <File + RelativePath="..\..\apr\misc\win32\rand.c" + > + </File> + <File + RelativePath="..\..\apr\misc\win32\start.c" + > + </File> + <File + RelativePath="..\..\apr\misc\win32\utf8.c" + > + </File> + <File + RelativePath="..\..\apr\misc\unix\version.c" + > + </File> + </Filter> + <Filter + Name="mmap" + > + <File + RelativePath="..\..\apr\mmap\unix\common.c" + > + </File> + <File + RelativePath="..\..\apr\mmap\win32\mmap.c" + > + </File> + </Filter> + <Filter + Name="network_io" + > + <File + RelativePath="..\..\apr\network_io\unix\inet_ntop.c" + > + </File> + <File + RelativePath="..\..\apr\network_io\unix\inet_pton.c" + > + </File> + <File + RelativePath="..\..\apr\network_io\unix\multicast.c" + > + </File> + <File + RelativePath="..\..\apr\poll\unix\select.c" + > + </File> + <File + RelativePath="..\..\apr\network_io\win32\sendrecv.c" + > + </File> + <File + RelativePath="..\..\apr\network_io\unix\sockaddr.c" + > + </File> + <File + RelativePath="..\..\apr\network_io\win32\sockets.c" + > + </File> + <File + RelativePath="..\..\apr\network_io\win32\sockopt.c" + > + </File> + </Filter> + <Filter + Name="passwd" + > + <File + RelativePath="..\..\apr\passwd\apr_getpass.c" + > + </File> + </Filter> + <Filter + Name="random" + > + <File + RelativePath="..\..\apr\random\unix\apr_random.c" + > + </File> + <File + RelativePath="..\..\apr\random\unix\sha2.c" + > + </File> + <File + RelativePath="..\..\apr\random\unix\sha2_glue.c" + > + </File> + </Filter> + <Filter + Name="shmem" + > + <File + RelativePath="..\..\apr\shmem\win32\shm.c" + > + </File> + </Filter> + <Filter + Name="strings" + > + <File + RelativePath="..\..\apr\strings\apr_cpystrn.c" + > + </File> + <File + RelativePath="..\..\apr\strings\apr_fnmatch.c" + > + </File> + <File + RelativePath="..\..\apr\strings\apr_snprintf.c" + > + </File> + <File + RelativePath="..\..\apr\strings\apr_strings.c" + > + </File> + <File + RelativePath="..\..\apr\strings\apr_strnatcmp.c" + > + </File> + <File + RelativePath="..\..\apr\strings\apr_strtok.c" + > + </File> + </Filter> + <Filter + Name="tables" + > + <File + RelativePath="..\..\apr\tables\apr_hash.c" + > + </File> + <File + RelativePath="..\..\apr\tables\apr_tables.c" + > + </File> + </Filter> + <Filter + Name="threadproc" + > + <File + RelativePath="..\..\apr\threadproc\win32\proc.c" + > + </File> + <File + RelativePath="..\..\apr\threadproc\win32\signals.c" + > + </File> + <File + RelativePath="..\..\apr\threadproc\win32\thread.c" + > + </File> + <File + RelativePath="..\..\apr\threadproc\win32\threadpriv.c" + > + </File> + </Filter> + <Filter + Name="time" + > + <File + RelativePath="..\..\apr\time\win32\access.c" + > + </File> + <File + RelativePath="..\..\apr\time\win32\time.c" + > + </File> + <File + RelativePath="..\..\apr\time\win32\timestr.c" + > + </File> + </Filter> + <Filter + Name="user" + > + <File + RelativePath="..\..\apr\user\win32\groupinfo.c" + > + </File> + <File + RelativePath="..\..\apr\user\win32\userinfo.c" + > + </File> + </Filter> + </Filter> + <Filter + Name="Private Header Files" + > + <File + RelativePath="..\..\apr\include\arch\win32\apr_arch_atime.h" + > + </File> + <File + RelativePath="..\..\apr\include\arch\win32\apr_arch_dso.h" + > + </File> + <File + RelativePath="..\..\apr\include\arch\win32\apr_arch_file_io.h" + > + </File> + <File + RelativePath="..\..\apr\include\arch\win32\apr_arch_inherit.h" + > + </File> + <File + RelativePath="..\..\apr\include\arch\win32\apr_arch_misc.h" + > + </File> + <File + RelativePath="..\..\apr\include\arch\win32\apr_arch_networkio.h" + > + </File> + <File + RelativePath="..\..\apr\include\arch\win32\apr_arch_thread_mutex.h" + > + </File> + <File + RelativePath="..\..\apr\include\arch\win32\apr_arch_thread_rwlock.h" + > + </File> + <File + RelativePath="..\..\apr\include\arch\win32\apr_arch_threadproc.h" + > + </File> + <File + RelativePath="..\..\apr\include\arch\win32\apr_arch_utf8.h" + > + </File> + <File + RelativePath="..\..\apr\include\arch\win32\apr_private.h" + > + </File> + <File + RelativePath="..\..\apr\include\arch\apr_private_common.h" + > + </File> + </Filter> + <Filter + Name="Public Header Files" + > + <File + RelativePath="..\..\apr\include\apr_allocator.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_atomic.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_dso.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_env.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_errno.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_file_info.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_file_io.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_fnmatch.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_general.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_getopt.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_global_mutex.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_hash.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_inherit.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_lib.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_mmap.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_network_io.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_poll.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_pools.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_portable.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_proc_mutex.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_ring.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_shm.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_signal.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_strings.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_support.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_tables.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_thread_cond.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_thread_mutex.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_thread_proc.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_thread_rwlock.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_time.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_user.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_version.h" + > + </File> + <File + RelativePath="..\..\apr\include\apr_want.h" + > + </File> + </Filter> + <File + RelativePath="..\..\apr\libapr.rc" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories="..\..\apr\include" + /> + </FileConfiguration> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/curl/curllib.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/curl/curllib.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,649 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="curllib" + ProjectGUID="{87EE9DA4-DE1E-4448-8324-183C98DCA588}" + RootNamespace="curllib" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Release|Win32" + OutputDirectory=".\Release" + IntermediateDirectory=".\Release" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Release/curllib.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\curl\lib\;..\..\curl\include;." + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\Release/curllib.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" + BrowseInformation="1" + WarningLevel="0" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Release/curllib.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\Debug" + IntermediateDirectory=".\Debug" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Debug/curllib.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\curl\lib\;..\..\curl\include;." + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile=".\Debug/curllib.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" + BrowseInformation="1" + WarningLevel="0" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Debug/curllib.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + > + <File + RelativePath="..\..\curl\lib\base64.c" + > + </File> + <File + RelativePath="..\..\curl\lib\connect.c" + > + </File> + <File + RelativePath="..\..\curl\lib\content_encoding.c" + > + </File> + <File + RelativePath="..\..\curl\lib\cookie.c" + > + </File> + <File + RelativePath="..\..\curl\lib\dict.c" + > + </File> + <File + RelativePath="..\..\curl\lib\easy.c" + > + </File> + <File + RelativePath="..\..\curl\lib\escape.c" + > + </File> + <File + RelativePath="..\..\curl\lib\file.c" + > + </File> + <File + RelativePath="..\..\curl\lib\formdata.c" + > + </File> + <File + RelativePath="..\..\curl\lib\ftp.c" + > + </File> + <File + RelativePath="..\..\curl\lib\getenv.c" + > + </File> + <File + RelativePath="..\..\curl\lib\getinfo.c" + > + </File> + <File + RelativePath="..\..\curl\lib\gtls.c" + > + </File> + <File + RelativePath="..\..\curl\lib\hash.c" + > + </File> + <File + RelativePath="..\..\curl\lib\hostares.c" + > + </File> + <File + RelativePath="..\..\curl\lib\hostasyn.c" + > + </File> + <File + RelativePath="..\..\curl\lib\hostip.c" + > + </File> + <File + RelativePath="..\..\curl\lib\hostip4.c" + > + </File> + <File + RelativePath="..\..\curl\lib\hostip6.c" + > + </File> + <File + RelativePath="..\..\curl\lib\hostsyn.c" + > + </File> + <File + RelativePath="..\..\curl\lib\hostthre.c" + > + </File> + <File + RelativePath="..\..\curl\lib\http.c" + > + </File> + <File + RelativePath="..\..\curl\lib\http_chunks.c" + > + </File> + <File + RelativePath="..\..\curl\lib\http_digest.c" + > + </File> + <File + RelativePath="..\..\curl\lib\http_negotiate.c" + > + </File> + <File + RelativePath="..\..\curl\lib\http_ntlm.c" + > + </File> + <File + RelativePath="..\..\curl\lib\if2ip.c" + > + </File> + <File + RelativePath="..\..\curl\lib\inet_ntop.c" + > + </File> + <File + RelativePath="..\..\curl\lib\inet_pton.c" + > + </File> + <File + RelativePath="..\..\curl\lib\krb4.c" + > + </File> + <File + RelativePath="..\..\curl\lib\ldap.c" + > + </File> + <File + RelativePath="..\..\curl\lib\llist.c" + > + </File> + <File + RelativePath="..\..\curl\lib\md5.c" + > + </File> + <File + RelativePath="..\..\curl\lib\memdebug.c" + > + </File> + <File + RelativePath="..\..\curl\lib\mprintf.c" + > + </File> + <File + RelativePath="..\..\curl\lib\multi.c" + > + </File> + <File + RelativePath="..\..\curl\lib\netrc.c" + > + </File> + <File + RelativePath="..\..\curl\lib\parsedate.c" + > + </File> + <File + RelativePath="..\..\curl\lib\progress.c" + > + </File> + <File + RelativePath="..\..\curl\lib\security.c" + > + </File> + <File + RelativePath="..\..\curl\lib\select.c" + > + </File> + <File + RelativePath="..\..\curl\lib\sendf.c" + > + </File> + <File + RelativePath="..\..\curl\lib\share.c" + > + </File> + <File + RelativePath="..\..\curl\lib\socks.c" + > + </File> + <File + RelativePath="..\..\curl\lib\speedcheck.c" + > + </File> + <File + RelativePath="..\..\curl\lib\splay.c" + > + </File> + <File + RelativePath="..\..\curl\lib\sslgen.c" + > + </File> + <File + RelativePath="..\..\curl\lib\ssluse.c" + > + </File> + <File + RelativePath="..\..\curl\lib\strequal.c" + > + </File> + <File + RelativePath="..\..\curl\lib\strerror.c" + > + </File> + <File + RelativePath="..\..\curl\lib\strtok.c" + > + </File> + <File + RelativePath="..\..\curl\lib\strtoofft.c" + > + </File> + <File + RelativePath="..\..\curl\lib\telnet.c" + > + </File> + <File + RelativePath="..\..\curl\lib\tftp.c" + > + </File> + <File + RelativePath="..\..\curl\lib\timeval.c" + > + </File> + <File + RelativePath="..\..\curl\lib\transfer.c" + > + </File> + <File + RelativePath="..\..\curl\lib\url.c" + > + </File> + <File + RelativePath="..\..\curl\lib\version.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + > + <File + RelativePath="..\..\curl\lib\arpa_telnet.h" + > + </File> + <File + RelativePath="..\..\curl\lib\base64.h" + > + </File> + <File + RelativePath="..\..\curl\lib\ca-bundle.h" + > + </File> + <File + RelativePath="..\..\curl\lib\config-win32.h" + > + </File> + <File + RelativePath="..\..\curl\lib\connect.h" + > + </File> + <File + RelativePath="..\..\curl\lib\content_encoding.h" + > + </File> + <File + RelativePath="..\..\curl\lib\cookie.h" + > + </File> + <File + RelativePath="..\..\curl\lib\curlx.h" + > + </File> + <File + RelativePath="..\..\curl\lib\dict.h" + > + </File> + <File + RelativePath="..\..\curl\lib\easyif.h" + > + </File> + <File + RelativePath="..\..\curl\lib\escape.h" + > + </File> + <File + RelativePath="..\..\curl\lib\file.h" + > + </File> + <File + RelativePath="..\..\curl\lib\formdata.h" + > + </File> + <File + RelativePath="..\..\curl\lib\ftp.h" + > + </File> + <File + RelativePath="..\..\curl\lib\getinfo.h" + > + </File> + <File + RelativePath="..\..\curl\lib\gtls.h" + > + </File> + <File + RelativePath="..\..\curl\lib\hash.h" + > + </File> + <File + RelativePath="..\..\curl\lib\hostip.h" + > + </File> + <File + RelativePath="..\..\curl\lib\http.h" + > + </File> + <File + RelativePath="..\..\curl\lib\http_chunks.h" + > + </File> + <File + RelativePath="..\..\curl\lib\http_digest.h" + > + </File> + <File + RelativePath="..\..\curl\lib\http_negotiate.h" + > + </File> + <File + RelativePath="..\..\curl\lib\http_ntlm.h" + > + </File> + <File + RelativePath="..\..\curl\lib\if2ip.h" + > + </File> + <File + RelativePath="..\..\curl\lib\inet_ntoa_r.h" + > + </File> + <File + RelativePath="..\..\curl\lib\inet_ntop.h" + > + </File> + <File + RelativePath="..\..\curl\lib\inet_pton.h" + > + </File> + <File + RelativePath="..\..\curl\lib\krb4.h" + > + </File> + <File + RelativePath="..\..\curl\lib\ldap.h" + > + </File> + <File + RelativePath="..\..\curl\lib\llist.h" + > + </File> + <File + RelativePath="..\..\curl\lib\md5.h" + > + </File> + <File + RelativePath="..\..\curl\lib\memdebug.h" + > + </File> + <File + RelativePath="..\..\curl\lib\memory.h" + > + </File> + <File + RelativePath="..\..\curl\lib\multiif.h" + > + </File> + <File + RelativePath="..\..\curl\lib\netrc.h" + > + </File> + <File + RelativePath="..\..\curl\lib\parsedate.h" + > + </File> + <File + RelativePath="..\..\curl\lib\progress.h" + > + </File> + <File + RelativePath="..\..\curl\lib\select.h" + > + </File> + <File + RelativePath="..\..\curl\lib\sendf.h" + > + </File> + <File + RelativePath="..\..\curl\lib\setup.h" + > + </File> + <File + RelativePath="..\..\curl\lib\share.h" + > + </File> + <File + RelativePath="..\..\curl\lib\sockaddr.h" + > + </File> + <File + RelativePath="..\..\curl\lib\speedcheck.h" + > + </File> + <File + RelativePath="..\..\curl\lib\sslgen.h" + > + </File> + <File + RelativePath="..\..\curl\lib\ssluse.h" + > + </File> + <File + RelativePath="..\..\curl\lib\strequal.h" + > + </File> + <File + RelativePath="..\..\curl\lib\strerror.h" + > + </File> + <File + RelativePath="..\..\curl\lib\strtok.h" + > + </File> + <File + RelativePath="..\..\curl\lib\strtoofft.h" + > + </File> + <File + RelativePath="..\..\curl\lib\telnet.h" + > + </File> + <File + RelativePath="..\..\curl\lib\tftp.h" + > + </File> + <File + RelativePath="..\..\curl\lib\timeval.h" + > + </File> + <File + RelativePath="..\..\curl\lib\transfer.h" + > + </File> + <File + RelativePath="..\..\curl\lib\url.h" + > + </File> + <File + RelativePath="..\..\curl\lib\urldata.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/howl/libhowl.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/howl/libhowl.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,369 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="howl static library" + ProjectGUID="{0D826AF5-0506-4C50-BB8B-7DB019AC21AE}" + RootNamespace="howl static library" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""..\..\howl-1.0.0\include";"..\..\howl-1.0.0\src\lib\howl"" + PreprocessorDefinitions="_DEBUG;WINDOWS;WIN32;_WIN32_WINNT=0x0500;HAVE_WSA_ASYNC_SELECT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CallingConvention="2" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/libhowld.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + OmitFramePointers="true" + AdditionalIncludeDirectories=""..\..\howl-1.0.0\include";"..\..\howl-1.0.0\src\lib\howl"" + PreprocessorDefinitions="NDEBUG;WINDOWS;WIN32;_WIN32_WINNT=0x0500;HAVE_WSA_ASYNC_SELECT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CallingConvention="2" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/libhowl.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" + > + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\address.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\buffer.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\channel.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\debug.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\discovery.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\interface.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\ior.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\message.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\NotOSX\notosx_mdns_stub.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\object.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\orb.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\platform.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\profile.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\salt.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\signal.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\socket.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\text_record.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\time.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\Win32\win32_interface.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\Win32\win32_salt.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\Win32\win32_socket.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\Win32\win32_time.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc" + > + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\buffer_i.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\channel_i.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\include\salt\debug.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\include\discovery\discovery.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\Win32\discovery_i.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\Win32\interface_i.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\Win32\ior.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\Win32\message_i.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\NotOSX\notosx_mdns_stub.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\object_i.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\orb_i.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\include\salt\platform.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\profile.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\Win32\resource.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\salt_i.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\signal_i.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\socket_i.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\include\discovery\text_record.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\text_record_i.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\time_i.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\tlist.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\Win32\win32_interface.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\Win32\win32_mdns.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\Win32\win32_salt.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\Win32\win32_socket.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\howl\Win32\win32_time.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + </Filter> + <File + RelativePath="ReadMe.txt" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/howl/libmDNSResponder.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/howl/libmDNSResponder.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,225 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mDNSResponder static library" + ProjectGUID="{49C34584-B6DA-448F-83CF-27584DC9FC90}" + RootNamespace="mDNSResponder static library" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug" + IntermediateDirectory="Debug Static" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\howl-1.0.0\include;..\..\howl-1.0.0\src\lib\howl;..\..\howl-1.0.0\src\lib\mDNSResponder" + PreprocessorDefinitions="_DEBUG;WINDOWS;WIN32;_WIN32_WINNT=0x0500;HAVE_WSA_ASYNC_SELECT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + CallingConvention="2" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/libmDNSResponderd.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release" + IntermediateDirectory="Release Static" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + OmitFramePointers="true" + AdditionalIncludeDirectories="..\..\howl-1.0.0\include;..\..\howl-1.0.0\src\lib\howl;..\..\howl-1.0.0\src\lib\mDNSResponder" + PreprocessorDefinitions="NDEBUG;WINDOWS;WIN32;_WIN32_WINNT=0x0500;HAVE_WSA_ASYNC_SELECT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CallingConvention="2" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/libmDNSResponder.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" + > + <File + RelativePath="..\..\howl-1.0.0\src\lib\mDNSResponder\DNSServices.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\mDNSResponder\mDNS.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\mDNSResponder\mDNSPlatform.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\mDNSResponder\mDNSServant.c" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\mDNSResponder\Win32\win32_mdns.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc" + > + <File + RelativePath="..\..\howl-1.0.0\src\lib\mDNSResponder\DNSServices.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\mDNSResponder\mDNSClientAPI.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\mDNSResponder\mDNSDebug.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\mDNSResponder\mDNSPlatform.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\mDNSResponder\mDNSPlatformFunctions.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\mDNSResponder\mDNSServant.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\mDNSResponder\Win32\resource.h" + > + </File> + <File + RelativePath="..\..\howl-1.0.0\src\lib\mDNSResponder\Win32\win32_mdns.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/iksemel/iksemel.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/iksemel/iksemel.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,232 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="iksemel" + ProjectGUID="{E727E8F6-935D-46FE-8B0E-37834748A0E3}" + RootNamespace="iksemel" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\iksemel\include;." + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\iksemel\include;." + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\iksemel\src\base64.c" + > + </File> + <File + RelativePath="..\..\iksemel\src\dom.c" + > + </File> + <File + RelativePath="..\..\iksemel\src\filter.c" + > + </File> + <File + RelativePath="..\..\iksemel\src\iks.c" + > + </File> + <File + RelativePath="..\..\iksemel\src\ikstack.c" + > + </File> + <File + RelativePath="..\..\iksemel\src\io-posix.c" + > + </File> + <File + RelativePath="..\..\iksemel\src\jabber.c" + > + </File> + <File + RelativePath="..\..\iksemel\src\md5.c" + > + </File> + <File + RelativePath="..\..\iksemel\src\sax.c" + > + </File> + <File + RelativePath="..\..\iksemel\src\sha.c" + > + </File> + <File + RelativePath="..\..\iksemel\src\stream.c" + > + </File> + <File + RelativePath="..\..\iksemel\src\utility.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\iksemel\include\common.h" + > + </File> + <File + RelativePath="..\..\iksemel\include\config.h" + > + </File> + <File + RelativePath="..\..\iksemel\include\finetune.h" + > + </File> + <File + RelativePath="..\..\iksemel\include\iksemel.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/js/js.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/js/js.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,828 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="js" + ProjectGUID="{204FA0DE-305D-4414-AE2E-F195A23F390D}" + RootNamespace="js" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)Release" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h"
if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h"
if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Release/js.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include" + PreprocessorDefinitions="NDEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile="$(IntDir)\js.pch" + AssemblerListingLocation="" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc80.pdb" + WarningLevel="0" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbc32.lib odbccp32.lib advapi32.lib wsock32.lib winmm.lib" + OutputFile="$(OutDir)\js32.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="" + ProgramDatabaseFile=".\Release/js32.pdb" + SubSystem="2" + OptimizeReferences="1" + EnableCOMDATFolding="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary=".\Release/js32.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Release/js.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)Debug" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)..\..\js\config.h" type "$(ProjectDir)..\..\js\config.hw" > "$(ProjectDir)..\..\js\config.h"
if not exist "$(ProjectDir)..\..\js\src\jsautocfg.h" type "$(ProjectDir)..\..\js\src\jsautocfg.hw" > "$(ProjectDir)..\..\js\src\jsautocfg.h"
if not exist "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h" type "$(ProjectDir)..\..\js\nsprpub\pr\include\md\_winnt.cfg" > "$(ProjectDir)..\..\js\nsprpub\pr\include\prcpucfg.h"
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Debug/js.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\js\nsprpub\pr\include\private;..\..\js\nsprpub\pr\include" + PreprocessorDefinitions="_DEBUG;DEBUG;_X86_=1;_WINDOWS;WIN32;XP_WIN;JSFILE;EXPORT_JS_API;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;JS_THREADSAFE;OSSP;_NSPR_BUILD_;JS_HAS_FILE_OBJECT=1" + MinimalRebuild="true" + RuntimeLibrary="3" + PrecompiledHeaderFile="$(IntDir)\js.pch" + AssemblerListingLocation="" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc80.pdb" + WarningLevel="0" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbc32.lib odbccp32.lib advapi32.lib wsock32.lib winmm.lib" + OutputFile="$(OutDir)\js32.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\Debug/js32.pdb" + SubSystem="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary=".\Debug/js32.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Debug/js.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" + > + <File + RelativePath="..\..\js\src\fdlibm\e_acos.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_acosh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_asin.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_atan2.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_atanh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_cosh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_exp.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_fmod.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_gamma.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_gamma_r.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_hypot.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_j0.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_j1.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_jn.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_lgamma.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_lgamma_r.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_log.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_log10.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_pow.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_rem_pio2.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_remainder.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_scalb.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_sinh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\e_sqrt.c" + > + </File> + <File + RelativePath="..\..\js\src\jsapi.c" + > + </File> + <File + RelativePath="..\..\js\src\jsarena.c" + > + </File> + <File + RelativePath="..\..\js\src\jsarray.c" + > + </File> + <File + RelativePath="..\..\js\src\jsatom.c" + > + </File> + <File + RelativePath="..\..\js\src\jsbool.c" + > + </File> + <File + RelativePath="..\..\js\src\jscntxt.c" + > + </File> + <File + RelativePath="..\..\js\src\jsdate.c" + > + </File> + <File + RelativePath="..\..\js\src\jsdbgapi.c" + > + </File> + <File + RelativePath="..\..\js\src\jsdhash.c" + > + </File> + <File + RelativePath="..\..\js\src\jsdso.c" + > + </File> + <File + RelativePath="..\..\js\src\jsdtoa.c" + > + </File> + <File + RelativePath="..\..\js\src\jsemit.c" + > + </File> + <File + RelativePath="..\..\js\src\jsexn.c" + > + </File> + <File + RelativePath="..\..\js\src\jsfile.c" + > + </File> + <File + RelativePath="..\..\js\src\jsfun.c" + > + </File> + <File + RelativePath="..\..\js\src\jsgc.c" + > + </File> + <File + RelativePath="..\..\js\src\jshash.c" + > + </File> + <File + RelativePath="..\..\js\src\jsinterp.c" + > + </File> + <File + RelativePath="..\..\js\src\jslock.c" + > + </File> + <File + RelativePath="..\..\js\src\jslog2.c" + > + </File> + <File + RelativePath="..\..\js\src\jslong.c" + > + </File> + <File + RelativePath="..\..\js\src\jsmath.c" + > + </File> + <File + RelativePath="..\..\js\src\jsnum.c" + > + </File> + <File + RelativePath="..\..\js\src\jsobj.c" + > + </File> + <File + RelativePath="..\..\js\src\jsopcode.c" + > + </File> + <File + RelativePath="..\..\js\src\jsparse.c" + > + </File> + <File + RelativePath="..\..\js\src\jsprf.c" + > + </File> + <File + RelativePath="..\..\js\src\jsregexp.c" + > + </File> + <File + RelativePath="..\..\js\src\jsscan.c" + > + </File> + <File + RelativePath="..\..\js\src\jsscope.c" + > + </File> + <File + RelativePath="..\..\js\src\jsscript.c" + > + </File> + <File + RelativePath="..\..\js\src\jsstr.c" + > + </File> + <File + RelativePath="..\..\js\src\jsutil.c" + > + </File> + <File + RelativePath="..\..\js\src\jsxdrapi.c" + > + </File> + <File + RelativePath="..\..\js\src\jsxml.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\k_cos.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\k_rem_pio2.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\k_sin.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\k_standard.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\k_tan.c" + > + </File> + <File + RelativePath="..\..\js\src\prmjtime.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_asinh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_atan.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_cbrt.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_ceil.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_copysign.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_cos.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_erf.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_expm1.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_fabs.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_finite.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_floor.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_frexp.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_ilogb.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_isnan.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_ldexp.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_lib_version.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_log1p.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_logb.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_matherr.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_modf.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_nextafter.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_rint.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_scalbn.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_signgam.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_significand.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_sin.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_tan.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\s_tanh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_acos.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_acosh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_asin.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_atan2.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_atanh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_cosh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_exp.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_fmod.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_gamma.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_gamma_r.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_hypot.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_j0.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_j1.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_jn.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_lgamma.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_lgamma_r.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_log.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_log10.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_pow.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_remainder.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_scalb.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_sinh.c" + > + </File> + <File + RelativePath="..\..\js\src\fdlibm\w_sqrt.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + > + </Filter> + <Filter + Name="NSPR Source" + > + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntinrval.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntio.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntmisc.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntsec.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\ntthread.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\pratom.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\prcthr.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prdir.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prerror.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prfdcach.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prfile.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prinit.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prinrval.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prio.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\priometh.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prlayer.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prlog.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\malloc\prmem.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prmmap.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prmwait.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prolock.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\prosdep.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\io\prprf.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\memory\prseg.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\misc\prtime.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\prtpd.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prucpu.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prucv.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prulock.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\combined\prustack.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\threads\combined\pruthr.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\w32poll.c" + > + </File> + <File + RelativePath="..\..\js\nsprpub\pr\src\md\windows\win32_errors.c" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/libresample/libresample.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/libresample/libresample.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,255 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libresample" + ProjectGUID="{50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}" + RootNamespace="libresample" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile=".\Debug/libresample.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" + WarningLevel="0" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\$(ProjectName).lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Debug/libresample.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\Release/libresample.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" + WarningLevel="0" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\$(ProjectName).lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Release/libresample.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + <File + RelativePath="..\..\libresample\src\filterkit.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;_DEBUG;_MBCS;_LIB;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_MBCS;_LIB;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libresample\src\resample.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;_DEBUG;_MBCS;_LIB;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_MBCS;_LIB;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libresample\src\resamplesubs.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;_DEBUG;_MBCS;_LIB;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_MBCS;_LIB;$(NoInherit)" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl" + > + <File + RelativePath="..\..\libresample\src\filterkit.h" + > + </File> + <File + RelativePath="..\include\libresample.h" + > + </File> + <File + RelativePath="..\..\libresample\src\resample_defs.h" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/libsndfile/libsndfile.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/libsndfile/libsndfile.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,450 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libsndfile" + ProjectGUID="{3D0370CA-BED2-4657-A475-32375CBCB6E4}" + RootNamespace="libsndfile" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UseUnicodeResponseFiles="true" + Optimization="0" + AdditionalIncludeDirectories="..\..\libsndfile\src;." + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;inline=__inline;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="1" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UseUnicodeResponseFiles="true" + AdditionalIncludeDirectories="..\..\libsndfile\src;." + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;inline=__inline;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="1" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\libsndfile\src\aiff.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\alaw.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\au.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\avr.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\broadcast.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\caf.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\command.c" + > + </File> + <File + RelativePath=".\common.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\dither.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\double64.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\dwd.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\dwvw.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\file_io.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\flac.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\float32.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\g72x.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\libsndfile\src\gsm610.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\htk.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\ima_adpcm.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\ircam.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\mat4.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\mat5.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\ms_adpcm.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\nist.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\ogg.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\paf.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\pcm.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\pvf.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\raw.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\rx2.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\sd2.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\sds.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\sndfile.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\strings.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\svx.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\txw.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\ulaw.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\voc.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\vox_adpcm.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\w64.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\wav.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\wav_w64.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\wve.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\xi.c" + > + </File> + <Filter + Name="GSM Sources" + > + <File + RelativePath="..\..\libsndfile\src\GSM610\add.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\GSM610\code.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\GSM610\decode.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\GSM610\gsm_create.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\GSM610\gsm_decode.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\GSM610\gsm_destroy.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\GSM610\gsm_encode.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\GSM610\gsm_option.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\GSM610\long_term.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\GSM610\lpc.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\GSM610\preprocess.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\GSM610\rpe.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\GSM610\short_term.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\GSM610\table.c" + > + </File> + </Filter> + <Filter + Name="G72X Sources" + > + <File + RelativePath="..\..\libsndfile\src\G72x\g721.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\G72x\g723_16.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\G72x\g723_24.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\G72x\g723_40.c" + > + </File> + <File + RelativePath="..\..\libsndfile\src\G72x\g72x.c" + > + </File> + </Filter> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/pcre/libpcre.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/pcre/libpcre.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,1116 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libpcre" + ProjectGUID="{8D04B550-D240-4A44-8A18-35DA3F7038D9}" + RootNamespace="libpcre" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + Description="" + CommandLine="" + AdditionalDependencies="" + Outputs="" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Debug/libpcre.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="./" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;DEBUG;PCRE_DEFINITION;PCRE_STATIC" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile="$(OutDir)\libpcre.pch" + AssemblerListingLocation="" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc80.pdb" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + LinkLibraryDependencies="true" + AdditionalDependencies="odbc32.lib odbccp32.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(OutDir)\$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + Description="" + CommandLine="" + AdditionalDependencies="" + Outputs="" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Release/libpcre.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="./" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;PCRE_DEFINITION;PCRE_STATIC" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile="$(OutDir)\libpcre.pch" + AssemblerListingLocation="" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc80.pdb" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + LinkLibraryDependencies="true" + AdditionalDependencies="odbc32.lib odbccp32.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(OutDir)\$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + <Configuration + Name="Debug DLL|Win32" + OutputDirectory="$(SolutionDir)Debug" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + Description="" + CommandLine="" + AdditionalDependencies="" + Outputs="" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Debug/libpcre.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="./" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;DEBUG;PCRE_DEFINITION;DLL_EXPORT" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile="$(OutDir)\libpcre.pch" + AssemblerListingLocation="" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc80.pdb" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbc32.lib odbccp32.lib" + OutputFile="$(OutDir)\$(ProjectName).dll" + LinkIncremental="1" + SuppressStartupBanner="true" + ModuleDefinitionFile="$(InputDir)..\..\pcre\pcre.def" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(IntDir)\$(ProjectName).lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(OutDir)\$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + <Configuration + Name="Release DLL|Win32" + OutputDirectory="$(SolutionDir)Release" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + Description="" + CommandLine="" + AdditionalDependencies="" + Outputs="" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\Release/libpcre.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="./" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;PCRE_DEFINITION;DLL_EXPORT" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile="$(OutDir)\libpcre.pch" + AssemblerListingLocation="" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc80.pdb" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbc32.lib odbccp32.lib" + OutputFile="$(OutDir)\$(ProjectName).dll" + LinkIncremental="1" + SuppressStartupBanner="true" + ModuleDefinitionFile="$(InputDir)..\..\pcre\pcre.def" + ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(IntDir)\$(ProjectName).lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="$(OutDir)\$(ProjectName).bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + <File + RelativePath=".\pcre_chartables.c" + > + </File> + <File + RelativePath="..\..\pcre\pcre_compile.c" + > + </File> + <File + RelativePath="..\..\pcre\pcre_config.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcre_dfa_exec.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcre_exec.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcre_fullinfo.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcre_get.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcre_globals.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcre_info.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcre_maketables.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcre_ord2utf8.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcre_refcount.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcre_study.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcre_tables.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcre_try_flipped.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcre_ucp_searchfuncs.c" + > + </File> + <File + RelativePath="..\..\pcre\pcre_valid_utf8.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcre_version.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcre_xclass.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\pcre\pcreposix.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;$(NoInherit)" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl" + > + <File + RelativePath="config.h" + > + </File> + <File + RelativePath="..\..\pcre\internal.h" + > + </File> + <File + RelativePath="..\..\pcre\pcre.h" + > + </File> + <File + RelativePath="..\..\pcre\pcre_internal.h" + > + </File> + <File + RelativePath="..\..\pcre\pcreposix.h" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/pcre/pcre_chartables.c.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,204 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libpcre Generate pcre_chartables.c" + ProjectGUID="{1CED5987-A529-46DC-B30F-870D85FF9C94}" + RootNamespace="Generatepcre_chartablesc" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\pcre\" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\dftables.exe" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine=""$(TargetPath)" "$(ProjectDir)pcre_chartables.c"" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\pcre\" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\dftables.exe" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine=""$(TargetPath)" "$(ProjectDir)pcre_chartables.c"" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="dftables.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/pthread/pthread.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/pthread/pthread.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,452 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="pthread" + ProjectGUID="{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}" + RootNamespace="pthread" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\./pthread.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../../pthreads-w32-2-7-0-release/" + PreprocessorDefinitions="__CLEANUP_C;WIN32;NDEBUG;_WINDOWS;_USRDLL;PTW32_BUILD;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\./pthread.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc80.pdb" + GenerateXMLDocumentationFiles="false" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG,PTW32_RC_MSC" + Culture="1033" + AdditionalIncludeDirectories="." + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\./pthread.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\./pthread.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../pthreads-w32-2-7-0-release/" + PreprocessorDefinitions="__CLEANUP_C;WIN32;_DEBUG;_WINDOWS;_USRDLL;PTW32_BUILD;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB" + MinimalRebuild="false" + BasicRuntimeChecks="0" + RuntimeLibrary="3" + PrecompiledHeaderFile=".\./pthread.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc80.pdb" + GenerateXMLDocumentationFiles="false" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG,PTW32_RC_MSC" + Culture="1033" + AdditionalIncludeDirectories="." + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\./pthread.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug DLL|Win32" + OutputDirectory="$(SolutionDir)Debug" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\./pthread.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../pthreads-w32-2-7-0-release/" + PreprocessorDefinitions="__CLEANUP_C;WIN32;_DEBUG;_WINDOWS;_USRDLL;PTW32_BUILD;_CRT_SECURE_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile=".\./pthread.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc80.pdb" + GenerateXMLDocumentationFiles="false" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG,PTW32_RC_MSC" + Culture="1033" + AdditionalIncludeDirectories="." + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + OutputFile="$(OutDir)\pthreadVC2.dll" + LinkIncremental="2" + SuppressStartupBanner="true" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\./pthreadVC2.pdb" + GenerateMapFile="true" + MapFileName=".\./pthreadVC2.map" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary=".\./pthreadVC2.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\./pthread.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release DLL|Win32" + OutputDirectory="$(SolutionDir)Release" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\./pthread.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../../pthreads-w32-2-7-0-release/" + PreprocessorDefinitions="__CLEANUP_C;WIN32;NDEBUG;_WINDOWS;_USRDLL;PTW32_BUILD;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\./pthread.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc80.pdb" + GenerateXMLDocumentationFiles="false" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG,PTW32_RC_MSC" + Culture="1033" + AdditionalIncludeDirectories="." + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + OutputFile="$(OutDir)\pthreadVC2.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary=".\./pthreadVC2.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\./pthread.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + <File + RelativePath="..\..\pthreads-w32-2-7-0-release\pthread.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl" + > + <File + RelativePath="../../pthreads-w32-2-7-0-release/implement.h" + > + </File> + <File + RelativePath="../../pthreads-w32-2-7-0-release/pthread.h" + > + </File> + <File + RelativePath="../../pthreads-w32-2-7-0-release/sched.h" + > + </File> + <File + RelativePath="../../pthreads-w32-2-7-0-release/semaphore.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + <File + RelativePath="../../pthreads-w32-2-7-0-release/version.rc" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug DLL|Win32" + > + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release DLL|Win32" + > + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="" + /> + </FileConfiguration> + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sofia/libsofia_sip_ua_static.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sofia/libsofia_sip_ua_static.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,1484 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libsofia_sip_ua_static" + ProjectGUID="{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}" + RootNamespace="libsofia_sip_ua_static" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\Debug" + IntermediateDirectory=".\Debug" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)..\..\sofia-sip\win32\gawk.exe" cscript /nologo "$(ProjectDir)..\util.vbs" Get http://svn.freeswitch.org/downloads/win32/gawk.exe "$(ProjectDir)..\..\sofia-sip\win32\"
cd /D "$(ProjectDir)..\..\sofia-sip\win32\"
set AWK="$(ProjectDir)..\..\sofia-sip\win32\gawk.exe"
"autogen.cmd"
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""..\..\sofia-sip\win32";"..\..\sofia-sip\libsofia-sip-ua\su";"..\..\sofia-sip\libsofia-sip-ua\ipt";"..\..\sofia-sip\libsofia-sip-ua\sresolv";"..\..\sofia-sip\libsofia-sip-ua\bnf";"..\..\sofia-sip\libsofia-sip-ua\url";"..\..\sofia-sip\libsofia-sip-ua\msg";"..\..\sofia-sip\libsofia-sip-ua\sip";"..\..\sofia-sip\libsofia-sip-ua\nta";"..\..\sofia-sip\libsofia-sip-ua\nua";"..\..\sofia-sip\libsofia-sip-ua\iptsec";"..\..\sofia-sip\libsofia-sip-ua\http";"..\..\sofia-sip\libsofia-sip-ua\nth";"..\..\sofia-sip\libsofia-sip-ua\nea";"..\..\sofia-sip\libsofia-sip-ua\sdp";"..\..\sofia-sip\libsofia-sip-ua\soa";"..\..\sofia-sip\libsofia-sip-ua\stun";"..\..\sofia-sip\libsofia-sip-ua\tport";"..\..\sofia-sip\libsofia-sip-ua\features";"..\..\pthreads-w32-2-7-0-release";." + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile=".\Debug/libsofia_sip_ua_static.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" + BrowseInformation="1" + WarningLevel="4" + WarnAsError="true" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1035" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile=".\Debug\libsofia_sip_ua_static.lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Debug/libsofia_sip_ua_static.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory=".\Release" + IntermediateDirectory=".\Release" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)..\..\sofia-sip\win32\gawk.exe" cscript /nologo "$(ProjectDir)..\util.vbs" Get http://svn.freeswitch.org/downloads/win32/gawk.exe "$(ProjectDir)..\..\sofia-sip\win32\"
cd /D "$(ProjectDir)..\..\sofia-sip\win32\"
set AWK="$(ProjectDir)..\..\sofia-sip\win32\gawk.exe"
"autogen.cmd"
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories=""..\..\sofia-sip\win32";"..\..\sofia-sip\libsofia-sip-ua\su";"..\..\sofia-sip\libsofia-sip-ua\ipt";"..\..\sofia-sip\libsofia-sip-ua\sresolv";"..\..\sofia-sip\libsofia-sip-ua\bnf";"..\..\sofia-sip\libsofia-sip-ua\url";"..\..\sofia-sip\libsofia-sip-ua\msg";"..\..\sofia-sip\libsofia-sip-ua\sip";"..\..\sofia-sip\libsofia-sip-ua\nta";"..\..\sofia-sip\libsofia-sip-ua\nua";"..\..\sofia-sip\libsofia-sip-ua\iptsec";"..\..\sofia-sip\libsofia-sip-ua\http";"..\..\sofia-sip\libsofia-sip-ua\nth";"..\..\sofia-sip\libsofia-sip-ua\nea";"..\..\sofia-sip\libsofia-sip-ua\sdp";"..\..\sofia-sip\libsofia-sip-ua\soa";"..\..\sofia-sip\libsofia-sip-ua\stun";"..\..\sofia-sip\libsofia-sip-ua\tport";"..\..\sofia-sip\libsofia-sip-ua\features";"..\..\pthreads-w32-2-7-0-release";." + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB;HAVE_IPHLPAPI_H" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\Release/libsofia_sip_ua_static.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" + BrowseInformation="1" + WarningLevel="4" + WarnAsError="true" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1035" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile=".\Release\libsofia_sip_ua_static.lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Release/libsofia_sip_ua_static.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + <Filter + Name="su" + Filter="su*.c" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\inet_ntop.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\inet_pton.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\smoothsort.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\string0.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_addrinfo.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_alloc.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_alloc_lock.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_base_port.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_bm.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_default_log.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_errno.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_global_log.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_localinfo.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_log.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_md5.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_os_nw.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_port.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_pthread_port.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_root.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_socket_port.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_sprintf.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_strdup.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_strlst.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_tag.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_tag_io.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_taglist.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_time.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_time0.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_timer.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_uniqueid.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_vector.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_wait.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_win32_port.c" + > + </File> + </Filter> + <Filter + Name="ipt" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\ipt\base64.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\ipt\rc4.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\ipt\token64.c" + > + </File> + </Filter> + <Filter + Name="url" + Filter="url*.c" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\url\url.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\url\url_tag.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\url\url_tag_ref.c" + > + </File> + </Filter> + <Filter + Name="features" + Filter="features*.c" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\features\features.c" + > + </File> + </Filter> + <Filter + Name="bnf" + Filter="bnf*.c" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\bnf\bnf.c" + > + </File> + </Filter> + <Filter + Name="msg" + Filter="msg*.c" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_auth.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_basic.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_date.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_generic.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_header_copy.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_header_make.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_mclass.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_mime.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_mime_table.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_parser.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_parser_util.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_tag.c" + > + </File> + </Filter> + <Filter + Name="clib replacement" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\memcspn.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\memmem.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\memspn.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\strcasestr.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\strtoull.c" + > + </File> + </Filter> + <Filter + Name="sip" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_basic.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_caller_prefs.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_event.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_extra.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_feature.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_header.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_mime.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_parser.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_parser_table.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_prack.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_pref_util.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_reason.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_refer.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_security.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_session.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_status.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_tag.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_tag_class.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_tag_ref.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_time.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_util.c" + > + </File> + </Filter> + <Filter + Name="http" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_basic.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_extra.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_header.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_parser.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_parser_table.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_status.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_tag.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_tag_class.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\http_tag_ref.c" + > + </File> + </Filter> + <Filter + Name="nth" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nth\nth_client.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nth\nth_server.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nth\nth_tag.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nth\nth_tag_ref.c" + > + </File> + </Filter> + <Filter + Name="sresolv" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sres.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sres_blocking.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sres_cache.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sresolv.c" + > + </File> + </Filter> + <Filter + Name="nea" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\nea.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\nea_debug.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\nea_event.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\nea_server.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\nea_tag.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\nea_tag_ref.c" + > + </File> + </Filter> + <Filter + Name="iptsec" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_client.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_common.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_digest.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_module.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_module_http.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_module_sip.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_plugin.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_plugin_delayed.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_tag.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\auth_tag_ref.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\iptsec_debug.c" + > + </File> + </Filter> + <Filter + Name="stun" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\stun.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\stun_common.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\stun_dns.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\stun_internal.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\stun_mini.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\stun_tag.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\stun_tag_ref.c" + > + </File> + </Filter> + <Filter + Name="nua" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_common.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_dialog.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_dialog.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_event_server.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_extension.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_message.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_notifier.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_options.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_params.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_params.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_publish.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_register.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_registrar.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_session.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_stack.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_stack.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_subnotref.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_tag.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\nua_tag_ref.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\outbound.c" + > + </File> + </Filter> + <Filter + Name="nta" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\nta.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\nta_check.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\nta_tag.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\nta_tag_ref.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sl_read_payload.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sl_utils_log.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sl_utils_print.c" + > + </File> + </Filter> + <Filter + Name="tport" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_internal.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_logging.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_stub_sigcomp.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_stub_stun.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_tag.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_tag_ref.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_type_connect.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_type_tcp.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_type_udp.c" + > + </File> + </Filter> + <Filter + Name="sdp" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sdp\sdp.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sdp\sdp_parse.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sdp\sdp_print.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sdp\sdp_tag.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sdp\sdp_tag_ref.c" + > + </File> + </Filter> + <Filter + Name="soa" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\soa.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\sofia-sip\soa_session.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\soa_static.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\soa_tag.c" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\soa_tag_ref.c" + > + </File> + </Filter> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl" + > + <Filter + Name="su headers" + Filter="su*.h" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\htable.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\htable2.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\rbtree.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\string0.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_addrinfo.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_alloc.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_alloc_stat.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_bm.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_config.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_debug.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_errno.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_localinfo.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_log.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_md5.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_module_debug.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_os_nw.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_port.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_source.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_strlst.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_tag.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_tag_class.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_tag_inline.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_tag_io.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_tagarg.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_time.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_types.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_uniqueid.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_vector.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\su_wait.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\sofia-sip\tstdef.h" + > + </File> + </Filter> + <Filter + Name="win32 headers" + > + <File + RelativePath="..\config.h" + > + </File> + <File + RelativePath="..\sofia-sip\su_configure.h" + > + </File> + <File + RelativePath="..\unistd.h" + > + </File> + </Filter> + <Filter + Name="ipt headers" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\ipt\sofia-sip\base64.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\ipt\sofia-sip\rc4.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\ipt\sofia-sip\token64.h" + > + </File> + </Filter> + <Filter + Name="url headers" + Filter="url*.h" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\url\sofia-sip\url.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\url\sofia-sip\url_tag.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\url\sofia-sip\url_tag_class.h" + > + </File> + </Filter> + <Filter + Name="features headers" + Filter="features*.h" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\features\sofia-sip\sofia_features.h" + > + </File> + </Filter> + <Filter + Name="bnf headers" + Filter="bnf*.h" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\bnf\sofia-sip\bnf.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\bnf\sofia-sip\hostdomain.h" + > + </File> + </Filter> + <Filter + Name="msg headers" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_addr.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_bnf.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_buffer.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_date.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_header.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\msg_internal.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_mclass.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_mclass_hash.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_mime.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_mime_protos.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_parser.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_protos.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_tag_class.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\msg\sofia-sip\msg_types.h" + > + </File> + </Filter> + <Filter + Name="sip headers" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_extensions.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_hclasses.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_header.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sip_internal.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_parser.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_protos.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_status.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_tag.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_tag_class.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sip\sofia-sip\sip_util.h" + > + </File> + </Filter> + <Filter + Name="http headers" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http_hclasses.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http_header.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http_parser.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http_protos.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http_status.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http_tag.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\http\sofia-sip\http_tag_class.h" + > + </File> + </Filter> + <Filter + Name="nth headers" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nth\sofia-sip\nth.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nth\sofia-sip\nth_tag.h" + > + </File> + </Filter> + <Filter + Name="sresolv headers" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sofia-resolv\sres.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sofia-resolv\sres_async.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sofia-resolv\sres_cache.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sofia-resolv\sres_record.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sresolv\sofia-sip\sresolv.h" + > + </File> + </Filter> + <Filter + Name="nea headers" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\sofia-sip\nea.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\nea_debug.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nea\sofia-sip\nea_tag.h" + > + </File> + </Filter> + <Filter + Name="iptsec headers" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\sofia-sip\auth_client.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\sofia-sip\auth_digest.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\sofia-sip\auth_module.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\sofia-sip\auth_ntlm.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\sofia-sip\auth_plugin.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\iptsec\iptsec_debug.h" + > + </File> + </Filter> + <Filter + Name="stun headers" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\sofia-sip\stun.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\sofia-sip\stun_common.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\stun\sofia-sip\stun_tag.h" + > + </File> + </Filter> + <Filter + Name="nua headers" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\sofia-sip\nua.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nua\sofia-sip\nua_tag.h" + > + </File> + </Filter> + <Filter + Name="nta headers" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sofia-sip\nta.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\nta_internal.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sofia-sip\nta_stateless.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sofia-sip\nta_tag.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sofia-sip\nta_tport.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\nta\sofia-sip\sl_utils.h" + > + </File> + </Filter> + <Filter + Name="tport headers" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\sofia-sip\tport.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\sofia-sip\tport_plugins.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\sofia-sip\tport_tag.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\tport\tport_tls.h" + > + </File> + </Filter> + <Filter + Name="sdp headers" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sdp\sofia-sip\sdp.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\sdp\sofia-sip\sdp_tag.h" + > + </File> + </Filter> + <Filter + Name="soa headers" + > + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\sofia-sip\soa.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\sofia-sip\soa_add.h" + > + </File> + <File + RelativePath="..\..\sofia-sip\libsofia-sip-ua\soa\sofia-sip\soa_tag.h" + > + </File> + </Filter> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/speex/libspeex.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/speex/libspeex.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,393 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libspeex" + ProjectGUID="{1C469CDD-A3AF-4A94-A592-B2CF12F2D918}" + RootNamespace="libspeex" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + AdditionalIncludeDirectories="..\..\speex\win32, ..\..\speex\include" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_CONFIG_H" + RuntimeLibrary="3" + PrecompiledHeaderFile=".\Debug/libspeex.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" + ProgramDataBaseFileName=".\Debug/" + WarningLevel="0" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="2057" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\$(ProjectName).lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Debug/libspeex.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + AdditionalIncludeDirectories="..\..\speex\win32, ..\..\speex\include" + PreprocessorDefinitions="inline=__inline;WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H" + RuntimeLibrary="2" + PrecompiledHeaderFile=".\Release/libspeex.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" + WarningLevel="0" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="2057" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\$(ProjectName).lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Release/libspeex.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + <File + RelativePath="..\..\speex\libspeex\bits.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\cb_search.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\exc_10_16_table.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\exc_10_32_table.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\exc_20_32_table.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\exc_5_256_table.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\exc_5_64_table.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\exc_8_128_table.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\filters.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\gain_table.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\gain_table_lbr.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\hexc_10_32_table.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\hexc_table.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\high_lsp_tables.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\lpc.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\lsp.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\lsp_tables_nb.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\ltp.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\math_approx.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\misc.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\modes.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\nb_celp.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\preprocess.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\quant_lsp.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\sb_celp.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\smallft.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\speex.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\speex_callbacks.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\speex_header.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\stereo.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\vbr.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\vq.c" + > + </File> + <File + RelativePath="..\..\speex\libspeex\window.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl" + > + <File + RelativePath="..\..\speex\libspeex\cb_search.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\filters.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\lpc.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\lsp.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\ltp.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\misc.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\modes.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\nb_celp.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\quant_lsp.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\sb_celp.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\smallft.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\speex.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\speex_bits.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\speex_callbacks.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\speex_denoise.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\speex_header.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\speex_stereo.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\stack_alloc.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\vbr.h" + > + </File> + <File + RelativePath="..\..\speex\libspeex\vq.h" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sqlite/sqlite.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/sqlite/sqlite.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,539 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libsqlite" + ProjectGUID="{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}" + RootNamespace="libsqlite" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if exist "$(ProjectDir)..\..\sqlite\src\sqlite3.h" del "$(ProjectDir)..\..\sqlite\src\sqlite3.h"
if exist "$(ProjectDir)..\..\sqlite\src\parse.h" del "$(ProjectDir)..\..\sqlite\src\parse.h"
if exist "$(ProjectDir)..\..\sqlite\src\parse.c" del "$(ProjectDir)..\..\sqlite\src\parse.c"
if exist "$(ProjectDir)..\..\sqlite\src\opcodes.h" del "$(ProjectDir)..\..\sqlite\src\opcodes.h"
if exist "$(ProjectDir)..\..\sqlite\src\opcodes.c" del "$(ProjectDir)..\..\sqlite\src\opcodes.c"
if exist "$(ProjectDir)..\..\sqlite\src\keywordhash.h" del "$(ProjectDir)..\..\sqlite\src\keywordhash.h"
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\sqlite\src"" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="
" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if exist "$(ProjectDir)..\..\sqlite\src\sqlite3.h" del "$(ProjectDir)..\..\sqlite\src\sqlite3.h"
if exist "$(ProjectDir)..\..\sqlite\src\parse.h" del "$(ProjectDir)..\..\sqlite\src\parse.h"
if exist "$(ProjectDir)..\..\sqlite\src\parse.c" del "$(ProjectDir)..\..\sqlite\src\parse.c"
if exist "$(ProjectDir)..\..\sqlite\src\opcodes.h" del "$(ProjectDir)..\..\sqlite\src\opcodes.h"
if exist "$(ProjectDir)..\..\sqlite\src\opcodes.c" del "$(ProjectDir)..\..\sqlite\src\opcodes.c"
if exist "$(ProjectDir)..\..\sqlite\src\keywordhash.h" del "$(ProjectDir)..\..\sqlite\src\keywordhash.h"
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\sqlite\src"" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/sqlite.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="
" + /> + </Configuration> + <Configuration + Name="Debug DLL|Win32" + OutputDirectory="$(SolutionDir)Debug" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if exist "$(ProjectDir)..\..\sqlite\src\sqlite3.h" del "$(ProjectDir)..\..\sqlite\src\sqlite3.h"
if exist "$(ProjectDir)..\..\sqlite\src\parse.h" del "$(ProjectDir)..\..\sqlite\src\parse.h"
if exist "$(ProjectDir)..\..\sqlite\src\parse.c" del "$(ProjectDir)..\..\sqlite\src\parse.c"
if exist "$(ProjectDir)..\..\sqlite\src\opcodes.h" del "$(ProjectDir)..\..\sqlite\src\opcodes.h"
if exist "$(ProjectDir)..\..\sqlite\src\opcodes.c" del "$(ProjectDir)..\..\sqlite\src\opcodes.c"
if exist "$(ProjectDir)..\..\sqlite\src\keywordhash.h" del "$(ProjectDir)..\..\sqlite\src\keywordhash.h"
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\sqlite\src"" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;SQLITE_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + ModuleDefinitionFile="sqlite3.def" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb" + SubSystem="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(IntDir)/$(TargetName).lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="
" + /> + </Configuration> + <Configuration + Name="Release DLL|Win32" + OutputDirectory="$(SolutionDir)Release" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if exist "$(ProjectDir)..\..\sqlite\src\sqlite3.h" del "$(ProjectDir)..\..\sqlite\src\sqlite3.h"
if exist "$(ProjectDir)..\..\sqlite\src\parse.h" del "$(ProjectDir)..\..\sqlite\src\parse.h"
if exist "$(ProjectDir)..\..\sqlite\src\parse.c" del "$(ProjectDir)..\..\sqlite\src\parse.c"
if exist "$(ProjectDir)..\..\sqlite\src\opcodes.h" del "$(ProjectDir)..\..\sqlite\src\opcodes.h"
if exist "$(ProjectDir)..\..\sqlite\src\opcodes.c" del "$(ProjectDir)..\..\sqlite\src\opcodes.c"
if exist "$(ProjectDir)..\..\sqlite\src\keywordhash.h" del "$(ProjectDir)..\..\sqlite\src\keywordhash.h"
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)..\..\sqlite\src"" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="0" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + ModuleDefinitionFile="sqlite3.def" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(IntDir)/$(TargetName).lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="
" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\sqlite\src\alter.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\analyze.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\attach.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\auth.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\btree.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\build.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\callback.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\complete.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\date.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\delete.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\expr.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\func.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\hash.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\insert.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\legacy.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\loadext.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\main.c" + > + </File> + <File + RelativePath=".\opcodes.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\os.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\os_unix.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\os_win.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\pager.c" + > + </File> + <File + RelativePath=".\parse.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\pragma.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\prepare.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\printf.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\random.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\select.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\shell.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\table.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\tokenize.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\trigger.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\update.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\utf.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\util.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\vacuum.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\vdbe.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\vdbeapi.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\vdbeaux.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\vdbefifo.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\vdbemem.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\vtab.c" + > + </File> + <File + RelativePath="..\..\sqlite\src\where.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\sqlite\src\btree.h" + > + </File> + <File + RelativePath="..\..\sqlite\src\hash.h" + > + </File> + <File + RelativePath=".\keywordhash.h" + > + </File> + <File + RelativePath=".\opcodes.h" + > + </File> + <File + RelativePath="..\..\sqlite\src\os.h" + > + </File> + <File + RelativePath="..\..\sqlite\src\os_common.h" + > + </File> + <File + RelativePath="..\..\sqlite\src\pager.h" + > + </File> + <File + RelativePath=".\parse.h" + > + </File> + <File + RelativePath=".\sqlite3.h" + > + </File> + <File + RelativePath="..\..\sqlite\src\sqliteInt.h" + > + </File> + <File + RelativePath="..\..\sqlite\src\vdbe.h" + > + </File> + <File + RelativePath="..\..\sqlite\src\vdbeInt.h" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/udns/libudns.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/udns/libudns.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,227 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libudns" + ProjectGUID="{4043FC6A-9A30-4577-8AD5-9B233C9575D8}" + RootNamespace="libudns" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="0" + WholeProgramOptimization="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\udns\inet_pton.c" + > + </File> + <File + RelativePath="..\..\udns\udns_bl.c" + > + </File> + <File + RelativePath="..\..\udns\udns_codes.c" + > + </File> + <File + RelativePath="..\..\udns\udns_dn.c" + > + </File> + <File + RelativePath="..\..\udns\udns_dntosp.c" + > + </File> + <File + RelativePath="..\..\udns\udns_misc.c" + > + </File> + <File + RelativePath="..\..\udns\udns_parse.c" + > + </File> + <File + RelativePath="..\..\udns\udns_resolver.c" + > + </File> + <File + RelativePath="..\..\udns\udns_rr_a.c" + > + </File> + <File + RelativePath="..\..\udns\udns_rr_mx.c" + > + </File> + <File + RelativePath="..\..\udns\udns_rr_naptr.c" + > + </File> + <File + RelativePath="..\..\udns\udns_rr_ptr.c" + > + </File> + <File + RelativePath="..\..\udns\udns_rr_srv.c" + > + </File> + <File + RelativePath="..\..\udns\udns_rr_txt.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\udns\inet_pton.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/xmlrpc/Abyss.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/xmlrpc/Abyss.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,388 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="Abyss" + ProjectGUID="{356EC96D-4C9F-47B5-9083-FC328B87BA94}" + RootNamespace="Abyss" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\../bin/Abyss.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(ProjectDir)../../xmlrpc-c/";"$(ProjectDir)../../xmlrpc-c/include/";"$(ProjectDir)../../xmlrpc-c/lib/util/include/"" + PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;ABYSS_WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + MinimalRebuild="true" + RuntimeLibrary="3" + PrecompiledHeaderFile=".\objs/Abyss.pch" + AssemblerListingLocation=".\objs/" + ObjectFile=".\objs/" + ProgramDataBaseFileName=".\objs/" + WarningLevel="0" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1036" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\../bin/Abyss.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\../bin/Abyss.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories=""$(ProjectDir)../../xmlrpc-c/";"$(ProjectDir)../../xmlrpc-c/include/";"$(ProjectDir)../../xmlrpc-c/lib/util/include/"" + PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;ABYSS_WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\objs/Abyss.pch" + AssemblerListingLocation=".\objs/" + ObjectFile=".\objs/" + ProgramDataBaseFileName=".\objs/" + WarningLevel="0" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1036" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\../bin/Abyss.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="c" + > + <File + RelativePath="..\..\xmlrpc-c\lib\abyss\src\conf.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\abyss\src\conn.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\abyss\src\data.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\abyss\src\file.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\abyss\src\http.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\abyss\src\server.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\abyss\src\socket.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\abyss\src\thread.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\abyss\src\.\token.c" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\abyss\src\trace.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h" + > + <File + RelativePath="..\..\xmlrpc-c\lib\abyss\src\abyss.h" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/xmlrpc/xmlrpc.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/win32/xmlrpc/xmlrpc.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,748 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="xmlrpc" + ProjectGUID="{A3FE0076-B366-429D-A238-D7304DA7D3C1}" + RootNamespace="xmlrpc" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\Debug\xmlrpc" + IntermediateDirectory=".\Debug\xmlrpc" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)..\..\xmlrpc-c\transport_config.h" copy "$(ProjectDir)..\..\xmlrpc-c\Windows\transport_config_win32.h" "$(ProjectDir)..\..\xmlrpc-c\transport_config.h"
if not exist "$(ProjectDir)..\..\xmlrpc-c\config.h" copy "$(ProjectDir)..\..\xmlrpc-c\Windows\xmlrpc_win32_config.h" "$(ProjectDir)..\..\xmlrpc-c\config.h"
if not exist "$(ProjectDir)..\..\xmlrpc-c\xmlrpc_config.h" copy "$(ProjectDir)..\..\xmlrpc-c\Windows\xmlrpc_win32_config.h" "$(ProjectDir)..\..\xmlrpc-c\xmlrpc_config.h"
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(ProjectDir)../../xmlrpc-c/lib/";"$(ProjectDir)../../xmlrpc-c/lib/curl_transport";"$(ProjectDir)../../xmlrpc-c/lib/util/include";"$(ProjectDir)../../xmlrpc-c/include";"$(ProjectDir)../../xmlrpc-c/";"$(ProjectDir)../../xmlrpc-c/lib/expat/xmlparse";"$(ProjectDir)../../xmlrpc-c/lib/w3c-libwww-5.3.2/Library/src";"$(ProjectDir)../../xmlrpc-c/lib/abyss/src";"$(ProjectDir)../../xmlrpc-c/lib/wininet_transport";"$(ProjectDir)../../include"" + PreprocessorDefinitions="_DEBUG;WIN32;_LIB;ABYSS_WIN32;CURL_STATICLIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile=".\Debug\xmlrpc/xmlrpc.pch" + AssemblerListingLocation=".\Debug\xmlrpc/" + ObjectFile=".\Debug\xmlrpc/" + ProgramDataBaseFileName=".\Debug\xmlrpc/" + WarningLevel="0" + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\$(ProjectName).lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Debug\xmlrpc/xmlrpc.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)..\..\xmlrpc-c\transport_config.h" copy "$(ProjectDir)..\..\xmlrpc-c\Windows\transport_config_win32.h" "$(ProjectDir)..\..\xmlrpc-c\transport_config.h"
if not exist "$(ProjectDir)..\..\xmlrpc-c\config.h" copy "$(ProjectDir)..\..\xmlrpc-c\Windows\xmlrpc_win32_config.h" "$(ProjectDir)..\..\xmlrpc-c\config.h"
if not exist "$(ProjectDir)..\..\xmlrpc-c\xmlrpc_config.h" copy "$(ProjectDir)..\..\xmlrpc-c\Windows\xmlrpc_win32_config.h" "$(ProjectDir)..\..\xmlrpc-c\xmlrpc_config.h"
" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories=""$(ProjectDir)../../xmlrpc-c/lib/";"$(ProjectDir)../../xmlrpc-c/lib/curl_transport";"$(ProjectDir)../../xmlrpc-c/lib/util/include";"$(ProjectDir)../../xmlrpc-c/include";"$(ProjectDir)../../xmlrpc-c/";"$(ProjectDir)../../xmlrpc-c/lib/expat/xmlparse";"$(ProjectDir)../../xmlrpc-c/lib/w3c-libwww-5.3.2/Library/src";"$(ProjectDir)../../xmlrpc-c/lib/abyss/src";"$(ProjectDir)../../xmlrpc-c/lib/wininet_transport";"$(ProjectDir)../../include"" + PreprocessorDefinitions="NDEBUG;WIN32;_LIB;ABYSS_WIN32;CURL_STATICLIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\Release\xmlrpc/xmlrpc.pch" + AssemblerListingLocation=".\Release\xmlrpc/" + ObjectFile=".\Release\xmlrpc/" + ProgramDataBaseFileName=".\Release\xmlrpc/" + BrowseInformation="1" + WarningLevel="0" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)\$(ProjectName).lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\Release\xmlrpc/xmlrpc.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;cc" + > + <File + RelativePath="..\..\xmlrpc-c\lib\util\casprintf.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\util\pthreadx_win32.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_array.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_authcookie.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_base64.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_builddecomp.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_client.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\curl_transport\xmlrpc_curl_transport.c" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_data.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_datetime.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_expat.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_libxml2.c" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_parse.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_registry.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_serialize.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_server_abyss.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_server_w32httpsys.c" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_struct.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_strutil.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_support.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\src\xmlrpc_utf8.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\wininet_transport\xmlrpc_wininet_transport.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl" + > + <File + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\abyss.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\base.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\util\include\bool.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\client.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\client_int.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\util\include\mallocvar.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\util\include\pthreadx.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\server.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\server_abyss.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\server_cgi.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\server_w32httpsys.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\transport.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\transport_config.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\transport_int.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\include\xmlrpc-c\xmlparser.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\xmlrpc_config.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\curl_transport\xmlrpc_curl_transport.h" + > + </File> + <File + RelativePath="..\..\xmlrpc-c\lib\wininet_transport\xmlrpc_wininet_transport.h" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_event.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_event.h Wed Dec 12 13:58:47 2007 @@ -242,10 +242,11 @@ \brief Render a string representation of an event sutable for printing or network transport \param event the event to render \param str a string pointer to point at the allocated data + \param encode url encode the headers \return SWITCH_STATUS_SUCCESS if the operation was successful \note you must free the resulting string when you are finished with it */ -SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, char **str); +SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, char **str, switch_bool_t encode); /*! \brief Render a XML representation of an event sutable for printing or network transport Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_platform.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_platform.h Wed Dec 12 13:58:47 2007 @@ -215,6 +215,10 @@ #define SWITCH_INT64_T_FMT "I64d" #define SWITCH_UINT64_T_FMT "I64u" +#ifndef TIME_T_FMT +#define TIME_T_FMT "ld" +#endif + #else #ifndef SWITCH_SSIZE_T_FMT #define SWITCH_SSIZE_T_FMT (sizeof (switch_ssize_t) == sizeof (long) ? "ld" : sizeof (switch_ssize_t) == sizeof (int) ? "d" : "lld") Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_commands/mod_commands.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_commands/mod_commands.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_commands" + ProjectGUID="{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}" + RootNamespace="mod_commands" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_commands.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_commands/mod_commands.c Wed Dec 12 13:58:47 2007 @@ -58,7 +58,7 @@ } mydata = strdup(cmd); - assert(mydata); + switch_assert(mydata); argc = switch_separate_string(mydata, delim, argv, (sizeof(argv) / sizeof(argv[0]))); @@ -145,7 +145,7 @@ } mydata = strdup(cmd); - assert(mydata); + switch_assert(mydata); argc = switch_separate_string(mydata, delim, argv, (sizeof(argv) / sizeof(argv[0]))); @@ -181,7 +181,7 @@ if (xml && x_user) { xmlstr = switch_xml_toxml(x_user, SWITCH_FALSE); - assert(xmlstr); + switch_assert(xmlstr); stream->write_function(stream, "%s", xmlstr); free(xmlstr); @@ -221,13 +221,13 @@ mydata = strdup(cmd); - assert(mydata); + switch_assert(mydata); argc = switch_separate_string(mydata, delim, argv, (sizeof(argv) / sizeof(argv[0]))); if (argc == 1 && !strcasecmp(argv[0], "root")) { - const char *err; - xml = switch_xml_open_root(0, &err); + const char *error; + xml = switch_xml_open_root(0, &error); obj = xml; goto end; } @@ -243,7 +243,7 @@ tag_attr_val = argv[3]; params = switch_mprintf("section=%s&tag=%s&tag_attr_name=%s&tag_attr_val=%s", section, tag, tag_attr_name, tag_attr_val); - assert(params); + switch_assert(params); if (switch_xml_locate(section, tag, tag_attr_name, tag_attr_val, &xml, &obj, params) != SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "can't find anything\n"); goto end; @@ -264,7 +264,7 @@ if (xml && obj) { xmlstr = switch_xml_toxml(obj, SWITCH_FALSE); - assert(xmlstr); + switch_assert(xmlstr); stream->write_function(stream, "%s", xmlstr); free(xmlstr); @@ -292,7 +292,7 @@ } mydata = strdup(cmd); - assert(mydata); + switch_assert(mydata); argc = switch_separate_string(mydata, '|', argv, (sizeof(argv) / sizeof(argv[0]))); @@ -305,7 +305,7 @@ if (argc > 2) { len = strlen(argv[0]) * 3; substituted = malloc(len); - assert(substituted); + switch_assert(substituted); memset(substituted, 0, len); switch_replace_char(argv[2], '%','$', SWITCH_FALSE); switch_perform_substitution(re, proceed, argv[2], argv[0], substituted, len, ovector); @@ -358,7 +358,7 @@ } mydata = strdup(cmd); - assert(mydata); + switch_assert(mydata); if ((p = strchr(mydata, '?'))) { *p = ':'; @@ -699,13 +699,13 @@ if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); if (argc >= 2 && argc <= 5) { - char *uuid = argv[0]; + char *tuuid = argv[0]; char *dest = argv[1]; char *dp = argv[2]; char *context = argv[3]; char *arg = NULL; - if ((tsession = switch_core_session_locate(uuid))) { + if ((tsession = switch_core_session_locate(tuuid))) { if (*dest == '-') { arg = dest; @@ -727,7 +727,6 @@ } } else if (!strcasecmp(arg, "both")) { const char *uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE); - switch_core_session_t *other_session; if (uuid && (other_session = switch_core_session_locate(uuid))) { switch_ivr_session_transfer(other_session, dest, dp, context); switch_core_session_rwunlock(other_session); @@ -773,7 +772,7 @@ } mydata = strdup(cmd); - assert(mydata != NULL); + switch_assert(mydata != NULL); if ((argc = switch_separate_string(mydata, ' ', argv, sizeof(argv) / sizeof(argv[0]))) < 3) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "-ERR INVALID ARGS!\n"); @@ -1354,7 +1353,7 @@ } mycmd = strdup(cmd); - assert(mycmd); + switch_assert(mycmd); argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); if (argc < 2 || argc > 7) { @@ -1363,13 +1362,13 @@ } - for (x = 0; x < argc; x++) { + for (x = 0; x < argc && argv[x]; x++) { if (!strcasecmp(argv[x], "undef")) { argv[x] = NULL; } } - if (!strcasecmp(argv[0], "machine")) { + if (argv[0] && !strcasecmp(argv[0], "machine")) { machine = 1; i++; } @@ -1403,7 +1402,7 @@ } caller_channel = switch_core_session_get_channel(caller_session); - assert(caller_channel != NULL); + switch_assert(caller_channel != NULL); switch_channel_clear_state_handler(caller_channel, NULL); if (*exten == '&' && *(exten + 1)) { @@ -1450,7 +1449,7 @@ char *cmd, *arg = NULL; switch_stream_handle_t stream = { 0 }; - assert(task); + switch_assert(task); cmd = (char *) task->cmd_arg; @@ -1517,7 +1516,7 @@ if (encoded) { elen = (int) strlen(mystream.data) * 3; edata = malloc(elen); - assert(edata != NULL); + switch_assert(edata != NULL); memset(edata, 0, elen); switch_url_encode(mystream.data, edata, elen); send = edata; @@ -1552,7 +1551,7 @@ return SWITCH_STATUS_SUCCESS; } tm = strdup(cmd); - assert(tm != NULL); + switch_assert(tm != NULL); if ((group = strchr(tm, ' '))) { uint32_t id; @@ -1717,7 +1716,7 @@ holder.print_title = 1; - if (!(cflags & SCF_USE_SQL) && !strcasecmp(command, "channels")) { + if (!(cflags & SCF_USE_SQL) && command && !strcasecmp(command, "channels")) { stream->write_function(stream, "-ERR SQL DISABLED NO CHANNEL DATA AVAILABLE!\n"); return SWITCH_STATUS_SUCCESS; } @@ -1866,7 +1865,7 @@ switch_channel_t *channel; channel = switch_core_session_get_channel(psession); - assert(channel != NULL); + switch_assert(channel != NULL); if (switch_strlen_zero(var_name)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); @@ -1914,7 +1913,7 @@ switch_channel_t *channel; channel = switch_core_session_get_channel(psession); - assert(channel != NULL); + switch_assert(channel != NULL); if (switch_strlen_zero(var_name)) { stream->write_function(stream, "-ERR No variable name specified!\n"); Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_conference/mod_conference.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_conference/mod_conference.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_conference" + ProjectGUID="{C24FB505-05D7-4319-8485-7540B44C8603}" + RootNamespace="mod_conference" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_conference.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_dptools" + ProjectGUID="{B5881A85-FE70-4F64-8607-2CAAE52669C6}" + RootNamespace="mod_dptools" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_dptools.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_dptools/mod_dptools.c Wed Dec 12 13:58:47 2007 @@ -456,7 +456,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); } else { var = strdup(data); - assert(var); + switch_assert(var); val = strchr(var, '='); if (val) { @@ -656,9 +656,11 @@ if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event); - switch_event_serialize(event, &buf); + switch_event_serialize(event, &buf, SWITCH_FALSE); + switch_assert(buf); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "CHANNEL_DATA:\n%s\n", buf); switch_event_destroy(&event); + free(buf); } } @@ -1499,6 +1501,9 @@ timelimit = atoi(var); } + switch_channel_set_variable(channel, "dialed_user", user); + switch_channel_set_variable(channel, "dialed_domain", domain); + d_dest = switch_channel_expand_variables(channel, dest); if (switch_ivr_originate(session, new_session, &cause, d_dest, timelimit, NULL, NULL, NULL, NULL) == SWITCH_STATUS_SUCCESS) { Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_enum/mod_enum.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_enum/mod_enum.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_enum" + ProjectGUID="{71A967D5-0E99-4CEF-A587-98836EE6F2EF}" + RootNamespace="mod_enum" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\udns"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\udns"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_enum.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_esf/mod_esf.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_esf/mod_esf.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_esf" + ProjectGUID="{3850D93A-5F24-4922-BC1C-74D08C37C256}" + RootNamespace="mod_esf" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_esf.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,214 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_expr" + ProjectGUID="{65A6273D-FCAB-4C55-B09E-65100141A5D4}" + RootNamespace="mod_expr" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + DisableSpecificWarnings="4100;4701" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + DisableSpecificWarnings="4100;4701" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\conio.h" + > + </File> + <File + RelativePath=".\exprconf.h" + > + </File> + <File + RelativePath=".\expreval.c" + > + </File> + <File + RelativePath=".\expreval.h" + > + </File> + <File + RelativePath=".\exprfunc.c" + > + </File> + <File + RelativePath=".\exprilfs.h" + > + </File> + <File + RelativePath=".\exprincl.h" + > + </File> + <File + RelativePath=".\exprinit.c" + > + </File> + <File + RelativePath=".\exprmem.c" + > + </File> + <File + RelativePath=".\exprmem.h" + > + </File> + <File + RelativePath=".\exprobj.c" + > + </File> + <File + RelativePath=".\exprpars.c" + > + </File> + <File + RelativePath=".\exprpriv.h" + > + </File> + <File + RelativePath=".\exprutil.c" + > + </File> + <File + RelativePath=".\exprval.c" + > + </File> + <File + RelativePath=".\mod_expr.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_expr/mod_expr.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_expr/mod_expr.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_expr/mod_expr.c Wed Dec 12 13:58:47 2007 @@ -61,7 +61,7 @@ m_cmd = malloc(len); - assert(m_cmd); + switch_assert(m_cmd); switch_copy_string(m_cmd, cmd, len); for (p = m_cmd; p && *p; p++) { Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_fifo/mod_fifo.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_fifo/mod_fifo.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_fifo" + ProjectGUID="{75DF7F29-2FBF-47F7-B5AF-5B4952DC1ABD}" + RootNamespace="mod_fifo" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_fifo.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_fifo/mod_fifo.c Wed Dec 12 13:58:47 2007 @@ -124,7 +124,7 @@ } mydata = switch_core_session_strdup(session, data); - assert(mydata); + switch_assert(mydata); if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 2) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE); return; @@ -137,7 +137,7 @@ switch_queue_create(&node->fifo, SWITCH_CORE_QUEUE_LEN, globals.pool); switch_core_hash_init(&node->caller_hash, globals.pool); switch_core_hash_init(&node->consumer_hash, globals.pool); - assert(node->fifo); + switch_assert(node->fifo); switch_mutex_init(&node->mutex, SWITCH_MUTEX_NESTED, globals.pool); switch_core_hash_insert(globals.fifo_hash, argv[0], node); } @@ -337,12 +337,12 @@ switch_channel_answer(channel); cloned_profile = switch_caller_profile_clone(other_session, switch_channel_get_caller_profile(channel)); - assert(cloned_profile); + switch_assert(cloned_profile); switch_channel_set_originator_caller_profile(other_channel, cloned_profile); cloned_profile = switch_caller_profile_clone(session, switch_channel_get_caller_profile(other_channel)); - assert(cloned_profile); - assert(cloned_profile->next == NULL); + switch_assert(cloned_profile); + switch_assert(cloned_profile->next == NULL); switch_channel_set_originatee_caller_profile(channel, cloned_profile); ts = switch_timestamp_now(); @@ -414,7 +414,7 @@ const void *var; x_tmp = switch_xml_add_child_d(xml, container, cc_off++); - assert(x_tmp); + switch_assert(x_tmp); for (hi = switch_hash_first(NULL, hash); hi; hi = switch_hash_next(hi)) { int c_off = 0, d_off = 0; @@ -425,7 +425,7 @@ session = (switch_core_session_t *) val; channel = switch_core_session_get_channel(session); x_caller = switch_xml_add_child_d(x_tmp, tag, c_off++); - assert(x_caller); + switch_assert(x_caller); switch_xml_set_attr_d(x_caller, "uuid", switch_core_session_get_uuid(session)); @@ -468,7 +468,7 @@ char *tmp = buffer; x_fifo = switch_xml_add_child_d(x_report, "fifo", (*off)++);; - assert(x_fifo); + switch_assert(x_fifo); switch_xml_set_attr_d(x_fifo, "name", node->name); snprintf(tmp, sizeof(buffer), "%d", node->consumer_count); @@ -496,10 +496,10 @@ if (!switch_strlen_zero(cmd)) { data = strdup(cmd); - assert(data); + switch_assert(data); } - if (switch_strlen_zero(cmd) || (argc = switch_separate_string(data, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 1) { + if (switch_strlen_zero(cmd) || (argc = switch_separate_string(data, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 1 || !argv[0]) { stream->write_function(stream, "%s\n", FIFO_API_SYNTAX); return SWITCH_STATUS_SUCCESS; } @@ -510,7 +510,7 @@ if (!strcasecmp(argv[0], "list") || verbose) { char *xml_text = NULL; switch_xml_t x_report = switch_xml_new("fifo_report"); - assert(x_report); + switch_assert(x_report); if (argc < 2) { for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { @@ -528,7 +528,7 @@ } } xml_text = switch_xml_toxml(x_report, SWITCH_FALSE); - assert(xml_text); + switch_assert(xml_text); stream->write_function(stream, "%s\n", xml_text); switch_xml_free(x_report); switch_safe_free(xml_text); Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_limit/mod_limit.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_limit/mod_limit.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_limit" + ProjectGUID="{F6A33240-8F29-48BD-98F0-826995911799}" + RootNamespace="mod_limit" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_limit.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_limit/mod_limit.c Wed Dec 12 13:58:47 2007 @@ -345,7 +345,7 @@ argc = switch_separate_string(mydata, '/', argv, (sizeof(argv) / sizeof(argv[0]))); } - if (argc < 1) { + if (argc < 1 || !argv[0]) { goto error; } @@ -419,7 +419,7 @@ argc = switch_separate_string(mydata, '/', argv, (sizeof(argv) / sizeof(argv[0]))); } - if (argc < 4) { + if (argc < 4 || !argv[0]) { goto error; } @@ -460,7 +460,7 @@ argc = switch_separate_string(mydata, ':', argv, (sizeof(argv) / sizeof(argv[0]))); } - if (argc < 2) { + if (argc < 2 || !argv[0]) { goto error; } @@ -544,7 +544,7 @@ argc = switch_separate_string(mydata, ':', argv, (sizeof(argv) / sizeof(argv[0]))); } - if (argc < 3) { + if (argc < 3 || !argv[0]) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: group %s\n", DB_USAGE); return; } Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_rss/mod_rss.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_rss/mod_rss.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_rss" + ProjectGUID="{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}" + RootNamespace="mod_rss" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_rss.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_voicemail/mod_voicemail.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_voicemail/mod_voicemail.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_voicemail" + ProjectGUID="{D7F1E3F2-A3F4-474C-8555-15122571AF52}" + RootNamespace="mod_voicemail" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_voicemail.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_cepstral" + ProjectGUID="{692F6330-4D87-4C82-81DF-40DB5892636E}" + RootNamespace="mod_cepstral" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""C:\Program Files\Cepstral\sdk\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="swift.lib" + AdditionalLibraryDirectories=""C:\Program Files\Cepstral\sdk\lib\winnt"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""C:\Program Files\Cepstral\sdk\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="swift.lib" + AdditionalLibraryDirectories=""C:\Program Files\Cepstral\sdk\lib\winnt"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_cepstral.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,286 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_openmrcp" + ProjectGUID="{E7116F50-2B10-472F-92BD-C8667AA9C1AE}" + RootNamespace="mod_openmrcp" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\apr\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib advapi32.lib iphlpapi.lib" + AdditionalLibraryDirectories=""C:\Program Files\openmrcp\sdk\lib\winnt"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\apr\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib advapi32.lib iphlpapi.lib" + AdditionalLibraryDirectories=""C:\Program Files\openmrcp\sdk\lib\winnt"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug Static|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\apr\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib advapi32.lib iphlpapi.lib" + AdditionalLibraryDirectories=""C:\Program Files\openmrcp\sdk\lib\winnt"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release Static|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\apr\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib advapi32.lib iphlpapi.lib" + AdditionalLibraryDirectories=""C:\Program Files\openmrcp\sdk\lib\winnt"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_openmrcp.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_amr/mod_amr.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_amr/mod_amr.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,282 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_amr" + ProjectGUID="{8DEB383C-4091-4F42-A56F-C9E46D552D79}" + RootNamespace="mod_amr" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libamr\src\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libamr.lib" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libamr\src\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libamr.lib" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug Passthrough|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libamr\src\include"" + PreprocessorDefinitions="AMR_PASSTHROUGH" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release Passthrough|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libamr\src\include"" + PreprocessorDefinitions="AMR_PASSTHROUGH" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="mod_amr.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_g711/mod_g711.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_g711/mod_g711.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_g711" + ProjectGUID="{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}" + RootNamespace="mod_g711" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g7xx\src\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g7xx\src\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\g711.h" + > + </File> + <File + RelativePath=".\mod_g711.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_g722/mod_g722.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_g722/mod_g722.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_g722" + ProjectGUID="{D42518CC-7475-454D-B392-0E132C07D761}" + RootNamespace="mod_g722" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g7xx\src\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""..\..\..\..\libs\codec\g726\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g7xx\src\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""..\..\..\..\libs\codec\g726\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="mod_g722.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,283 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_g723_1" + ProjectGUID="{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}" + RootNamespace="mod_g723_1" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libg723\src\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libg723.lib" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(OutDir)/mod_g723_1.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libg723\src\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libg723.lib" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug Passthrough|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libg723\src\include"" + PreprocessorDefinitions="G723_PASSTHROUGH" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release Passthrough|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libg723\src\include"" + PreprocessorDefinitions="G723_PASSTHROUGH" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="mod_g723_1.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_g726/mod_g726.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_g726/mod_g726.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_g726" + ProjectGUID="{486369EB-F150-4B56-BCC8-77B9E18FF5F5}" + RootNamespace="mod_g726" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g726\src"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""..\..\..\..\libs\codec\g726\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g726\src"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""..\..\..\..\libs\codec\g726\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="mod_g726.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_g729/mod_g729.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_g729/mod_g729.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,284 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_g729" + ProjectGUID="{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}" + RootNamespace="mod_g729" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libg729\src\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libg729.lib FreeSwitchCore.lib" + AdditionalLibraryDirectories="" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libg729\src\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libg729.lib" + AdditionalLibraryDirectories="" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug Passthrough|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libg729\src\include"" + PreprocessorDefinitions="G729_PASSTHROUGH" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release Passthrough|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\libg729\src\include"" + PreprocessorDefinitions="G729_PASSTHROUGH" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="mod_g729.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_gsm/mod_gsm.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_gsm/mod_gsm.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_gsm" + ProjectGUID="{4926323F-4EA8-4B7D-A3D3-65488725988F}" + RootNamespace="mod_gsm" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\gsm\inc"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""..\..\..\..\libs\codec\gsm\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\gsm\inc"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""..\..\..\..\libs\codec\gsm\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="mod_gsm.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_h26x/mod_h26x.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_h26x/mod_h26x.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_h26x" + ProjectGUID="{2C3C2423-234B-4772-8899-D3B137E5CA35}" + RootNamespace="mod_h26x" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libresample\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libresample\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_h26x.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_ilbc" + ProjectGUID="{D3EC0AFF-76FC-4210-A825-9A17410660A3}" + RootNamespace="mod_ilbc" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\ilbc\src"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""..\..\..\..\libs\codec\ilbc\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\ilbc\src"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""..\..\..\..\libs\codec\ilbc\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="mod_ilbc.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_l16/mod_l16.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_l16/mod_l16.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_l16" + ProjectGUID="{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}" + RootNamespace="mod_l16" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libresample\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libresample\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libresample\win"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_l16.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_speex/mod_speex.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/codecs/mod_speex/mod_speex.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_speex" + ProjectGUID="{5580D60E-0F77-4716-9CD4-B8E5986FA375}" + RootNamespace="mod_speex" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\speex\include";"$(InputDir)..\..\..\..\libs\speex\include\speex"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\speex-1.1.11.1\win32\libspeex\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\speex\include";"$(InputDir)..\..\..\..\libs\speex\include\speex"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\speex-1.1.11.1\win32\libspeex\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_speex.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_dialplan_asterisk" + ProjectGUID="{E7BC026C-7CC5-45A3-BC7C-3B88EEF01F24}" + RootNamespace="mod_dialplan_asterisk" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_dialplan_asterisk.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_dialplan_directory" + ProjectGUID="{A27CCA23-1541-4337-81A4-F0A6413078A0}" + RootNamespace="mod_dialplan_directory" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_dialplan_directory.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_dialplan_xml" + ProjectGUID="{07113B25-D3AF-4E04-BA77-4CD1171F022C}" + RootNamespace="mod_dialplan_xml" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_dialplan_xml.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/directories/mod_ldap/mod_ldap.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/directories/mod_ldap/mod_ldap.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,295 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_ldap" + ProjectGUID="{EC3E5C7F-EE09-47E2-80FE-546363D14A98}" + RootNamespace="mod_ldap" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cscript /nologo "$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs" Mod_ldap Debug" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openldap\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;LDAP_DEPRECATED" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="olber32.lib oldap_r.lib" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\openldap\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="cscript /nologo "$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs" Mod_ldap Release" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openldap\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="olber32.lib oldap_r.lib" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\openldap\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug MS-LDAP|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openldap\include"" + PreprocessorDefinitions="MSLDAP" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="Wldap32.lib" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\openldap\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release MS-LDAP|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openldap\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;MSLDAP" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="Wldap32.lib" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\openldap\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_ldap.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_dingaling" + ProjectGUID="{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}" + RootNamespace="mod_dingaling" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libdingaling\src"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/NODEFAULTLIB:LIMBCTD" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)";"$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libdingaling\src"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)";"$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_dingaling.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,160 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_iax" + ProjectGUID="{3A5B9131-F20C-4A85-9447-6C1610941CEE}" + RootNamespace="mod_iax" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\iax\src"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + UsePrecompiledHeader="0" + DisableSpecificWarnings="4201" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""..\..\..\..\libs\iax\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\iax\src"" + UsePrecompiledHeader="0" + DisableSpecificWarnings="4201" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""..\..\..\..\libs\iax\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_iax.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,177 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_PortAudio" + ProjectGUID="{5FD31A25-5D83-4794-8BEE-904DAD84CE71}" + RootNamespace="mod_PortAudio" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\portaudio\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ALLOW_SMP_DANGERS" + UsePrecompiledHeader="0" + DisableSpecificWarnings="4100;4101" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/NODEFAULTLIB:LIMBCTD" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\portaudio\include"" + PreprocessorDefinitions="ALLOW_SMP_DANGERS" + UsePrecompiledHeader="0" + DisableSpecificWarnings="4100;4101" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_PortAudio.c" + > + </File> + <File + RelativePath=".\pa_ringbuffer.c" + > + </File> + <File + RelativePath=".\pa_ringbuffer.h" + > + </File> + <File + RelativePath=".\pablio.c" + > + </File> + <File + RelativePath=".\pablio.h" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,182 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_sofia" + ProjectGUID="{0DF3ABD0-DDC0-4265-B778-07C66780979B}" + RootNamespace="mod_sofia" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\bnf"" + PreprocessorDefinitions="LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" + UsePrecompiledHeader="0" + DisableSpecificWarnings="4201" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib advapi32.lib iphlpapi.lib" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\win32\pthread"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\bnf"" + PreprocessorDefinitions="LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" + UsePrecompiledHeader="0" + DisableSpecificWarnings="4201" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib advapi32.lib iphlpapi.lib" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\win32\pthread"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_sofia.c" + > + </File> + <File + RelativePath=".\mod_sofia.h" + > + </File> + <File + RelativePath=".\sofia.c" + > + </File> + <File + RelativePath=".\sofia_glue.c" + > + </File> + <File + RelativePath=".\sofia_presence.c" + > + </File> + <File + RelativePath=".\sofia_reg.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Dec 12 13:58:47 2007 @@ -849,7 +849,7 @@ reason = "Call Refused"; } - if (!(code > 400 && code < 600)) { + if (!(code > 400 && code < 700)) { code = 488; } Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_woomera/mod_woomera.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_woomera/mod_woomera.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_woomera" + ProjectGUID="{FE3540C5-3303-46E0-A69E-D92F775687F1}" + RootNamespace="mod_woomera" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_woomera.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_cdr_csv" + ProjectGUID="{44D7DEAF-FDA5-495E-8B9D-1439E4F4C21E}" + RootNamespace="mod_cdr_csv" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories="" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_cdr_csv.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Wed Dec 12 13:58:47 2007 @@ -49,6 +49,7 @@ char *default_template; int shutdown; int rotate; + int debug; } globals; SWITCH_MODULE_LOAD_FUNCTION(mod_cdr_csv_load); @@ -163,8 +164,10 @@ switch_app_log_t *app_log, *ap; char *last_app = NULL, *last_arg = NULL; - char start[80] = "", answer[80] = "", end[80] = "", tmp[30] = ""; - int32_t duration = 0, billsec = 0; + char start[80] = "", answer[80] = "", end[80] = "", tmp[80] = ""; + int32_t duration = 0, billsec = 0, mduration = 0, billmsec = 0; + switch_time_t uduration = 0, billusec = 0; + time_t tt_created = 0, tt_answered = 0, tt_hungup = 0, mtt_created = 0, mtt_answered = 0, mtt_hungup = 0; if (switch_channel_get_originator_caller_profile(channel)) { return SWITCH_STATUS_SUCCESS; @@ -202,28 +205,50 @@ switch_time_exp_lt(&tm, caller_profile->times->created); switch_strftime(start, &retsize, sizeof(start), fmt, &tm); + switch_channel_set_variable(channel, "start_stamp", start); switch_time_exp_lt(&tm, caller_profile->times->answered); switch_strftime(answer, &retsize, sizeof(answer), fmt, &tm); + switch_channel_set_variable(channel, "answer_stamp", answer); switch_time_exp_lt(&tm, caller_profile->times->hungup); switch_strftime(end, &retsize, sizeof(end), fmt, &tm); - - duration = ((int32_t) caller_profile->times->hungup / 1000000) - ((int32_t) caller_profile->times->created / 1000000); - if (duration < 0) { - duration = 0; - } + switch_channel_set_variable(channel, "end_stamp", end); - billsec = ((int32_t) caller_profile->times->hungup / 1000000) - ((int32_t) caller_profile->times->answered / 1000000); - if (billsec < 0) { - billsec = 0; - } + tt_created = (time_t) (caller_profile->times->created / 1000000); + mtt_created = (time_t) (caller_profile->times->created / 1000); + snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_created); + switch_channel_set_variable(channel, "start_epoch", tmp); + snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->created); + switch_channel_set_variable(channel, "start_uepoch", tmp); + tt_answered = (time_t) (caller_profile->times->answered / 1000000); + mtt_answered = (time_t) (caller_profile->times->answered / 1000); + snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_answered); + switch_channel_set_variable(channel, "answer_epoch", tmp); + snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->answered); + switch_channel_set_variable(channel, "answer_uepoch", tmp); + + + tt_hungup = (time_t) (caller_profile->times->hungup / 1000000); + mtt_hungup = (time_t) (caller_profile->times->hungup / 1000); + snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_hungup); + switch_channel_set_variable(channel, "end_epoch", tmp); + snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->hungup); + switch_channel_set_variable(channel, "end_uepoch", tmp); + + uduration = caller_profile->times->hungup - caller_profile->times->created; + duration = (int32_t)(tt_hungup - tt_created); + mduration = (int32_t)(mtt_hungup - mtt_created); + + if (caller_profile->times->answered) { + billsec = (int32_t)(tt_hungup - tt_answered); + billmsec = (int32_t)(mtt_hungup - mtt_answered); + billusec = caller_profile->times->hungup - caller_profile->times->answered; + } } - switch_channel_set_variable(channel, "start_stamp", start); - switch_channel_set_variable(channel, "answer_stamp", answer); - switch_channel_set_variable(channel, "end_stamp", end); + switch_channel_set_variable(channel, "last_app", last_app); switch_channel_set_variable(channel, "last_arg", last_arg); switch_channel_set_variable(channel, "caller_id", cid_buf); @@ -233,6 +258,31 @@ snprintf(tmp, sizeof(tmp), "%d", billsec); switch_channel_set_variable(channel, "billsec", tmp); + + snprintf(tmp, sizeof(tmp), "%d", mduration); + switch_channel_set_variable(channel, "mduration", tmp); + + snprintf(tmp, sizeof(tmp), "%d", billmsec); + switch_channel_set_variable(channel, "billmsec", tmp); + + snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, uduration); + switch_channel_set_variable(channel, "uduration", tmp); + + snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, billusec); + switch_channel_set_variable(channel, "billusec", tmp); + + if (globals.debug) { + switch_event_t *event; + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + char *buf; + switch_channel_event_set_data(channel, event); + switch_event_serialize(event, &buf, SWITCH_FALSE); + switch_assert(buf); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "CHANNEL_DATA:\n%s\n", buf); + switch_event_destroy(&event); + free(buf); + } + } g_template_str = (const char *) switch_core_hash_find(globals.template_hash, globals.default_template); @@ -325,8 +375,9 @@ for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); - - if (!strcasecmp(var, "log-base")) { + if (!strcasecmp(var, "debug")) { + globals.debug = switch_true(val); + } else if (!strcasecmp(var, "log-base")) { globals.log_dir = switch_core_sprintf(pool, "%s%scdr-csv", val, SWITCH_PATH_SEPARATOR); } else if (!strcasecmp(var, "rotate-on-hup")) { globals.rotate = switch_true(val); Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,154 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_event_multicast" + ProjectGUID="{784113EF-44D9-4949-835D-7065D3C7AD08}" + RootNamespace="mod_event_multicast" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_event_multicast.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Wed Dec 12 13:58:47 2007 @@ -162,7 +162,7 @@ return; default: switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Multicast-Sender", "%s", globals.hostname); - if (switch_event_serialize(event, &packet) == SWITCH_STATUS_SUCCESS) { + if (switch_event_serialize(event, &packet, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { memcpy(buf, &globals.host_hash, sizeof(globals.host_hash)); switch_copy_string(buf + sizeof(globals.host_hash), packet, sizeof(buf) - sizeof(globals.host_hash)); len = strlen(packet) + sizeof(globals.host_hash);; Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_event_socket" + ProjectGUID="{05515420-16DE-4E63-BE73-85BE85BA5142}" + RootNamespace="mod_event_socket" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_event_socket.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Wed Dec 12 13:58:47 2007 @@ -471,7 +471,7 @@ do_sleep = 0; if (listener->format == EVENT_FORMAT_PLAIN) { etype = "plain"; - switch_event_serialize(event, &listener->ebuf); + switch_event_serialize(event, &listener->ebuf, SWITCH_TRUE); } else { switch_xml_t xml; etype = "xml"; @@ -1049,7 +1049,7 @@ switch_event_add_header(call_event, SWITCH_STACK_BOTTOM, "Socket-Mode", switch_test_flag(listener, LFLAG_ASYNC) ? "async" : "static"); switch_event_add_header(call_event, SWITCH_STACK_BOTTOM, "Control", switch_test_flag(listener, LFLAG_FULL) ? "full" : "single-channel"); - switch_event_serialize(call_event, &event_str); + switch_event_serialize(call_event, &event_str, SWITCH_TRUE); if (!event_str) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); switch_clear_flag_locked(listener, LFLAG_RUNNING); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.c Wed Dec 12 13:58:47 2007 @@ -48,7 +48,7 @@ case SWITCH_EVENT_LOG: return; default: - switch_event_serialize(event, &buf); + switch_event_serialize(event, &buf, SWITCH_TRUE); if ((xml = switch_event_xmlize(event, NULL))) { xmlstr = switch_xml_toxml(xml, SWITCH_FALSE); dofree++; Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_zeroconf" + ProjectGUID="{C7705DC4-2088-493E-AF8D-65BC6D65C125}" + RootNamespace="mod_zeroconf" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\howl-1.0.0\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)";"$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\howl-1.0.0\include"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)";"$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_zeroconf.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_local_stream" + ProjectGUID="{2CA40887-1622-46A1-A7F9-17FD7E7E545B}" + RootNamespace="mod_local_stream" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_local_stream.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Wed Dec 12 13:58:47 2007 @@ -63,6 +63,7 @@ int rate; int interval; int samples; + uint32_t prebuf; char *timer_name; local_stream_context_t *context_list; switch_dir_t *dir_handle; @@ -99,10 +100,30 @@ while(RUNNING && (fname = switch_dir_next_file(source->dir_handle, file_buf, sizeof(file_buf)))) { switch_size_t olen; - uint8_t *abuf[SWITCH_RECOMMENDED_BUFFER_SIZE] = {0}; + uint8_t abuf[SWITCH_RECOMMENDED_BUFFER_SIZE] = {0}; snprintf(path_buf, sizeof(path_buf), "%s%s%s", source->location, SWITCH_PATH_SEPARATOR, fname); + if (switch_stristr(".loc", path_buf)) { + int fd, bytes; + char *p; + + if ((fd = open(path_buf, O_RDONLY)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open %s\n", fname); + switch_yield(1000000); + continue; + } + + bytes = read(fd, path_buf, sizeof(path_buf)); + if ((p = strchr(path_buf, '\r')) || + (p = strchr(path_buf, '\n'))) { + *p = '\0'; + } + close(fd); + } + fname = path_buf; + fh.prebuf = source->prebuf; + if (switch_core_file_open(&fh, (char *)fname, source->channels, @@ -311,6 +332,11 @@ if (tmp == 8000 || tmp == 16000) { source->rate = tmp; } + } else if (!strcasecmp(var, "prebuf")) { + int tmp = atoi(val); + if (tmp > 0) { + source->prebuf = (uint32_t) tmp; + } } else if (!strcasecmp(var, "channels")) { int tmp = atoi(val); if (tmp == 1 || tmp == 2) { Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_native_file/mod_native_file.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_native_file/mod_native_file.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_native_file" + ProjectGUID="{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}" + RootNamespace="mod_native_file" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_native_file.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_sndfile/mod_sndfile.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/formats/mod_sndfile/mod_sndfile.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_sndfile" + ProjectGUID="{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}" + RootNamespace="mod_sndfile" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\win32\libsndfile\"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""..\..\..\..\libs\libsndfile\Win32\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\win32\libsndfile\"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""..\..\..\..\libs\libsndfile\Win32\$(OutDir)"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_sndfile.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_spidermonkey" + ProjectGUID="{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}" + RootNamespace="mod_spidermonkey" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories="" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories="" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_spidermonkey.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Dec 12 13:58:47 2007 @@ -243,7 +243,7 @@ } } else { char *buf; - switch_event_serialize(ro->stream->event, &buf); + switch_event_serialize(ro->stream->event, &buf, SWITCH_TRUE); if (buf) { *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, buf)); free(buf); @@ -654,7 +654,7 @@ *rval = BOOLEAN_TO_JSVAL(JS_FALSE); } } else { - if (switch_event_serialize(eo->event, &buf) == SWITCH_STATUS_SUCCESS) { + if (switch_event_serialize(eo->event, &buf, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, buf)); switch_safe_free(buf); } Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_spidermonkey_core_db" + ProjectGUID="{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}" + RootNamespace="mod_spidermonkey_core_db" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories="" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories="" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_spidermonkey_core_db.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,163 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_spidermonkey_odbc" + ProjectGUID="{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}" + RootNamespace="mod_spidermonkey_odbc" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories="" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + WholeProgramOptimization="true" + AdditionalIncludeDirectories="" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories="" + OptimizeReferences="2" + EnableCOMDATFolding="2" + LinkTimeCodeGeneration="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_spidermonkey_odbc.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_spidermonkey_socket" + ProjectGUID="{028C7278-05D7-4E18-82FE-BE231B844F41}" + RootNamespace="mod_spidermonkey_socket" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions=""..\..\..\..\libs\win32\js\debug\js32.lib" "..\..\..\..\libs\win32\apr\debug\libapr-1.lib" "..\..\..\..\w32\library\debug\freeswitchcore.lib" "..\..\..\..\libs\win32\debug\libetpan.lib" "..\mod_spidermonkey\debug\mod_spidermonkey.lib"" + AdditionalLibraryDirectories="" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_spidermonkey_socket.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,161 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_spidermonkey_teletone" + ProjectGUID="{8F992C49-6C51-412F-B2A3-34EAB708EB65}" + RootNamespace="mod_spidermonkey_teletone" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libteletone\src"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories="" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libteletone\src"" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories="" + OptimizeReferences="2" + EnableCOMDATFolding="2" + LinkTimeCodeGeneration="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_spidermonkey_teletone.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/loggers/mod_console/mod_console.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/loggers/mod_console/mod_console.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_console" + ProjectGUID="{1C453396-D912-4213-89FD-9B489162B7B5}" + RootNamespace="mod_console" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_console.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/loggers/mod_logfile/mod_logfile.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/loggers/mod_logfile/mod_logfile.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_logfile" + ProjectGUID="{D0BCAC02-D94B-46B8-9B49-CDDCC2BD7909}" + RootNamespace="mod_logfile" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_logfile.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_de/mod_say_de.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_de/mod_say_de.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_say_de" + ProjectGUID="{5BC072DB-3826-48EA-AF34-FE32AA01E83B}" + RootNamespace="mod_say_de" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_say_de.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_en/mod_say_en.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_en/mod_say_en.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_say_en" + ProjectGUID="{988CACF7-3FCB-4992-BE69-77872AE67DC8}" + RootNamespace="mod_say_en" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_say_en.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_es/mod_say_es.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_es/mod_say_es.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_say_es" + ProjectGUID="{FA429E98-8B03-45E6-A096-A4BC5E821DE4}" + RootNamespace="mod_say_es" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_say_es.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_fr/mod_say_fr.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_fr/mod_say_fr.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_say_fr" + ProjectGUID="{06E3A538-AB32-44F2-B477-755FF9CB5D37}" + RootNamespace="mod_say_fr" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_say_fr.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_it/mod_say_it.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_it/mod_say_it.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_say_it" + ProjectGUID="{6D1BEC70-4DCD-4FE9-ADBD-4A43A67E4D05}" + RootNamespace="mod_say_it" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_say_it.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_nl/mod_say_nl.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/say/mod_say_nl/mod_say_nl.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_say_nl" + ProjectGUID="{A4B122CF-5196-476B-8C0E-D8BD59AC3C14}" + RootNamespace="mod_say_nl" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_say_nl.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_xml_cdr" + ProjectGUID="{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}" + RootNamespace="mod_xml_cdr" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories="" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_xml_cdr.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_xml_curl" + ProjectGUID="{AB91A099-7690-4ECF-8994-E458F4EA1ED4}" + RootNamespace="mod_xml_curl" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories="" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories="" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_xml_curl.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_xml_rpc" + ProjectGUID="{CBEC7225-0C21-4DA8-978E-1F158F8AD950}" + RootNamespace="mod_xml_rpc" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c"" + PreprocessorDefinitions="ABYSS_WIN32" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories="..\..\..\..\libs\xmlrpc\lib;"..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibD"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c"" + PreprocessorDefinitions="ABYSS_WIN32" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories="..\..\..\..\libs\xmlrpc\lib;"..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibR"" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_xml_rpc.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Wed Dec 12 13:58:47 2007 @@ -336,7 +336,7 @@ if (!strncmp(r->uri, "/domains/", 9)) { domain_name = strdup(r->uri + 9); - assert(domain_name); + switch_assert(domain_name); if ((e = strchr(domain_name, '/'))) { *e++ = '\0'; @@ -556,7 +556,7 @@ switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-QUERY", "%s", query); qd = strdup(query); - assert(qd != NULL); + switch_assert(qd != NULL); q = qd; next = q; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_asr.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_asr.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_asr.c Wed Dec 12 13:58:47 2007 @@ -125,9 +125,17 @@ SWITCH_DECLARE(switch_status_t) switch_core_asr_close(switch_asr_handle_t *ah, switch_asr_flag_t *flags) { + switch_status_t status; + switch_assert(ah != NULL); - return ah->asr_interface->asr_close(ah, flags); + status = ah->asr_interface->asr_close(ah, flags); + + if (switch_test_flag(ah, SWITCH_ASR_FLAG_FREE_POOL)) { + switch_core_destroy_memory_pool(&ah->memory_pool); + } + + return status; } SWITCH_DECLARE(switch_status_t) switch_core_asr_feed(switch_asr_handle_t *ah, void *data, unsigned int len, switch_asr_flag_t *flags) Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_directory.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_directory.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_directory.c Wed Dec 12 13:58:47 2007 @@ -73,6 +73,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_directory_close(switch_directory_handle_t *dh) { - return dh->directory_interface->directory_close(dh); + switch_status_t status; + + status = dh->directory_interface->directory_close(dh); + + if (switch_test_flag(dh, SWITCH_DIRECTORY_FLAG_FREE_POOL)) { + switch_core_destroy_memory_pool(&dh->memory_pool); + } + + return status; } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c Wed Dec 12 13:58:47 2007 @@ -143,10 +143,17 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_close(switch_file_handle_t *fh) { + switch_status_t status; + switch_assert(fh != NULL); switch_assert(fh->file_interface != NULL); switch_clear_flag(fh, SWITCH_FILE_OPEN); - return fh->file_interface->file_close(fh); + status = fh->file_interface->file_close(fh); + + if (switch_test_flag(fh, SWITCH_FILE_FLAG_FREE_POOL)) { + switch_core_destroy_memory_pool(&fh->memory_pool); + } + return status; } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_port_allocator.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_port_allocator.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_port_allocator.c Wed Dec 12 13:58:47 2007 @@ -52,6 +52,7 @@ switch_status_t status; switch_memory_pool_t *pool; switch_core_port_allocator_t *alloc; + int even, odd; if ((status = switch_core_new_memory_pool(&pool)) != SWITCH_STATUS_SUCCESS) { return status; @@ -62,15 +63,40 @@ return SWITCH_STATUS_MEMERR; } - alloc->track_len = (end - start) + 2; alloc->flags = flags; + even = switch_test_flag(alloc, SPF_EVEN); + odd = switch_test_flag(alloc, SPF_ODD); - if (!(switch_test_flag(alloc, SPF_EVEN) && switch_test_flag(alloc, SPF_ODD))) { - alloc->track_len /= 2; + if (!(even && odd)) { + if (even) { + if ((start % 2) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Rounding odd start port %d to %d\n", start, start + 1); + start++; + } + if ((end % 2) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Rounding odd end port %d to %d\n", end, end - 1); + end--; + } + } else if (odd) { + if ((start % 2) == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Rounding even start port %d to %d\n", start, start + 1); + start++; + } + if ((end % 2) == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Rounding even end port %d to %d\n", end, end - 1); + end--; + } + } } - alloc->track = switch_core_alloc(pool, (alloc->track_len + 2) * sizeof(switch_byte_t)); + alloc->track_len = (end - start) + 2; + if (!(even && odd)) { + alloc->track_len /= 2; + } + + alloc->track = switch_core_alloc(pool, (alloc->track_len + 2) * sizeof(switch_byte_t)); + alloc->start = start; alloc->next = start; alloc->end = end; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_event.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_event.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_event.c Wed Dec 12 13:58:47 2007 @@ -706,7 +706,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, char **str) +SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, char **str, switch_bool_t encode) { switch_size_t len = 0; switch_event_header_t *hp; @@ -758,7 +758,11 @@ } /* handle any bad things in the string like newlines : etc that screw up the serialized format */ - switch_url_encode(hp->value, encode_buf, encode_len - 1); + if (encode) { + switch_url_encode(hp->value, encode_buf, encode_len - 1); + } else { + snprintf(encode_buf, encode_len, "[%s]", hp->value); + } llen = strlen(hp->name) + strlen(encode_buf) + 8; Added: freeswitch/branches/stkn/sofia-exp/trunk/w32/Console/FreeSwitchConsole.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/w32/Console/FreeSwitchConsole.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,257 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="FreeSwitchConsole" + ProjectGUID="{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}" + RootNamespace="FreeSwitchConsole" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="..\winlibs.vsprops" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(InputDir)include";"$(InputDir)..\libs\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe" + LinkIncremental="1" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/FreeSwitchConsole.pdb" + SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="..\winlibs.vsprops" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)include";"$(InputDir)..\libs\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe" + LinkIncremental="1" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/FreeSwitchConsole.pdb" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\src\switch.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\src\include\switch.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_buffer.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_caller.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_channel.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_config.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_console.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_core.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_frame.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_loadable_module.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_module_interfaces.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_types.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_utils.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/stkn/sofia-exp/trunk/w32/Library/FreeSwitchCore.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/sofia-exp/trunk/w32/Library/FreeSwitchCore.2008.vcproj Wed Dec 12 13:58:47 2007 @@ -0,0 +1,656 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="FreeSwitchCoreLib" + ProjectGUID="{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}" + RootNamespace="FreeSwitchCoreLib" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="..\winlibs.vsprops" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="switch.h" + PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch" + BrowseInformation="0" + WarningLevel="4" + WarnAsError="true" + DebugInformationFormat="3" + ForcedIncludeFiles="" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkLibraryDependencies="true" + OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.dll" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\$(OutDir)";"$(InputDir)..\..\libs\sqlite\$(OutDir) DLL";"$(InputDir)..\..\libs\apr-util\$(OutDir)";"$(InputDir)..\..\libs\apr-iconv\$(OutDir)";"$(InputDir)..\..\libs\libresample\win";"$(InputDir)..\..\libs\srtp\$(OutDir)"" + AddModuleNamesToAssembly="" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(SolutionDir)$(OutDir)/FreeSwitch.pdb" + SubSystem="2" + OptimizeReferences="0" + EnableCOMDATFolding="0" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(OutDir)/FreeSwitchCore.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="if not exist "$(SolutionDir)$(OutDir)\conf" xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y /S
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"
if not exist "$(SolutionDir)$(OutDir)\htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(SolutionDir)$(OutDir)\htdocs\" /C /D /Y /S

" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="..\winlibs.vsprops" + CharacterSet="2" + BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;CRASH_PROT;PCRE_STATIC" + RuntimeLibrary="2" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="switch.h" + PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch" + BrowseInformation="0" + WarningLevel="4" + WarnAsError="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkLibraryDependencies="true" + OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.dll" + LinkIncremental="1" + AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\$(OutDir)";"$(InputDir)..\..\libs\sqlite\$(OutDir) DLL";"$(InputDir)..\..\libs\apr-util\$(OutDir)";"$(InputDir)..\..\libs\apr-iconv\$(OutDir)";"$(InputDir)..\..\libs\libresample\win";"$(InputDir)..\..\libs\srtp\$(OutDir)"" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)/FreeSwitchCore.pdb" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(OutDir)/FreeSwitchCore.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="if not exist "$(SolutionDir)$(OutDir)\conf" xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y /S
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"
if not exist "$(SolutionDir)$(OutDir)\htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(SolutionDir)$(OutDir)\htdocs\" /C /D /Y /S

" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\libs\stfu\stfu.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\switch_apr.c" + > + </File> + <File + RelativePath="..\..\src\switch_buffer.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\switch_caller.c" + > + </File> + <File + RelativePath="..\..\src\switch_channel.c" + > + </File> + <File + RelativePath="..\..\src\switch_config.c" + > + </File> + <File + RelativePath="..\..\src\switch_console.c" + > + </File> + <File + RelativePath="..\..\src\switch_core.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_asr.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_codec.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_db.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_directory.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_event_hook.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_file.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_hash.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_io.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_media_bug.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_memory.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_port_allocator.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_rwlock.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_session.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_speech.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_sqldb.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_state_machine.c" + > + </File> + <File + RelativePath="..\..\src\switch_core_timer.c" + > + </File> + <File + RelativePath="..\..\src\switch_cpp.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\switch_event.c" + > + </File> + <File + RelativePath="..\..\src\switch_ivr.c" + > + </File> + <File + RelativePath="..\..\src\switch_ivr_async.c" + > + </File> + <File + RelativePath="..\..\src\switch_ivr_bridge.c" + > + </File> + <File + RelativePath="..\..\src\switch_ivr_menu.c" + > + </File> + <File + RelativePath="..\..\src\switch_ivr_originate.c" + > + </File> + <File + RelativePath="..\..\src\switch_ivr_play_say.c" + > + </File> + <File + RelativePath="..\..\src\switch_loadable_module.c" + > + </File> + <File + RelativePath="..\..\src\switch_log.c" + > + </File> + <File + RelativePath="..\..\src\switch_odbc.c" + > + </File> + <File + RelativePath="..\..\src\switch_regex.c" + > + </File> + <File + RelativePath="..\..\src\switch_resample.c" + > + </File> + <File + RelativePath="..\..\src\switch_rtp.c" + > + </File> + <File + RelativePath="..\..\src\switch_scheduler.c" + > + </File> + <File + RelativePath="..\..\src\switch_stun.c" + > + </File> + <File + RelativePath="..\..\src\switch_time.c" + > + </File> + <File + RelativePath="..\..\src\switch_utils.c" + > + </File> + <File + RelativePath="..\..\src\switch_xml.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\src\include\SimpleGlob.h" + > + </File> + <File + RelativePath="..\..\libs\stfu\stfu.h" + > + </File> + <File + RelativePath="..\..\src\include\switch.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_apr.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_bitpack.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_buffer.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_caller.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_channel.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_config.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_console.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_core.h" + > + </File> + <File + RelativePath="..\..\src\include\private\switch_core.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_core_db.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_core_event_hook.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_cpp.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_event.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_frame.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_ivr.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_loadable_module.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_log.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_module_interfaces.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_odbc.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_platform.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_regex.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_resample.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_rtp.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_scheduler.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_sqlite.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_stun.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_types.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_utils.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_version.h" + > + </File> + <File + RelativePath="..\..\src\include\switch_xml.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + <Filter + Name="Generated Header Files" + > + <File + RelativePath="..\..\src\include\switch_am_config.h.template" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\include\switch_version.h.template" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Generating switch_version.h" + CommandLine="cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)..\..\src\include\switch_version.h.template" "$(ProjectDir)..\..\src\include\switch_version.h"
" + AdditionalDependencies="..\..\src\include\switch.h;..\..\src\include\switch_apr.h;..\..\src\include\switch_buffer.h;..\..\src\include\switch_caller.h;..\..\src\include\switch_channel.h;..\..\src\include\switch_console.h;..\..\src\include\switch_core.h;..\..\src\include\switch_event.h;..\..\src\include\switch_frame.h;..\..\src\include\switch_ivr.h;..\..\src\include\switch_loadable_module.h;..\..\src\include\switch_log.h;..\..\src\include\switch_module_interfaces.h;..\..\src\include\switch_platform.h;..\..\src\include\switch_resample.h;..\..\src\include\switch_rtp.h;..\..\src\include\switch_sqlite.h;..\..\src\include\switch_stun.h;..\..\src\include\switch_types.h;..\..\src\include\switch_utils.h;..\..\src\include\switch_xml.h;..\..\src\switch_buffer.c;..\..\src\switch_caller.c;..\..\src\switch_channel.c;..\..\src\switch_config.c;..\..\src\switch_console.c;..\..\src\switch_core.c;..\..\src\switch_event.c;..\..\src\switch_ivr.c;..\..\src\switch_loadable_module.c;..\..\src\switch_log.c;..\..\src\switch_resample.c;..\..\src\switch_rtp.c;..\..\src\switch_stun.c;..\..\src\switch_utils.c;..\..\src\switch_xml.c" + Outputs="..\..\src\include\switch_version.h;lastversion" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Generating switch_version.h" + CommandLine="cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)..\..\src\include\switch_version.h.template" "$(ProjectDir)..\..\src\include\switch_version.h"
" + AdditionalDependencies="..\..\src\include\switch.h;..\..\src\include\switch_apr.h;..\..\src\include\switch_buffer.h;..\..\src\include\switch_caller.h;..\..\src\include\switch_channel.h;..\..\src\include\switch_console.h;..\..\src\include\switch_core.h;..\..\src\include\switch_event.h;..\..\src\include\switch_frame.h;..\..\src\include\switch_ivr.h;..\..\src\include\switch_loadable_module.h;..\..\src\include\switch_log.h;..\..\src\include\switch_module_interfaces.h;..\..\src\include\switch_platform.h;..\..\src\include\switch_resample.h;..\..\src\include\switch_rtp.h;..\..\src\include\switch_sqlite.h;..\..\src\include\switch_stun.h;..\..\src\include\switch_types.h;..\..\src\include\switch_utils.h;..\..\src\include\switch_xml.h;..\..\src\switch_buffer.c;..\..\src\switch_caller.c;..\..\src\switch_channel.c;..\..\src\switch_config.c;..\..\src\switch_console.c;..\..\src\switch_core.c;..\..\src\switch_event.c;..\..\src\switch_ivr.c;..\..\src\switch_loadable_module.c;..\..\src\switch_log.c;..\..\src\switch_resample.c;..\..\src\switch_rtp.c;..\..\src\switch_stun.c;..\..\src\switch_utils.c;..\..\src\switch_xml.c" + Outputs="..\..\src\include\switch_version.h;lastversion" + /> + </FileConfiguration> + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/branches/stkn/sofia-exp/trunk/w32/module_debug.vsprops ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/w32/module_debug.vsprops (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/w32/module_debug.vsprops Wed Dec 12 13:58:47 2007 @@ -15,7 +15,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)Debug/mod/$(InputName).dll" + OutputFile="$(SolutionDir)Debug/mod/$(ProjectName).dll" LinkIncremental="1" /> </VisualStudioPropertySheet> Modified: freeswitch/branches/stkn/sofia-exp/trunk/w32/module_release.vsprops ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/w32/module_release.vsprops (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/w32/module_release.vsprops Wed Dec 12 13:58:47 2007 @@ -14,7 +14,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(SolutionDir)Release/mod/$(InputName).dll" + OutputFile="$(SolutionDir)Release/mod/$(ProjectName).dll" LinkIncremental="1" OptimizeReferences="2" EnableCOMDATFolding="2"

1 0

[commit] r6691 - freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 12 Dec '07

12 Dec '07

Author: stkn Date: Tue Dec 11 21:01:25 2007 New Revision: 6691 Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: Still getting a "no route to host" message on the remote box, but stuff is starting to work now... somehow Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Dec 11 21:01:25 2007 @@ -544,3 +544,5 @@ const char *sofia_glue_transport2str(const sofia_transport_t tp); const char *sofia_glue_transport2scheme(const sofia_transport_t tp); + +int sofia_glue_transport_has_tls(const sofia_transport_t tp); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Dec 11 21:01:25 2007 @@ -1065,7 +1065,7 @@ profile->tls_url = switch_core_sprintf(profile->pool, "sips:mod_sofia@%s:%d", profile->extsipip, profile->tls_sip_port); profile->tls_bindurl = switch_core_sprintf(profile->pool, "sips:mod_sofia@%s:%d;maddr=%s", profile->extsipip, profile->tls_sip_port, profile->sipip); } else { - profile->tls_url = switch_core_sprintf(profile->pool, "sips:mod_sofia@%s:%d", profile->extsipip, profile->tls_sip_port); + profile->tls_url = switch_core_sprintf(profile->pool, "sips:mod_sofia@%s:%d", profile->sipip, profile->tls_sip_port); profile->tls_bindurl = switch_core_sprintf(profile->pool, "sips:mod_sofia@%s:%d", profile->sipip, profile->tls_sip_port); } @@ -2010,13 +2010,27 @@ } if (sip->sip_to && sip->sip_to->a_url) { - const char *val; + const char *host, *user; + int port; sofia_transport_t transport = sofia_glue_url2transport(sip->sip_contact->m_url); url_set_chanvars(session, sip->sip_to->a_url, sip_to); - if ((val = switch_channel_get_variable(channel, "sip_to_uri"))) { + if (switch_channel_get_variable(channel, "sip_to_uri")) { + + host = switch_channel_get_variable(channel, "sip_to_host"); + user = switch_channel_get_variable(channel, "sip_to_user"); + + if (sip->sip_contact->m_url->url_port) { + port = atoi(sip->sip_contact->m_url->url_port); + } else { + port = sofia_glue_transport_has_tls(transport) ? profile->tls_sip_port : profile->sip_port; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Components: \"%s\" \"%s\" \"%d\"\n", host, user, port); + + tech_pvt->to_uri = switch_core_session_sprintf(session, "%s:%s@%s:%d;transport=%s", + sofia_glue_transport2scheme(transport), host, user, port, sofia_glue_transport2str(transport)); - tech_pvt->to_uri = switch_core_session_sprintf(session, "%s:%s;transport=%s", sofia_glue_transport2scheme(transport), val, sofia_glue_transport2str(transport)); if (profile->ndlb & PFLAG_NDLB_TO_IN_200_CONTACT) { if (strchr(tech_pvt->to_uri, '>')) { tech_pvt->reply_contact = tech_pvt->to_uri; @@ -2024,17 +2038,21 @@ tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s>", tech_pvt->to_uri); } } else { - if (strchr(profile->url, '>')) { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", profile->url, sofia_glue_transport2str(transport)); + const char *url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_url : profile->url; + + if (strchr(url, '>')) { + tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", url, sofia_glue_transport2str(transport)); } else { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", profile->url, sofia_glue_transport2str(transport)); + tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", url, sofia_glue_transport2str(transport)); } } } else { - if (strchr(profile->url, '>')) { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", profile->url, sofia_glue_transport2str(transport)); + const char *url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_url : profile->url; + + if (strchr(url, '>')) { + tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", url, sofia_glue_transport2str(transport)); } else { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", profile->url, sofia_glue_transport2str(transport)); + tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", url, sofia_glue_transport2str(transport)); } } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Dec 11 21:01:25 2007 @@ -613,7 +613,7 @@ } } -static int sofia_glue_transport_has_tls(const sofia_transport_t tp) +int sofia_glue_transport_has_tls(const sofia_transport_t tp) { switch(tp) { case SOFIA_TRANSPORT_TCP_TLS:

1 0

[commit] r6688 - freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 12 Dec '07

12 Dec '07

Author: stkn Date: Tue Dec 11 19:47:25 2007 New Revision: 6688 Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: Still not working... Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Dec 11 19:47:25 2007 @@ -328,6 +328,8 @@ } } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Answering channel with reply_contact: %s\n", tech_pvt->reply_contact); + nua_respond(tech_pvt->nh, SIP_200_OK, NUTAG_SESSION_TIMER(session_timeout), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Dec 11 19:47:25 2007 @@ -220,6 +220,7 @@ char *username; char *url; char *bindurl; + char *tls_url; char *tls_bindurl; char *sipdomain; char *timer_name; @@ -533,4 +534,13 @@ \ if(_session) break; \ } while(!_session) - + + +/* + * Transport handling helper functions + */ +sofia_transport_t sofia_glue_via2transport(const sip_via_t *via); +sofia_transport_t sofia_glue_url2transport(const url_t *url); + +const char *sofia_glue_transport2str(const sofia_transport_t tp); +const char *sofia_glue_transport2scheme(const sofia_transport_t tp); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Dec 11 19:47:25 2007 @@ -1062,8 +1062,10 @@ } if (profile->extsipip) { + profile->tls_url = switch_core_sprintf(profile->pool, "sips:mod_sofia@%s:%d", profile->extsipip, profile->tls_sip_port); profile->tls_bindurl = switch_core_sprintf(profile->pool, "sips:mod_sofia@%s:%d;maddr=%s", profile->extsipip, profile->tls_sip_port, profile->sipip); } else { + profile->tls_url = switch_core_sprintf(profile->pool, "sips:mod_sofia@%s:%d", profile->extsipip, profile->tls_sip_port); profile->tls_bindurl = switch_core_sprintf(profile->pool, "sips:mod_sofia@%s:%d", profile->sipip, profile->tls_sip_port); } @@ -2009,11 +2011,12 @@ if (sip->sip_to && sip->sip_to->a_url) { const char *val; - char *transport = (my_addrinfo->ai_socktype == SOCK_STREAM) ? "tcp" : "udp"; - + sofia_transport_t transport = sofia_glue_url2transport(sip->sip_contact->m_url); + url_set_chanvars(session, sip->sip_to->a_url, sip_to); if ((val = switch_channel_get_variable(channel, "sip_to_uri"))) { - tech_pvt->to_uri = switch_core_session_sprintf(session, "sip:%s;transport=%s", val, transport); + + tech_pvt->to_uri = switch_core_session_sprintf(session, "%s:%s;transport=%s", sofia_glue_transport2scheme(transport), val, sofia_glue_transport2str(transport)); if (profile->ndlb & PFLAG_NDLB_TO_IN_200_CONTACT) { if (strchr(tech_pvt->to_uri, '>')) { tech_pvt->reply_contact = tech_pvt->to_uri; @@ -2022,18 +2025,20 @@ } } else { if (strchr(profile->url, '>')) { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", profile->url, transport); + tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", profile->url, sofia_glue_transport2str(transport)); } else { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", profile->url, transport); + tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", profile->url, sofia_glue_transport2str(transport)); } } } else { if (strchr(profile->url, '>')) { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", profile->url, transport); + tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", profile->url, sofia_glue_transport2str(transport)); } else { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", profile->url, transport); + tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", profile->url, sofia_glue_transport2str(transport)); } } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Resulting Reply-Contact: %s\n", tech_pvt->reply_contact); } if (sip->sip_contact && sip->sip_contact->m_url) { Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Dec 11 19:47:25 2007 @@ -471,7 +471,121 @@ return SOFIA_TRANSPORT_UNKNOWN; } -static const char *sofia_glue_transport2str(const sofia_transport_t tp) +sofia_transport_t sofia_glue_url2transport(const url_t *url) +{ + char *ptr = NULL; + int tls = 0; + + if(!url) + return SOFIA_TRANSPORT_UNKNOWN; + + if (url->url_scheme && !strcasecmp(url->url_scheme, "sips")) { + tls++; + } + + ptr = (char *)url->url_params; + while(ptr) { + + if (!strncasecmp(ptr, "transport", 9)) { + ptr += 10; + + if (!strncasecmp(ptr, "udp", 3)) { + return SOFIA_TRANSPORT_UDP; + } + else if (!strncasecmp(ptr, "tcp", 3)) { + return SOFIA_TRANSPORT_TCP; + } + else if (!strncasecmp(ptr, "tls", 3)) { + return SOFIA_TRANSPORT_TCP_TLS; + } + else if (!strncasecmp(ptr, "sctp", 4)) { + return SOFIA_TRANSPORT_SCTP; + } + break; + } + + if ((ptr = strchr(ptr, ';'))) + ptr++; + } + + return (tls) ? SOFIA_TRANSPORT_TCP_TLS : SOFIA_TRANSPORT_UDP; +} + +sofia_transport_t sofia_glue_via2transport(const sip_via_t *via) +{ + char *ptr = NULL; + int tls = 0; + + if (!via || !via->v_protocol) + return SOFIA_TRANSPORT_UNKNOWN; + + if (!strcasecmp(via->v_protocol, "sips")) { + tls++; + } + + if ((ptr = strrchr(via->v_protocol, '/'))) { + ptr++; + + if (!strcasecmp(ptr, "udp")) { + return SOFIA_TRANSPORT_UDP; + } + else if(!strcasecmp(ptr, "tcp")) { + return SOFIA_TRANSPORT_TCP; + } + else if(!strcasecmp(ptr, "tls")) { + return SOFIA_TRANSPORT_TCP_TLS; + } + else if(!strcasecmp(ptr, "sctp")) { + return SOFIA_TRANSPORT_SCTP; + } + } + + return SOFIA_TRANSPORT_UNKNOWN; +} + +#if 0 +sofia_transport_t sofia_glue_uri2transport(const char *uri) +{ + char *scheme = NULL, *transport = NULL; + int tls = 0; + + if ((scheme = strchr(uri, '<'))) { + scheme++; + } else { + scheme = (char *)uri; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "scheme: %s\n", scheme); + + if (!strncasecmp(scheme, "sips", 4)) { + tls = 1; + } + + if (!(transport = strchr(uri, ';'))) { + return (tls) ? SOFIA_TRANSPORT_TCP_TLS : SOFIA_TRANSPORT_UDP; + } else { + transport = strchr(transport, '='); + if (transport) + transport++; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "transport: %s\n", transport); + + if (!strncasecmp(transport, "tls", 3)) { + return SOFIA_TRANSPORT_TCP_TLS; + } + else if (!strncasecmp(transport, "tcp", 3)) { + return (tls) ? SOFIA_TRANSPORT_TCP_TLS : SOFIA_TRANSPORT_TCP; + } + else if (!strncasecmp(transport, "sctp", 4)) { + return SOFIA_TRANSPORT_SCTP; + } + + return (tls) ? SOFIA_TRANSPORT_TCP_TLS : SOFIA_TRANSPORT_UDP; +} +#endif + +const char *sofia_glue_transport2str(const sofia_transport_t tp) { switch(tp) { case SOFIA_TRANSPORT_TCP: @@ -488,7 +602,7 @@ } } -static const char *sofia_glue_transport2scheme(const sofia_transport_t tp) +const char *sofia_glue_transport2scheme(const sofia_transport_t tp) { switch (tp) { case SOFIA_TRANSPORT_TCP_TLS: @@ -499,6 +613,17 @@ } } +static int sofia_glue_transport_has_tls(const sofia_transport_t tp) +{ + switch(tp) { + case SOFIA_TRANSPORT_TCP_TLS: + return 1; + + default: + return 0; + } +} + char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const sofia_transport_t transport, switch_bool_t uri_only) { char *stripped = switch_core_session_strdup(session, uri); @@ -611,7 +736,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "URL Error! [%s]\n", tech_pvt->dest); return SWITCH_STATUS_FALSE; } - + if ((d_url = sofia_glue_get_url_from_contact(tech_pvt->dest, 1))) { url = d_url; } else { @@ -620,16 +745,12 @@ url_str = url; - if (switch_strlen_zero(tech_pvt->invite_contact)) { - tech_pvt->invite_contact = tech_pvt->profile->url; - } - if (!switch_strlen_zero(tech_pvt->gateway_from_str)) { use_from_str = tech_pvt->gateway_from_str; } else { use_from_str = tech_pvt->from_str; } - + rpid_domain = switch_core_session_strdup(session, use_from_str); sofia_glue_get_url_from_contact(rpid_domain, 0); if ((rpid_domain = strchr(rpid_domain, '@'))) { @@ -655,12 +776,19 @@ } } + if (switch_strlen_zero(tech_pvt->invite_contact)) { + if (sofia_glue_transport_has_tls(transport)) + tech_pvt->invite_contact = tech_pvt->profile->tls_url; + else + tech_pvt->invite_contact = tech_pvt->profile->url; + } + url_str = sofia_overcome_sip_uri_weakness(session, url, transport, SWITCH_TRUE); invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, transport, SWITCH_FALSE); from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_FALSE); to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE); - - /* + + /* Does the "genius" who wanted SIP to be "text-based" so it was "easier to read" even use it now, or did he just suggest it to make our lives miserable? */

1 0

[commit] r6674 - in freeswitch/branches/stkn/sofia-exp/trunk: conf/autoload_configs conf/dialplan conf/directory/default conf/sip_profiles scripts src src/include src/mod/applications/mod_conference src/mod/applications/mod_enum src/mod/applications/mod_esf src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: stkn Date: Tue Dec 11 16:35:05 2007 New Revision: 6674 Added: freeswitch/branches/stkn/sofia-exp/trunk/conf/directory/default/voipuser.org.noload - copied unchanged from r6673, /freeswitch/trunk/conf/directory/default/voipuser.org.noload Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/conference.conf.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/console.conf.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/local_stream.conf.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/public.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/nat.xml freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/outbound.xml freeswitch/branches/stkn/sofia-exp/trunk/scripts/sipsetup freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_console.h freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_core.h freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_platform.h freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_rtp.h freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_types.h freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_utils.h freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_enum/mod_enum.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_esf/mod_esf.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_buffer.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_caller.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_channel.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_asr.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_codec.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_hash.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_io.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_memory.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_port_allocator.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_session.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_speech.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_sqldb.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_state_machine.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_event.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_async.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_bridge.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_originate.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_play_say.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_loadable_module.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_log.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_odbc.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_rtp.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_scheduler.c freeswitch/branches/stkn/sofia-exp/trunk/src/switch_utils.c Log: Merge changes from trunk Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/conference.conf.xml Tue Dec 11 16:35:05 2007 @@ -1,3 +1,4 @@ +  <configuration name="conference.conf" description="Audio Conference">  Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/console.conf.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/console.conf.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/console.conf.xml Tue Dec 11 16:35:05 2007 @@ -6,7 +6,7 @@ name can be a file name, function name or 'all' value is one or more of debug,info,notice,warning,err,crit,alert,all --> - <map name="all" value="debug,info,notice,warning,err,crit,alert"/> + <map name="all" value="info,notice,warning,err,crit,alert"/> </mappings> <settings>  Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/local_stream.conf.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/local_stream.conf.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/autoload_configs/local_stream.conf.xml Tue Dec 11 16:35:05 2007 @@ -1,5 +1,5 @@ <configuration name="local_stream.conf" description="stream files from local dir"> -<directory name="foo" path="/path/to/moh/files"> +<directory name="demo_moh" path="$${base_dir}/sounds/moh"> <param name="rate" value="8000"/> <param name="channels" value="1"/> <param name="interval" value="2"/> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/default.xml Tue Dec 11 16:35:05 2007 @@ -1,3 +1,4 @@ + <include> <context name="default"> <extension name="intercept"> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/public.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/dialplan/public.xml Tue Dec 11 16:35:05 2007 @@ -1,3 +1,4 @@ + <include> <context name="public"> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml Tue Dec 11 16:35:05 2007 @@ -1,3 +1,4 @@ + <profile name="default">  <aliases> @@ -14,7 +15,7 @@ </domains> <settings> - <param name="debug" value="1"/> + <param name="debug" value="0"/> <param name="context" value="public"/> <param name="rfc2833-pt" value="101"/> <param name="sip-port" value="5060"/> @@ -25,6 +26,7 @@ <param name="rtp-timer-name" value="soft"/> <param name="rtp-ip" value="$${local_ip_v4}"/> <param name="sip-ip" value="$${local_ip_v4}"/> + <param name="hold-music" value="local_stream://demo_moh"/>  <param name="manage-presence" value="true"/>  Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/nat.xml Tue Dec 11 16:35:05 2007 @@ -1,10 +1,11 @@ + <profile name="nat"> <gateways> <X-PRE-PROCESS cmd="include" data="nat/*.xml"/> </gateways> <settings> - <param name="debug" value="1"/> + <param name="debug" value="0"/> <param name="rfc2833-pt" value="101"/> <param name="sip-port" value="5070"/> <param name="dialplan" value="XML"/> @@ -12,6 +13,7 @@ <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/> <param name="use-rtp-timer" value="true"/> + <param name="hold-music" value="local_stream://demo_moh"/> <param name="rtp-timer-name" value="soft"/> <param name="manage-presence" value="true"/> <param name="inbound-codec-negotiation" value="generous"/> Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/outbound.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/outbound.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/outbound.xml Tue Dec 11 16:35:05 2007 @@ -1,3 +1,4 @@ + <profile name="outbound">  <gateways> @@ -9,13 +10,14 @@ </domains> <settings> - <param name="debug" value="1"/> + <param name="debug" value="0"/> <param name="rfc2833-pt" value="101"/> <param name="sip-port" value="5080"/> <param name="dialplan" value="XML"/> <param name="context" value="public"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/> + <param name="hold-music" value="local_stream://demo_moh"/> <param name="use-rtp-timer" value="true"/> <param name="rtp-timer-name" value="soft"/> <param name="manage-presence" value="true"/> Modified: freeswitch/branches/stkn/sofia-exp/trunk/scripts/sipsetup ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/scripts/sipsetup (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/scripts/sipsetup Tue Dec 11 16:35:05 2007 @@ -12,159 +12,169 @@ my $PREFIX = "/usr/local/freeswitch"; my $providers = { - "1" => "FWD", - "2" => "SP", - "3" => "IS", - "4" => "AL", - "5" => "SB" - }; + "1" => "FWD", + "2" => "SP", + "3" => "IS", + "4" => "AL", + "5" => "SB", + "6" => "VU" + }; my $FWD = { - "type" => "network", - "register" => "true", - "fields" => [number, password, extension], - "domain" => "pulver.com", - "dialprefix" => "1-393" - }; - -my $SP = { - "type" => "network", - "register" => "true", - "fields" => [username, password, extension], - "domain" => "sipphone.com", - "dialprefix" => "1-747, 1-222" - }; - -my $IS = { - "type" => "network", - "register" => "true", - "fields" => [username, password, extension], - "domain" => "ideasip.com", - "dialprefix" => "1-101" - }; - -my $AL = { - "type" => "pstn", - "register" => "true", - "fields" => [username, password, extension], - "domain" => "asterlink.com", - }; - -my $SB = { - "type" => "peer", - "domain" => "sipbroker.com", - "dialprefix" => "*XXX" - }; + "type" => "network", + "register" => "true", + "fields" => [number, password, extension], + "domain" => "pulver.com", + "dialprefix" => "1-393" + }; + +my $SIPHONE = { + "type" => "network", + "register" => "true", + "fields" => [username, password, extension], + "domain" => "sipphone.com", + "dialprefix" => "1-747, 1-222" + }; + +my $IDEASIP = { + "type" => "network", + "register" => "true", + "fields" => [username, password, extension], + "domain" => "ideasip.com", + "dialprefix" => "1-101" + }; + +my $VOIPUSER = { + "type" => "network", + "register" => "true", + "fields" => [username, password, extension], + "domain" => "voipuser.org" + }; + +my $ASTERLINK = { + "type" => "pstn", + "register" => "true", + "fields" => [username, password, extension], + "domain" => "asterlink.com", +}; + +my $SIPBROKER = { + "type" => "peer", + "domain" => "sipbroker.com", + "dialprefix" => "*XXX" + }; my $TEMPLATES = { - "FWD" => $FWD, - "SP" => $SP, - "IS" => $IS, - "AL" => $AL, - "SB" => $SB - }; + "FWD" => $FWD, + "SP" => $SIPPHONE, + "IS" => $IDEASIP, + "AL" => $ASTERLINK, + "SB" => $SIPBROKER, + "VU" => $VOIPUSER + }; print "\n" x 60; &welcome; sub welcome { - print <<WELCOME + print <<WELCOME - Welcome to the FreeSWITCH setup assistant. + Welcome to the FreeSWITCH setup assistant. - 1. Configure Free World Dialup - 2. Configure SIPPhone.com - 3. Configure ideaSIP.com - 4. Configure Asterlink.com - 5. Configure SIPBroker.com + 1. Configure Free World Dialup + 2. Configure SIPPhone.com + 3. Configure ideaSIP.com + 4. Configure Asterlink.com + 5. Configure SIPBroker.com + 6. Configure voipuser.org - X. Exit + X. Exit WELCOME - ; - print "Which provider do you wish to setup? "; - my $i = <STDIN>; - chomp($i); - if ($i =~ m/X|x/) { - print "Thanks you!\n"; exit; - } elsif ($i > 5) { - print "Invalid Choice\n"; &welcome; - } else { - if (exists($providers->{$i})) { - configure_sip_provider($providers->{$i}); - } - }; - &welcome; +; + print "Which provider do you wish to setup? "; + my $i = <STDIN>; + chomp($i); + if ($i =~ m/X|x/) { + print "Thanks you!\n"; exit; + } elsif ($i > 6) { + print "Invalid Choice\n"; &welcome; + } else { + if (exists($providers->{$i})) { + configure_sip_provider($providers->{$i}); + } + }; + &welcome; } sub configure_sip_provider($) { - my $provider = shift; - my $template = $TEMPLATES->{$provider}; - my $config; - my $check = 1; - foreach $field (@{$template->{fields}}) { - print "\nPlease your $template->{domain} $field: "; - $tmp = "$provider" . uc($field); - $i = <STDIN>; - chomp($i); - $config->{$tmp} = $i; - } + my $provider = shift; + my $template = $TEMPLATES->{$provider}; + my $config; + my $check = 1; + foreach $field (@{$template->{fields}}) { + print "\nPlease your $template->{domain} $field: "; + $tmp = "$provider" . uc($field); + $i = <STDIN>; + chomp($i); + $config->{$tmp} = $i; + } - while($check) { - $check = &are_you_sure; - }; - - if ($template->{type} eq "network") { - do_config($provider, $config); - } - if ($template->{dialprefix}) { - enable_extension($provider, $config); - } - print "\n\n\nConfiguration Complete!!!\n\n\n\n\n"; - sleep(2); - &welcome; + while($check) { + $check = &are_you_sure; + }; + + if ($template->{type} eq "network" || $template->{type} eq "pstn") { + do_config($provider, $config); + } + if ($template->{dialprefix}) { + enable_extension($provider, $config); + } + print "\n\n\nConfiguration Complete!!!\n\n\n\n\n"; + sleep(2); + &welcome; } sub enable_extension($$) { - my $provider = shift; - my $config = shift; + my $provider = shift; + my $config = shift; - my $todo = $TEMPLATES->{$provider}; + my $todo = $TEMPLATES->{$provider}; - copy("$PREFIX/conf/dialplan/extensions/$todo->{domain}.noload", "$PREFIX/conf/dialplan/extensions/$todo->{domain}.xml"); - print "\nExtension prefix $todo->{dialprefix} enabled for dialing $todo->{domain}...\n"; + copy("$PREFIX/conf/dialplan/extensions/$todo->{domain}.noload", "$PREFIX/conf/dialplan/extensions/$todo->{domain}.xml"); + print "\nExtension prefix $todo->{dialprefix} enabled for dialing $todo->{domain}...\n"; } sub do_config($$) { - my $provider = shift; - my $config = shift; - my $todo = $TEMPLATES->{$provider}; - - open(TEMPLATE, "<$PREFIX/conf/directory/default/$todo->{domain}.noload"); - @lines = <TEMPLATE>; - close(TEMPLATE); - open(CONFIG, ">$PREFIX/conf/directory/default/$todo->{domain}.xml"); - foreach $line (@lines) { - foreach $key (sort keys %{$config}) { - $line =~ s/%$key%/$config->{$key}/g; + my $provider = shift; + my $config = shift; + my $todo = $TEMPLATES->{$provider}; + + open(TEMPLATE, "<$PREFIX/conf/directory/default/$todo->{domain}.noload"); + @lines = <TEMPLATE>; + close(TEMPLATE); + open(CONFIG, ">$PREFIX/conf/directory/default/$todo->{domain}.xml"); + foreach $line (@lines) { + foreach $key (sort keys %{$config}) { + $line =~ s/%$key%/$config->{$key}/g; + } + print CONFIG $line; } - print CONFIG $line; - } - close(CONFIG); - print "Config Created...\n"; + close(CONFIG); + print "Config Created...\n"; } sub are_you_sure { - my $sure = 1; - while($sure) { - print "Are you sure? (yes/no)"; - $i = <STDIN>; - chomp($i); - if($i =~ m/No|no|NO|n/) { - &welcome; - } elsif ($i =~ m/Yes|yes|YES|y/) { - return 0; + my $sure = 1; + while($sure) { + print "Are you sure? (yes/no)"; + $i = <STDIN>; + chomp($i); + if($i =~ m/No|no|NO|n/) { + &welcome; + } elsif ($i =~ m/Yes|yes|YES|y/) { + return 0; + } } - } } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_console.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_console.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_console.h Tue Dec 11 16:35:05 2007 @@ -44,7 +44,7 @@ SWITCH_BEGIN_EXTERN_C #define SWITCH_CMD_CHUNK_LEN 1024 #define SWITCH_STANDARD_STREAM(s) memset(&s, 0, sizeof(s)); s.data = malloc(SWITCH_CMD_CHUNK_LEN); \ - assert(s.data); \ + switch_assert(s.data); \ memset(s.data, 0, SWITCH_CMD_CHUNK_LEN); \ s.end = s.data; \ s.data_size = SWITCH_CMD_CHUNK_LEN; \ Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_core.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_core.h Tue Dec 11 16:35:05 2007 @@ -216,14 +216,16 @@ \return SWITCH_STATUS_SUCCESS if the operation was a success */ SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_new(switch_port_t start, - switch_port_t end, uint8_t inc, switch_core_port_allocator_t **new_allocator); + switch_port_t end, switch_port_flag_t flags, switch_core_port_allocator_t **new_allocator); /*! \brief Get a port from the port allocator \param alloc the allocator object - \return the port + \param port a pointer to the port + \return SUCCESS */ -SWITCH_DECLARE(switch_port_t) switch_core_port_allocator_request_port(switch_core_port_allocator_t *alloc); +SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_request_port(switch_core_port_allocator_t *alloc, switch_port_t *port_ptr); +SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_free_port(switch_core_port_allocator_t *alloc, switch_port_t port); /*! \brief destroythe port allocator Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_platform.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_platform.h Tue Dec 11 16:35:05 2007 @@ -69,6 +69,10 @@ #pragma include_alias(<libteletone_generate.h>, <../../libs/libteletone/src/libteletone_generate.h>) #pragma include_alias(<libteletone_detect.h>, <../../libs/libteletone/src/libteletone_detect.h>) +#if (_MSC_VER >= 1500) // VC9+ +#define switch_assert(expr) assert(expr);__analysis_assume( expr ) +#endif + #if (_MSC_VER >= 1400) // VC8+ #ifndef _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE @@ -285,6 +289,9 @@ #ifndef TRUE #define TRUE (!FALSE) #endif +#ifndef switch_assert +#define switch_assert(expr) assert(expr) +#endif /* For Emacs: * Local Variables: * mode:c Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_rtp.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_rtp.h Tue Dec 11 16:35:05 2007 @@ -53,6 +53,7 @@ \note Generally called by the core_init */ SWITCH_DECLARE(void) switch_rtp_init(switch_memory_pool_t *pool); +SWITCH_DECLARE(void) switch_rtp_shutdown(void); /*! \brief Set/Get RTP start port @@ -70,9 +71,10 @@ /*! \brief Request a new port to be used for media + \param ip the ip to request a port from \return the new port to use */ -SWITCH_DECLARE(switch_port_t) switch_rtp_request_port(void); +SWITCH_DECLARE(switch_port_t) switch_rtp_request_port(const char *ip); /*! \brief create a new RTP session handle Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_types.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_types.h Tue Dec 11 16:35:05 2007 @@ -137,6 +137,12 @@ typedef uint8_t switch_byte_t; typedef enum { + SPF_NONE = 0, + SPF_ODD = (1 << 0), + SPF_EVEN = (1 << 1) +} switch_port_flag_t; + +typedef enum { ED_MUX_READ = (1 << 0), ED_MUX_WRITE = (1 << 1), ED_DTMF = (1 << 2) Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_utils.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/include/switch_utils.h Tue Dec 11 16:35:05 2007 @@ -352,9 +352,14 @@ #define switch_malloc(ptr, len) (void)( (!!(ptr = malloc(len))) || (fprintf(stderr,"ABORT! Malloc failure at: %s:%s", __FILE__, __LINE__),abort(), 0), ptr ) #define switch_zmalloc(ptr, len) (void)( (!!(ptr = malloc(len))) || (fprintf(stderr,"ABORT! Malloc failure at: %s:%s", __FILE__, __LINE__),abort(), 0), memset(ptr, 0, len)) #else +#if (_MSC_VER >= 1500) // VC9+ +#define switch_malloc(ptr, len) (void)(assert(((ptr) = malloc((len)))),ptr);__analysis_assume( ptr ) +#define switch_zmalloc(ptr, len) (void)(assert((ptr = malloc(len))),memset(ptr, 0, len));__analysis_assume( ptr ) +#else #define switch_malloc(ptr, len) (void)(assert(((ptr) = malloc((len)))),ptr) #define switch_zmalloc(ptr, len) (void)(assert((ptr = malloc(len))),memset(ptr, 0, len)) #endif +#endif SWITCH_END_EXTERN_C #endif Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Dec 11 16:35:05 2007 @@ -422,8 +422,8 @@ { conference_member_t *member = NULL; - assert(conference != NULL); - assert(id != 0); + switch_assert(conference != NULL); + switch_assert(id != 0); switch_mutex_lock(conference->member_mutex); for (member = conference->members; member; member = member->next) { @@ -452,7 +452,7 @@ conference_member_t *member = NULL; int count = 0; - assert(conference != NULL); + switch_assert(conference != NULL); switch_mutex_lock(conference->member_mutex); for (member = conference->members; member; member = member->next) { if (switch_test_flag(member, MFLAG_NOCHANNEL) && (!path || !strcmp(path, member->rec_path))) { @@ -517,8 +517,8 @@ call_list_t *call_list = NULL; switch_channel_t *channel; - assert(conference != NULL); - assert(member != NULL); + switch_assert(conference != NULL); + switch_assert(member != NULL); switch_mutex_lock(conference->mutex); switch_mutex_lock(member->audio_in_mutex); @@ -559,9 +559,9 @@ call_list = (call_list_t *) switch_channel_get_private(channel, "_conference_autocall_list_"); if (call_list) { - char msg[1024]; - snprintf(msg, sizeof(msg), "Auto Calling %d parties", call_list->itteration); - conference_member_say(member, msg, 0); + char saymsg[1024]; + snprintf(saymsg, sizeof(saymsg), "Auto Calling %d parties", call_list->itteration); + conference_member_say(member, saymsg, 0); } else { if (switch_strlen_zero(conference->special_announce)) { /* anounce the total number of members in the conference */ @@ -609,8 +609,8 @@ conference_member_t *imember, *last = NULL; switch_event_t *event; - assert(conference != NULL); - assert(member != NULL); + switch_assert(conference != NULL); + switch_assert(member != NULL); switch_mutex_lock(conference->mutex); switch_mutex_lock(conference->member_mutex); @@ -716,8 +716,8 @@ uint8_t *file_frame; uint8_t *async_file_frame; - file_frame = switch_core_alloc(conference->pool, CONF_BUFFER_SIZE); - async_file_frame = switch_core_alloc(conference->pool, CONF_BUFFER_SIZE); + file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE); + async_file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE); if (switch_core_timer_init(&timer, conference->timer_name, conference->interval, samples, conference->pool) == SWITCH_STATUS_SUCCESS) { @@ -1335,13 +1335,13 @@ uint32_t hangover = 40, hangunder = 15, hangover_hits = 0, hangunder_hits = 0, energy_level = 0, diff_level = 400; uint8_t talking = 0; - assert(member != NULL); + switch_assert(member != NULL); channel = switch_core_session_get_channel(member->session); - assert(channel != NULL); + switch_assert(channel != NULL); read_codec = switch_core_session_get_read_codec(member->session); - assert(read_codec != NULL); + switch_assert(read_codec != NULL); /* As long as we have a valid read, feed that data into an input buffer where the conference thread will take it and mux it with any audio from other channels. */ @@ -1521,8 +1521,8 @@ channel = switch_core_session_get_channel(member->session); - assert(channel != NULL); - assert(member->conference != NULL); + switch_assert(channel != NULL); + switch_assert(member->conference != NULL); tsamples = member->orig_read_codec->implementation->samples_per_frame; @@ -1586,7 +1586,7 @@ while (switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(member, MFLAG_ITHREAD) && switch_channel_ready(channel)) { char dtmf[128] = ""; - uint8_t file_frame[CONF_BUFFER_SIZE] = { 0 }; + uint8_t file_frame[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 }; switch_size_t file_data_len = csamples * 2; switch_size_t file_sample_len = csamples; char *digit; @@ -1955,7 +1955,7 @@ uint32_t count = 0; conference_file_node_t *nptr; - assert(conference != NULL); + switch_assert(conference != NULL); switch_mutex_lock(conference->mutex); @@ -2022,7 +2022,7 @@ uint32_t count; char *dfile = NULL, *expanded = NULL; - assert(conference != NULL); + switch_assert(conference != NULL); switch_mutex_lock(conference->mutex); switch_mutex_lock(conference->member_mutex); @@ -2100,10 +2100,10 @@ conference->async_fnode = fnode; if (nptr) { - switch_memory_pool_t *pool; + switch_memory_pool_t *tmppool; switch_core_file_close(&nptr->fh); - pool = nptr->pool; - switch_core_destroy_memory_pool(&pool); + tmppool = nptr->pool; + switch_core_destroy_memory_pool(&tmppool); } } else { @@ -2225,7 +2225,7 @@ switch_memory_pool_t *pool; switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - assert(conference != NULL); + switch_assert(conference != NULL); if (!(conference->tts_engine && conference->tts_voice)) { return SWITCH_STATUS_SUCCESS; @@ -2303,7 +2303,7 @@ switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; uint32_t count; - assert(conference != NULL); + switch_assert(conference != NULL); if (switch_strlen_zero(text)) { return SWITCH_STATUS_GENERR; @@ -2389,9 +2389,9 @@ { conference_member_t *member = NULL; - assert(conference != NULL); - assert(stream != NULL); - assert(pfncallback != NULL); + switch_assert(conference != NULL); + switch_assert(stream != NULL); + switch_assert(pfncallback != NULL); switch_mutex_lock(conference->member_mutex); for (member = conference->members; member; member = member->next) { @@ -2405,8 +2405,8 @@ { conference_member_t *member = NULL; - assert(conference != NULL); - assert(stream != NULL); + switch_assert(conference != NULL); + switch_assert(stream != NULL); switch_mutex_lock(conference->member_mutex); @@ -2433,9 +2433,9 @@ { conference_member_t *member = NULL; - assert(conference != NULL); - assert(stream != NULL); - assert(delim != NULL); + switch_assert(conference != NULL); + switch_assert(stream != NULL); + switch_assert(delim != NULL); switch_mutex_lock(conference->member_mutex); @@ -2813,8 +2813,8 @@ switch_event_t *event; uint8_t async = 0; - assert(conference != NULL); - assert(stream != NULL); + switch_assert(conference != NULL); + switch_assert(stream != NULL); if ((argc == 4 && !strcasecmp(argv[3], "async")) || (argc == 5 && !strcasecmp(argv[4], "async"))) { argc--; @@ -2954,8 +2954,8 @@ int ret_status = SWITCH_STATUS_GENERR; uint8_t current = 0, all = 0; - assert(conference != NULL); - assert(stream != NULL); + switch_assert(conference != NULL); + switch_assert(stream != NULL); if (argc > 2) { current = strcasecmp(argv[2], "current") ? 0 : 1; @@ -2990,8 +2990,8 @@ { int ret_status = SWITCH_STATUS_GENERR; - assert(conference != NULL); - assert(stream != NULL); + switch_assert(conference != NULL); + switch_assert(stream != NULL); if (argc > 4) { uint8_t nospeak = 0, nohear = 0, clear = 0; @@ -3059,8 +3059,8 @@ { switch_event_t *event; - assert(conference != NULL); - assert(stream != NULL); + switch_assert(conference != NULL); + switch_assert(stream != NULL); if (conference->is_locked_sound) { conference_play_file(conference, conference->is_locked_sound, CONF_DEFAULT_LEADIN, NULL, 0); @@ -3081,8 +3081,8 @@ { switch_event_t *event; - assert(conference != NULL); - assert(stream != NULL); + switch_assert(conference != NULL); + switch_assert(stream != NULL); if (conference->is_unlocked_sound) { conference_play_file(conference, conference->is_unlocked_sound, CONF_DEFAULT_LEADIN, NULL, 0); @@ -3104,7 +3104,7 @@ { switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - assert(stream != NULL); + switch_assert(stream != NULL); if (argc > 2) { switch_call_cause_t cause; @@ -3129,7 +3129,7 @@ { switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - assert(stream != NULL); + switch_assert(stream != NULL); if (argc > 2) { if (conference) { @@ -3150,8 +3150,8 @@ { switch_status_t ret_status = SWITCH_STATUS_SUCCESS; char *params = NULL, *chanvars = NULL; - assert(conference != NULL); - assert(stream != NULL); + switch_assert(conference != NULL); + switch_assert(stream != NULL); if (argc > 3 && !switch_strlen_zero(argv[2])) { int x; @@ -3274,8 +3274,8 @@ static switch_status_t conf_api_sub_record(conference_obj_t * conference, switch_stream_handle_t *stream, int argc, char **argv) { switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - assert(conference != NULL); - assert(stream != NULL); + switch_assert(conference != NULL); + switch_assert(stream != NULL); if (argc > 2) { stream->write_function(stream, "Record file %s\n", argv[2]); @@ -3291,8 +3291,8 @@ { switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - assert(conference != NULL); - assert(stream != NULL); + switch_assert(conference != NULL); + switch_assert(stream != NULL); if (argc > 2) { int all = (strcasecmp(argv[2], "all") == 0); @@ -3378,8 +3378,8 @@ { switch_status_t status = SWITCH_STATUS_FALSE; uint32_t i, found = 0; - assert(conference != NULL); - assert(stream != NULL); + switch_assert(conference != NULL); + switch_assert(stream != NULL); /* loop through the command table to find a match */ for (i = 0; i < CONFFUNCAPISIZE && !found; i++) { @@ -3535,7 +3535,7 @@ } switch_thread_rwlock_unlock(conference->rwlock); - } else { + } else if (argv[0]) { /* special case the list command, because it doesn't require a conference argument */ if (strcasecmp(argv[0], "list") == 0) { conf_api_sub_list(NULL, stream, argc, argv); @@ -3573,7 +3573,7 @@ switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CUSTOM RING\n"); @@ -3620,7 +3620,7 @@ } peer_channel = switch_core_session_get_channel(peer_session); - assert(peer_channel != NULL); + switch_assert(peer_channel != NULL); rdlock = 1; goto callup; } @@ -3659,7 +3659,7 @@ rdlock = 1; peer_channel = switch_core_session_get_channel(peer_session); - assert(peer_channel != NULL); + switch_assert(peer_channel != NULL); /* make sure the conference still exists */ if (!switch_test_flag(conference, CFLAG_RUNNING)) { @@ -3811,7 +3811,7 @@ /* generate some space infront of the file to be played */ for (x = 0; x < leadin; x++) { switch_frame_t *read_frame; - switch_status_t status = switch_core_session_read_frame(session, &read_frame, 1000, 0); + status = switch_core_session_read_frame(session, &read_frame, 1000, 0); if (!SWITCH_READ_ACCEPTABLE(status)) { break; @@ -3880,7 +3880,7 @@ char *addition = (char *) data; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); call_list = switch_channel_get_private(channel, "_conference_autocall_list_"); @@ -3888,7 +3888,7 @@ call_list = NULL; } else { np = switch_core_session_alloc(session, sizeof(*np)); - assert(np != NULL); + switch_assert(np != NULL); np->string = switch_core_session_strdup(session, addition); if (call_list) { @@ -3931,7 +3931,7 @@ char *params = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (!mydata) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); @@ -4297,13 +4297,13 @@ switch_xml_free(cxml); } - if (switch_test_flag(&member, MFLAG_KICKED) && conference->kicked_sound) { + if (conference && switch_test_flag(&member, MFLAG_KICKED) && conference->kicked_sound) { char *toplay = NULL; char *dfile = NULL; if (conference->sound_prefix) { dfile = switch_mprintf("%s%s%s", conference->sound_prefix, SWITCH_PATH_SEPARATOR, conference->kicked_sound); - assert(dfile); + switch_assert(dfile); toplay = dfile; } else { toplay = conference->kicked_sound; @@ -4353,6 +4353,7 @@ if (!(rec = switch_core_alloc(pool, sizeof(*rec)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); switch_core_destroy_memory_pool(&pool); + return; } rec->conference = conference; @@ -4382,6 +4383,7 @@ if (!(ci = switch_loadable_module_get_chat_interface(proto))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Chat Interface [%s]!\n", proto); + return SWITCH_STATUS_FALSE; } @@ -4432,7 +4434,7 @@ uint32_t i; caller_control_action_t *action; - assert(conference != NULL); + switch_assert(conference != NULL); for (i = 0, status = SWITCH_STATUS_SUCCESS; status == SWITCH_STATUS_SUCCESS && i < CCFNTBL_QTY; i++) { if (!switch_strlen_zero(ccfntbl[i].digits)) { @@ -4460,7 +4462,7 @@ switch_status_t status = SWITCH_STATUS_FALSE; switch_xml_t xml_kvp; - assert(conference != NULL); + switch_assert(conference != NULL); if (!xml_controls) { return status; @@ -4855,8 +4857,6 @@ } if ((conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { - switch_event_t *event; - if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", conference->name); @@ -4919,7 +4919,7 @@ { uint32_t i; size_t nl, ol = 0; - char *p = NULL; + char *p = NULL, *tmp = NULL; switch_chat_interface_t *chat_interface; switch_api_interface_t *api_interface; switch_application_interface_t *app_interface; @@ -4937,13 +4937,17 @@ if (p != NULL) { ol = strlen(p); } - p = realloc(p, ol + nl); - if (p != NULL) { + tmp = realloc(p, ol + nl); + if (tmp != NULL) { + p = tmp; strcat(p, "\t\t"); strcat(p, conf_api_sub_commands[i].psyntax); if (i < CONFFUNCAPISIZE - 1) { strcat(p, "\n"); } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't realloc\n"); + return SWITCH_STATUS_TERM; } } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_enum/mod_enum.c Tue Dec 11 16:35:05 2007 @@ -55,6 +55,7 @@ unsigned char dn[DNS_MAXDN]; enum dns_type qtyp; /* type of the query */ enum_record_t *results; + int errs; }; typedef struct query enum_query_t; @@ -203,9 +204,10 @@ static void dnserror(enum_query_t * q, int errnum) { - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "unable to lookup %s record for %s: %s\n", dns_typename(q->qtyp), dns_dntosp(q->dn), dns_strerror(errnum)); + q->errs++; } @@ -501,7 +503,7 @@ j += i; - if (j > globals.timeout || query.results) { + if (j > globals.timeout || query.results || query.errs) { break; } @@ -509,8 +511,9 @@ tv.tv_usec = 0; i = select((int) (fd + 1), &fds, 0, 0, &tv); now = time(NULL); - if (i > 0) + if (i > 0) { dns_ioevent(nctx, now); + } } if (!query.results) { Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_esf/mod_esf.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_esf/mod_esf.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/applications/mod_esf/mod_esf.c Tue Dec 11 16:35:05 2007 @@ -153,7 +153,10 @@ } if (ready == SEND_TYPE_RTP) { - rtp_port = switch_rtp_request_port(); + if (!(rtp_port = switch_rtp_request_port(guess_ip))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RTP Port Error\n"); + goto fail; + } switch_find_local_ip(guess_ip, sizeof(guess_ip), AF_INET); rtp_session = switch_rtp_new(guess_ip, rtp_port, Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Dec 11 16:35:05 2007 @@ -1697,7 +1697,11 @@ switch_core_session_set_private(*new_session, tech_pvt); tech_pvt->session = *new_session; tech_pvt->codec_index = -1; - tech_pvt->local_port = switch_rtp_request_port(); + if (!(tech_pvt->local_port = switch_rtp_request_port(tech_pvt->profile->ip))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No RTP port available!\n"); + terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + } tech_pvt->recip = switch_core_session_strdup(*new_session, full_id); tech_pvt->dnis = switch_core_session_strdup(*new_session, dnis); } else { @@ -2584,7 +2588,12 @@ tech_pvt->session = session; tech_pvt->codec_index = -1; tech_pvt->profile = profile; - tech_pvt->local_port = switch_rtp_request_port(); + if (!(tech_pvt->local_port = switch_rtp_request_port(profile->ip))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No RTP port available!\n"); + terminate_session(&session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + status = LDL_STATUS_FALSE; + goto done; + } switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); tech_pvt->recip = switch_core_session_strdup(session, from); if (!(exten = ldl_session_get_value(dlsession, "dnis"))) { Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Dec 11 16:35:05 2007 @@ -398,7 +398,10 @@ } tech_pvt->local_sdp_audio_ip = ip; - tech_pvt->local_sdp_audio_port = switch_rtp_request_port(); + if (!(tech_pvt->local_sdp_audio_port = switch_rtp_request_port(tech_pvt->profile->rtpip))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No RTP ports available!\n"); + return SWITCH_STATUS_FALSE; + } sdp_port = tech_pvt->local_sdp_audio_port; if (tech_pvt->profile->extrtpip) { @@ -428,7 +431,10 @@ return SWITCH_STATUS_SUCCESS; } - tech_pvt->local_sdp_video_port = switch_rtp_request_port(); + if (!(tech_pvt->local_sdp_video_port = switch_rtp_request_port(tech_pvt->profile->rtpip))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No RTP ports available!\n"); + return SWITCH_STATUS_FALSE; + } sdp_port = tech_pvt->local_sdp_video_port; if (tech_pvt->profile->extrtpip) { Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_buffer.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_buffer.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_buffer.c Tue Dec 11 16:35:05 2007 @@ -126,7 +126,7 @@ SWITCH_DECLARE(switch_size_t) switch_buffer_len(switch_buffer_t *buffer) { - assert(buffer != NULL); + switch_assert(buffer != NULL); return buffer->datalen; @@ -135,7 +135,7 @@ SWITCH_DECLARE(switch_size_t) switch_buffer_freespace(switch_buffer_t *buffer) { - assert(buffer != NULL); + switch_assert(buffer != NULL); if (switch_test_flag(buffer, SWITCH_BUFFER_FLAG_DYNAMIC)) { if (buffer->max_len) { @@ -150,7 +150,7 @@ SWITCH_DECLARE(switch_size_t) switch_buffer_inuse(switch_buffer_t *buffer) { - assert(buffer != NULL); + switch_assert(buffer != NULL); return buffer->used; } @@ -159,7 +159,7 @@ { switch_size_t reading = 0; - assert(buffer != NULL); + switch_assert(buffer != NULL); if (buffer->used < 1) { buffer->used = 0; @@ -202,8 +202,8 @@ { switch_size_t reading = 0; - assert(buffer != NULL); - assert(data != NULL); + switch_assert(buffer != NULL); + switch_assert(data != NULL); if (buffer->used < 1) { @@ -227,9 +227,9 @@ { switch_size_t freespace, actual_freespace; - assert(buffer != NULL); - assert(data != NULL); - assert(buffer->data != NULL); + switch_assert(buffer != NULL); + switch_assert(data != NULL); + switch_assert(buffer->data != NULL); if (!datalen) { return buffer->used; @@ -286,8 +286,8 @@ SWITCH_DECLARE(void) switch_buffer_zero(switch_buffer_t *buffer) { - assert(buffer != NULL); - assert(buffer->data != NULL); + switch_assert(buffer != NULL); + switch_assert(buffer->data != NULL); buffer->used = 0; buffer->actually_used = 0; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_caller.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_caller.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_caller.c Tue Dec 11 16:35:05 2007 @@ -54,7 +54,7 @@ switch_caller_profile_t *profile = NULL; profile = switch_core_alloc(pool, sizeof(*profile)); - assert(profile != NULL); + switch_assert(profile != NULL); if (!context) { context = "default"; @@ -85,7 +85,7 @@ switch_caller_profile_t *profile = NULL; profile = switch_core_alloc(pool, sizeof(*profile)); - assert(profile != NULL); + switch_assert(profile != NULL); profile_dup(tocopy->username, profile->username, pool); profile_dup(tocopy->dialplan, profile->dialplan, pool); @@ -294,7 +294,7 @@ { switch_caller_application_t *caller_application = NULL; - assert(session != NULL); + switch_assert(session != NULL); if ((caller_application = switch_core_session_alloc(session, sizeof(switch_caller_application_t))) != 0) { caller_application->application_name = switch_core_session_strdup(session, application_name); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_channel.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_channel.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_channel.c Tue Dec 11 16:35:05 2007 @@ -156,7 +156,7 @@ SWITCH_DECLARE(switch_call_cause_t) switch_channel_get_cause(switch_channel_t *channel) { - assert(channel != NULL); + switch_assert(channel != NULL); return channel->hangup_cause; } @@ -164,7 +164,7 @@ { switch_channel_timetable_t *times = NULL; - assert(channel != NULL); + switch_assert(channel != NULL); if (channel->caller_profile) { switch_mutex_lock(channel->profile_mutex); times = channel->caller_profile->times; @@ -176,7 +176,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_alloc(switch_channel_t **channel, switch_memory_pool_t *pool) { - assert(pool != NULL); + switch_assert(pool != NULL); if (((*channel) = switch_core_alloc(pool, sizeof(switch_channel_t))) == 0) { return SWITCH_STATUS_MEMERR; @@ -200,7 +200,7 @@ { switch_size_t has; - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->dtmf_mutex); has = switch_buffer_inuse(channel->dtmf_buffer); switch_mutex_unlock(channel->dtmf_mutex); @@ -215,7 +215,7 @@ switch_size_t wr = 0; const char *p; - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->dtmf_mutex); @@ -254,7 +254,7 @@ switch_size_t bytes; switch_event_t *event; - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->dtmf_mutex); if ((bytes = switch_buffer_read(channel->dtmf_buffer, dtmf, len)) > 0) { @@ -283,7 +283,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_init(switch_channel_t *channel, switch_core_session_t *session, switch_channel_state_t state, uint32_t flags) { - assert(channel != NULL); + switch_assert(channel != NULL); channel->state = state; channel->flags = flags; channel->session = session; @@ -325,7 +325,7 @@ SWITCH_DECLARE(const char *) switch_channel_get_variable(switch_channel_t *channel, const char *varname) { const char *v = NULL; - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->profile_mutex); if (!(v = switch_event_get_header(channel->variables, (char*)varname))) { @@ -352,7 +352,7 @@ SWITCH_DECLARE(void) switch_channel_variable_last(switch_channel_t *channel) { - assert(channel != NULL); + switch_assert(channel != NULL); if (!channel->vi) { return; } @@ -365,7 +365,7 @@ { switch_event_header_t *hi = NULL; - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->profile_mutex); if ((hi = channel->variables->headers)) { channel->vi = 1; @@ -379,7 +379,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, const char *key, const void *private_info) { - assert(channel != NULL); + switch_assert(channel != NULL); switch_core_hash_insert_locked(channel->private_hash, key, private_info, channel->profile_mutex); return SWITCH_STATUS_SUCCESS; } @@ -387,14 +387,14 @@ SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key) { void *val; - assert(channel != NULL); + switch_assert(channel != NULL); val = switch_core_hash_find_locked(channel->private_hash, key, channel->profile_mutex); return val; } SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channel, const char *name) { - assert(channel != NULL); + switch_assert(channel != NULL); channel->name = NULL; if (name) { char *uuid = switch_core_session_get_uuid(channel->session); @@ -408,13 +408,13 @@ SWITCH_DECLARE(char *) switch_channel_get_name(switch_channel_t *channel) { - assert(channel != NULL); + switch_assert(channel != NULL); return channel->name ? channel->name : "N/A"; } SWITCH_DECLARE(switch_status_t) switch_channel_set_variable(switch_channel_t *channel, const char *varname, const char *value) { - assert(channel != NULL); + switch_assert(channel != NULL); if (!switch_strlen_zero(varname)) { switch_mutex_lock(channel->profile_mutex); @@ -431,7 +431,7 @@ SWITCH_DECLARE(int) switch_channel_test_flag(switch_channel_t *channel, switch_channel_flag_t flags) { - assert(channel != NULL); + switch_assert(channel != NULL); return switch_test_flag(channel, flags) ? 1 : 0; } @@ -439,7 +439,7 @@ { const char *uuid; - assert(channel != NULL); + switch_assert(channel != NULL); if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { switch_core_session_t *session; @@ -457,7 +457,7 @@ { const char *uuid; - assert(channel != NULL); + switch_assert(channel != NULL); if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { switch_core_session_t *session; @@ -489,13 +489,13 @@ SWITCH_DECLARE(void) switch_channel_set_flag(switch_channel_t *channel, switch_channel_flag_t flags) { - assert(channel != NULL); + switch_assert(channel != NULL); switch_set_flag_locked(channel, flags); } SWITCH_DECLARE(void) switch_channel_set_state_flag(switch_channel_t *channel, switch_channel_flag_t flags) { - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->flag_mutex); channel->state_flags |= flags; @@ -504,14 +504,14 @@ SWITCH_DECLARE(void) switch_channel_clear_flag(switch_channel_t *channel, switch_channel_flag_t flags) { - assert(channel != NULL); + switch_assert(channel != NULL); switch_clear_flag_locked(channel, flags); } SWITCH_DECLARE(switch_channel_state_t) switch_channel_get_state(switch_channel_t *channel) { switch_channel_state_t state; - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->flag_mutex); state = channel->state; @@ -523,7 +523,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_get_running_state(switch_channel_t *channel) { switch_channel_state_t state; - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->flag_mutex); state = channel->running_state; @@ -536,7 +536,7 @@ { uint8_t ret = 0; - assert(channel != NULL); + switch_assert(channel != NULL); if (!channel->hangup_cause && channel->state > CS_RING && channel->state < CS_HANGUP && channel->state != CS_RESET && !switch_test_flag(channel, CF_TRANSFER)) { @@ -618,7 +618,7 @@ int ok = 0; - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->flag_mutex); last_state = channel->state; @@ -800,7 +800,7 @@ /* we won't tolerate an invalid state change so we can make sure we are as robust as a nice cup of dark coffee! */ if (channel->state < CS_HANGUP) { /* not cool lets crash this bad boy and figure out wtf is going on */ - assert(0); + switch_assert(0); } } done: @@ -869,7 +869,7 @@ vval = (char *) hi->value; x++; - assert(vvar && vval); + switch_assert(vvar && vval); snprintf(buf, sizeof(buf), "variable_%s", vvar); switch_event_add_header(event, SWITCH_STACK_BOTTOM, buf, "%s", vval); @@ -882,10 +882,10 @@ SWITCH_DECLARE(void) switch_channel_set_caller_profile(switch_channel_t *channel, switch_caller_profile_t *caller_profile) { char *uuid = NULL; - assert(channel != NULL); - assert(channel->session != NULL); + switch_assert(channel != NULL); + switch_assert(channel->session != NULL); switch_mutex_lock(channel->profile_mutex); - assert(caller_profile != NULL); + switch_assert(caller_profile != NULL); uuid = switch_core_session_get_uuid(channel->session); @@ -927,7 +927,7 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_channel_get_caller_profile(switch_channel_t *channel) { switch_caller_profile_t *profile; - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->profile_mutex); profile = channel->caller_profile; switch_mutex_unlock(channel->profile_mutex); @@ -936,26 +936,28 @@ SWITCH_DECLARE(void) switch_channel_set_originator_caller_profile(switch_channel_t *channel, switch_caller_profile_t *caller_profile) { - assert(channel != NULL); + switch_assert(channel != NULL); + switch_assert(channel->caller_profile != NULL); switch_mutex_lock(channel->profile_mutex); if (channel->caller_profile) { caller_profile->next = channel->caller_profile->originator_caller_profile; channel->caller_profile->originator_caller_profile = caller_profile; } - assert(channel->caller_profile->originator_caller_profile->next != channel->caller_profile->originator_caller_profile); + switch_assert(channel->caller_profile->originator_caller_profile->next != channel->caller_profile->originator_caller_profile); switch_mutex_unlock(channel->profile_mutex); } SWITCH_DECLARE(void) switch_channel_set_originatee_caller_profile(switch_channel_t *channel, switch_caller_profile_t *caller_profile) { - assert(channel != NULL); + switch_assert(channel != NULL); + switch_assert(channel->caller_profile != NULL); switch_mutex_lock(channel->profile_mutex); if (channel->caller_profile) { caller_profile->next = channel->caller_profile->originatee_caller_profile; channel->caller_profile->originatee_caller_profile = caller_profile; } - assert(channel->caller_profile->originatee_caller_profile->next != channel->caller_profile->originatee_caller_profile); + switch_assert(channel->caller_profile->originatee_caller_profile->next != channel->caller_profile->originatee_caller_profile); switch_mutex_unlock(channel->profile_mutex); } @@ -963,7 +965,7 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_channel_get_originator_caller_profile(switch_channel_t *channel) { switch_caller_profile_t *profile = NULL; - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->profile_mutex); if (channel->caller_profile) { @@ -977,7 +979,7 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_channel_get_originatee_caller_profile(switch_channel_t *channel) { switch_caller_profile_t *profile = NULL; - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->profile_mutex); if (channel->caller_profile) { @@ -990,8 +992,8 @@ SWITCH_DECLARE(char *) switch_channel_get_uuid(switch_channel_t *channel) { - assert(channel != NULL); - assert(channel->session != NULL); + switch_assert(channel != NULL); + switch_assert(channel->session != NULL); return switch_core_session_get_uuid(channel->session); } @@ -999,7 +1001,7 @@ { int x, index; - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->flag_mutex); for (x = 0; x < SWITCH_MAX_STATE_HANDLERS; x++) { if (channel->state_handlers[x] == state_handler) { @@ -1025,7 +1027,7 @@ { const switch_state_handler_table_t *h = NULL; - assert(channel != NULL); + switch_assert(channel != NULL); if (index > SWITCH_MAX_STATE_HANDLERS || index > channel->state_handler_index) { return NULL; @@ -1046,7 +1048,7 @@ switch_mutex_lock(channel->flag_mutex); - assert(channel != NULL); + switch_assert(channel != NULL); channel->state_handler_index = 0; if (state_handler) { @@ -1072,7 +1074,7 @@ SWITCH_DECLARE(void) switch_channel_set_caller_extension(switch_channel_t *channel, switch_caller_extension_t *caller_extension) { - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->profile_mutex); caller_extension->next = channel->caller_profile->caller_extension; @@ -1085,7 +1087,7 @@ { switch_caller_extension_t *extension = NULL; - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->profile_mutex); if (channel->caller_profile) { extension = channel->caller_profile->caller_extension; @@ -1098,7 +1100,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_channel_t *channel, const char *file, const char *func, int line, switch_call_cause_t hangup_cause) { - assert(channel != NULL); + switch_assert(channel != NULL); switch_mutex_lock(channel->flag_mutex); if (channel->caller_profile && channel->caller_profile->times && !channel->caller_profile->times->hungup) { @@ -1182,7 +1184,7 @@ switch_core_session_message_t msg; switch_status_t status; - assert(channel != NULL); + switch_assert(channel != NULL); if (channel->hangup_cause || channel->state >= CS_HANGUP) { return SWITCH_STATUS_FALSE; @@ -1212,7 +1214,7 @@ switch_core_session_message_t msg; switch_status_t status; - assert(channel != NULL); + switch_assert(channel != NULL); if (channel->hangup_cause || channel->state >= CS_HANGUP) { return SWITCH_STATUS_FALSE; @@ -1243,7 +1245,7 @@ const char *uuid; switch_core_session_t *other_session; - assert(channel != NULL); + switch_assert(channel != NULL); if (channel->hangup_cause || channel->state >= CS_HANGUP) { return SWITCH_STATUS_FALSE; @@ -1286,7 +1288,7 @@ switch_core_session_message_t msg; switch_status_t status; - assert(channel != NULL); + switch_assert(channel != NULL); if (channel->hangup_cause || channel->state >= CS_HANGUP) { return SWITCH_STATUS_FALSE; @@ -1471,7 +1473,7 @@ sub_val = switch_channel_get_variable(channel, vname); if (offset || ooffset) { cloned_sub_val = strdup(sub_val); - assert(cloned_sub_val); + switch_assert(cloned_sub_val); sub_val = cloned_sub_val; } @@ -1583,13 +1585,13 @@ } encode_buf = malloc(encode_len); - assert(encode_buf); + switch_assert(encode_buf); if (!caller_profile) { caller_profile = switch_channel_get_caller_profile(channel); } - assert(caller_profile != NULL); + switch_assert(caller_profile != NULL); prof[0] = caller_profile->context; prof[1] = caller_profile->destination_number; @@ -1647,7 +1649,7 @@ encode_len = new_len; tmp = realloc(encode_buf, encode_len); - assert(tmp); + switch_assert(tmp); encode_buf = tmp; } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core.c Tue Dec 11 16:35:05 2007 @@ -182,10 +182,10 @@ switch_frame_t *read_frame; int stream_id = *stream_id_p; - assert(thread != NULL); - assert(session != NULL); + switch_assert(thread != NULL); + switch_assert(session != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); switch_channel_set_flag(channel, CF_SERVICE); while (data->running > 0) { @@ -536,7 +536,9 @@ #ifdef WIN32 snprintf(path, sizeof(path), "Global\\Freeswitch.%d", getpid()); shutdown_event = CreateEvent(NULL, FALSE, FALSE, path); - WaitForSingleObject(shutdown_event, INFINITE); + if (shutdown_event) { + WaitForSingleObject(shutdown_event, INFINITE); + } #else runtime.running = 1; while (runtime.running) { @@ -568,8 +570,8 @@ const char *check = (const char *) switch_core_hash_find(runtime.mime_types, ext); switch_status_t status = SWITCH_STATUS_FALSE; - assert(type); - assert(ext); + switch_assert(type); + switch_assert(ext); if (!check) { char *ptype = switch_core_permanent_strdup(type); @@ -578,7 +580,7 @@ char *argv[20] = { 0 }; int x; - assert(ext_list); + switch_assert(ext_list); if ((argc = switch_separate_string(ext_list, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { @@ -603,7 +605,7 @@ char *mime_path = NULL; mime_path = switch_mprintf("%s/%s", SWITCH_GLOBAL_dirs.conf_dir, cf); - assert(mime_path); + switch_assert(mime_path); fd = open(mime_path, O_RDONLY); if (fd <= 0) { @@ -664,7 +666,7 @@ *err = "FATAL ERROR! Could noat allocate memory pool\n"; return SWITCH_STATUS_MEMERR; } - assert(runtime.memory_pool != NULL); + switch_assert(runtime.memory_pool != NULL); switch_mutex_init(&runtime.throttle_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool); switch_core_set_globals(); switch_core_session_init(runtime.memory_pool); @@ -750,7 +752,7 @@ runtime.console = stdout; } - assert(runtime.memory_pool != NULL); + switch_assert(runtime.memory_pool != NULL); switch_log_init(runtime.memory_pool); switch_event_init(runtime.memory_pool); @@ -994,13 +996,12 @@ } switch_scheduler_task_thread_stop(); + switch_rtp_shutdown(); switch_xml_destroy(); switch_core_memory_stop(); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Finalizing Shutdown.\n"); switch_log_shutdown(); - - if (runtime.console && runtime.console != stdout && runtime.console != stderr) { fclose(runtime.console); runtime.console = NULL; @@ -1028,6 +1029,18 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_DECLARE(switch_status_t) switch_core_management_exec(char *relative_oid, switch_management_action_t action, char *data, switch_size_t datalen) +{ + const switch_management_interface_t *ptr; + switch_status_t status = SWITCH_STATUS_FALSE; + + if ((ptr = switch_loadable_module_get_management_interface(relative_oid))) { + status = ptr->management_function(relative_oid, action, data, datalen); + } + + return status; +} + SWITCH_DECLARE(void) switch_core_memory_reclaim_all(void) { switch_core_memory_reclaim_logger(); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_asr.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_asr.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_asr.c Tue Dec 11 16:35:05 2007 @@ -54,7 +54,7 @@ } } - assert(ah != NULL); + switch_assert(ah != NULL); if ((ah->asr_interface = switch_loadable_module_get_asr_interface(module_name)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid asr module [%s]!\n", module_name); @@ -86,7 +86,7 @@ char *epath = NULL; switch_status_t status; - assert(ah != NULL); + switch_assert(ah != NULL); if (!switch_is_file_path(path)) { epath = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, path); @@ -103,7 +103,7 @@ { switch_status_t status; - assert(ah != NULL); + switch_assert(ah != NULL); status = ah->asr_interface->asr_unload_grammar(ah, grammar); return status; @@ -111,42 +111,42 @@ SWITCH_DECLARE(switch_status_t) switch_core_asr_pause(switch_asr_handle_t *ah) { - assert(ah != NULL); + switch_assert(ah != NULL); return ah->asr_interface->asr_pause(ah); } SWITCH_DECLARE(switch_status_t) switch_core_asr_resume(switch_asr_handle_t *ah) { - assert(ah != NULL); + switch_assert(ah != NULL); return ah->asr_interface->asr_resume(ah); } SWITCH_DECLARE(switch_status_t) switch_core_asr_close(switch_asr_handle_t *ah, switch_asr_flag_t *flags) { - assert(ah != NULL); + switch_assert(ah != NULL); return ah->asr_interface->asr_close(ah, flags); } SWITCH_DECLARE(switch_status_t) switch_core_asr_feed(switch_asr_handle_t *ah, void *data, unsigned int len, switch_asr_flag_t *flags) { - assert(ah != NULL); + switch_assert(ah != NULL); return ah->asr_interface->asr_feed(ah, data, len, flags); } SWITCH_DECLARE(switch_status_t) switch_core_asr_check_results(switch_asr_handle_t *ah, switch_asr_flag_t *flags) { - assert(ah != NULL); + switch_assert(ah != NULL); return ah->asr_interface->asr_check_results(ah, flags); } SWITCH_DECLARE(switch_status_t) switch_core_asr_get_results(switch_asr_handle_t *ah, char **xmlstr, switch_asr_flag_t *flags) { - assert(ah != NULL); + switch_assert(ah != NULL); return ah->asr_interface->asr_get_results(ah, xmlstr, flags); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_codec.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_codec.c Tue Dec 11 16:35:05 2007 @@ -40,7 +40,7 @@ switch_channel_t *channel; char tmp[30]; - assert(session != NULL); + switch_assert(session != NULL); channel = switch_core_session_get_channel(session); if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { @@ -77,7 +77,7 @@ switch_channel_t *channel; char tmp[30]; - assert(session != NULL); + switch_assert(session != NULL); channel = switch_core_session_get_channel(session); @@ -112,8 +112,8 @@ const switch_codec_implementation_t *iptr, *implementation = NULL; char *mode = fmtp; - assert(codec != NULL); - assert(codec_name != NULL); + switch_assert(codec != NULL); + switch_assert(codec_name != NULL); memset(codec, 0, sizeof(*codec)); @@ -199,9 +199,9 @@ uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate, unsigned int *flag) { - assert(codec != NULL); - assert(encoded_data != NULL); - assert(decoded_data != NULL); + switch_assert(codec != NULL); + switch_assert(encoded_data != NULL); + switch_assert(decoded_data != NULL); if (!codec->implementation) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec is not initilized!\n"); @@ -227,9 +227,9 @@ void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, unsigned int *flag) { - assert(codec != NULL); - assert(encoded_data != NULL); - assert(decoded_data != NULL); + switch_assert(codec != NULL); + switch_assert(encoded_data != NULL); + switch_assert(decoded_data != NULL); @@ -251,7 +251,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_destroy(switch_codec_t *codec) { - assert(codec != NULL); + switch_assert(codec != NULL); if (!codec->implementation) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec is not initilized!\n"); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_file.c Tue Dec 11 16:35:05 2007 @@ -94,16 +94,16 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh, void *data, switch_size_t *len) { - assert(fh != NULL); - assert(fh->file_interface != NULL); + switch_assert(fh != NULL); + switch_assert(fh->file_interface != NULL); return fh->file_interface->file_read(fh, data, len); } SWITCH_DECLARE(switch_status_t) switch_core_file_write(switch_file_handle_t *fh, void *data, switch_size_t *len) { - assert(fh != NULL); - assert(fh->file_interface != NULL); + switch_assert(fh != NULL); + switch_assert(fh->file_interface != NULL); return fh->file_interface->file_write(fh, data, len); } @@ -112,8 +112,8 @@ { switch_status_t status; - assert(fh != NULL); - assert(fh->file_interface != NULL); + switch_assert(fh != NULL); + switch_assert(fh->file_interface != NULL); switch_set_flag(fh, SWITCH_FILE_SEEK); status = fh->file_interface->file_seek(fh, cur_pos, samples, whence); @@ -125,16 +125,16 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_set_string(switch_file_handle_t *fh, switch_audio_col_t col, const char *string) { - assert(fh != NULL); - assert(fh->file_interface != NULL); + switch_assert(fh != NULL); + switch_assert(fh->file_interface != NULL); return fh->file_interface->file_set_string(fh, col, string); } SWITCH_DECLARE(switch_status_t) switch_core_file_get_string(switch_file_handle_t *fh, switch_audio_col_t col, const char **string) { - assert(fh != NULL); - assert(fh->file_interface != NULL); + switch_assert(fh != NULL); + switch_assert(fh->file_interface != NULL); return fh->file_interface->file_get_string(fh, col, string); @@ -143,8 +143,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_close(switch_file_handle_t *fh) { - assert(fh != NULL); - assert(fh->file_interface != NULL); + switch_assert(fh != NULL); + switch_assert(fh->file_interface != NULL); switch_clear_flag(fh, SWITCH_FILE_OPEN); return fh->file_interface->file_close(fh); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_hash.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_hash.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_hash.c Tue Dec 11 16:35:05 2007 @@ -47,7 +47,7 @@ switch_hash_t *newhash; newhash = switch_core_alloc(pool, sizeof(*newhash)); - assert(newhash); + switch_assert(newhash); sqlite3HashInit(&newhash->table, SQLITE_HASH_STRING, 1); *hash = newhash; @@ -58,7 +58,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_destroy(switch_hash_t **hash) { - assert(hash != NULL && *hash != NULL); + switch_assert(hash != NULL && *hash != NULL); sqlite3HashClear(&(*hash)->table); *hash = NULL; return SWITCH_STATUS_SUCCESS; @@ -145,9 +145,9 @@ { if (key) { *key = sqliteHashKey((HashElem *) hi); - } - if (klen) { - *klen = strlen((char *) *key) + 1; + if (klen) { + *klen = strlen((char *) *key) + 1; + } } if (val) { *val = sqliteHashData((HashElem *) hi); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_io.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_io.c Tue Dec 11 16:35:05 2007 @@ -76,8 +76,8 @@ goto done; } - assert(session != NULL); - assert(*frame != NULL); + switch_assert(session != NULL); + switch_assert(*frame != NULL); if (switch_test_flag(*frame, SFF_CNG)) { status = SWITCH_STATUS_SUCCESS; @@ -101,7 +101,7 @@ status = SWITCH_STATUS_FALSE; need_codec = perfect = 0; - assert(session != NULL); + switch_assert(session != NULL); *frame = NULL; if (switch_channel_test_flag(session->channel, CF_HOLD)) { @@ -128,8 +128,8 @@ goto done; } - assert(session != NULL); - assert(*frame != NULL); + switch_assert(session != NULL); + switch_assert(*frame != NULL); if (switch_test_flag(*frame, SFF_CNG)) { @@ -137,7 +137,7 @@ goto done; } - assert((*frame)->codec != NULL); + switch_assert((*frame)->codec != NULL); if ((session->read_codec && (*frame)->codec && session->read_codec->implementation != (*frame)->codec->implementation)) { need_codec = TRUE; } @@ -313,9 +313,9 @@ } session->enc_read_frame.datalen = session->enc_read_frame.buflen; - assert(session->read_codec != NULL); - assert(enc_frame != NULL); - assert(enc_frame->data != NULL); + switch_assert(session->read_codec != NULL); + switch_assert(enc_frame != NULL); + switch_assert(enc_frame->data != NULL); status = switch_core_codec_encode(session->read_codec, enc_frame->codec, @@ -433,8 +433,8 @@ unsigned int flag = 0, need_codec = 0, perfect = 0, do_bugs = 0, do_write = 0, do_resample = 0; switch_io_flag_t io_flag = SWITCH_IO_FLAG_NOOP; - assert(session != NULL); - assert(frame != NULL); + switch_assert(session != NULL); + switch_assert(frame != NULL); if (switch_channel_test_flag(session->channel, CF_HOLD)) { @@ -450,7 +450,7 @@ return SWITCH_STATUS_SUCCESS; } - assert(frame->codec != NULL); + switch_assert(frame->codec != NULL); if ((session->write_codec && frame->codec && session->write_codec->implementation != frame->codec->implementation)) { need_codec = TRUE; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_memory.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_memory.c Tue Dec 11 16:35:05 2007 @@ -45,8 +45,8 @@ SWITCH_DECLARE(switch_memory_pool_t *) switch_core_session_get_pool(switch_core_session_t *session) { - assert(session != NULL); - assert(session->pool != NULL); + switch_assert(session != NULL); + switch_assert(session->pool != NULL); return session->pool; } @@ -55,8 +55,8 @@ SWITCH_DECLARE(void *) switch_core_session_alloc(switch_core_session_t *session, switch_size_t memory) { void *ptr = NULL; - assert(session != NULL); - assert(session->pool != NULL); + switch_assert(session != NULL); + switch_assert(session->pool != NULL); #ifdef LOCK_MORE switch_mutex_lock(memory_manager.mem_lock); @@ -67,7 +67,7 @@ #endif ptr = apr_palloc(session->pool, memory); - assert(ptr != NULL); + switch_assert(ptr != NULL); memset(ptr, 0, memory); @@ -84,7 +84,7 @@ SWITCH_DECLARE(void *) switch_core_permanent_alloc(switch_size_t memory) { void *ptr = NULL; - assert(memory_manager.memory_pool != NULL); + switch_assert(memory_manager.memory_pool != NULL); #ifdef LOCK_MORE switch_mutex_lock(memory_manager.mem_lock); @@ -96,7 +96,7 @@ ptr = apr_palloc(memory_manager.memory_pool, memory); - assert(ptr != NULL); + switch_assert(ptr != NULL); memset(ptr, 0, memory); #ifdef LOCK_MORE @@ -110,7 +110,7 @@ { char *duped = NULL; switch_size_t len; - assert(memory_manager.memory_pool != NULL); + switch_assert(memory_manager.memory_pool != NULL); if (!todup) return NULL; @@ -121,7 +121,7 @@ len = strlen(todup) + 1; duped = apr_pstrmemdup(memory_manager.memory_pool, todup, len); - assert(duped != NULL); + switch_assert(duped != NULL); #ifdef DEBUG_ALLOC printf("Perm Allocate %d\n", (int)len); @@ -143,12 +143,12 @@ switch_mutex_lock(memory_manager.mem_lock); #endif - assert(session != NULL); - assert(session->pool != NULL); + switch_assert(session != NULL); + switch_assert(session->pool != NULL); va_start(ap, fmt); result = apr_pvsprintf(session->pool, fmt, ap); - assert(result != NULL); + switch_assert(result != NULL); va_end(ap); @@ -164,7 +164,7 @@ va_list ap; char *result = NULL; - assert(pool != NULL); + switch_assert(pool != NULL); #ifdef LOCK_MORE switch_mutex_lock(memory_manager.mem_lock); @@ -173,7 +173,7 @@ va_start(ap, fmt); result = apr_pvsprintf(pool, fmt, ap); - assert(result != NULL); + switch_assert(result != NULL); va_end(ap); #ifdef LOCK_MORE @@ -188,8 +188,8 @@ { char *duped = NULL; switch_size_t len; - assert(session != NULL); - assert(session->pool != NULL); + switch_assert(session != NULL); + switch_assert(session->pool != NULL); if (!todup) { return NULL; @@ -206,7 +206,7 @@ #endif duped = apr_pstrmemdup(session->pool, todup, len); - assert(duped != NULL); + switch_assert(duped != NULL); #ifdef LOCK_MORE @@ -221,7 +221,7 @@ { char *duped = NULL; switch_size_t len; - assert(pool != NULL); + switch_assert(pool != NULL); if (!todup) { return NULL; @@ -238,7 +238,7 @@ #endif duped = apr_pstrmemdup(pool, todup, len); - assert(duped != NULL); + switch_assert(duped != NULL); #ifdef LOCK_MORE switch_mutex_unlock(memory_manager.mem_lock); @@ -253,13 +253,13 @@ void *pop; switch_mutex_lock(memory_manager.mem_lock); - assert(pool != NULL); + switch_assert(pool != NULL); if (switch_queue_trypop(memory_manager.pool_recycle_queue, &pop) == SWITCH_STATUS_SUCCESS) { *pool = (switch_memory_pool_t *) pop; } else { apr_pool_create(pool, NULL); - assert(*pool != NULL); + switch_assert(*pool != NULL); } #ifdef DEBUG_ALLOC2 @@ -276,7 +276,7 @@ //char tmp[128] = ""; - assert(pool != NULL); + switch_assert(pool != NULL); #ifdef DEBUG_ALLOC2 printf("Free Pool %s %s:%d\n", file, func, line); @@ -296,7 +296,7 @@ { void *ptr = NULL; - assert(pool != NULL); + switch_assert(pool != NULL); #ifdef LOCK_MORE switch_mutex_lock(memory_manager.mem_lock); @@ -304,11 +304,11 @@ #ifdef DEBUG_ALLOC printf("Allocate %d\n", (int)memory); - /*assert(memory < 20000);*/ + /*switch_assert(memory < 20000);*/ #endif ptr = apr_palloc(pool, memory); - assert(ptr != NULL); + switch_assert(ptr != NULL); memset(ptr, 0, memory); @@ -413,7 +413,7 @@ memset(&memory_manager, 0, sizeof(memory_manager)); apr_pool_create(&memory_manager.memory_pool, NULL); - assert(memory_manager.memory_pool != NULL); + switch_assert(memory_manager.memory_pool != NULL); switch_mutex_init(&memory_manager.mem_lock, SWITCH_MUTEX_NESTED, memory_manager.memory_pool); switch_queue_create(&memory_manager.pool_queue, 50000, memory_manager.memory_pool); switch_queue_create(&memory_manager.pool_recycle_queue, 50000, memory_manager.memory_pool); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_port_allocator.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_port_allocator.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_port_allocator.c Tue Dec 11 16:35:05 2007 @@ -38,18 +38,21 @@ switch_port_t start; switch_port_t end; switch_port_t next; - uint8_t inc; + switch_byte_t *track; + uint32_t track_len; + uint32_t track_used; + switch_port_flag_t flags; switch_mutex_t *mutex; switch_memory_pool_t *pool; }; SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_new(switch_port_t start, - switch_port_t end, uint8_t inc, switch_core_port_allocator_t **new_allocator) + switch_port_t end, switch_port_flag_t flags, switch_core_port_allocator_t **new_allocator) { switch_status_t status; switch_memory_pool_t *pool; switch_core_port_allocator_t *alloc; - + if ((status = switch_core_new_memory_pool(&pool)) != SWITCH_STATUS_SUCCESS) { return status; } @@ -58,13 +61,21 @@ switch_core_destroy_memory_pool(&pool); return SWITCH_STATUS_MEMERR; } + + alloc->track_len = (end - start) + 2; + alloc->flags = flags; + + if (!(switch_test_flag(alloc, SPF_EVEN) && switch_test_flag(alloc, SPF_ODD))) { + alloc->track_len /= 2; + } + + alloc->track = switch_core_alloc(pool, (alloc->track_len + 2) * sizeof(switch_byte_t)); alloc->start = start; alloc->next = start; alloc->end = end; - if (!(alloc->inc = inc)) { - alloc->inc = 2; - } + + switch_mutex_init(&alloc->mutex, SWITCH_MUTEX_NESTED, pool); alloc->pool = pool; *new_allocator = alloc; @@ -72,34 +83,89 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_status_t) switch_core_management_exec(char *relative_oid, switch_management_action_t action, char *data, switch_size_t datalen) + +SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_request_port(switch_core_port_allocator_t *alloc, switch_port_t *port_ptr) { - const switch_management_interface_t *ptr; + switch_port_t port = 0; switch_status_t status = SWITCH_STATUS_FALSE; + int even = switch_test_flag(alloc, SPF_EVEN); + int odd = switch_test_flag(alloc, SPF_ODD); + + switch_mutex_lock(alloc->mutex); + srand(getpid() + (unsigned)time(NULL)); + + while(alloc->track_used < alloc->track_len) { + double r; + uint32_t index; + int tries = 0; + + do { + r = ((double)rand() / ((double)(RAND_MAX)+(double)(1))); + index = (int) (r * alloc->track_len); + tries++; + } while((alloc->track[index] || index >= alloc->track_len) && tries < 10000); + + while(alloc->track[index]) { + if (++index >= alloc->track_len) { + index = 0; + } + } + + if (index < alloc->track_len) { + alloc->track[index] = 1; + alloc->track_used++; + status = SWITCH_STATUS_SUCCESS; + + if ((even && odd)) { + port = (switch_port_t)(index + alloc->start); + } else { + port = (switch_port_t)(index + (alloc->start / 2)); + port *= 2; + } + goto end; + } + } + + + end: - if ((ptr = switch_loadable_module_get_management_interface(relative_oid))) { - status = ptr->management_function(relative_oid, action, data, datalen); + switch_mutex_unlock(alloc->mutex); + + if (status == SWITCH_STATUS_SUCCESS) { + *port_ptr = port; + } else { + *port_ptr = 0; } + return status; + } - -SWITCH_DECLARE(switch_port_t) switch_core_port_allocator_request_port(switch_core_port_allocator_t *alloc) +SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_free_port(switch_core_port_allocator_t *alloc, switch_port_t port) { - switch_port_t port; + switch_status_t status = SWITCH_STATUS_FALSE; + int even = switch_test_flag(alloc, SPF_EVEN); + int odd = switch_test_flag(alloc, SPF_ODD); + int index = port - alloc->start; + + if (!(even && odd)) { + index /= 2; + } switch_mutex_lock(alloc->mutex); - port = alloc->next; - alloc->next = alloc->next + alloc->inc; - if (alloc->next > alloc->end) { - alloc->next = alloc->start; + if (alloc->track[index]) { + alloc->track[index] = 0; + alloc->track_used--; + status = SWITCH_STATUS_SUCCESS; } switch_mutex_unlock(alloc->mutex); - return port; + + return status; } + SWITCH_DECLARE(void) switch_core_port_allocator_destroy(switch_core_port_allocator_t **alloc) { switch_memory_pool_t *pool = (*alloc)->pool; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_session.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_session.c Tue Dec 11 16:35:05 2007 @@ -144,14 +144,14 @@ SWITCH_DECLARE(void *) switch_core_session_get_private(switch_core_session_t *session) { - assert(session != NULL); + switch_assert(session != NULL); return session->private_info; } SWITCH_DECLARE(switch_status_t) switch_core_session_set_private(switch_core_session_t *session, void *private_info) { - assert(session != NULL); + switch_assert(session != NULL); session->private_info = private_info; return SWITCH_STATUS_SUCCESS; } @@ -231,7 +231,7 @@ return SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED; } - assert(*new_session != NULL); + switch_assert(*new_session != NULL); if (*new_session) { switch_caller_profile_t *profile = NULL, *peer_profile = NULL, *cloned_profile = NULL; @@ -270,13 +270,13 @@ int x; for (x = 0; x < argc; x++) { - const char *val; - if ((val = switch_channel_get_variable(channel, argv[x]))) { - char *var = argv[x]; - if (!strncasecmp(var, "nolocal:", 8)) { - var += 8; + const char *vval; + if ((vval = switch_channel_get_variable(channel, argv[x]))) { + char *vvar = argv[x]; + if (!strncasecmp(vvar, "nolocal:", 8)) { + vvar += 8; } - switch_channel_set_variable(peer_channel, var, val); + switch_channel_set_variable(peer_channel, vvar, vval); } } } @@ -321,7 +321,7 @@ switch_io_event_hook_receive_message_t *ptr; switch_status_t status = SWITCH_STATUS_SUCCESS; - assert(session != NULL); + switch_assert(session != NULL); if (session->endpoint_interface->io_routines->receive_message) { status = session->endpoint_interface->io_routines->receive_message(session, message); @@ -348,10 +348,10 @@ switch_channel_t *channel; switch_status_t status = SWITCH_STATUS_SUCCESS; - assert(session != NULL); + switch_assert(session != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { msg.message_id = indication; @@ -385,7 +385,7 @@ { switch_status_t status = SWITCH_STATUS_FALSE; - assert(session != NULL); + switch_assert(session != NULL); if (session->message_queue) { if (switch_queue_trypush(session->message_queue, message) == SWITCH_STATUS_SUCCESS) { @@ -401,7 +401,7 @@ switch_status_t status = SWITCH_STATUS_FALSE; void *pop; - assert(session != NULL); + switch_assert(session != NULL); if (session->message_queue) { if ((status = (switch_status_t) switch_queue_trypop(session->message_queue, &pop)) == SWITCH_STATUS_SUCCESS) { @@ -433,7 +433,7 @@ switch_io_event_hook_receive_event_t *ptr; switch_status_t status = SWITCH_STATUS_FALSE; - assert(session != NULL); + switch_assert(session != NULL); /* Acquire a read lock on the session or forget it the channel is dead */ if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { @@ -470,7 +470,7 @@ { switch_status_t status = SWITCH_STATUS_FALSE; - assert(session != NULL); + switch_assert(session != NULL); if (session->event_queue) { if (switch_queue_trypush(session->event_queue, *event) == SWITCH_STATUS_SUCCESS) { @@ -496,7 +496,7 @@ switch_status_t status = SWITCH_STATUS_FALSE; void *pop; - assert(session != NULL); + switch_assert(session != NULL); if (session->event_queue) { if ((status = (switch_status_t) switch_queue_trypop(session->event_queue, &pop)) == SWITCH_STATUS_SUCCESS) { @@ -511,7 +511,7 @@ { switch_status_t status = SWITCH_STATUS_FALSE; - assert(session != NULL); + switch_assert(session != NULL); if (session->private_event_queue) { (*event)->event_id = SWITCH_EVENT_PRIVATE_COMMAND; @@ -540,10 +540,10 @@ void *pop; switch_channel_t *channel; - assert(session != NULL); + switch_assert(session != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (switch_channel_test_flag(channel, CF_EVENT_LOCK)) { @@ -849,8 +849,8 @@ SWITCH_DECLARE(uint8_t) switch_core_session_compare(switch_core_session_t *a, switch_core_session_t *b) { - assert(a != NULL); - assert(b != NULL); + switch_assert(a != NULL); + switch_assert(b != NULL); return (uint8_t) (a->endpoint_interface == b->endpoint_interface); } @@ -911,7 +911,7 @@ log = switch_core_session_alloc(session, sizeof(*log)); - assert(log != NULL); + switch_assert(log != NULL); log->app = switch_core_session_strdup(session, application_interface->interface_name); log->arg = switch_core_session_strdup(session, arg); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_speech.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_speech.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_speech.c Tue Dec 11 16:35:05 2007 @@ -87,14 +87,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_speech_feed_tts(switch_speech_handle_t *sh, char *text, switch_speech_flag_t *flags) { - assert(sh != NULL); + switch_assert(sh != NULL); return sh->speech_interface->speech_feed_tts(sh, text, flags); } SWITCH_DECLARE(void) switch_core_speech_flush_tts(switch_speech_handle_t *sh) { - assert(sh != NULL); + switch_assert(sh != NULL); if (sh->speech_interface->speech_flush_tts) { sh->speech_interface->speech_flush_tts(sh); @@ -103,7 +103,7 @@ SWITCH_DECLARE(void) switch_core_speech_text_param_tts(switch_speech_handle_t *sh, char *param, const char *val) { - assert(sh != NULL); + switch_assert(sh != NULL); if (sh->speech_interface->speech_text_param_tts) { sh->speech_interface->speech_text_param_tts(sh, param, val); @@ -112,7 +112,7 @@ SWITCH_DECLARE(void) switch_core_speech_numeric_param_tts(switch_speech_handle_t *sh, char *param, int val) { - assert(sh != NULL); + switch_assert(sh != NULL); if (sh->speech_interface->speech_numeric_param_tts) { sh->speech_interface->speech_numeric_param_tts(sh, param, val); @@ -121,7 +121,7 @@ SWITCH_DECLARE(void) switch_core_speech_float_param_tts(switch_speech_handle_t *sh, char *param, double val) { - assert(sh != NULL); + switch_assert(sh != NULL); if (sh->speech_interface->speech_float_param_tts) { sh->speech_interface->speech_float_param_tts(sh, param, val); @@ -131,7 +131,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_speech_read_tts(switch_speech_handle_t *sh, void *data, switch_size_t *datalen, uint32_t * rate, switch_speech_flag_t *flags) { - assert(sh != NULL); + switch_assert(sh != NULL); return sh->speech_interface->speech_read_tts(sh, data, datalen, rate, flags); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_sqldb.c Tue Dec 11 16:35:05 2007 @@ -154,10 +154,12 @@ uint8_t trans = 0, nothing_in_queue = 0; uint32_t target = 1000; switch_size_t len = 0, sql_len = SQLLEN; - char *sqlbuf = (char *) malloc(sql_len); + char *tmp, *sqlbuf = (char *) malloc(sql_len); char *sql; switch_size_t newlen; + switch_assert(sqlbuf); + if (!sql_manager.event_db) { sql_manager.event_db = switch_core_db_handle(); } @@ -180,10 +182,12 @@ itterations++; if (len + newlen > sql_len) { sql_len = len + SQLLEN; - if (!(sqlbuf = realloc(sqlbuf, sql_len))) { + if (!(tmp = realloc(sqlbuf, sql_len))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "SQL thread ending on mem err\n"); + abort(); break; } + sqlbuf = tmp; } sprintf(sqlbuf + len, "%s;\n", sql); len += newlen; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_core_state_machine.c Tue Dec 11 16:35:05 2007 @@ -201,19 +201,19 @@ static void switch_core_standard_on_transmit(switch_core_session_t *session) { - assert(session != NULL); + switch_assert(session != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard TRANSMIT\n"); } static void switch_core_standard_on_hold(switch_core_session_t *session) { - assert(session != NULL); + switch_assert(session != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard HOLD\n"); } static void switch_core_standard_on_hibernate(switch_core_session_t *session) { - assert(session != NULL); + switch_assert(session != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard HIBERNATE\n"); } @@ -368,14 +368,14 @@ */ - assert(session != NULL); + switch_assert(session != NULL); session->thread_running = 1; endpoint_interface = session->endpoint_interface; - assert(endpoint_interface != NULL); + switch_assert(endpoint_interface != NULL); driver_state_handler = endpoint_interface->state_handler; - assert(driver_state_handler != NULL); + switch_assert(driver_state_handler != NULL); switch_mutex_lock(session->mutex); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_event.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_event.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_event.c Tue Dec 11 16:35:05 2007 @@ -89,7 +89,7 @@ { size_t len = strlen (s) + 1; void *new = malloc (len); - assert(new); + switch_assert(new); return (char *) memcpy (new, s, len); } @@ -207,13 +207,13 @@ void *pop; int i, len[3] = { 0, 0, 0 }; - assert(thread != NULL); - assert(obj == NULL); - assert(POOL_LOCK != NULL); - assert(RUNTIME_POOL != NULL); - assert(EVENT_QUEUE_MUTEX != NULL); - assert(EVENT_QUEUE_HAVEMORE_MUTEX != NULL); - assert(EVENT_QUEUE_CONDITIONAL != NULL); + switch_assert(thread != NULL); + switch_assert(obj == NULL); + switch_assert(POOL_LOCK != NULL); + switch_assert(RUNTIME_POOL != NULL); + switch_assert(EVENT_QUEUE_MUTEX != NULL); + switch_assert(EVENT_QUEUE_HAVEMORE_MUTEX != NULL); + switch_assert(EVENT_QUEUE_CONDITIONAL != NULL); THREAD_RUNNING = 1; queues[0] = EVENT_QUEUE[SWITCH_PRIORITY_HIGH]; @@ -319,8 +319,8 @@ SWITCH_DECLARE(char *) switch_event_name(switch_event_types_t event) { - assert(BLOCK != NULL); - assert(RUNTIME_POOL != NULL); + switch_assert(BLOCK != NULL); + switch_assert(RUNTIME_POOL != NULL); return EVENT_NAMES[event]; } @@ -328,8 +328,8 @@ SWITCH_DECLARE(switch_status_t) switch_name_event(char *name, switch_event_types_t *type) { switch_event_types_t x; - assert(BLOCK != NULL); - assert(RUNTIME_POOL != NULL); + switch_assert(BLOCK != NULL); + switch_assert(RUNTIME_POOL != NULL); for (x = 0; x <= SWITCH_EVENT_ALL; x++) { if ((strlen(name) > 13 && !strcasecmp(name + 13, EVENT_NAMES[x])) || !strcasecmp(name, EVENT_NAMES[x])) { @@ -347,8 +347,8 @@ switch_event_subclass_t *subclass; - assert(RUNTIME_POOL != NULL); - assert(CUSTOM_HASH != NULL); + switch_assert(RUNTIME_POOL != NULL); + switch_assert(CUSTOM_HASH != NULL); if (switch_core_hash_find(CUSTOM_HASH, subclass_name)) { return SWITCH_STATUS_INUSE; @@ -448,7 +448,7 @@ switch_find_local_ip(guess_ip_v4, sizeof(guess_ip_v4), AF_INET); switch_find_local_ip(guess_ip_v6, sizeof(guess_ip_v6), AF_INET6); - assert(pool != NULL); + switch_assert(pool != NULL); THRUNTIME_POOL = RUNTIME_POOL = pool; /* @@ -501,7 +501,7 @@ *event = (switch_event_t *) pop; } else { *event = ALLOC(sizeof(switch_event_t)); - assert(*event); + switch_assert(*event); } memset(*event, 0, sizeof(switch_event_t)); @@ -594,7 +594,7 @@ header = (switch_event_header_t *) pop; } else { header = ALLOC(sizeof(*header)); - assert(header); + switch_assert(header); } memset(header, 0, sizeof(*header)); @@ -850,6 +850,7 @@ ret = vasprintf(&data, fmt, ap); #else data = (char *) malloc(2048); + switch_assert(data); ret = vsnprintf(data, 2048, fmt, ap); #endif va_end(ap); @@ -899,12 +900,12 @@ switch_size_t retsize; switch_time_t ts = switch_timestamp_now(); - assert(BLOCK != NULL); - assert(RUNTIME_POOL != NULL); - assert(EVENT_QUEUE_HAVEMORE_MUTEX != NULL); - assert(EVENT_QUEUE_MUTEX != NULL); - assert(EVENT_QUEUE_CONDITIONAL != NULL); - assert(RUNTIME_POOL != NULL); + switch_assert(BLOCK != NULL); + switch_assert(RUNTIME_POOL != NULL); + switch_assert(EVENT_QUEUE_HAVEMORE_MUTEX != NULL); + switch_assert(EVENT_QUEUE_MUTEX != NULL); + switch_assert(EVENT_QUEUE_CONDITIONAL != NULL); + switch_assert(RUNTIME_POOL != NULL); if (THREAD_RUNNING <= 0) { /* sorry we're closed */ @@ -976,8 +977,8 @@ switch_event_node_t *event_node; switch_event_subclass_t *subclass = NULL; - assert(BLOCK != NULL); - assert(RUNTIME_POOL != NULL); + switch_assert(BLOCK != NULL); + switch_assert(RUNTIME_POOL != NULL); if (subclass_name) { if ((subclass = switch_core_hash_find(CUSTOM_HASH, subclass_name)) == 0) { Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr.c Tue Dec 11 16:35:05 2007 @@ -45,7 +45,7 @@ int32_t left, elapsed; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); start = switch_time_now(); @@ -125,7 +125,7 @@ int sanity = 0; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (!switch_channel_test_flag(channel, CF_UNICAST)) { return SWITCH_STATUS_FALSE; @@ -163,10 +163,10 @@ switch_codec_t *read_codec; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); conninfo = switch_core_session_alloc(session, sizeof(*conninfo)); - assert(conninfo != NULL); + switch_assert(conninfo != NULL); conninfo->local_ip = switch_core_session_strdup(session, local_ip); conninfo->local_port = local_port; @@ -269,8 +269,8 @@ char *event_lock = switch_event_get_header(event, "event-lock"); switch_status_t status = SWITCH_STATUS_FALSE; - assert(channel != NULL); - assert(event != NULL); + switch_assert(channel != NULL); + switch_assert(event != NULL); if (switch_strlen_zero(cmd)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Command!\n"); @@ -382,7 +382,7 @@ switch_channel_t *channel; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); while (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { switch_ivr_parse_event(session, event); @@ -404,7 +404,7 @@ switch_codec_t *read_codec = switch_core_session_get_read_codec(session); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (!switch_channel_test_flag(channel, CF_ANSWERED)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Careful, Channel is unaswered. Pre-answering...\n"); @@ -539,7 +539,7 @@ uint32_t elapsed; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (!args->input_callback) { return SWITCH_STATUS_GENERR; @@ -606,7 +606,7 @@ uint32_t elapsed; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (terminator != NULL) *terminator = '\0'; @@ -680,7 +680,7 @@ msg.from = __FILE__; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); switch_channel_set_flag(channel, CF_HOLD); switch_channel_set_flag(channel, CF_SUSPEND); @@ -711,7 +711,7 @@ msg.from = __FILE__; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); switch_channel_clear_flag(channel, CF_HOLD); switch_channel_clear_flag(channel, CF_SUSPEND); @@ -747,7 +747,7 @@ if ((session = switch_core_session_locate(uuid))) { channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if ((flags & SMF_REBRIDGE) && !switch_channel_test_flag(channel, CF_ORIGINATOR)) { swap = 1; } @@ -760,7 +760,7 @@ && (other_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(other_uuid))) { other_channel = switch_core_session_get_channel(other_session); - assert(other_channel != NULL); + switch_assert(other_channel != NULL); switch_core_session_receive_message(other_session, &msg); switch_channel_clear_state_handler(other_channel, NULL); switch_core_session_rwunlock(other_session); @@ -800,7 +800,7 @@ if ((session = switch_core_session_locate(uuid))) { status = SWITCH_STATUS_SUCCESS; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if ((flags & SMF_REBRIDGE) && !switch_channel_test_flag(channel, CF_ORIGINATOR)) { swap = 1; @@ -812,7 +812,7 @@ if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(other_uuid))) { other_channel = switch_core_session_get_channel(other_session); - assert(other_channel != NULL); + switch_assert(other_channel != NULL); switch_core_session_receive_message(other_session, &msg); switch_channel_clear_state_handler(other_channel, NULL); @@ -843,11 +843,11 @@ switch_channel_t *other_channel = NULL; const char *uuid = NULL; - assert(session != NULL); + switch_assert(session != NULL); switch_core_session_reset(session); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); /* clear all state handlers */ switch_channel_clear_state_handler(channel, NULL); @@ -893,7 +893,7 @@ if (uuid && (other_session = switch_core_session_locate(uuid))) { other_channel = switch_core_session_get_channel(other_session); - assert(other_channel != NULL); + switch_assert(other_channel != NULL); switch_channel_set_variable(other_channel, SWITCH_SIGNAL_BOND_VARIABLE, NULL); switch_core_session_rwunlock(other_session); } @@ -901,7 +901,7 @@ if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { other_channel = switch_core_session_get_channel(other_session); - assert(other_channel != NULL); + switch_assert(other_channel != NULL); switch_channel_set_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); switch_channel_set_variable(other_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); @@ -1309,7 +1309,7 @@ int cdr_off = 0, v_off = 0; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (!(cdr = switch_xml_new("cdr"))) { return SWITCH_STATUS_SUCCESS; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_async.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_async.c Tue Dec 11 16:35:05 2007 @@ -174,7 +174,7 @@ switch_media_bug_t *bug; switch_channel_t *channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if ((bug = switch_channel_get_private(channel, file))) { switch_channel_set_private(channel, file, NULL); switch_core_media_bug_remove(session, &bug); @@ -196,7 +196,7 @@ channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if ((bug = switch_channel_get_private(channel, file))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Only 1 of the same file per channel please!\n"); @@ -210,7 +210,7 @@ read_codec = switch_core_session_get_read_codec(session); - assert(read_codec != NULL); + switch_assert(read_codec != NULL); dh->fh.channels = read_codec->implementation->number_of_channels; dh->fh.samplerate = read_codec->implementation->actual_samples_per_second; @@ -272,9 +272,9 @@ switch_channel_t *channel; session = switch_core_media_bug_get_session(bug); - assert(session != NULL); + switch_assert(session != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (switch_core_media_bug_read(bug, &frame) == SWITCH_STATUS_SUCCESS) { int doit = 1; @@ -302,7 +302,7 @@ switch_media_bug_t *bug; switch_channel_t *channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if ((bug = switch_channel_get_private(channel, file))) { switch_channel_set_private(channel, file, NULL); switch_core_media_bug_remove(session, &bug); @@ -595,7 +595,7 @@ switch_media_bug_flag_t flags = SMBF_READ_STREAM | SMBF_WRITE_STREAM; uint8_t channels; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if ((bug = switch_channel_get_private(channel, file))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Only 1 of the same file per channel please!\n"); @@ -609,7 +609,7 @@ } read_codec = switch_core_session_get_read_codec(session); - assert(read_codec != NULL); + switch_assert(read_codec != NULL); channels = read_codec->implementation->number_of_channels; @@ -703,7 +703,7 @@ char digit_str[80]; switch_channel_t *channel = switch_core_session_get_channel(pvt->session); - assert(channel != NULL); + switch_assert(channel != NULL); frame.data = data; frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; @@ -735,7 +735,7 @@ switch_media_bug_t *bug; switch_channel_t *channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if ((bug = switch_channel_get_private(channel, "dtmf"))) { switch_channel_set_private(channel, "dtmf", NULL); switch_core_media_bug_remove(session, &bug); @@ -755,10 +755,10 @@ switch_inband_dtmf_t *pvt; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); read_codec = switch_core_session_get_read_codec(session); - assert(read_codec != NULL); + switch_assert(read_codec != NULL); if (!(pvt = switch_core_session_alloc(session, sizeof(*pvt)))) { return SWITCH_STATUS_MEMERR; @@ -885,7 +885,7 @@ switch_media_bug_t *bug; switch_channel_t *channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if ((bug = switch_channel_get_private(channel, "dtmf_generate"))) { switch_channel_set_private(channel, "dtmf_generate", NULL); switch_core_media_bug_remove(session, &bug); @@ -905,10 +905,10 @@ switch_inband_dtmf_generate_t *pvt; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); read_codec = switch_core_session_get_read_codec(session); - assert(read_codec != NULL); + switch_assert(read_codec != NULL); if (!(pvt = switch_core_session_alloc(session, sizeof(*pvt)))) { return SWITCH_STATUS_MEMERR; @@ -1014,7 +1014,7 @@ switch_channel_t *channel = switch_core_session_get_channel(session); switch_tone_container_t *cont; - assert(channel != NULL); + switch_assert(channel != NULL); if ((cont = switch_channel_get_private(channel, "_tone_detect_"))) { switch_channel_set_private(channel, "_tone_detect_", NULL); switch_core_media_bug_remove(session, &cont->bug); @@ -1040,10 +1040,10 @@ switch_media_bug_flag_t bflags = 0; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); read_codec = switch_core_session_get_read_codec(session); - assert(read_codec != NULL); + switch_assert(read_codec != NULL); if (switch_strlen_zero(key)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Key Specified!\n"); @@ -1268,7 +1268,7 @@ switch_channel_t *channel = switch_core_session_get_channel(session); struct speech_thread_handle *sth; - assert(channel != NULL); + switch_assert(channel != NULL); if ((sth = switch_channel_get_private(channel, SWITCH_SPEECH_KEY))) { switch_channel_set_private(channel, SWITCH_SPEECH_KEY, NULL); switch_core_media_bug_remove(session, &sth->bug); @@ -1286,7 +1286,7 @@ switch_channel_t *channel = switch_core_session_get_channel(session); struct speech_thread_handle *sth; - assert(channel != NULL); + switch_assert(channel != NULL); if ((sth = switch_channel_get_private(channel, SWITCH_SPEECH_KEY))) { switch_core_asr_pause(sth->ah); return SWITCH_STATUS_SUCCESS; @@ -1301,7 +1301,7 @@ switch_channel_t *channel = switch_core_session_get_channel(session); struct speech_thread_handle *sth; - assert(channel != NULL); + switch_assert(channel != NULL); if ((sth = switch_channel_get_private(channel, SWITCH_SPEECH_KEY))) { switch_core_asr_resume(sth->ah); return SWITCH_STATUS_SUCCESS; @@ -1318,7 +1318,7 @@ switch_asr_flag_t flags = SWITCH_ASR_FLAG_NONE; struct speech_thread_handle *sth; - assert(channel != NULL); + switch_assert(channel != NULL); if ((sth = switch_channel_get_private(channel, SWITCH_SPEECH_KEY))) { if (switch_core_asr_load_grammar(sth->ah, grammar, path) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error loading Grammar\n"); @@ -1340,7 +1340,7 @@ switch_asr_flag_t flags = SWITCH_ASR_FLAG_NONE; struct speech_thread_handle *sth; - assert(channel != NULL); + switch_assert(channel != NULL); if ((sth = switch_channel_get_private(channel, SWITCH_SPEECH_KEY))) { if (switch_core_asr_unload_grammar(sth->ah, grammar) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error unloading Grammar\n"); @@ -1376,10 +1376,10 @@ } channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); read_codec = switch_core_session_get_read_codec(session); - assert(read_codec != NULL); + switch_assert(read_codec != NULL); if ((val = switch_channel_get_variable(channel, "fire_asr_events"))) { @@ -1443,7 +1443,7 @@ switch_core_session_t *session, *other_session; const char *other_uuid; - assert(task); + switch_assert(task); helper = (struct hangup_helper *) task->cmd_arg; @@ -1492,7 +1492,7 @@ struct transfer_helper *helper; switch_core_session_t *session; - assert(task); + switch_assert(task); helper = (struct transfer_helper *) task->cmd_arg; @@ -1558,7 +1558,7 @@ SWITCH_STANDARD_SCHED_FUNC(sch_broadcast_callback) { struct broadcast_helper *helper; - assert(task); + switch_assert(task); helper = (struct broadcast_helper *) task->cmd_arg; switch_ivr_broadcast(helper->uuid_str, helper->path, helper->flags); @@ -1593,7 +1593,7 @@ const char *other_uuid = NULL; char *app = "playback"; - assert(path); + switch_assert(path); if ((session = switch_core_session_locate(uuid))) { char *cause = NULL; @@ -1603,7 +1603,7 @@ master = session; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if ((switch_channel_test_flag(channel, CF_EVENT_PARSE))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Channel [%s] already broadcasting...broadcast aborted\n", Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_bridge.c Tue Dec 11 16:35:05 2007 @@ -233,7 +233,7 @@ switch_ivr_bridge_data_t *bd; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if ((bd = (switch_ivr_bridge_data_t *) switch_channel_get_private(channel, "_bridge_"))) { switch_channel_set_private(channel, "_bridge_", NULL); @@ -260,7 +260,7 @@ switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CUSTOM RING\n", switch_channel_get_name(channel)); @@ -274,7 +274,7 @@ switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CUSTOM HOLD\n", switch_channel_get_name(channel)); @@ -298,7 +298,7 @@ switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CUSTOM RESET\n", switch_channel_get_name(channel)); @@ -318,7 +318,7 @@ const char *other_uuid = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CUSTOM TRANSMIT\n", switch_channel_get_name(channel)); switch_channel_clear_state_handler(channel, NULL); @@ -407,7 +407,7 @@ switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); switch_channel_clear_flag(channel, CF_TRANSFER); switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE)); @@ -423,7 +423,7 @@ switch_event_t *event; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (switch_channel_test_flag(channel, CF_ORIGINATOR)) { switch_channel_clear_flag(channel, CF_ORIGINATOR); @@ -439,7 +439,7 @@ switch_channel_t *other_channel = NULL; other_channel = switch_core_session_get_channel(other_session); - assert(other_channel != NULL); + switch_assert(other_channel != NULL); switch_channel_set_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); switch_channel_set_variable(other_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); @@ -480,10 +480,10 @@ switch_event_t *event; caller_channel = switch_core_session_get_channel(session); - assert(caller_channel != NULL); + switch_assert(caller_channel != NULL); peer_channel = switch_core_session_get_channel(peer_session); - assert(peer_channel != NULL); + switch_assert(peer_channel != NULL); if (!switch_channel_ready(peer_channel)) { switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel)); @@ -547,21 +547,21 @@ int stream_id = 0; switch_status_t status = SWITCH_STATUS_SUCCESS; - assert(session != NULL); - assert(peer_session != NULL); + switch_assert(session != NULL); + switch_assert(peer_session != NULL); caller_channel = switch_core_session_get_channel(session); - assert(caller_channel != NULL); + switch_assert(caller_channel != NULL); switch_channel_set_flag(caller_channel, CF_ORIGINATOR); peer_channel = switch_core_session_get_channel(peer_session); - assert(peer_channel != NULL); + switch_assert(peer_channel != NULL); a_leg = switch_core_session_alloc(session, sizeof(*a_leg)); b_leg = switch_core_session_alloc(peer_session, sizeof(*b_leg)); - assert(a_leg && b_leg); + switch_assert(a_leg && b_leg); b_leg->session = peer_session; switch_copy_string(b_leg->b_uuid, switch_core_session_get_uuid(session), sizeof(b_leg->b_uuid)); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_originate.c Tue Dec 11 16:35:05 2007 @@ -38,7 +38,7 @@ switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); /* put the channel in a passive state so we can loop audio to it */ @@ -323,7 +323,7 @@ switch_event_header_t *hi; caller_channel = switch_core_session_get_channel(session); - assert(caller_channel != NULL); + switch_assert(caller_channel != NULL); /* Copy all the applicable channel variables into the event */ if ((hi = switch_channel_variable_first(caller_channel))) { @@ -444,7 +444,7 @@ for (try = 0; try < retries; try++) { switch_safe_free(loop_data); loop_data = strdup(data); - assert(loop_data); + switch_assert(loop_data); or_argc = switch_separate_string(loop_data, '|', pipe_names, (sizeof(pipe_names) / sizeof(pipe_names[0]))); if (caller_channel && or_argc > 1 && !ringback_data) { @@ -574,7 +574,7 @@ caller_profiles[i] = new_profile; peer_sessions[i] = new_session; peer_channels[i] = switch_core_session_get_channel(new_session); - assert(peer_channels[i] != NULL); + switch_assert(peer_channels[i] != NULL); if (var_event) { @@ -585,7 +585,7 @@ switch_channel_set_variable(peer_channels[i], header->name, header->value); } switch_event_create(&event, SWITCH_EVENT_CHANNEL_ORIGINATE); - assert(event); + switch_assert(event); switch_channel_event_set_data(peer_channels[i], event); switch_event_fire(&event); } Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_ivr_play_say.c Tue Dec 11 16:35:05 2007 @@ -103,7 +103,7 @@ int matches = 0; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (!macro_name) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No phrase macro specified.\n"); @@ -356,10 +356,10 @@ } channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); read_codec = switch_core_session_get_read_codec(session); - assert(read_codec != NULL); + switch_assert(read_codec != NULL); fh->channels = read_codec->implementation->number_of_channels; @@ -602,10 +602,10 @@ switch_byte_t data[1024]; switch_channel_t *channel; - assert(session != NULL); + switch_assert(session != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); switch_channel_pre_answer(channel); read_codec = switch_core_session_get_read_codec(session); @@ -711,7 +711,7 @@ const char *prebuf; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); prefix = switch_channel_get_variable(channel, "sound_prefix"); timer_name = switch_channel_get_variable(channel, "timer_name"); @@ -819,7 +819,7 @@ "ARTIST=%s\n" "COMMENT=%s\n" "DATE=%s\n", file, fh->samplerate, fh->channels, title, copyright, software, artist, comment, date); #endif - assert(read_codec != NULL); + switch_assert(read_codec != NULL); interval = read_codec->implementation->microseconds_per_frame / 1000; if (!fh->audio_buffer) { @@ -1137,7 +1137,7 @@ channel = switch_core_session_get_channel(session); //Make sure somebody is home - assert(channel != NULL); + switch_assert(channel != NULL); //Answer the channel if it hasn't already been answered switch_channel_answer(channel); @@ -1254,7 +1254,7 @@ switch_size_t starlen, poundlen; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (!sh) { return SWITCH_STATUS_FALSE; @@ -1320,7 +1320,7 @@ write_frame.samples = len / 2; write_frame.codec = codec; - assert(codec->implementation != NULL); + switch_assert(codec->implementation != NULL); for (x = 0; !done && x < lead_in_out; x++) { switch_yield(codec->implementation->microseconds_per_frame); @@ -1502,7 +1502,7 @@ switch_channel_t *channel; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if ((cache_obj = switch_channel_get_private(channel, SWITCH_CACHE_SPEECH_HANDLES_OBJ_NAME))) { switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; @@ -1539,7 +1539,7 @@ int need_create = 1, need_alloc = 1; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); sh = &lsh; codec = &lcodec; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_loadable_module.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_loadable_module.c Tue Dec 11 16:35:05 2007 @@ -83,8 +83,8 @@ switch_loadable_module_t *module = ts->objs[0]; int restarts; - assert(thread != NULL); - assert(module != NULL); + switch_assert(thread != NULL); + switch_assert(module != NULL); for (restarts = 0; status != SWITCH_STATUS_TERM; restarts++) { status = module->switch_module_runtime(); @@ -653,7 +653,7 @@ char derr[512] = ""; switch_memory_pool_t *pool; - assert(path != NULL); + switch_assert(path != NULL); switch_core_new_memory_pool(&pool); *new_module = NULL; @@ -1030,7 +1030,6 @@ while (apr_dir_read(&finfo, finfo_flags, module_dir_handle) == APR_SUCCESS) { const char *fname = finfo.fname; - const char *err; if (finfo.filetype != APR_REG) { continue; @@ -1060,7 +1059,7 @@ static void do_shutdown(switch_loadable_module_t *module) { - assert(module != NULL); + switch_assert(module != NULL); switch_loadable_module_unprocess(module); if (module->switch_module_shutdown) { @@ -1328,9 +1327,9 @@ switch_api_interface_t *api; switch_status_t status; - assert(stream != NULL); - assert(stream->data != NULL); - assert(stream->write_function != NULL); + switch_assert(stream != NULL); + switch_assert(stream->data != NULL); + switch_assert(stream->write_function != NULL); if (!stream->event) { switch_event_create(&stream->event, SWITCH_EVENT_API); @@ -1366,7 +1365,7 @@ switch_loadable_module_interface_t *mod; mod = switch_core_alloc(pool, sizeof(switch_loadable_module_interface_t)); - assert(mod != NULL); + switch_assert(mod != NULL); mod->pool = pool; @@ -1378,7 +1377,7 @@ #define ALLOC_INTERFACE(_TYPE_) { \ switch_##_TYPE_##_interface_t *i, *ptr; \ i = switch_core_alloc(mod->pool, sizeof(switch_##_TYPE_##_interface_t)); \ - assert(i != NULL); \ + switch_assert(i != NULL); \ for (ptr = mod->_TYPE_##_interface; ptr && ptr->next; ptr = ptr->next); \ if (ptr) { \ ptr->next = i; \ Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_log.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_log.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_log.c Tue Dec 11 16:35:05 2007 @@ -77,10 +77,10 @@ char *p = strdup(str); switch_log_level_t level; - assert(p); + switch_assert(p); if ((argc = switch_separate_string(p, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) { - for (x = 0; x < argc; x++) { + for (x = 0; x < argc && argv[x]; x++) { if (!strcasecmp(argv[x], "all")) { mask = 0xFF; break; @@ -121,7 +121,7 @@ SWITCH_DECLARE(switch_status_t) switch_log_bind_logger(switch_log_function_t function, switch_log_level_t level) { switch_log_binding_t *binding = NULL, *ptr = NULL; - assert(function != NULL); + switch_assert(function != NULL); if (!(binding = switch_core_alloc(LOG_POOL, sizeof(*binding)))) { return SWITCH_STATUS_MEMERR; @@ -221,6 +221,7 @@ len = (uint32_t) (strlen(extra_fmt) + strlen(date) + strlen(filep) + 32 + strlen(funcp) + strlen(fmt)); new_fmt = malloc(len + 1); + switch_assert(new_fmt); snprintf(new_fmt, len, extra_fmt, date, switch_log_level2str(level), filep, line, funcp, 128, fmt); fmt = new_fmt; } @@ -263,7 +264,7 @@ node = (switch_log_node_t *) pop; } else { node = malloc(sizeof(*node)); - assert(node); + switch_assert(node); } node->data = data; @@ -292,7 +293,7 @@ switch_thread_t *thread; switch_threadattr_t *thd_attr;; - assert(pool != NULL); + switch_assert(pool != NULL); LOG_POOL = pool; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_odbc.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_odbc.c Tue Dec 11 16:35:05 2007 @@ -320,7 +320,7 @@ SQLLEN m = 0, t = 0; int result; - assert(callback != NULL); + switch_assert(callback != NULL); if (!db_is_up(handle)) { goto error; @@ -358,7 +358,7 @@ names = calloc(c, sizeof(*names)); vals = calloc(c, sizeof(*vals)); - assert(names && vals); + switch_assert(names && vals); for (x = 1; x <= c; x++) { SQLSMALLINT NameLength, DataType, DecimalDigits, Nullable; @@ -407,9 +407,10 @@ { switch_odbc_handle_t *handle = NULL; - if (handlep) { - handle = *handlep; + if (!handlep) { + return; } + handle = *handlep; if (handle) { switch_odbc_handle_disconnect(handle); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_rtp.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_rtp.c Tue Dec 11 16:35:05 2007 @@ -67,7 +67,7 @@ #pragma pack() #endif - +static switch_hash_t *alloc_hash = NULL; typedef struct { srtp_hdr_t header; @@ -147,7 +147,8 @@ uint32_t flags; switch_memory_pool_t *pool; switch_sockaddr_t *from_addr; - + char *rx_host; + switch_port_t rx_port; char *ice_user; char *user_ice; char *timer_name; @@ -182,8 +183,8 @@ unsigned int elapsed; switch_size_t bytes; - assert(rtp_session != NULL); - assert(rtp_session->ice_user != NULL); + switch_assert(rtp_session != NULL); + switch_assert(rtp_session->ice_user != NULL); if (rtp_session->stuncount != 0) { rtp_session->stuncount--; @@ -261,12 +262,17 @@ if (global_init) { return; } - + switch_core_hash_init(&alloc_hash, pool); srtp_init(); switch_mutex_init(&port_lock, SWITCH_MUTEX_NESTED, pool); global_init = 1; } +SWITCH_DECLARE(void) switch_rtp_shutdown(void) +{ + switch_core_hash_destroy(&alloc_hash); +} + SWITCH_DECLARE(switch_port_t) switch_rtp_set_start_port(switch_port_t port) { if (port) { @@ -304,16 +310,43 @@ return END_PORT; } -SWITCH_DECLARE(switch_port_t) switch_rtp_request_port(void) +static void release_port(switch_rtp_t *rtp_session) { - switch_port_t port; + switch_core_port_allocator_t *alloc = NULL; + if (!rtp_session->rx_host) { + return; + } + + switch_mutex_lock(port_lock); + if ((alloc = switch_core_hash_find(alloc_hash, rtp_session->rx_host))) { + switch_core_port_allocator_free_port(alloc, rtp_session->rx_port); + } + switch_mutex_unlock(port_lock); + +} + +SWITCH_DECLARE(switch_port_t) switch_rtp_request_port(const char *ip) +{ + switch_port_t port = 0; + switch_core_port_allocator_t *alloc = NULL; + switch_mutex_lock(port_lock); - port = NEXT_PORT; - NEXT_PORT += 2; - if (NEXT_PORT > END_PORT) { - NEXT_PORT = START_PORT; + alloc = switch_core_hash_find(alloc_hash, ip); + if (!alloc) { + if (switch_core_port_allocator_new(START_PORT, END_PORT, SPF_EVEN, &alloc) != SWITCH_STATUS_SUCCESS) { + port = 0; + goto end; + } + + switch_core_hash_insert(alloc_hash, ip, alloc); + } + + if (switch_core_port_allocator_request_port(alloc, &port) != SWITCH_STATUS_SUCCESS) { + port = 0; } + + end: switch_mutex_unlock(port_lock); return port; } @@ -379,7 +412,8 @@ *err = "Send myself a packet failed!"; goto done; } - + release_port(rtp_session); + old_sock = rtp_session->sock; rtp_session->sock = new_sock; new_sock = NULL; @@ -395,7 +429,9 @@ done: - if (status != SWITCH_STATUS_SUCCESS) { + if (status == SWITCH_STATUS_SUCCESS) { + rtp_session->rx_host = switch_core_strdup(rtp_session->pool, host); + rtp_session->rx_port = port; rtp_session->ready = 1; } @@ -632,10 +668,10 @@ SWITCH_DECLARE(void) switch_rtp_kill_socket(switch_rtp_t *rtp_session) { - assert(rtp_session != NULL); + switch_assert(rtp_session != NULL); switch_mutex_lock(rtp_session->flag_mutex); if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) { - assert(rtp_session->sock != NULL); + switch_assert(rtp_session->sock != NULL); switch_socket_shutdown(rtp_session->sock, SWITCH_SHUTDOWN_READWRITE); switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_IO); } @@ -653,6 +689,7 @@ return; } + (*rtp_session)->ready = 0; switch_mutex_lock((*rtp_session)->flag_mutex); @@ -683,6 +720,8 @@ switch_core_timer_destroy(&(*rtp_session)->timer); } + release_port(*rtp_session); + switch_mutex_unlock((*rtp_session)->flag_mutex); return; } @@ -1553,7 +1592,7 @@ return -1; } - assert(frame != NULL); + switch_assert(frame != NULL); if (switch_test_flag(frame, SFF_CNG)) { payload = rtp_session->cng_pt; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_scheduler.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_scheduler.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_scheduler.c Tue Dec 11 16:35:05 2007 @@ -158,7 +158,7 @@ switch_mutex_lock(globals.task_mutex); switch_zmalloc(container, sizeof(*container)); - assert(func); + switch_assert(func); container->func = func; container->task.created = time(NULL); container->task.runtime = task_runtime; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/switch_utils.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/switch_utils.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/switch_utils.c Tue Dec 11 16:35:05 2007 @@ -45,7 +45,7 @@ s++; } - if (*s == open) { + if (s && *s == open) { depth++; for (e = s + 1; e && *e; e++) { if (*e == open) { @@ -86,7 +86,7 @@ { char *p, *q; switch_size_t x = 0; - assert(s); + switch_assert(s); q = buf; @@ -266,11 +266,11 @@ } if (file) { - const char *filename = switch_cut_path(file); + const char *stipped_file = switch_cut_path(file); const char *new_type; char *ext; - if ((ext = strrchr(filename, '.'))) { + if ((ext = strrchr(stipped_file, '.'))) { ext++; if ((new_type = switch_core_mime_ext2type(ext))) { mime_type = new_type; @@ -283,7 +283,7 @@ "Content-Transfer-Encoding: base64\n" "Content-Description: Sound attachment.\n" "Content-Disposition: attachment; filename=\"%s\"\n\n", - bound, mime_type, filename, filename); + bound, mime_type, stipped_file, stipped_file); if (!write_buf(fd, buf)) return SWITCH_FALSE; @@ -379,6 +379,11 @@ SWITCH_DECLARE(switch_bool_t) switch_ast2regex(char *pat, char *rbuf, size_t len) { char *p = pat; + + if (!pat) { + return SWITCH_FALSE; + } + memset(rbuf, 0, len); *(rbuf + strlen(rbuf)) = '^'; @@ -408,7 +413,7 @@ if (dup) { p = strdup(str); - assert(p); + switch_assert(p); } else { p = str; } @@ -926,7 +931,7 @@ SWITCH_DECLARE(char *) get_addr(char *buf, switch_size_t len, struct in_addr *in) { - assert(buf); + switch_assert(buf); *buf = '\0'; if (in) { switch_inet_ntop(AF_INET, in, buf, len); @@ -1098,22 +1103,27 @@ size_t replace_len = strlen(replace); size_t i, n; size_t dest_len = 0; - char *dest; + char *dest, *tmp; dest = (char *) malloc(sizeof(char)); + switch_assert(dest); for (i = 0; i < string_len; i++) { if (switch_string_match(string + i, string_len - i, search, search_len) == SWITCH_STATUS_SUCCESS) { for (n = 0; n < replace_len; n++) { dest[dest_len] = replace[n]; dest_len++; - dest = (char *) realloc(dest, sizeof(char) * (dest_len + 1)); + tmp = (char *) realloc(dest, sizeof(char) * (dest_len + 1)); + switch_assert(tmp); + dest = tmp; } i += search_len - 1; } else { dest[dest_len] = string[i]; dest_len++; - dest = (char *) realloc(dest, sizeof(char) * (dest_len + 1)); + tmp = (char *) realloc(dest, sizeof(char) * (dest_len + 1)); + switch_assert(tmp); + dest = tmp; } }

1 0

[commit] r6655 - freeswitch/branches/jfenton/spu
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: jfenton Date: Tue Dec 11 12:40:52 2007 New Revision: 6655 Added: freeswitch/branches/jfenton/spu/ - copied from r6654, /freeswitch/trunk/ Log: initial branch creation

1 0

[commit] r6654 - freeswitch/branches/testing
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: sphere Date: Tue Dec 11 12:38:49 2007 New Revision: 6654 Added: freeswitch/branches/testing/ Log: Creating empty folder for ->{pop}

1 0

[commit] r6653 - freeswitch/branches/jfenton
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 12:36:24 2007 New Revision: 6653 Added: freeswitch/branches/jfenton/ Log: Created folder remotely

1 0