October 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9831 - freeswitch/trunk/src/mod/languages/mod_managed/managed
by Freeswitch SVN 04 Oct '08

04 Oct '08

Author: michaelgg Date: Sat Oct 4 05:36:52 2008 New Revision: 9831 Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Log: Tweak input/error handling Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs Sat Oct 4 05:36:52 2008 @@ -57,6 +57,14 @@ return false; } + AppDomain.CurrentDomain.AssemblyResolve += (_, rargs) => { + Log.WriteLine(LogLevel.Debug, "Trying to resolve assembly '{0}'.", rargs.Name); + if (rargs.Name == Assembly.GetExecutingAssembly().FullName) return Assembly.GetExecutingAssembly(); + var path = Path.Combine(managedDir, rargs.Name + ".dll"); + Log.WriteLine(LogLevel.Debug, "Resolving to: '" + path + "'."); + return File.Exists(path) ? Assembly.LoadFile(path) : null; + }; + // This is a simple one-time loader to get things in memory // Some day we should allow reloading of modules or something loadAssemblies(managedDir) @@ -109,6 +117,7 @@ { string f = Path.Combine(managedDir, s); try { + Log.WriteLine(LogLevel.Debug, "Loading '{0}'.", f); System.Reflection.Assembly.LoadFile(f); } catch (Exception ex) { Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs Sat Oct 4 05:36:52 2008 @@ -76,7 +76,6 @@ } catch (Exception ex) { Log.WriteLine(LogLevel.Warning, "Exception in hangupCallback: {0}", ex.ToString()); - throw; } } @@ -86,35 +85,36 @@ string inputCallback(IntPtr input, Native.switch_input_type_t inputType) { - switch (inputType) { - case FreeSWITCH.Native.switch_input_type_t.SWITCH_INPUT_TYPE_DTMF: - using (var dtmf = new Native.switch_dtmf_t(input, false)) { - return dtmfCallback(dtmf); - } - case FreeSWITCH.Native.switch_input_type_t.SWITCH_INPUT_TYPE_EVENT: - using (var swevt = new Native.switch_event(input, false)) { - return eventCallback(swevt); - } - default: - return ""; + try { + switch (inputType) { + case FreeSWITCH.Native.switch_input_type_t.SWITCH_INPUT_TYPE_DTMF: + using (var dtmf = new Native.switch_dtmf_t(input, false)) { + return dtmfCallback(dtmf); + } + case FreeSWITCH.Native.switch_input_type_t.SWITCH_INPUT_TYPE_EVENT: + using (var swevt = new Native.switch_event(input, false)) { + return eventCallback(swevt); + } + default: + return ""; + } + } catch (Exception ex) { + Log.WriteLine(LogLevel.Error, "InputCallback threw exception: " + ex.ToString()); + return "-ERR InputCallback Exception: " + ex.Message; } } - string dtmfCallback(Native.switch_dtmf_t dtmf) - { + string dtmfCallback(Native.switch_dtmf_t dtmf) { var f = DtmfReceivedFunction; - return f == null ? - "-ERR No DtmfReceivedFunction set." : - f(((char)(byte)dtmf.digit), TimeSpan.FromMilliseconds(dtmf.duration)); + return f == null ? "" + : f(((char)(byte)dtmf.digit), TimeSpan.FromMilliseconds(dtmf.duration)); } - string eventCallback(Native.switch_event swevt) - { + string eventCallback(Native.switch_event swevt) { using (var evt = new FreeSWITCH.Native.Event(swevt, 0)) { var f = EventReceivedFunction; - return f == null ? - "-ERR No EventReceivedFunction set." : - f(evt); + return f == null ? "" + : f(evt); } } 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 Sat Oct 4 05:36:52 2008 @@ -2758,7 +2758,7 @@ return ret; } - public static switch_status_t switch_ivr_detect_speech(SWIGTYPE_p_switch_core_session session, string mod_name, string grammar, string path, string dest, switch_asr_handle ah) { + public static switch_status_t oh(SWIGTYPE_p_switch_core_session session, string mod_name, string grammar, string path, string dest, switch_asr_handle ah) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_detect_speech(SWIGTYPE_p_switch_core_session.getCPtr(session), mod_name, grammar, path, dest, switch_asr_handle.getCPtr(ah)); return ret; }

1 0

[commit] r9830 - freeswitch/trunk/src
by Freeswitch SVN 04 Oct '08

04 Oct '08

Author: mikej Date: Sat Oct 4 04:09:44 2008 New Revision: 9830 Modified: freeswitch/trunk/src/switch_cpp.cpp Log: debug tweak Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Sat Oct 4 04:09:44 2008 @@ -1238,7 +1238,7 @@ return SWITCH_STATUS_SUCCESS; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "no match, return false\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "no callback result match for '%s', return false\n", result); return SWITCH_STATUS_FALSE; }

1 0

[commit] r9829 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by Freeswitch SVN 04 Oct '08

04 Oct '08

