ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-10 22:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

FS-2774 --resolve upgrade mono support - MichaelGG

Browse Source
This commit is contained in:
Jeff Lenk
2011-10-25 16:58:38 -05:00
parent cdb00f132b
commit 1dcac642dd
5 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mod/languages/mod_managed/mod_managed.cpp
+7 -11
View File
@@ -190,6 +190,7 @@ switch_status_t loadRuntime()
// So linux can find the .so
char xmlConfig[300];
switch_snprintf(xmlConfig, 300, "<configuration><dllmap dll=\"mod_managed\" target=\"%s%smod_managed.so\"/></configuration>", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR);
mono_config_parse(NULL);
mono_config_parse_memory(xmlConfig);
#endif
@@ -208,18 +209,13 @@ switch_status_t loadRuntime()
}
/* Already loaded? */
MonoAssemblyName name;
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 = "";
MonoAssemblyName *name = mono_assembly_name_new (MOD_MANAGED_ASM_NAME);
//Note also that it can't be allocated on the stack anymore and you'll need to create and destroy it with the following API:
//mono_assembly_name_free (name);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Calling mono_assembly_loaded.\n");
if (!(globals.mod_mono_asm = mono_assembly_loaded(&name))) {
if (!(globals.mod_mono_asm = mono_assembly_loaded(name))) {
/* Open the assembly */
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Calling mono_domain_assembly_open.\n");
globals.mod_mono_asm = mono_domain_assembly_open(globals.domain, filename);
@@ -444,4 +440,4 @@ SWITCH_STANDARD_API(managedreload_api_function)
return SWITCH_STATUS_SUCCESS;
}
SWITCH_END_EXTERN_C
SWITCH_END_EXTERN_C