- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12243 - freeswitch/trunk/src/mod/applications/mod_enum
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: anthm Date: Mon Feb 23 07:49:34 2009 New Revision: 12243 Log: MODAPP-220 Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Mon Feb 23 07:49:34 2009 @@ -639,7 +639,7 @@ continue; } switch_snprintf(vbuf, sizeof(vbuf), "enum_route_%d", cnt++); - switch_channel_set_variable(channel, vbuf, rp->route); + switch_channel_set_variable_var_check(channel, vbuf, rp->route, SWITCH_FALSE); if (rp->preference == last_pref && rp->order == last_order) { *last_delim = ','; } @@ -653,9 +653,9 @@ } switch_snprintf(vbuf, sizeof(vbuf), "%d", cnt - 1); - switch_channel_set_variable(channel, "enum_route_count", vbuf); + switch_channel_set_variable_var_check(channel, "enum_route_count", vbuf, SWITCH_FALSE); *(rbuf + strlen(rbuf) - 1) = '\0'; - switch_channel_set_variable(channel, "enum_auto_route", rbuf); + switch_channel_set_variable_var_check(channel, "enum_auto_route", rbuf, SWITCH_FALSE); free_results(&results); } }

1 0

[commit] r12242 - freeswitch/branches/ctrix/mod_airpe
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: ctrix Date: Mon Feb 23 04:42:34 2009 New Revision: 12242 Log: Shutdown function for each interface Modified: freeswitch/branches/ctrix/mod_airpe/airpe_if_osx.c freeswitch/branches/ctrix/mod_airpe/airpe_if_win32.c freeswitch/branches/ctrix/mod_airpe/airpe_if_x11.c freeswitch/branches/ctrix/mod_airpe/mod_airpe.h Modified: freeswitch/branches/ctrix/mod_airpe/airpe_if_osx.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/airpe_if_osx.c (original) +++ freeswitch/branches/ctrix/mod_airpe/airpe_if_osx.c Mon Feb 23 04:42:34 2009 @@ -69,6 +69,10 @@ } } +switch_status_t airpe_interface_shutdown(airpe_interface_t *airpe) { + return SWITCH_STATUS_SUCCESS; +} + /***************************************************************************** THREADS *****************************************************************************/ Modified: freeswitch/branches/ctrix/mod_airpe/airpe_if_win32.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/airpe_if_win32.c (original) +++ freeswitch/branches/ctrix/mod_airpe/airpe_if_win32.c Mon Feb 23 04:42:34 2009 @@ -103,6 +103,10 @@ return SWITCH_STATUS_SUCCESS; } +switch_status_t airpe_interface_shutdown(airpe_interface_t *airpe) { + return SWITCH_STATUS_SUCCESS; +} + /***************************************************************************** THREADS *****************************************************************************/ Modified: freeswitch/branches/ctrix/mod_airpe/airpe_if_x11.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/airpe_if_x11.c (original) +++ freeswitch/branches/ctrix/mod_airpe/airpe_if_x11.c Mon Feb 23 04:42:34 2009 @@ -212,7 +212,9 @@ return SWITCH_STATUS_SUCCESS; } - +switch_status_t airpe_interface_shutdown(airpe_interface_t *airpe) { + return SWITCH_STATUS_SUCCESS; +} /***************************************************************************** THREADS Modified: freeswitch/branches/ctrix/mod_airpe/mod_airpe.h ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/mod_airpe.h (original) +++ freeswitch/branches/ctrix/mod_airpe/mod_airpe.h Mon Feb 23 04:42:34 2009 @@ -232,6 +232,8 @@ switch_status_t airpe_skype_avalaible(skype_window_handler_t *window); switch_status_t skype_restart( skype_window_handler_t *airpe, const char *params ); switch_status_t airpe_skype_send_message(skype_window_handler_t *window, const char *message_P); +switch_status_t airpe_interface_shutdown(airpe_interface_t *airpe); + void *SWITCH_THREAD_FUNC airpe_skype_thread(switch_thread_t * thread, void *obj); /* For Emacs:

1 0

[commit] r12241 - freeswitch/trunk/src/mod/languages/mod_lua/lua
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mikej Date: Mon Feb 23 04:38:38 2009 New Revision: 12241 Log: typo Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h Mon Feb 23 04:38:38 2009 @@ -161,8 +161,7 @@ #else -#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(HAVE_VISIBILITY) && (defined(LUA_CORE) || defined(LUA_LIB) -) +#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(HAVE_VISIBILITY) && (defined(LUA_CORE) || defined(LUA_LIB)) #define LUA_API __attribute__((visibility("default"))) #else #define LUA_API extern

1 0

[commit] r12240 - freeswitch/trunk/src/mod/languages/mod_lua/lua
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mikej Date: Sun Feb 22 22:43:42 2009 New Revision: 12240 Log: mod_lua: fix visibility support (FSCORE-302) Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h Sun Feb 22 22:43:42 2009 @@ -161,7 +161,8 @@ #else -#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(HAVE_VISIBILITY) +#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(HAVE_VISIBILITY) && (defined(LUA_CORE) || defined(LUA_LIB) +) #define LUA_API __attribute__((visibility("default"))) #else #define LUA_API extern

1 0

[commit] r12239 - freeswitch/trunk/src/mod/languages/mod_lua/lua
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mikej Date: Sun Feb 22 22:42:10 2009 New Revision: 12239 Log: mod_lua: fix visibility support (FSCORE-302) Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h Sun Feb 22 22:42:10 2009 @@ -161,8 +161,11 @@ #else +#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(HAVE_VISIBILITY) +#define LUA_API __attribute__((visibility("default"))) +#else #define LUA_API extern - +#endif #endif /* more often than not the libs go together with the core */