Author: anthm Date: Sat Oct 4 03:47:30 2008 New Revision: 9829 Removed: freeswitch/trunk/src/mod/languages/mod_managed/runswig.sh Modified: freeswitch/trunk/src/mod/languages/mod_managed/Makefile freeswitch/trunk/src/mod/languages/mod_managed/managed/Makefile Log: linux build system fixups Modified: freeswitch/trunk/src/mod/languages/mod_managed/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/Makefile Sat Oct 4 03:47:30 2008 @@ -1,10 +1,9 @@ -#MOD_CFLAGS=`pkg-config --cflags --libs mono` MOD_CFLAGS=-D_REENTRANT -pthread -I/opt/mono-1.9/lib/pkgconfig/../../include/mono-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -lmono -#LDFLAGS=`pkg-config --libs mono` BASE=../../../.. VERBOSE=1 include $(BASE)/build/modmake.rules LOCAL_OBJS=freeswitch_managed.o freeswitch_wrap.o + local_depend: $(LOCAL_OBJS) freeswitch_managed.o: freeswitch_managed.h freeswitch_managed.cpp @@ -16,6 +15,19 @@ reswig: swigclean freeswitch_wrap.cxx +local_depend: + cd managed && $(MAKE) + +local_install: $(MODINSTDIR)/mod_managed.so + cd managed && $(MAKE) MODINSTDIR=$(MODINSTDIR) install + +local_uninstall: + rm -fr $(MODINSTDIR)/mod_managed.so + cd managed && $(MAKE) MODINSTDIR=$(MODINSTDIR) uninstall + +local_clean: + cd managed && $(MAKE) clean + swigclean: clean rm -f freeswitch_wrap.cxx freeswitch_wrap.cpp managed/swig.cs @@ -24,3 +36,6 @@ rm -f ./managed/swig.cs cat *.cs > ./managed/swig.cs rm -f *.cs + +depend_install: + mkdir -p $(DESTDIR)$(PREFIX)/mod/managed Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/Makefile Sat Oct 4 03:47:30 2008 @@ -1,13 +1,14 @@ -all: Debug Debug/mod_managed_lib.dll +all: mod_managed_lib.dll clean: - rm -fr Debug + rm -fr mod_managed_lib.dll -Debug: - mkdir Debug +mod_managed_lib.dll: Loader.cs ManagedSession.cs ApiFunction.cs AppFunction.cs Extensions.cs Log.cs Demo.cs swig.cs + gmcs -target:library -out:mod_managed_lib.dll -d:DEBUG Loader.cs ManagedSession.cs ApiFunction.cs AppFunction.cs Extensions.cs Log.cs Demo.cs swig.cs -Debug/mod_managed_lib.dll: Loader.cs ManagedSession.cs ApiFunction.cs AppFunction.cs Extensions.cs Log.cs Demo.cs swig.cs - gmcs -target:library -out:Debug/mod_managed_lib.dll -d:DEBUG Loader.cs ManagedSession.cs ApiFunction.cs AppFunction.cs Extensions.cs Log.cs Demo.cs swig.cs +install: mod_managed_lib.dll + install mod_managed_lib.dll $(MODINSTDIR) + +uninstall: + rm -f $(MODINSTDIR)/mod_managed_lib.dll -install: Debug/mod_managed_lib.dll - install Debug/mod_managed_lib.dll /usr/local/freeswitch/mod

1 0

[commit] r9828 - freeswitch/trunk/src/mod/languages/mod_managed
by Freeswitch SVN 04 Oct '08

04 Oct '08

Author: mikej Date: Sat Oct 4 03:05:49 2008 New Revision: 9828 Modified: freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Log: a little more cleanup Modified: freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Sat Oct 4 03:05:49 2008 @@ -63,11 +63,10 @@ mod_managed_globals globals = { 0 }; -#ifndef _MANAGED - // Sets up delegates (and anything else needed) on the ManagedSession object -// Called via internalcall -SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession * session, inputFunction dtmfDelegate, hangupFunction hangupDelegate) +// Called from ManagedSession.Initialize Managed -> this is Unmanaged code so all pointers are marshalled and prevented from GC +// Exported method. +SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession *session, inputFunction dtmfDelegate, hangupFunction hangupDelegate) { switch_assert(session); if (!session) { @@ -79,6 +78,8 @@ session->hangupDelegate = hangupDelegate; } +#ifndef _MANAGED + #ifdef WIN32 #include <shlobj.h> #endif @@ -262,20 +263,6 @@ **********************************************************/ #ifdef _MANAGED -// Sets up delegates (and anything else needed) on the ManagedSession object -// Called from ManagedSession.Initialize Managed -> this is Unmanaged code so all pointers are marshalled and prevented from GC -// Exported method. -SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession *session, inputFunction dtmfDelegate, hangupFunction hangupDelegate) -{ - switch_assert(session); - if (!session) { - return; - } - session->setDTMFCallback(NULL, ""); - session->setHangupHook(NULL); - session->dtmfDelegate = dtmfDelegate; - session->hangupDelegate = hangupDelegate; -} switch_status_t loadRuntime() {

1 0

[commit] r9827 - freeswitch/trunk/src/mod/languages/mod_managed
by Freeswitch SVN 04 Oct '08

04 Oct '08

