- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9570 - freeswitch/trunk/src/mod/languages/mod_mono
by Freeswitch SVN 15 Sep '08

15 Sep '08

Author: mikej Date: Mon Sep 15 16:30:57 2008 New Revision: 9570 Modified: freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.cpp Log: cleanup Modified: freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/mod_mono.cpp Mon Sep 15 16:30:57 2008 @@ -34,7 +34,6 @@ #include <switch.h> - SWITCH_BEGIN_EXTERN_C #include "freeswitch_mono.h" @@ -50,27 +49,19 @@ #define EXPORT __declspec(dllexport) #elif #define EXPORT -#endif /* - */ - +#endif + #define MOD_MONO_MANAGED_DLL "mod_mono_managed.dll" -mod_mono_globals globals = { -0}; - - +mod_mono_globals globals = +{ 0 }; SWITCH_MODULE_LOAD_FUNCTION(mod_mono_load); - SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_mono_shutdown); - SWITCH_MODULE_DEFINITION(mod_mono, mod_mono_load, mod_mono_shutdown, NULL); - SWITCH_STANDARD_API(monorun_api_function); /* ExecuteBackground */ - SWITCH_STANDARD_API(mono_api_function); /* Execute */ - SWITCH_STANDARD_APP(mono_app_function); /* Run */ @@ -88,451 +79,292 @@ session->hangupDelegateHandle = mono_gchandle_new(hangupDelegate, FALSE); } - switch_status_t setMonoDirs() { - #ifdef WIN32 - /* Win32 Mono installs can't figure out their own path - // Guys in #mono say we should just deploy all the libs we need - // I think it's much nicer to let the user deal with installing Mono - // and we'll just look for it in program files. */ - HANDLE hFind; - -WIN32_FIND_DATA findData; - -char progFilesPath[MAX_PATH]; - -char findPath[MAX_PATH]; - -SHGetFolderPath(NULL, CSIDL_PROGRAM_FILES, NULL, SHGFP_TYPE_CURRENT, progFilesPath); - -switch_snprintf(findPath, MAX_PATH, "%s\\Mono-*", progFilesPath); - -hFind = FindFirstFile(findPath, &findData); - -if (hFind == INVALID_HANDLE_VALUE) { - -switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error looking for Mono in Program Files.\n"); - -return SWITCH_STATUS_FALSE; - -} - -while ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) { - -if (FindNextFile(hFind, &findData) == 0) { - -switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find Mono directory in Program Files.\n"); - -FindClose(hFind); - -return SWITCH_STATUS_FALSE; - -} - -} - - /* Got it */ + /* Win32 Mono installs can't figure out their own path + // Guys in #mono say we should just deploy all the libs we need + // I think it's much nicer to let the user deal with installing Mono + // and we'll just look for it in program files. */ + HANDLE hFind; + WIN32_FIND_DATA findData; + char progFilesPath[MAX_PATH]; + char findPath[MAX_PATH]; + + SHGetFolderPath(NULL, CSIDL_PROGRAM_FILES, NULL, SHGFP_TYPE_CURRENT, progFilesPath); + switch_snprintf(findPath, MAX_PATH, "%s\\Mono-*", progFilesPath); + hFind = FindFirstFile(findPath, &findData); + if (hFind == INVALID_HANDLE_VALUE) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error looking for Mono in Program Files.\n"); + return SWITCH_STATUS_FALSE; + } + + while ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) { + if (FindNextFile(hFind, &findData) == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find Mono directory in Program Files.\n"); + FindClose(hFind); + return SWITCH_STATUS_FALSE; + } + } + + /* Got it */ { - -char libPath[MAX_PATH]; - -char etcPath[MAX_PATH]; - -switch_snprintf(libPath, MAX_PATH, "%s\\%s\\lib", progFilesPath, findData.cFileName); - -switch_snprintf(etcPath, MAX_PATH, "%s\\%s\\etc", progFilesPath, findData.cFileName); - -FindClose(hFind); - -switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Using Mono paths '%s' and '%s'.\n", libPath, etcPath); - -mono_set_dirs(libPath, etcPath); - -return SWITCH_STATUS_SUCCESS; - -} - + char libPath[MAX_PATH]; + char etcPath[MAX_PATH]; + + switch_snprintf(libPath, MAX_PATH, "%s\\%s\\lib", progFilesPath, findData.cFileName); + switch_snprintf(etcPath, MAX_PATH, "%s\\%s\\etc", progFilesPath, findData.cFileName); + FindClose(hFind); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Using Mono paths '%s' and '%s'.\n", libPath, etcPath); + mono_set_dirs(libPath, etcPath); + return SWITCH_STATUS_SUCCESS; + } + #elif - // On other platforms, it should just work if it hasn't been relocated - mono_set_dirs(NULL, NULL); - -return SWITCH_STATUS_SUCCESS; - + // On other platforms, it should just work if it hasn't been relocated + mono_set_dirs(NULL, NULL); + return SWITCH_STATUS_SUCCESS; + #endif /* - */ + */ } - switch_status_t loadModMonoManaged() { - - /* Find and load mod_mono_managed.exe */ + /* Find and load mod_mono_managed.exe */ char filename[256]; - -switch_snprintf(filename, 256, "%s%s%s", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR, MOD_MONO_MANAGED_DLL); - -globals.domain = mono_jit_init(filename); - -if (!globals.domain) { - -switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mono_jit_init failed.\n"); - -return SWITCH_STATUS_FALSE; - -} - + switch_snprintf(filename, 256, "%s%s%s", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR, MOD_MONO_MANAGED_DLL); + globals.domain = mono_jit_init(filename); - /* Open the assembly */ - globals.mod_mono_asm = mono_domain_assembly_open(globals.domain, filename); - -if (!globals.mod_mono_asm) { - -switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mono_domain_assembly_open failed.\n"); - -return SWITCH_STATUS_FALSE; - -} - -return SWITCH_STATUS_SUCCESS; + if (!globals.domain) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mono_jit_init failed.\n"); + return SWITCH_STATUS_FALSE; + } -} + /* Open the assembly */ + globals.mod_mono_asm = mono_domain_assembly_open(globals.domain, filename); + if (!globals.mod_mono_asm) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "mono_domain_assembly_open failed.\n"); + return SWITCH_STATUS_FALSE; + } + return SWITCH_STATUS_SUCCESS; +} MonoMethod * getMethod(const char *name, MonoClass * klass) { - -MonoMethodDesc * desc; - -MonoMethod * method; - -desc = mono_method_desc_new(name, TRUE); - -method = mono_method_desc_search_in_class(desc, klass); - -if (!method) { - -switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find %s method.\n", name); - -return NULL; - -} - -return method; + MonoMethodDesc * desc; + MonoMethod * method; -} + desc = mono_method_desc_new(name, TRUE); + method = mono_method_desc_search_in_class(desc, klass); + if (!method) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find %s method.\n", name); + return NULL; + } + + return method; +} switch_status_t findLoader() { - - /* Find loader class and methods */ - MonoImage * img; - -MonoClass * loaderClass; - -img = mono_assembly_get_image(globals.mod_mono_asm); - -loaderClass = mono_class_from_name(img, "FreeSWITCH", "Loader"); - -if (!loaderClass) { - -switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find FreeSWITCH.Loader class.\n"); - -return SWITCH_STATUS_FALSE; - -} - + /* Find loader class and methods */ + MonoClass * loaderClass; + MonoImage * img = mono_assembly_get_image(globals.mod_mono_asm); -globals.loadMethod = getMethod("FreeSWITCH.Loader:Load()", loaderClass); - -if (!globals.loadMethod) + if (!(loaderClass = mono_class_from_name(img, "FreeSWITCH", "Loader"))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find FreeSWITCH.Loader class.\n"); return SWITCH_STATUS_FALSE; - + } -globals.unloadMethod = getMethod("FreeSWITCH.Loader:Unload()", loaderClass); - -if (!globals.unloadMethod) + if (!(globals.loadMethod = getMethod("FreeSWITCH.Loader:Load()", loaderClass))) { return SWITCH_STATUS_FALSE; - + } -globals.runMethod = getMethod("FreeSWITCH.Loader:Run(string,intptr)", loaderClass); - -if (!globals.runMethod) + if (!(globals.unloadMethod = getMethod("FreeSWITCH.Loader:Unload()", loaderClass))) { return SWITCH_STATUS_FALSE; - + } -globals.executeMethod = getMethod("FreeSWITCH.Loader:Execute(string,intptr,intptr)", loaderClass); - -if (!globals.executeMethod) + if (!(globals.runMethod = getMethod("FreeSWITCH.Loader:Run(string,intptr)", loaderClass))) { return SWITCH_STATUS_FALSE; - + } -globals.executeBackgroundMethod = getMethod("FreeSWITCH.Loader:ExecuteBackground(string)", loaderClass); - -if (!globals.executeBackgroundMethod) + if (!(globals.executeMethod = getMethod("FreeSWITCH.Loader:Execute(string,intptr,intptr)", loaderClass))) { return SWITCH_STATUS_FALSE; - + } -switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found all loader functions.\n"); - -return SWITCH_STATUS_SUCCESS; + if (!(globals.executeBackgroundMethod = getMethod("FreeSWITCH.Loader:ExecuteBackground(string)", loaderClass))) { + return SWITCH_STATUS_FALSE; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found all loader functions.\n"); + return SWITCH_STATUS_SUCCESS; } - - SWITCH_MODULE_LOAD_FUNCTION(mod_mono_load) { - - /* connect my internal structure to the blank pointer passed to me */ - *module_interface = switch_loadable_module_create_module_interface(pool, modname); - -globals.pool = pool; - + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); -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; - -} - + globals.pool = pool; - /* Not sure if this is necesary on the loading thread */ - mono_thread_attach(globals.domain); - -mono_add_internal_call("FreeSWITCH.Native.MonoSession::InitMonoSession", InitMonoSession); - + if (setMonoDirs() != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } - /* 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; - -} - + if (loadModMonoManaged() != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } + if (findLoader() != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } - /* We're good to register */ - switch_api_interface_t *api_interface; - -switch_application_interface_t *app_interface; - + /* Not sure if this is necesary on the loading thread */ + mono_thread_attach(globals.domain); -SWITCH_ADD_API(api_interface, "monorun", "Run a module (ExecuteBackground)", monorun_api_function, "<module> [<args>]"); - -SWITCH_ADD_API(api_interface, "mono", "Run a module as an API function (Execute)", mono_api_function, "<module> [<args>]"); - -SWITCH_ADD_APP(app_interface, "mono", "Run Mono IVR", "Run a Mono IVR on a channel", mono_app_function, "<modulename> [<args>]", SAF_NONE); - + mono_add_internal_call("FreeSWITCH.Native.MonoSession::InitMonoSession", InitMonoSession); -return SWITCH_STATUS_SUCCESS; + /* 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, "monorun", "Run a module (ExecuteBackground)", monorun_api_function, "<module> [<args>]"); + SWITCH_ADD_API(api_interface, "mono", "Run a module as an API function (Execute)", mono_api_function, "<module> [<args>]"); + SWITCH_ADD_APP(app_interface, "mono", "Run Mono IVR", "Run a Mono IVR on a channel", mono_app_function, "<modulename> [<args>]", SAF_NONE); + return SWITCH_STATUS_SUCCESS; +} SWITCH_STANDARD_API(monorun_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; - -} - + // 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) + // 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; -} + 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(mono_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; - -} - + mono_thread_attach(globals.domain); - // Method is: Execute(string command, IntPtr streamPtr, IntPtr eventPtr) + 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[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; + 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(mono_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"); - -} - + 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) + // 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); - -} + 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_mono_shutdown) { - -mono_thread_attach(globals.domain); - -MonoObject * ex; - -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); - -} - -mono_runtime_set_shutting_down(); - -mono_runtime_cleanup(globals.domain); - -mono_runtime_quit(); - -return SWITCH_STATUS_SUCCESS; + 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); + } + + mono_runtime_set_shutting_down(); + mono_runtime_cleanup(globals.domain); + mono_runtime_quit(); + return SWITCH_STATUS_SUCCESS; +} SWITCH_END_EXTERN_C