1 0

[commit] r12238 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mikej Date: Sun Feb 22 22:36:56 2009 New Revision: 12238 Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Sun Feb 22 22:36:56 2009 @@ -6061,15 +6061,17 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_dequeue_event(void * jarg1, void * jarg2) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_dequeue_event(void * jarg1, void * jarg2, int jarg3) { int jresult ; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; switch_event_t **arg2 = (switch_event_t **) 0 ; + switch_bool_t arg3 ; switch_status_t result; arg1 = (switch_core_session_t *)jarg1; arg2 = (switch_event_t **)jarg2; - result = (switch_status_t)switch_core_session_dequeue_event(arg1,arg2); + arg3 = (switch_bool_t)jarg3; + result = (switch_status_t)switch_core_session_dequeue_event(arg1,arg2,arg3); jresult = result; return jresult; } @@ -19536,17 +19538,23 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_create_subclass(void * jarg1, int jarg2, char * jarg3) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_create_subclass_detailed(char * jarg1, char * jarg2, int jarg3, void * jarg4, int jarg5, char * jarg6) { int jresult ; - switch_event_t **arg1 = (switch_event_t **) 0 ; - switch_event_types_t arg2 ; - char *arg3 = (char *) 0 ; + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + int arg3 ; + switch_event_t **arg4 = (switch_event_t **) 0 ; + switch_event_types_t arg5 ; + char *arg6 = (char *) 0 ; switch_status_t result; - arg1 = (switch_event_t **)jarg1; - arg2 = (switch_event_types_t)jarg2; - arg3 = (char *)jarg3; - result = (switch_status_t)switch_event_create_subclass(arg1,arg2,(char const *)arg3); + arg1 = (char *)jarg1; + arg2 = (char *)jarg2; + arg3 = (int)jarg3; + arg4 = (switch_event_t **)jarg4; + arg5 = (switch_event_types_t)jarg5; + arg6 = (char *)jarg6; + result = (switch_status_t)switch_event_create_subclass_detailed((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,(char const *)arg6); jresult = result; return jresult; } @@ -19666,6 +19674,20 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_event_prep_for_delivery_detailed(char * jarg1, char * jarg2, int jarg3, void * jarg4) { + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + int arg3 ; + switch_event_t *arg4 = (switch_event_t *) 0 ; + + arg1 = (char *)jarg1; + arg2 = (char *)jarg2; + arg3 = (int)jarg3; + arg4 = (switch_event_t *)jarg4; + switch_event_prep_for_delivery_detailed((char const *)arg1,(char const *)arg2,arg3,arg4); +} + + SWIGEXPORT int SWIGSTDCALL CSharp_switch_event_bind(char * jarg1, int jarg2, char * jarg3, void * jarg4, void * jarg5) { int jresult ; char *arg1 = (char *) 0 ; Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Sun Feb 22 22:36:56 2009 @@ -1317,8 +1317,8 @@ return ret; } - public static switch_status_t switch_core_session_dequeue_event(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_p_switch_event arg1) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_dequeue_event(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_p_switch_event.getCPtr(arg1)); + public static switch_status_t switch_core_session_dequeue_event(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_p_switch_event arg1, switch_bool_t force) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_dequeue_event(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_p_switch_event.getCPtr(arg1), (int)force); return ret; } @@ -2759,8 +2759,8 @@ return ret; } - public static switch_status_t switch_event_create_subclass(SWIGTYPE_p_p_switch_event arg0, switch_event_types_t event_id, string subclass_name) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_event_create_subclass(SWIGTYPE_p_p_switch_event.getCPtr(arg0), (int)event_id, subclass_name); + public static switch_status_t switch_event_create_subclass_detailed(string file, string func, int line, SWIGTYPE_p_p_switch_event arg3, switch_event_types_t event_id, string subclass_name) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_event_create_subclass_detailed(file, func, line, SWIGTYPE_p_p_switch_event.getCPtr(arg3), (int)event_id, subclass_name); return ret; } @@ -2803,6 +2803,10 @@ return ret; } + public static void switch_event_prep_for_delivery_detailed(string file, string func, int line, switch_event arg3) { + freeswitchPINVOKE.switch_event_prep_for_delivery_detailed(file, func, line, switch_event.getCPtr(arg3)); + } + public static switch_status_t switch_event_bind(string id, switch_event_types_t arg1, string subclass_name, SWIGTYPE_p_f_p_switch_event__void callback, SWIGTYPE_p_void user_data) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_event_bind(id, (int)arg1, subclass_name, SWIGTYPE_p_f_p_switch_event__void.getCPtr(callback), SWIGTYPE_p_void.getCPtr(user_data)); return ret; @@ -5852,7 +5856,7 @@ public static extern uint switch_core_session_event_count(HandleRef jarg1); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_dequeue_event")] - public static extern int switch_core_session_dequeue_event(HandleRef jarg1, HandleRef jarg2); + public static extern int switch_core_session_dequeue_event(HandleRef jarg1, HandleRef jarg2, int jarg3); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_queue_private_event")] public static extern int switch_core_session_queue_private_event(HandleRef jarg1, HandleRef jarg2); @@ -9079,8 +9083,8 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_event_shutdown")] public static extern int switch_event_shutdown(); - [DllImport("mod_managed", EntryPoint="CSharp_switch_event_create_subclass")] - public static extern int switch_event_create_subclass(HandleRef jarg1, int jarg2, string jarg3); + [DllImport("mod_managed", EntryPoint="CSharp_switch_event_create_subclass_detailed")] + public static extern int switch_event_create_subclass_detailed(string jarg1, string jarg2, int jarg3, HandleRef jarg4, int jarg5, string jarg6); [DllImport("mod_managed", EntryPoint="CSharp_switch_event_set_priority")] public static extern int switch_event_set_priority(HandleRef jarg1, int jarg2); @@ -9106,6 +9110,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_event_fire_detailed")] public static extern int switch_event_fire_detailed(string jarg1, string jarg2, int jarg3, HandleRef jarg4, HandleRef jarg5); + [DllImport("mod_managed", EntryPoint="CSharp_switch_event_prep_for_delivery_detailed")] + public static extern void switch_event_prep_for_delivery_detailed(string jarg1, string jarg2, int jarg3, HandleRef jarg4); + [DllImport("mod_managed", EntryPoint="CSharp_switch_event_bind")] public static extern int switch_event_bind(string jarg1, int jarg2, string jarg3, HandleRef jarg4, HandleRef jarg5); @@ -17272,6 +17279,7 @@ CF_REQ_MEDIA, CF_VERBOSE_EVENTS, CF_PAUSE_BUGS, + CF_DIVERT_EVENTS, CF_FLAG_MAX } @@ -20095,6 +20103,8 @@ SWITCH_EVENT_GENERAL, SWITCH_EVENT_COMMAND, SWITCH_EVENT_SESSION_HEARTBEAT, + SWITCH_EVENT_CLIENT_DISCONNECTED, + SWITCH_EVENT_SERVER_DISCONNECTED, SWITCH_EVENT_ALL }