Author: mikej Date: Sat Oct 4 03:01:30 2008 New Revision: 9827 Modified: freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Log: a little more cleanup Modified: freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Sat Oct 4 03:01:30 2008 @@ -157,11 +157,15 @@ #endif } -switch_status_t loadModMonoManaged() +switch_status_t loadRuntime() { /* Find and load mod_mono_managed.exe */ char filename[256]; + if (setMonoDirs() != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } + switch_snprintf(filename, 256, "%s%s%s", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR, MOD_MANAGED_DLL); globals.domain = mono_jit_init(filename); @@ -251,59 +255,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found all loader functions.\n"); return SWITCH_STATUS_SUCCESS; } - -SWITCH_MODULE_LOAD_FUNCTION(mod_managed_load) -{ - /* connect my internal structure to the blank pointer passed to me */ - *module_interface = switch_loadable_module_create_module_interface(pool, modname); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Loading mod_managed (Common Language Infrastructure), Mono Version\n"); - globals.pool = pool; - - if (setMonoDirs() != SWITCH_STATUS_SUCCESS) { - return SWITCH_STATUS_FALSE; - } - - if (loadModMonoManaged() != SWITCH_STATUS_SUCCESS) { - return SWITCH_STATUS_FALSE; - } - - if (findLoader() != SWITCH_STATUS_SUCCESS) { - return SWITCH_STATUS_FALSE; - } - - /* Not sure if this is necesary on the loading thread */ - mono_thread_attach(globals.domain); - - /* Run loader */ - MonoObject * objResult; - MonoObject * exception = NULL; - - objResult = mono_runtime_invoke(globals.loadMethod, NULL, NULL, &exception); - - if (exception) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Load threw an exception.\n"); - mono_print_unhandled_exception(exception); - return SWITCH_STATUS_FALSE; - } - - if (*(int *) mono_object_unbox(objResult)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Load completed successfully.\n"); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Load did not return true.\n"); - return SWITCH_STATUS_FALSE; - } - - /* We're good to register */ - switch_api_interface_t *api_interface; - switch_application_interface_t *app_interface; - - SWITCH_ADD_API(api_interface, "managedrun", "Run a module (ExecuteBackground)", managedrun_api_function, "<module> [<args>]"); - SWITCH_ADD_API(api_interface, "managed", "Run a module as an API function (Execute)", managed_api_function, "<module> [<args>]"); - SWITCH_ADD_APP(app_interface, "managed", "Run Mono IVR", "Run a Mono IVR on a channel", managed_app_function, "<modulename> [<args>]", SAF_NONE); - - return SWITCH_STATUS_SUCCESS; -} - #endif /********************************************************** @@ -326,7 +277,7 @@ session->hangupDelegate = hangupDelegate; } -switch_status_t loadModDotnetManaged() +switch_status_t loadRuntime() { /* Find and load mod_dotnet_managed.dll */ char filename[256]; @@ -362,26 +313,29 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found all FreeSWITCH.Loader functions.\n"); return SWITCH_STATUS_SUCCESS; } +#endif SWITCH_MODULE_LOAD_FUNCTION(mod_managed_load) { + int success; /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Loading mod_managed (Common Language Infrastructure), Microsoft CLR Version\n"); globals.pool = pool; - if (loadModDotnetManaged() != SWITCH_STATUS_SUCCESS) { + if (loadRuntime() != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_FALSE; } if (findLoader() != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_FALSE; } - +#ifdef _MANAGED Object ^objResult; try { objResult = FreeSwitchManaged::loadMethod->Invoke(nullptr, nullptr); + success = *reinterpret_cast<bool^>(objResult); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Load completed successfully.\n"); } catch(Exception^ ex) { @@ -390,8 +344,24 @@ Marshal::FreeHGlobal(msg); return SWITCH_STATUS_FALSE; } +#else + /* Not sure if this is necesary on the loading thread */ + mono_thread_attach(globals.domain); + + /* Run loader */ + MonoObject * objResult; + MonoObject * exception = NULL; + + objResult = mono_runtime_invoke(globals.loadMethod, NULL, NULL, &exception); + success = *(int *) mono_object_unbox(objResult); - if (*reinterpret_cast<bool^>(objResult)) { + if (exception) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Load threw an exception.\n"); + mono_print_unhandled_exception(exception); + return SWITCH_STATUS_FALSE; + } +#endif + if (success) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Load completed successfully.\n"); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Load did not return true.\n"); @@ -407,7 +377,6 @@ SWITCH_ADD_APP(app_interface, "managed", "Run CLI App", "Run an App on a channel", managed_app_function, "<modulename> [<args>]", SAF_NONE); return SWITCH_STATUS_SUCCESS; } -#endif SWITCH_STANDARD_API(managedrun_api_function) { @@ -420,6 +389,7 @@ Object ^objResult; try { objResult = FreeSwitchManaged::executeBackgroundMethod->Invoke(nullptr, gcnew array<Object^> { gcnew String(cmd) } ); + success = *reinterpret_cast<bool^>(objResult); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Load completed successfully.\n"); } catch(Exception^ ex) { IntPtr msg = Marshal::StringToHGlobalAnsi(ex->ToString()); @@ -428,7 +398,6 @@ Marshal::FreeHGlobal(msg); return SWITCH_STATUS_FALSE; } - success = *reinterpret_cast<bool^>(objResult); #else mono_thread_attach(globals.domain); void *args[1]; @@ -436,13 +405,13 @@ args[0] = mono_string_new(globals.domain, cmd); MonoObject * exception = NULL; MonoObject * objResult = mono_runtime_invoke(globals.executeBackgroundMethod, NULL, args, &exception); + success = *(int *) mono_object_unbox(objResult); if (exception) { stream->write_function(stream, "-ERR FreeSWITCH.Loader.ExecuteBackground threw an exception.\n"); mono_print_unhandled_exception(exception); return SWITCH_STATUS_SUCCESS; } - success = *(int *) mono_object_unbox(objResult); #endif if (success) { stream->write_function(stream, "+OK\n"); @@ -466,13 +435,13 @@ try { objResult = FreeSwitchManaged::executeMethod->Invoke(nullptr, gcnew array<Object^>{gcnew String(cmd),gcnew IntPtr(stream), gcnew IntPtr(stream->param_event)}); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Execute completed successfully.\n"); + success = *reinterpret_cast<bool^>(objResult); } catch(Exception ^ex) { IntPtr msg = Marshal::StringToHGlobalAnsi(ex->ToString()); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception trying to execute cli %s: %s\n", cmd, static_cast<const char*>(msg.ToPointer())); Marshal::FreeHGlobal(msg); return SWITCH_STATUS_FALSE; } - success = *reinterpret_cast<bool^>(objResult); #else mono_thread_attach(globals.domain); void *args[3]; @@ -483,12 +452,12 @@ MonoObject * exception = NULL; MonoObject * objResult = mono_runtime_invoke(globals.executeMethod, NULL, args, &exception); + success = *(int *) mono_object_unbox(objResult); if (exception) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception trying to execute mono %s.\n", cmd); mono_print_unhandled_exception(exception); } - success = *(int *) mono_object_unbox(objResult); #endif if (!success) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Execute failed for %s (unknown module?).\n", cmd); @@ -508,6 +477,7 @@ try { objResult = FreeSwitchManaged::runMethod->Invoke(nullptr, gcnew array<Object^>{gcnew String(data),gcnew IntPtr(session)}); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "RunMethod completed successfully.\n"); + success = *reinterpret_cast<bool^>(objResult); } catch(Exception ^ex) { IntPtr msg = Marshal::StringToHGlobalAnsi(ex->ToString()); @@ -515,7 +485,6 @@ Marshal::FreeHGlobal(msg); return; } - success = *reinterpret_cast<bool^>(objResult); #else mono_thread_attach(globals.domain); void *args[2]; @@ -525,12 +494,12 @@ MonoObject * exception = NULL; MonoObject * objResult = mono_runtime_invoke(globals.runMethod, NULL, args, &exception); + success = *(int *) mono_object_unbox(objResult); if (exception) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception trying to execute application mono %s.\n", data); mono_print_unhandled_exception(exception); } - success = *(int *) mono_object_unbox(objResult); #endif if (!success) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Application run failed for %s (unknown module?).\n", data);

