kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-29 01:51:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101 in FS/freeswitch from ~RAVENOX/freeswitch:fixes_for_pull_request_#93 to master

Browse Source 
* commit 'c97c0e8a7805f15fd52e7400b3a984d981e2524a':
  Fix for  case-sensitive filesystems
  Fixed code formatting. Return ListDelegate
This commit is contained in:
Mike Jerris 2014-11-06 11:42:35 -06:00
commit 7b7685484d
2 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/mod/languages/mod_managed/managed/Loader.cs
View File

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

5
src/mod/languages/mod_managed/mod_managed.cpp
View File

@ -74,13 +74,14 @@ typedef int (*runFunction)(const char *data, void *sessionPtr);
typedef int (*executeFunction)(const char *cmd, void *stream, void *Event); typedef int (*executeFunction)(const char *cmd, void *stream, void *Event);
typedef int (*executeBackgroundFunction)(const char* cmd); typedef int (*executeBackgroundFunction)(const char* cmd);
typedef int (*reloadFunction)(const char* cmd); typedef int (*reloadFunction)(const char* cmd);
typedef int (*listFunction)(const char *cmd, void *stream, void *Event);
static runFunction runDelegate; static runFunction runDelegate;
static executeFunction executeDelegate; static executeFunction executeDelegate;
static executeBackgroundFunction executeBackgroundDelegate; static executeBackgroundFunction executeBackgroundDelegate;
static reloadFunction reloadDelegate; 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; runDelegate = run;
executeDelegate = execute; executeDelegate = execute;