1 0

[commit] r12237 - in freeswitch/trunk/src/mod/languages/mod_lua: . lua
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mikej Date: Sun Feb 22 22:21:56 2009 New Revision: 12237 Log: mod_lua: windows build changes to support externally built modules. (MODLANG-101) Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.2005.vcproj freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.2008.vcproj freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.vcproj Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.2005.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.2005.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.2005.vcproj Sun Feb 22 22:21:56 2009 @@ -23,23 +23,71 @@ CharacterSet="2" > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="." - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_WIN32" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL" + RuntimeLibrary="3" UsePrecompiledHeader="0" + DebugInformationFormat="3" DisableSpecificWarnings="4127, 4505" EnablePREfast="false" /> <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)\lua.5.1.dll" - ModuleDefinitionFile="lua.def" + OutputFile="$(OutDir)\lua5.1.dll" + ModuleDefinitionFile="" GenerateDebugInformation="true" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - ImportLibrary=".\Debug/lua.5.1.lib" + ImportLibrary=".\$(IntDir)\lua5.1.lib" TargetMachine="1" /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" @@ -49,21 +97,69 @@ CharacterSet="2" > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="." - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_WIN32" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL" + RuntimeLibrary="2" UsePrecompiledHeader="0" + DebugInformationFormat="3" DisableSpecificWarnings="4127, 4505" /> <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)\lua.5.1.dll" - ModuleDefinitionFile="lua.def" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - ImportLibrary=".\$(IntDir)\lua.5.1.lib" + OutputFile="$(OutDir)\lua5.1.dll" + ModuleDefinitionFile="" + ImportLibrary=".\$(IntDir)\lua5.1.lib" TargetMachine="1" /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.2008.vcproj Sun Feb 22 22:21:56 2009 @@ -44,8 +44,10 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="." - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_WIN32" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL" + RuntimeLibrary="3" UsePrecompiledHeader="0" + DebugInformationFormat="3" DisableSpecificWarnings="4127, 4505" EnablePREfast="false" /> @@ -60,12 +62,12 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)\lua.5.1.dll" - ModuleDefinitionFile="lua.def" + OutputFile="$(OutDir)\lua5.1.dll" + ModuleDefinitionFile="" GenerateDebugInformation="true" RandomizedBaseAddress="1" DataExecutionPrevention="0" - ImportLibrary=".\Debug/lua.5.1.lib" + ImportLibrary=".\$(IntDir)/lua5.1.lib" TargetMachine="1" /> <Tool @@ -116,8 +118,10 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="." - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_WIN32" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL" + RuntimeLibrary="3" UsePrecompiledHeader="0" + DebugInformationFormat="3" DisableSpecificWarnings="4127, 4505" EnablePREfast="false" /> @@ -132,12 +136,12 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)\lua.5.1.dll" - ModuleDefinitionFile="lua.def" + OutputFile="$(OutDir)\lua5.1.dll" + ModuleDefinitionFile="" GenerateDebugInformation="true" RandomizedBaseAddress="1" DataExecutionPrevention="0" - ImportLibrary=".\$(IntDir)/lua.5.1.lib" + ImportLibrary=".\$(IntDir)/lua5.1.lib" TargetMachine="17" /> <Tool @@ -187,8 +191,10 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="." - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_WIN32" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL" + RuntimeLibrary="2" UsePrecompiledHeader="0" + DebugInformationFormat="3" DisableSpecificWarnings="4127, 4505" /> <Tool @@ -202,11 +208,11 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)\lua.5.1.dll" - ModuleDefinitionFile="lua.def" + OutputFile="$(OutDir)\lua5.1.dll" + ModuleDefinitionFile="" RandomizedBaseAddress="1" DataExecutionPrevention="0" - ImportLibrary=".\$(IntDir)\lua.5.1.lib" + ImportLibrary=".\$(IntDir)/lua5.1.lib" TargetMachine="1" /> <Tool @@ -257,8 +263,10 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="." - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_WIN32" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL" + RuntimeLibrary="2" UsePrecompiledHeader="0" + DebugInformationFormat="3" DisableSpecificWarnings="4127, 4505" /> <Tool @@ -272,11 +280,11 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)\lua.5.1.dll" - ModuleDefinitionFile="lua.def" + OutputFile="$(OutDir)\lua5.1.dll" + ModuleDefinitionFile="" RandomizedBaseAddress="1" DataExecutionPrevention="0" - ImportLibrary=".\$(IntDir)\lua.5.1.lib" + ImportLibrary=".\$(IntDir)/lua5.1.lib" TargetMachine="17" /> <Tool Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.vcproj Sun Feb 22 22:21:56 2009 @@ -39,7 +39,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=".;./lua" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_WIN32" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL" UsePrecompiledHeader="0" DisableSpecificWarnings="4127, 4505" EnablePREfast="false" @@ -105,7 +105,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=".;./lua" - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_WIN32" + PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL" UsePrecompiledHeader="0" DisableSpecificWarnings="4127, 4505" />