1 0

[commit] r9826 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by Freeswitch SVN 04 Oct '08

04 Oct '08

Author: anthm Date: Sat Oct 4 02:40:55 2008 New Revision: 9826 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Log: update swig 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 Sat Oct 4 02:40:55 2008 @@ -25598,52 +25598,6 @@ } -SWIGEXPORT void SWIGSTDCALL CSharp_ManagedSession_dtmfDelegate_set(void * jarg1, void * jarg2) { - ManagedSession *arg1 = (ManagedSession *) 0 ; - inputFunction arg2 = (inputFunction) 0 ; - - arg1 = (ManagedSession *)jarg1; - arg2 = (inputFunction)jarg2; - if (arg1) (arg1)->dtmfDelegate = arg2; - -} - - -SWIGEXPORT void * SWIGSTDCALL CSharp_ManagedSession_dtmfDelegate_get(void * jarg1) { - void * jresult ; - ManagedSession *arg1 = (ManagedSession *) 0 ; - inputFunction result; - - arg1 = (ManagedSession *)jarg1; - result = (inputFunction) ((arg1)->dtmfDelegate); - jresult = (void *)result; - return jresult; -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_ManagedSession_hangupDelegate_set(void * jarg1, void * jarg2) { - ManagedSession *arg1 = (ManagedSession *) 0 ; - hangupFunction arg2 = (hangupFunction) 0 ; - - arg1 = (ManagedSession *)jarg1; - arg2 = (hangupFunction)jarg2; - if (arg1) (arg1)->hangupDelegate = arg2; - -} - - -SWIGEXPORT void * SWIGSTDCALL CSharp_ManagedSession_hangupDelegate_get(void * jarg1) { - void * jresult ; - ManagedSession *arg1 = (ManagedSession *) 0 ; - hangupFunction result; - - arg1 = (ManagedSession *)jarg1; - result = (hangupFunction) ((arg1)->hangupDelegate); - jresult = (void *)result; - return jresult; -} - - SWIGEXPORT CoreSession * SWIGSTDCALL CSharp_ManagedSessionUpcast(ManagedSession *objectRef) { return (CoreSession *)objectRef; } 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 Sat Oct 4 02:40:55 2008 @@ -10082,18 +10082,6 @@ [DllImport("mod_managed", EntryPoint="CSharp_delete_ManagedSession")] public static extern void delete_ManagedSession(HandleRef jarg1); - [DllImport("mod_managed", EntryPoint="CSharp_ManagedSession_dtmfDelegate_set")] - public static extern void ManagedSession_dtmfDelegate_set(HandleRef jarg1, HandleRef jarg2); - - [DllImport("mod_managed", EntryPoint="CSharp_ManagedSession_dtmfDelegate_get")] - public static extern IntPtr ManagedSession_dtmfDelegate_get(HandleRef jarg1); - - [DllImport("mod_managed", EntryPoint="CSharp_ManagedSession_hangupDelegate_set")] - public static extern void ManagedSession_hangupDelegate_set(HandleRef jarg1, HandleRef jarg2); - - [DllImport("mod_managed", EntryPoint="CSharp_ManagedSession_hangupDelegate_get")] - public static extern IntPtr ManagedSession_hangupDelegate_get(HandleRef jarg1); - [DllImport("mod_managed", EntryPoint="CSharp_ManagedSessionUpcast")] public static extern IntPtr ManagedSessionUpcast(IntPtr objectRef); } @@ -10293,28 +10281,6 @@ public ManagedSession(SWIGTYPE_p_switch_core_session session) : this(freeswitchPINVOKE.new_ManagedSession__SWIG_2(SWIGTYPE_p_switch_core_session.getCPtr(session)), true) { } - public SWIGTYPE_p_f_p_void_enum_switch_input_type_t__p_char dtmfDelegate { - set { - freeswitchPINVOKE.ManagedSession_dtmfDelegate_set(swigCPtr, SWIGTYPE_p_f_p_void_enum_switch_input_type_t__p_char.getCPtr(value)); - } - get { - IntPtr cPtr = freeswitchPINVOKE.ManagedSession_dtmfDelegate_get(swigCPtr); - SWIGTYPE_p_f_p_void_enum_switch_input_type_t__p_char ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_f_p_void_enum_switch_input_type_t__p_char(cPtr, false); - return ret; - } - } - - public SWIGTYPE_p_f_void__void hangupDelegate { - set { - freeswitchPINVOKE.ManagedSession_hangupDelegate_set(swigCPtr, SWIGTYPE_p_f_void__void.getCPtr(value)); - } - get { - IntPtr cPtr = freeswitchPINVOKE.ManagedSession_hangupDelegate_get(swigCPtr); - SWIGTYPE_p_f_void__void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_f_void__void(cPtr, false); - return ret; - } - } - } } @@ -12267,36 +12233,6 @@ using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_f_p_void_enum_switch_input_type_t__p_char { - private HandleRef swigCPtr; - - internal SWIGTYPE_p_f_p_void_enum_switch_input_type_t__p_char(IntPtr cPtr, bool futureUse) { - swigCPtr = new HandleRef(this, cPtr); - } - - protected SWIGTYPE_p_f_p_void_enum_switch_input_type_t__p_char() { - swigCPtr = new HandleRef(null, IntPtr.Zero); - } - - internal static HandleRef getCPtr(SWIGTYPE_p_f_p_void_enum_switch_input_type_t__p_char obj) { - return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; - } -} - -} -/* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.35 - * - * Do not make changes to this file unless you know what you are doing--modify - * the SWIG interface file instead. - * ----------------------------------------------------------------------------- */ - -namespace FreeSWITCH.Native { - -using System; -using System.Runtime.InteropServices; - public class SWIGTYPE_p_f_p_void_int_p_p_char_p_p_char__int { private HandleRef swigCPtr; @@ -12387,36 +12323,6 @@ using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_f_void__void { - private HandleRef swigCPtr; - - internal SWIGTYPE_p_f_void__void(IntPtr cPtr, bool futureUse) { - swigCPtr = new HandleRef(this, cPtr); - } - - protected SWIGTYPE_p_f_void__void() { - swigCPtr = new HandleRef(null, IntPtr.Zero); - } - - internal static HandleRef getCPtr(SWIGTYPE_p_f_void__void obj) { - return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; - } -} - -} -/* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.35 - * - * Do not make changes to this file unless you know what you are doing--modify - * the SWIG interface file instead. - * ----------------------------------------------------------------------------- */ - -namespace FreeSWITCH.Native { - -using System; -using System.Runtime.InteropServices; - public class SWIGTYPE_p_HashElem { private HandleRef swigCPtr;

1 0

[commit] r9825 - freeswitch/trunk/src
by Freeswitch SVN 04 Oct '08

04 Oct '08

Author: robertj Date: Sat Oct 4 02:39:28 2008 New Revision: 9825 Modified: freeswitch/trunk/src/switch.c Log: Fixed win32 compatibility. Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Sat Oct 4 02:39:28 2008 @@ -617,8 +617,8 @@ } if (destroy_status == SWITCH_STATUS_RESTART) { - sleep(1); - ret = execv(argv[0], argv); + switch_sleep(1); + ret = (int)execv(argv[0], argv); } return ret;

1 0

[commit] r9824 - freeswitch/trunk/src/mod/languages/mod_managed
by Freeswitch SVN 04 Oct '08

04 Oct '08

Author: mikej Date: Sat Oct 4 02:35:32 2008 New Revision: 9824 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Log: a little more cleanup Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h Sat Oct 4 02:35:32 2008 @@ -41,19 +41,21 @@ typedef void (*hangupFunction)(void); typedef char* (*inputFunction)(void*, switch_input_type_t); -#ifdef _MANAGED -#define ATTACH_THREADS -#else +#ifndef _MANAGED #include <glib.h> #include <mono/jit/jit.h> #include <mono/metadata/assembly.h> +#include <mono/metadata/environment.h> #include <mono/metadata/threads.h> +#include <mono/metadata/debug-helpers.h> +#endif #ifndef SWIG -struct mod_mono_globals { +struct mod_managed_globals { + switch_memory_pool_t *pool; +#ifndef _MANAGED MonoDomain *domain; MonoAssembly *mod_mono_asm; - switch_memory_pool_t *pool; switch_bool_t embedded; MonoMethod *loadMethod; @@ -61,11 +63,15 @@ MonoMethod *runMethod; MonoMethod *executeMethod; MonoMethod *executeBackgroundMethod; +#endif }; - -typedef struct mod_mono_globals mod_mono_globals; -extern mod_mono_globals globals; +typedef struct mod_managed_globals mod_managed_globals; +extern mod_managed_globals globals; #endif + +#ifdef _MANAGED +#define ATTACH_THREADS +#else #define ATTACH_THREADS mono_thread_attach(globals.domain); #endif Modified: freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Sat Oct 4 02:35:32 2008 @@ -36,9 +36,16 @@ #include <switch.h> -SWITCH_BEGIN_EXTERN_C #include "freeswitch_managed.h" +#ifdef _MANAGED +#include <mscoree.h> +using namespace System; +using namespace System::Runtime::InteropServices; +#endif + +SWITCH_BEGIN_EXTERN_C + SWITCH_MODULE_LOAD_FUNCTION(mod_managed_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_managed_shutdown); SWITCH_MODULE_DEFINITION(mod_managed, mod_managed_load, mod_managed_shutdown, NULL); @@ -47,36 +54,16 @@ SWITCH_STANDARD_API(managed_api_function); /* Execute */ SWITCH_STANDARD_APP(managed_app_function); /* Run */ -SWITCH_END_EXTERN_C +#define MOD_MANAGED_ASM_NAME "mod_managed_lib" +#define MOD_MANAGED_ASM_V1 1 +#define MOD_MANAGED_ASM_V2 0 +#define MOD_MANAGED_ASM_V3 0 +#define MOD_MANAGED_ASM_V4 0 +#define MOD_MANAGED_DLL MOD_MANAGED_ASM_NAME ".dll" -#define MOD_MANAGED_DLL "mod_managed_lib.dll" +mod_managed_globals globals = { 0 }; #ifndef _MANAGED - -SWITCH_BEGIN_EXTERN_C - -#include <glib.h> -#include <mono/jit/jit.h> -#include <mono/metadata/assembly.h> -#include <mono/metadata/environment.h> -#include <mono/metadata/threads.h> -#include <mono/metadata/debug-helpers.h> - -#ifdef WIN32 -#include <shlobj.h> -#define EXPORT __declspec(dllexport) -#else -#define EXPORT -#endif - -#define MOD_MONO_MANAGED_ASM_NAME "mod_managed_lib" -#define MOD_MONO_MANAGED_ASM_V1 1 -#define MOD_MONO_MANAGED_ASM_V2 0 -#define MOD_MONO_MANAGED_ASM_V3 0 -#define MOD_MONO_MANAGED_ASM_V4 0 - -mod_mono_globals globals = -{ 0 }; // Sets up delegates (and anything else needed) on the ManagedSession object // Called via internalcall @@ -92,6 +79,10 @@ session->hangupDelegate = hangupDelegate; } +#ifdef WIN32 +#include <shlobj.h> +#endif + switch_status_t setMonoDirs() { #ifdef WIN32 @@ -187,11 +178,11 @@ /* Already loaded? */ MonoAssemblyName name; - name.name = MOD_MONO_MANAGED_ASM_NAME; - name.major = MOD_MONO_MANAGED_ASM_V1; - name.minor = MOD_MONO_MANAGED_ASM_V2; - name.revision = MOD_MONO_MANAGED_ASM_V3; - name.build = MOD_MONO_MANAGED_ASM_V4; + name.name = MOD_MANAGED_ASM_NAME; + name.major = MOD_MANAGED_ASM_V1; + name.minor = MOD_MANAGED_ASM_V2; + name.revision = MOD_MANAGED_ASM_V3; + name.build = MOD_MANAGED_ASM_V4; name.culture = ""; name.hash_value = ""; @@ -313,116 +304,6 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_STANDARD_API(managedrun_api_function) -{ - // TODO: Should we be detaching after all this? - mono_thread_attach(globals.domain); - - if (switch_strlen_zero(cmd)) { - stream->write_function(stream, "-ERR no args specified!\n"); - return SWITCH_STATUS_SUCCESS; - } - - // ExecuteBackground(string command) - void *args[1]; - - args[0] = mono_string_new(globals.domain, cmd); - MonoObject * exception = NULL; - MonoObject * objResult = mono_runtime_invoke(globals.executeBackgroundMethod, NULL, args, &exception); - - if (exception) { - stream->write_function(stream, "-ERR FreeSWITCH.Loader.ExecuteBackground threw an exception.\n"); - mono_print_unhandled_exception(exception); - return SWITCH_STATUS_SUCCESS; - } - - if (*(int *) mono_object_unbox(objResult)) { - stream->write_function(stream, "+OK\n"); - } else { - stream->write_function(stream, "-ERR ExecuteBackground returned false (unknown module?).\n"); - } - - return SWITCH_STATUS_SUCCESS; -} - -SWITCH_STANDARD_API(managed_api_function) -{ - mono_thread_attach(globals.domain); - - if (switch_strlen_zero(cmd)) { - stream->write_function(stream, "-ERR no args specified!\n"); - return SWITCH_STATUS_SUCCESS; - } - - // Method is: Execute(string command, IntPtr streamPtr, IntPtr eventPtr) - void *args[3]; - - args[0] = mono_string_new(globals.domain, cmd); - args[1] = &stream; // Address of the arguments - args[2] = &(stream->param_event); - - MonoObject * exception = NULL; - MonoObject * objResult = mono_runtime_invoke(globals.executeMethod, NULL, args, &exception); - - if (exception) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception trying to execute mono %s.\n", cmd); - mono_print_unhandled_exception(exception); - } - - if (!(*(int *) mono_object_unbox(objResult))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Execute failed for %s (unknown module?).\n", cmd); - } - - return SWITCH_STATUS_SUCCESS; -} - -SWITCH_STANDARD_APP(managed_app_function) -{ - mono_thread_attach(globals.domain); - - if (switch_strlen_zero(data)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No args specified!\n"); - } - - // bool Run(string command, IntPtr sessionHandle) - void *args[2]; - - args[0] = mono_string_new(globals.domain, data); - args[1] = &session; - - MonoObject * exception = NULL; - MonoObject * objResult = mono_runtime_invoke(globals.runMethod, NULL, args, &exception); - - if (exception) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception trying to execute application mono %s.\n", data); - mono_print_unhandled_exception(exception); - } - - if (!(*(int *) mono_object_unbox(objResult))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Application run failed for %s (unknown module?).\n", data); - } -} - -SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_managed_shutdown) -{ - MonoObject * ex; - - mono_thread_attach(globals.domain); - mono_runtime_invoke(globals.unloadMethod, NULL, NULL, &ex); - - if (ex) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception occurred in Loader::Unload.\n"); - mono_print_unhandled_exception(ex); - } - - if (!globals.embedded) { - mono_jit_cleanup(globals.domain); - } - - return SWITCH_STATUS_SUCCESS; -} - -SWITCH_END_EXTERN_C #endif /********************************************************** @@ -430,23 +311,6 @@ **********************************************************/ #ifdef _MANAGED - -#include <mscoree.h> - -using namespace System; -using namespace System::Runtime::InteropServices; - -SWITCH_BEGIN_EXTERN_C - -struct dotnet_conf_t { - switch_memory_pool_t *pool; - //ICLRRuntimeHost *pCorRuntime; - //HMODULE lock_module; - //OSVERSIONINFO osver; - //char *cor_version; -} globals; - - // Sets up delegates (and anything else needed) on the ManagedSession object // Called from ManagedSession.Initialize Managed -> this is Unmanaged code so all pointers are marshalled and prevented from GC // Exported method. @@ -543,15 +407,16 @@ SWITCH_ADD_APP(app_interface, "managed", "Run CLI App", "Run an App on a channel", managed_app_function, "<modulename> [<args>]", SAF_NONE); return SWITCH_STATUS_SUCCESS; } - +#endif SWITCH_STANDARD_API(managedrun_api_function) { + int success; if (switch_strlen_zero(cmd)) { stream->write_function(stream, "-ERR no args specified!\n"); return SWITCH_STATUS_SUCCESS; } - +#ifdef _MANAGED Object ^objResult; try { objResult = FreeSwitchManaged::executeBackgroundMethod->Invoke(nullptr, gcnew array<Object^> { gcnew String(cmd) } ); @@ -563,22 +428,40 @@ Marshal::FreeHGlobal(msg); return SWITCH_STATUS_FALSE; } + success = *reinterpret_cast<bool^>(objResult); +#else + mono_thread_attach(globals.domain); + void *args[1]; - if (*reinterpret_cast<bool^>(objResult)) { + args[0] = mono_string_new(globals.domain, cmd); + MonoObject * exception = NULL; + MonoObject * objResult = mono_runtime_invoke(globals.executeBackgroundMethod, NULL, args, &exception); + + if (exception) { + stream->write_function(stream, "-ERR FreeSWITCH.Loader.ExecuteBackground threw an exception.\n"); + mono_print_unhandled_exception(exception); + return SWITCH_STATUS_SUCCESS; + } + success = *(int *) mono_object_unbox(objResult); +#endif + if (success) { stream->write_function(stream, "+OK\n"); } else { stream->write_function(stream, "-ERR ExecuteBackground returned false (unknown module?).\n"); } + return SWITCH_STATUS_SUCCESS; } + SWITCH_STANDARD_API(managed_api_function) { + int success; if (switch_strlen_zero(cmd)) { stream->write_function(stream, "-ERR no args specified!\n"); return SWITCH_STATUS_SUCCESS; } - +#ifdef _MANAGED Object ^objResult; try { objResult = FreeSwitchManaged::executeMethod->Invoke(nullptr, gcnew array<Object^>{gcnew String(cmd),gcnew IntPtr(stream), gcnew IntPtr(stream->param_event)}); @@ -589,20 +472,38 @@ Marshal::FreeHGlobal(msg); return SWITCH_STATUS_FALSE; } - - if (!*reinterpret_cast<bool^>(objResult)) { + success = *reinterpret_cast<bool^>(objResult); +#else + mono_thread_attach(globals.domain); + void *args[3]; + + args[0] = mono_string_new(globals.domain, cmd); + args[1] = &stream; // Address of the arguments + args[2] = &(stream->param_event); + + MonoObject * exception = NULL; + MonoObject * objResult = mono_runtime_invoke(globals.executeMethod, NULL, args, &exception); + + if (exception) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception trying to execute mono %s.\n", cmd); + mono_print_unhandled_exception(exception); + } + success = *(int *) mono_object_unbox(objResult); +#endif + if (!success) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Execute failed for %s (unknown module?).\n", cmd); } - return SWITCH_STATUS_SUCCESS; } + SWITCH_STANDARD_APP(managed_app_function) { + int success; if (switch_strlen_zero(data)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No args specified!\n"); } - +#ifdef _MANAGED Object ^objResult; try { objResult = FreeSwitchManaged::runMethod->Invoke(nullptr, gcnew array<Object^>{gcnew String(data),gcnew IntPtr(session)}); @@ -614,8 +515,24 @@ Marshal::FreeHGlobal(msg); return; } - - if (!*reinterpret_cast<bool^>(objResult)) { + success = *reinterpret_cast<bool^>(objResult); +#else + mono_thread_attach(globals.domain); + void *args[2]; + + args[0] = mono_string_new(globals.domain, data); + args[1] = &session; + + MonoObject * exception = NULL; + MonoObject * objResult = mono_runtime_invoke(globals.runMethod, NULL, args, &exception); + + if (exception) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception trying to execute application mono %s.\n", data); + mono_print_unhandled_exception(exception); + } + success = *(int *) mono_object_unbox(objResult); +#endif + if (!success) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Application run failed for %s (unknown module?).\n", data); } } @@ -623,6 +540,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_managed_shutdown) { +#ifdef _MANAGED Object ^objResult; try { objResult = FreeSwitchManaged::unloadMethod->Invoke(nullptr, nullptr); @@ -634,9 +552,22 @@ Marshal::FreeHGlobal(msg); return SWITCH_STATUS_FALSE;; } +#else + MonoObject * ex; + + mono_thread_attach(globals.domain); + mono_runtime_invoke(globals.unloadMethod, NULL, NULL, &ex); + + if (ex) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Exception occurred in Loader::Unload.\n"); + mono_print_unhandled_exception(ex); + } + + if (!globals.embedded) { + mono_jit_cleanup(globals.domain); + } +#endif return SWITCH_STATUS_SUCCESS; } SWITCH_END_EXTERN_C - -#endif \ No newline at end of file

1 0

[commit] r9822 - freeswitch/trunk/src/mod/languages/mod_managed
by Freeswitch SVN 04 Oct '08

04 Oct '08

Author: mikej Date: Sat Oct 4 01:12:47 2008 New Revision: 9822 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h Log: a little more cleanup Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp Sat Oct 4 01:12:47 2008 @@ -32,21 +32,6 @@ #include <switch.h> #include <switch_cpp.h> - -#ifdef _MANAGED -#define ATTACH_THREADS -#else -#include <glib.h> -#include <mono/metadata/threads.h> -#define ATTACH_THREADS mono_thread_attach(globals.domain); -#endif - -#ifdef WIN32 -#define RESULT_FREE(x) CoTaskMemFree(x) -#else -#define RESULT_FREE(x) g_free(x) -#endif - #include "freeswitch_managed.h" ManagedSession::ManagedSession():CoreSession() Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h Sat Oct 4 01:12:47 2008 @@ -26,12 +26,12 @@ * Michael Giagnocavo <mgg(a)packetrino.com> * Jeff Lenk <jlenk(a)frontiernet.net> - Modified class to support Dotnet * - * freeswitch_mono.h -- Header for MonoSession and globals + * freeswitch_managed.h -- Header for ManagedSession and globals * */ -#ifndef FREESWITCH_MONO_H -#define FREESWITCH_MONO_H +#ifndef FREESWITCH_MANAGED_H +#define FREESWITCH_MANAGED_H SWITCH_BEGIN_EXTERN_C @@ -41,10 +41,13 @@ typedef void (*hangupFunction)(void); typedef char* (*inputFunction)(void*, switch_input_type_t); -#ifndef _MANAGED - +#ifdef _MANAGED +#define ATTACH_THREADS +#else +#include <glib.h> #include <mono/jit/jit.h> #include <mono/metadata/assembly.h> +#include <mono/metadata/threads.h> #ifndef SWIG struct mod_mono_globals { @@ -63,6 +66,13 @@ typedef struct mod_mono_globals mod_mono_globals; extern mod_mono_globals globals; #endif +#define ATTACH_THREADS mono_thread_attach(globals.domain); +#endif + +#ifdef WIN32 +#define RESULT_FREE(x) CoTaskMemFree(x) +#else +#define RESULT_FREE(x) g_free(x) #endif SWITCH_END_EXTERN_C

1 0

[commit] r9821 - freeswitch/trunk/src/mod/languages/mod_managed
by Freeswitch SVN 04 Oct '08

04 Oct '08

Author: mikej Date: Sat Oct 4 00:58:20 2008 New Revision: 9821 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp Log: a little more cleanup Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp Sat Oct 4 00:58:20 2008 @@ -26,30 +26,29 @@ * Michael Giagnocavo <mgg(a)packetrino.com> * Jeff Lenk <jlenk(a)frontiernet.net> - Modified class to support Dotnet * - * freeswitch_cli.cpp -- CLI CoreSession subclasses + * freeswitch_managed.cpp -- Managed CoreSession subclasses * */ - #include <switch.h> #include <switch_cpp.h> -#ifndef _MANAGED -#include <glib.h> -#include <mono/jit/jit.h> -#include <mono/metadata/assembly.h> -#include <mono/metadata/environment.h> -#include <mono/metadata/threads.h> -#include <mono/metadata/metadata.h> -#endif - -#include "freeswitch_managed.h" #ifdef _MANAGED #define ATTACH_THREADS #else +#include <glib.h> +#include <mono/metadata/threads.h> #define ATTACH_THREADS mono_thread_attach(globals.domain); #endif +#ifdef WIN32 +#define RESULT_FREE(x) CoTaskMemFree(x) +#else +#define RESULT_FREE(x) g_free(x) +#endif + +#include "freeswitch_managed.h" + ManagedSession::ManagedSession():CoreSession() { @@ -75,7 +74,6 @@ return true; } - ManagedSession::~ManagedSession() { ATTACH_THREADS @@ -112,11 +110,8 @@ char *result = dtmfDelegate(input, itype); switch_status_t status = process_callback_result(result); -#if WIN32 - CoTaskMemFree(result); -#else - g_free(result) -#endif + RESULT_FREE(result); + return status; }

1 0