1 0

[commit] r9569 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 15 Sep '08

15 Sep '08

Author: anthm Date: Mon Sep 15 14:39:16 2008 New Revision: 9569 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: fix FSCORE-187 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Mon Sep 15 14:39:16 2008 @@ -1538,6 +1538,9 @@ } +#define FREE_DOMAIN_ROOT() if (x_domain_root) switch_xml_free(x_domain_root); x_user = x_domain = x_domain_root = NULL + + static void voicemail_check_main(switch_core_session_t *session, const char *profile_name, const char *domain_name, const char *id, int auth) { vm_check_state_t vm_check_state = VM_CHECK_START; @@ -1601,10 +1604,7 @@ mypass = NULL; myfolder = "inbox"; vm_check_state = VM_CHECK_AUTH; - if (x_domain_root) { - switch_xml_free(x_domain_root); - } - x_user = x_domain = x_domain_root = NULL; + FREE_DOMAIN_ROOT(); } break; case VM_CHECK_FOLDER_SUMMARY: @@ -1893,8 +1893,8 @@ switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", myid); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "destination_number", caller_profile->destination_number); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "caller_id_number", caller_id_number); - - + + if (switch_xml_locate_user("id", myid, domain_name, switch_channel_get_variable(channel, "network_addr"), &x_domain_root, &x_domain, &x_user, params) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", myid, domain_name); @@ -1946,8 +1946,6 @@ thepass = cbt.password; } } - switch_xml_free(x_domain_root); - x_domain_root = NULL; if (!auth) { if (switch_strlen_zero(cbt.password) && !strcmp(cbt.password, mypass)) { @@ -1961,6 +1959,7 @@ } } + FREE_DOMAIN_ROOT(); if (auth) { if (!dir_path) { @@ -1977,7 +1976,7 @@ if (switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s\n", dir_path); - return; + goto end; } } @@ -1985,10 +1984,13 @@ } else { goto failed; } - + continue; failed: + + FREE_DOMAIN_ROOT(); + status = switch_ivr_phrase_macro(session, VM_FAIL_AUTH_MACRO, NULL, NULL, NULL); myid = id; mypass = NULL; @@ -2011,6 +2013,7 @@ if (x_domain_root) { switch_xml_free(x_domain_root); + x_domain_root = NULL; } } @@ -2711,6 +2714,7 @@ if (x_domain_root) { switch_xml_free(x_domain_root); + x_domain_root = NULL; } switch_safe_free(file_path);

