Fixed code formatting.

Return ListDelegate

diff --git a/src/mod/languages/mod_managed/managed/Loader.cs b/src/mod/languages/mod_managed/managed/Loader.cs
index cee7af86c24377af3cf5f25bad72b39052533d7a..942431e98969489ec6125a6a920a7e5fc41d8d38 100644 (file)
--- a/src/mod/languages/mod_managed/managed/Loader.cs
+++ b/src/mod/languages/mod_managed/managed/Loader.cs
@@ -46,15 +46,16 @@ namespace FreeSWITCH {
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate bool ExecuteDelegate(string cmd, IntPtr streamH, IntPtr eventH);\r
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate bool ExecuteBackgroundDelegate(string cmd);\r
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate bool RunDelegate(string cmd, IntPtr session);\r
-        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate bool ReloadDelegate(string cmd);        \r
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate bool ReloadDelegate(string cmd);\r
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate bool ListDelegate(string cmd, IntPtr streamH, IntPtr eventH);\r
         static readonly ExecuteDelegate _execute = Execute;\r
         static readonly ExecuteBackgroundDelegate _executeBackground = ExecuteBackground;\r
         static readonly RunDelegate _run = Run;\r
         static readonly ReloadDelegate _reload = Reload;\r
-        static readonly ExecuteDelegate _list = List;\r
+        static readonly ListDelegate _list = List;\r
         \r
         [DllImport("mod_managed", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]\r
-        static extern void InitManagedDelegates(RunDelegate run, ExecuteDelegate execute, ExecuteBackgroundDelegate executeBackground, ReloadDelegate reload, ExecuteDelegate list);\r
+        static extern void InitManagedDelegates(RunDelegate run, ExecuteDelegate execute, ExecuteBackgroundDelegate executeBackground, ReloadDelegate reload, ListDelegate list);\r
 \r
         static readonly object loaderLock = new object();\r
 \r
@@ -64,14 +65,10 @@ namespace FreeSWITCH {
         public static bool Load() {\r
             managedDir = Path.Combine(Native.freeswitch.SWITCH_GLOBAL_dirs.mod_dir, "managed");\r
             shadowDir = Path.Combine(managedDir, "shadow");\r
-            if (Directory.Exists(shadowDir)) \r
-            {\r
-                try\r
-                {\r
+            if (Directory.Exists(shadowDir)) {\r
+                try {\r
                     Directory.Delete(shadowDir, true);\r
-                }\r
-                catch (Exception ex)\r
-                {\r
+                } catch (Exception ex) {\r
                     Log.WriteLine(LogLevel.Warning, "Cannot delete shadow directory: {0}", ex);\r
                 }\r
 \r
@@ -79,8 +76,7 @@ namespace FreeSWITCH {
             }\r
 \r
             Log.WriteLine(LogLevel.Debug, "FreeSWITCH.Managed loader is starting with directory '{0}'.", managedDir);\r
-            if (!Directory.Exists(managedDir))\r
-            {\r
+            if (!Directory.Exists(managedDir)) {\r
                 Log.WriteLine(LogLevel.Error, "Managed directory not found: {0}", managedDir);\r
                 return false;\r
             }\r
@@ -241,8 +237,7 @@ namespace FreeSWITCH {
                 .ToList();\r
 \r
             // adding "managed" (modules) directory\r
-            if (!binPaths.Contains("managed", StringComparer.OrdinalIgnoreCase))\r
-            {\r
+            if (!binPaths.Contains("managed", StringComparer.OrdinalIgnoreCase)) {\r
                 binPaths.Add("managed");\r
             }\r
 \r
@@ -250,11 +245,9 @@ namespace FreeSWITCH {
             var moduleRefsDir = Path.GetFileName(fileName);\r
             moduleRefsDir = Path.GetFileNameWithoutExtension(moduleRefsDir);\r
 \r
-            if (moduleRefsDir != null && moduleRefsDir.Trim() != "")\r
-            {\r
+            if (moduleRefsDir != null && moduleRefsDir.Trim() != "") {\r
                 moduleRefsDir = Path.Combine("managed", moduleRefsDir);\r
-                if (!binPaths.Contains(moduleRefsDir, StringComparer.OrdinalIgnoreCase))\r
-                {\r
+                if (!binPaths.Contains(moduleRefsDir, StringComparer.OrdinalIgnoreCase)) {\r
                     binPaths.Add(moduleRefsDir);\r
                 }\r
             }\r
@@ -446,12 +439,9 @@ namespace FreeSWITCH {
 \r
         public static bool List(string command, IntPtr streamHandle, IntPtr eventHandle)\r
         {\r
-            try\r
-            {\r
-                if (streamHandle != IntPtr.Zero)\r
-                {\r
-                    using (var stream = new Native.Stream(new Native.switch_stream_handle(streamHandle, false)))\r
-                    {\r
+            try {\r
+                if (streamHandle != IntPtr.Zero) {\r
+                    using (var stream = new Native.Stream(new Native.switch_stream_handle(streamHandle, false))) {\r
                         stream.Write("Available APIs:\n");\r
 \r
                         getApiExecs().Values.ForEach(x => stream.Write(string.Format("{0}: {1}\n", x.Name, String.Join(",", x.Aliases.ToArray()))));\r
@@ -459,18 +449,14 @@ namespace FreeSWITCH {
                         stream.Write("Available Apps:\n");\r
                         getAppExecs().Values.ForEach(x => stream.Write(string.Format("{0}: {1}\n", x.Name, String.Join(",", x.Aliases.ToArray()))));\r
                     }\r
-                }\r
-                else\r
-                {\r
+                } else {\r
                     Log.WriteLine(LogLevel.Info, "Available APIs:");\r
                     getApiExecs().Values.ForEach(x => Log.WriteLine(LogLevel.Info, "{0}: {1}", x.Name, String.Join(",", x.Aliases.ToArray())));\r
                     Log.WriteLine(LogLevel.Info, "Available Apps:");\r
                     getAppExecs().Values.ForEach(x => Log.WriteLine(LogLevel.Info, "{0}: {1}", x.Name, String.Join(",", x.Aliases.ToArray())));\r
                 }\r
                 return true;\r
-            }\r
-            catch (Exception ex)\r
-            {\r
+            } catch (Exception ex) {\r
                 Log.WriteLine(LogLevel.Error, "Exception listing managed modules: {0}", ex.ToString());\r
                 return false;\r
             }\r

diff --git a/src/mod/languages/mod_managed/mod_managed.cpp b/src/mod/languages/mod_managed/mod_managed.cpp
index 6718265d538745aa204e8e51f4b1a4f57d644360..6831aec9309f3f64c73638c2b47ecbd770d7a3a6 100644 (file)
--- a/src/mod/languages/mod_managed/mod_managed.cpp
+++ b/src/mod/languages/mod_managed/mod_managed.cpp
@@ -74,13 +74,14 @@ typedef int (*runFunction)(const char *data, void *sessionPtr);
 typedef int (*executeFunction)(const char *cmd, void *stream, void *Event);
 typedef int (*executeBackgroundFunction)(const char* cmd);
 typedef int (*reloadFunction)(const char* cmd);
+typedef int (*listFunction)(const char *cmd, void *stream, void *Event);
 static runFunction runDelegate;
 static executeFunction executeDelegate;
 static executeBackgroundFunction executeBackgroundDelegate;
 static reloadFunction reloadDelegate;
-static executeFunction listDelegate;
+static listFunction listDelegate;
 
-SWITCH_MOD_DECLARE_NONSTD(void) InitManagedDelegates(runFunction run, executeFunction execute, executeBackgroundFunction executeBackground, reloadFunction reload, executeFunction list)
+SWITCH_MOD_DECLARE_NONSTD(void) InitManagedDelegates(runFunction run, executeFunction execute, executeBackgroundFunction executeBackground, reloadFunction reload, listFunction list)
 {
        runDelegate = run;
        executeDelegate = execute;