1 0

[commit] r12236 - freeswitch/trunk/libs/esl/src
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: anthm Date: Sun Feb 22 20:10:10 2009 New Revision: 12236 Log: use blank string instead of NULL Modified: freeswitch/trunk/libs/esl/src/esl.c Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Sun Feb 22 20:10:10 2009 @@ -471,7 +471,7 @@ } snprintf(send_buf, sizeof(send_buf), "%s\ncall-command: execute\n%s%s%s%s\n", - cmd_buf, app_buf, arg_buf, handle->event_lock ? el_buf : NULL, handle->blocking_execute ? bl_buf : NULL); + cmd_buf, app_buf, arg_buf, handle->event_lock ? el_buf : "", handle->blocking_execute ? bl_buf : ""); return esl_send_recv(handle, send_buf); }

1 0

[commit] r12235 - in freeswitch/trunk/src/mod: applications/mod_limit endpoints/mod_sofia
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: anthm Date: Sun Feb 22 19:49:49 2009 New Revision: 12235 Log: create indexes for ODBC as well Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Sun Feb 22 19:49:49 2009 @@ -211,6 +211,21 @@ #ifdef SWITCH_HAVE_ODBC if (globals.odbc_dsn) { + int x; + char *indexes[] = { + "create index ld_hostname on limit_data (hostname)", + "create index ld_uuid on limit_data (uuid)", + "create index ld_realm on limit_data (realm)", + "create index ld_id on limit_data (id)", + "create index dd_realm on db_data (realm)", + "create index dd_data_key on db_data (data_key)", + "create index gd_groupname on group_data (groupname)", + "create index gd_url on group_data (url)", + NULL + }; + + + if (!(globals.master_odbc = switch_odbc_handle_new(globals.odbc_dsn, odbc_user, odbc_pass))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n"); status = SWITCH_STATUS_FALSE; @@ -238,6 +253,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Create SQL Database!\n"); } } + + for (x = 0; indexes[x]; x++) { + switch_odbc_handle_exec(globals.master_odbc, indexes[x], NULL); + } } else { #endif if ((db = switch_core_db_open_file(globals.dbname))) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sun Feb 22 19:49:49 2009 @@ -3080,6 +3080,38 @@ if (profile->odbc_dsn) { #ifdef SWITCH_HAVE_ODBC + int x; + char *indexes[] = { + "create index sr_call_id on sip_registrations (call_id)", + "create index sr_sip_user on sip_registrations (sip_user)", + "create index sr_sip_host on sip_registrations (sip_host)", + "create index sr_profile_name on sip_registrations (profile_name)", + "create index sr_presence_hosts on sip_registrations (presence_hosts)", + "create index sr_contact on sip_registrations (contact)", + "create index sr_expires on sip_registrations (expires)", + "create index sr_hostname on sip_registrations (hostname)", + "create index sr_status on sip_registrations (status)", + "create index ss_call_id on sip_subscriptions (call_id)", + "create index ss_hostname on sip_subscriptions (hostname)", + "create index ss_sip_user on sip_subscriptions (sip_user)", + "create index ss_sip_host on sip_subscriptions (sip_host)", + "create index ss_presence_hosts on sip_subscriptions (presence_hosts)", + "create index ss_event on sip_subscriptions (event)", + "create index ss_proto on sip_subscriptions (proto)", + "create index ss_sub_to_user on sip_subscriptions (sub_to_user)", + "create index ss_sub_to_host on sip_subscriptions (sub_to_host)", + "create index sd_uuid on sip_dialogs (uuid)", + "create index sd_hostname on sip_dialogs (hostname)", + "create index sp_hostname on sip_presence (hostname)", + "create index sa_nonce on sip_authentication (nonce)", + "create index sa_hostname on sip_authentication (hostname)", + "create index ssa_hostname on sip_shared_appearance_subscriptions (hostname)", + "create index ssa_subscriber on sip_shared_appearance_subscriptions (subscriber)", + "create index ssa_profile_name on sip_shared_appearance_subscriptions (profile_name)", + "create index ssa_aor on sip_shared_appearance_subscriptions (aor)", + NULL + }; + if (!(profile->master_odbc = switch_odbc_handle_new(profile->odbc_dsn, profile->odbc_user, profile->odbc_pass))) { return 0; } @@ -3132,19 +3164,22 @@ } free(test_sql); - if (sofia_test_pflag(profile, PFLAG_MANAGE_SHARED_APPEARANCE)) { - test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str='' or hostname='%q'", mod_sofia_globals.hostname); - if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { - switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_shared_appearance_subscriptions", NULL); - switch_odbc_handle_exec(profile->master_odbc, shared_appearance_sql, NULL); - } - free(test_sql); + test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str='' or hostname='%q'", mod_sofia_globals.hostname); + if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { + switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_shared_appearance_subscriptions", NULL); + switch_odbc_handle_exec(profile->master_odbc, shared_appearance_sql, NULL); } + free(test_sql); + + for (x = 0; indexes[x]; x++) { + switch_odbc_handle_exec(profile->master_odbc, indexes[x], NULL); + } + #else switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n"); #endif - } else { + } else { if (!(profile->master_db = switch_core_db_open_file(profile->dbname))) { return 0; } @@ -3172,16 +3207,19 @@ switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_authentication", auth_sql); free(test_sql); - if(sofia_test_pflag(profile, PFLAG_MANAGE_SHARED_APPEARANCE)) { - test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str = '' or hostname='%q'", mod_sofia_globals.hostname); - switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_shared_appearance_subscriptions", shared_appearance_sql); - free(test_sql); - - switch_core_db_exec(profile->master_db, "create index if not exists ssa_hostname on sip_shared_appearance_subscriptions (hostname)", NULL, NULL, NULL); - switch_core_db_exec(profile->master_db, "create index if not exists ssa_subscriber on sip_shared_appearance_subscriptions (subscriber)", NULL, NULL, NULL); - switch_core_db_exec(profile->master_db, "create index if not exists ssa_profile_name on sip_shared_appearance_subscriptions (profile_name)", NULL, NULL, NULL); - switch_core_db_exec(profile->master_db, "create index if not exists ssa_aor on sip_shared_appearance_subscriptions (aor)", NULL, NULL, NULL); - } + + test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str = '' or hostname='%q'", mod_sofia_globals.hostname); + switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_shared_appearance_subscriptions", shared_appearance_sql); + free(test_sql); + + switch_core_db_exec(profile->master_db, "create index if not exists ssa_hostname on sip_shared_appearance_subscriptions (hostname)", + NULL, NULL, NULL); + switch_core_db_exec(profile->master_db, "create index if not exists ssa_subscriber on sip_shared_appearance_subscriptions (subscriber)", + NULL, NULL, NULL); + switch_core_db_exec(profile->master_db, "create index if not exists ssa_profile_name on sip_shared_appearance_subscriptions (profile_name)", + NULL, NULL, NULL); + switch_core_db_exec(profile->master_db, "create index if not exists ssa_aor on sip_shared_appearance_subscriptions (aor)", NULL, NULL, NULL); + switch_core_db_exec(profile->master_db, "create index if not exists sr_call_id on sip_registrations (call_id)", NULL, NULL, NULL);