1 0

[commit] r9568 - freeswitch/trunk/src/include
by Freeswitch SVN 15 Sep '08

15 Sep '08

Author: mikej Date: Mon Sep 15 12:48:45 2008 New Revision: 9568 Modified: freeswitch/trunk/src/include/switch_types.h Log: tweak Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Sep 15 12:48:45 2008 @@ -124,6 +124,7 @@ #define SWITCH_BRIDGE_CHANNEL_VARIABLE "bridge_channel" #define SWITCH_CHANNEL_NAME_VARIABLE "channel_name" #define SWITCH_BRIDGE_UUID_VARIABLE "bridge_uuid" +#define SWITCH_CONTINUE_ON_FAILURE_VARIABLE "continue_on_fail" #define SWITCH_PLAYBACK_TERMINATORS_VARIABLE "playback_terminators" #define SWITCH_CACHE_SPEECH_HANDLES_VARIABLE "cache_speech_handles" #define SWITCH_CACHE_SPEECH_HANDLES_OBJ_NAME "__cache_speech_handles_obj__"

1 0

[commit] r9567 - freeswitch/trunk/src
by Freeswitch SVN 15 Sep '08

15 Sep '08

Author: anthm Date: Mon Sep 15 10:32:23 2008 New Revision: 9567 Modified: freeswitch/trunk/src/switch_caller.c Log: expose time table to variable interface via caller field lookup Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Mon Sep 15 10:32:23 2008 @@ -207,6 +207,29 @@ if (!strcasecmp(name, "privacy_hide_number")) { return switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER) ? "true" : "false"; } + if (!strcasecmp(name, "profile_created_time")) { + return switch_core_sprintf(caller_profile->pool, "%" SWITCH_TIME_T_FMT, caller_profile->times->profile_created); + } + if (!strcasecmp(name, "created_time")) { + return switch_core_sprintf(caller_profile->pool, "%" SWITCH_TIME_T_FMT, caller_profile->times->created); + } + if (!strcasecmp(name, "answered_time")) { + return switch_core_sprintf(caller_profile->pool, "%" SWITCH_TIME_T_FMT, caller_profile->times->answered); + } + if (!strcasecmp(name, "progress_time")) { + return switch_core_sprintf(caller_profile->pool, "%" SWITCH_TIME_T_FMT, caller_profile->times->progress); + } + if (!strcasecmp(name, "progress_media_time")) { + return switch_core_sprintf(caller_profile->pool, "%" SWITCH_TIME_T_FMT, caller_profile->times->progress_media); + } + if (!strcasecmp(name, "hungup_time")) { + return switch_core_sprintf(caller_profile->pool, "%" SWITCH_TIME_T_FMT, caller_profile->times->hungup); + } + if (!strcasecmp(name, "transferred_time")) { + return switch_core_sprintf(caller_profile->pool, "%" SWITCH_TIME_T_FMT, caller_profile->times->transferred); + } + + return NULL; } @@ -271,10 +294,16 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->profile_index); } if (caller_profile->times) { + switch_snprintf(header_name, sizeof(header_name), "%s-Profile-Created-Time", prefix); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, caller_profile->times->profile_created); switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Created-Time", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, caller_profile->times->created); switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Answered-Time", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, caller_profile->times->answered); + switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Progress-Time", prefix); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, caller_profile->times->progress); + switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Progress-Media-Time", prefix); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, caller_profile->times->progress_media); switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Hangup-Time", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, caller_profile->times->hungup); switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Transfer-Time", prefix);