1 0

[commit] r12234 - freeswitch/branches/ctrix/mod_airpe
by FreeSWITCH SVN 22 Feb '09

22 Feb '09

Author: ctrix Date: Sun Feb 22 06:29:00 2009 New Revision: 12234 Log: and the project as well Added: freeswitch/branches/ctrix/mod_airpe/mod_airpe.2008.vcproj Added: freeswitch/branches/ctrix/mod_airpe/mod_airpe.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/ctrix/mod_airpe/mod_airpe.2008.vcproj Sun Feb 22 06:29:00 2009 @@ -0,0 +1,175 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9,00" + Name="mod_airpe" + ProjectGUID="{6E5ACF23-5B82-4987-B3C7-68F723EC47A3}" + RootNamespace="mod_snom" + 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" + UseLibraryDependencyInputs="false" + AdditionalDependencies="ws2_32.lib rpcrt4.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" + 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=".\airpe_api.c" + > + </File> + <File + RelativePath=".\airpe_apps.c" + > + </File> + <File + RelativePath=".\airpe_if_common.c" + > + </File> + <File + RelativePath=".\airpe_if_win32.c" + > + </File> + <File + RelativePath=".\mod_airpe.c" + > + </File> + <File + RelativePath=".\mod_airpe.h" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject>

1 0