1 0

[commit] r9566 - freeswitch/trunk/src/mod/applications/mod_fax
by Freeswitch SVN 15 Sep '08

15 Sep '08

Author: coppice Date: Mon Sep 15 00:48:55 2008 New Revision: 9566 Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Log: The location of the T.30 state context is now extracted from the FAX or T.38 state contexts by function calls. This is part of a move towards less knowledge of spandsp internals being required by applications. Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Mon Sep 15 00:48:55 2008 @@ -247,7 +247,6 @@ /* TODO Fire events */ - } static switch_status_t spanfax_init(pvt_t * pvt, transport_mode_t trans_mode) @@ -256,6 +255,7 @@ switch_core_session_t *session; switch_channel_t *chan; fax_state_t *fax; + t30_state_t *t30; session = (switch_core_session_t *) pvt->session; switch_assert(session); @@ -273,6 +273,7 @@ } fax = pvt->fax_state; + t30 = fax_get_t30_state(fax); memset(fax, 0, sizeof(fax_state_t)); if (fax_init(fax, pvt->caller) == NULL) { @@ -283,54 +284,54 @@ fax_set_transmit_on_idle(fax, TRUE); span_log_set_message_handler(&fax->logging, spanfax_log_message); - span_log_set_message_handler(&fax->t30.logging, spanfax_log_message); + span_log_set_message_handler(&t30->logging, spanfax_log_message); if (pvt->verbose) { span_log_set_level(&fax->logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW); - span_log_set_level(&fax->t30.logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW); + span_log_set_level(&t30->logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW); } - t30_set_tx_ident(&fax->t30, pvt->ident); - t30_set_tx_page_header_info(&fax->t30, pvt->header); + t30_set_tx_ident(t30, pvt->ident); + t30_set_tx_page_header_info(t30, pvt->header); - t30_set_phase_e_handler(&fax->t30, phase_e_handler, pvt); + t30_set_phase_e_handler(t30, phase_e_handler, pvt); - t30_set_supported_image_sizes(&fax->t30, + t30_set_supported_image_sizes(t30, T30_SUPPORT_US_LETTER_LENGTH | T30_SUPPORT_US_LEGAL_LENGTH | T30_SUPPORT_UNLIMITED_LENGTH | T30_SUPPORT_215MM_WIDTH | T30_SUPPORT_255MM_WIDTH | T30_SUPPORT_303MM_WIDTH); - t30_set_supported_resolutions(&fax->t30, + t30_set_supported_resolutions(t30, T30_SUPPORT_STANDARD_RESOLUTION | T30_SUPPORT_FINE_RESOLUTION | T30_SUPPORT_SUPERFINE_RESOLUTION | T30_SUPPORT_R8_RESOLUTION | T30_SUPPORT_R16_RESOLUTION); if (pvt->disable_v17) { - t30_set_supported_modems(&fax->t30, T30_SUPPORT_V29 | T30_SUPPORT_V27TER); + t30_set_supported_modems(t30, T30_SUPPORT_V29 | T30_SUPPORT_V27TER); switch_channel_set_variable(chan, "fax_v17_disabled", "1"); } else { - t30_set_supported_modems(&fax->t30, T30_SUPPORT_V29 | T30_SUPPORT_V27TER | T30_SUPPORT_V17); + t30_set_supported_modems(t30, T30_SUPPORT_V29 | T30_SUPPORT_V27TER | T30_SUPPORT_V17); switch_channel_set_variable(chan, "fax_v17_disabled", "0"); } if (pvt->use_ecm) { - t30_set_supported_compressions(&fax->t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); - t30_set_ecm_capability(&fax->t30, TRUE); + t30_set_supported_compressions(t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); + t30_set_ecm_capability(t30, TRUE); switch_channel_set_variable(chan, "fax_ecm_requested", "1"); } else { - t30_set_supported_compressions(&fax->t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION); + t30_set_supported_compressions(t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION); switch_channel_set_variable(chan, "fax_ecm_requested", "0"); } if (pvt->app_mode == FUNCTION_TX) { - t30_set_tx_file(&fax->t30, pvt->filename, pvt->tx_page_start, pvt->tx_page_end); + t30_set_tx_file(t30, pvt->filename, pvt->tx_page_start, pvt->tx_page_end); } else { - t30_set_rx_file(&fax->t30, pvt->filename, -1); + t30_set_rx_file(t30, pvt->filename, -1); } switch_channel_set_variable(chan, "fax_filename", pvt->filename); break; case T38_MODE: /* Here goes the T.38 SpanDSP initializing functions - T.38 will require a big effort as it needs a different approac + T.38 will require a big effort as it needs a different approach but the pieces are already in place */ default: @@ -344,6 +345,7 @@ static switch_status_t spanfax_destroy(pvt_t * pvt) { int terminate; + t30_state_t *t30; if (pvt->fax_state) { if (pvt->t38_state) { @@ -352,8 +354,9 @@ terminate = 1; } - if (terminate && &pvt->fax_state->t30) { - t30_terminate(&pvt->fax_state->t30); + t30 = fax_get_t30_state(pvt->fax_state); + if (terminate && t30) { + t30_terminate(t30); } fax_release(pvt->fax_state); @@ -366,8 +369,9 @@ terminate = 0; } - if (terminate && &pvt->t38_state->t30) { - t30_terminate(&pvt->t38_state->t30); + t30 = t38_terminal_get_t30_state(pvt->t38_state); + if (terminate && t30) { + t30_terminate(t30); } t38_terminal_release(pvt->t38_state);

1 0

[commit] r9565 - freeswitch/trunk/conf/lang/en/vm
by Freeswitch SVN 15 Sep '08

15 Sep '08

Author: brian Date: Sun Sep 14 23:01:43 2008 New Revision: 9565 Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml Log: fix MODAPP-143 Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/vm/sounds.xml (original) +++ freeswitch/trunk/conf/lang/en/vm/sounds.xml Sun Sep 14 23:01:43 2008 @@ -104,7 +104,7 @@ <action function="play-file" data="voicemail/vm-record_name2.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="say" data="$4" method="pronounced" type="name_spelled"/> - <action function="play-file" data="voicemail/vm-change_pass.wav"/> + <action function="play-file" data="voicemail/vm-change_password.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="say" data="$5" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-main_menu.wav"/>

1 0

[commit] r9551 - freeswitch/trunk/conf
by Freeswitch SVN 13 Sep '08

13 Sep '08

Author: brian Date: Fri Sep 12 22:15:39 2008 New Revision: 9551 Modified: freeswitch/trunk/conf/vars.xml Log: fix bind_server_ip since its only used in dingaling and NOT sofia Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Fri Sep 12 22:15:39 2008 @@ -65,7 +65,7 @@ This determines an ip address available on this host to bind. If you are separating RTP and SIP traffic, you will want to have use different addresses where this variable appears. - Used by: sofia.conf.xml dingaling.conf.xml + Used by: dingaling.conf.xml --> <X-PRE-PROCESS cmd="set" data="bind_server_ip=auto"/> <!-- external_rtp_ip

1 0

[commit] r9550 - freeswitch/trunk/src
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: anthm Date: Fri Sep 12 17:55:47 2008 New Revision: 9550 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: fix rare transfer super duper uuid_bridge roller coaster thing for panchi Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Sep 12 17:55:47 2008 @@ -585,7 +585,7 @@ switch_ivr_multi_threaded_bridge(session, other_session, NULL, NULL, NULL); state = switch_channel_get_state(channel); - if (state < CS_HANGUP && state != CS_ROUTING && state != CS_PARK) { + if (!switch_channel_test_flag(channel, CF_TRANSFER) && state < CS_HANGUP && state != CS_ROUTING && state != CS_PARK) { switch_channel_set_state(channel, CS_EXECUTE); } switch_core_session_rwunlock(other_session);

1 0

[commit] r9549 - freeswitch/trunk/libs/sofia-sip/tests
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: mikej Date: Fri Sep 12 17:48:10 2008 New Revision: 9549 Modified: freeswitch/trunk/libs/sofia-sip/tests/test_100rel.c Log: Fri Sep 12 16:55:08 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * test_100rel.c: fixed timing problem w/ failing PRACK case Modified: freeswitch/trunk/libs/sofia-sip/tests/test_100rel.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/test_100rel.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/test_100rel.c Fri Sep 12 17:48:10 2008 @@ -719,9 +719,9 @@ TEST(callstate(e->data->e_tags), nua_callstate_terminating); { - int bye = 1, cancel = 1, invite = 1; + int bye = 1, cancel = 1, invite = 1, state = 1; - while (bye || cancel || invite) { + while (bye || cancel || invite || state) { TEST_1(e = e->next); if (e->data->e_event == nua_r_bye) { TEST_E(e->data->e_event, nua_r_bye); @@ -739,9 +739,18 @@ TEST_1(e->data->e_status == 200 || e->data->e_status == 481); cancel = 0; } + else if (e->data->e_event == nua_i_state) { + TEST_E(e->data->e_event, nua_i_state); + TEST(callstate(e->data->e_tags), nua_callstate_terminated); + state = 0; + } + } + if (e->next) { + /* 2nd terminated? */ + TEST_1(e = e->next); + TEST_E(e->data->e_event, nua_i_state); + TEST(callstate(e->data->e_tags), nua_callstate_terminated); } - TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state); - TEST(callstate(e->data->e_tags), nua_callstate_terminated); } TEST_1(!e->next); @@ -799,7 +808,7 @@ static int prack_until_terminated(CONDITION_PARAMS) { - static int terminated, bye_responded; + static int terminated, bye_responded, invite_responded, cancel_responded; if (!check_handle(ep, call, nh, SIP_500_INTERNAL_SERVER_ERROR)) return 0; @@ -825,7 +834,13 @@ if (event == nua_r_bye && status >= 200) bye_responded = 1; - return terminated && bye_responded; + if (event == nua_r_invite && status >= 200) + invite_responded = 1; + + if (event == nua_r_cancel && status >= 200) + cancel_responded = 1; + + return terminated && bye_responded && invite_responded && cancel_responded; } int respond_483_to_prack(CONDITION_PARAMS)

1 0

[commit] r9548 - freeswitch/trunk/src
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: anthm Date: Fri Sep 12 15:23:45 2008 New Revision: 9548 Modified: freeswitch/trunk/src/switch_event.c Log: doh Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri Sep 12 15:23:45 2008 @@ -83,7 +83,7 @@ static int SYSTEM_RUNNING = 0; static switch_queue_t *EVENT_RECYCLE_QUEUE = NULL; static switch_queue_t *EVENT_HEADER_RECYCLE_QUEUE = NULL; -static void launch_dispatch_threads(int max, int len, switch_memory_pool_t *pool); +static void launch_dispatch_threads(uint32_t max, int len, switch_memory_pool_t *pool); static char *my_dup(const char *s) { @@ -245,7 +245,7 @@ static void *SWITCH_THREAD_FUNC switch_event_thread(switch_thread_t *thread, void *obj) { switch_queue_t *queue = (switch_queue_t *) obj; - int index = 0; + uint32_t index = 0; int my_id = 0; switch_mutex_lock(EVENT_QUEUE_MUTEX); @@ -462,7 +462,7 @@ return SWITCH_STATUS_SUCCESS; } -static void launch_dispatch_threads(int max, int len, switch_memory_pool_t *pool) +static void launch_dispatch_threads(uint32_t max, int len, switch_memory_pool_t *pool) { switch_thread_t *thread; switch_threadattr_t *thd_attr;

1 0