- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10306 - in freeswitch/trunk/src: . include mod/asr_tts/mod_cepstral mod/languages/mod_lua
by FreeSWITCH SVN 08 Nov '08

08 Nov '08

Author: mikej Date: Sat Nov 8 06:21:54 2008 New Revision: 10306 Log: (LBAPR-1) load mod_lua with global symbols space so that sub modules are able to link to it properly. Broken in svn r9605. Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp freeswitch/trunk/src/switch_loadable_module.c Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Sat Nov 8 06:21:54 2008 @@ -1355,7 +1355,7 @@ typedef struct switch_network_list switch_network_list_t; -#define SWITCH_API_VERSION 1 +#define SWITCH_API_VERSION 2 #define SWITCH_MODULE_LOAD_ARGS (switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) #define SWITCH_MODULE_RUNTIME_ARGS (void) #define SWITCH_MODULE_SHUTDOWN_ARGS (void) @@ -1366,22 +1366,32 @@ #define SWITCH_MODULE_RUNTIME_FUNCTION(name) switch_status_t name SWITCH_MODULE_RUNTIME_ARGS #define SWITCH_MODULE_SHUTDOWN_FUNCTION(name) switch_status_t name SWITCH_MODULE_SHUTDOWN_ARGS +typedef enum { + SMODF_NONE = 0, + SMODF_GLOBAL_SYMBOLS = (1 << 0) +} switch_module_flag_enum_t; +typedef uint32_t switch_module_flag_t; + typedef struct switch_loadable_module_function_table { int switch_api_version; switch_module_load_t load; switch_module_shutdown_t shutdown; switch_module_runtime_t runtime; + switch_module_flag_t flags; } switch_loadable_module_function_table_t; -#define SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime) \ +#define SWITCH_MODULE_DEFINITION_EX(name, load, shutdown, runtime, flags) \ static const char modname[] = #name ; \ SWITCH_MOD_DECLARE_DATA switch_loadable_module_function_table_t name##_module_interface = { \ SWITCH_API_VERSION, \ load, \ shutdown, \ - runtime \ + runtime, \ + flags \ } +#define SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime) \ + SWITCH_MODULE_DEFINITION_EX(name, load, shutdown, runtime, SMODF_NONE) /* things we don't deserve to know about */ /*! \brief A channel */ Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Sat Nov 8 06:21:54 2008 @@ -52,7 +52,7 @@ #define SWIFT_FAILED(r) ((void *)(r) < (void *)0) SWITCH_MODULE_LOAD_FUNCTION(mod_cepstral_load); -SWITCH_MODULE_DEFINITION(mod_cepstral, mod_cepstral_load, NULL, NULL); +SWITCH_MODULE_DEFINITION_EX(mod_cepstral, mod_cepstral_load, NULL, NULL, SMODF_GLOBAL_SYMBOLS); static swift_engine *engine; Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Sat Nov 8 06:21:54 2008 @@ -40,8 +40,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_lua_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lua_shutdown); -SWITCH_MODULE_DEFINITION(mod_lua, mod_lua_load, mod_lua_shutdown, NULL); - +SWITCH_MODULE_DEFINITION_EX(mod_lua, mod_lua_load, mod_lua_shutdown, NULL, SMODF_GLOBAL_SYMBOLS); static struct { switch_memory_pool_t *pool; char *xml_handler; Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Sat Nov 8 06:21:54 2008 @@ -691,6 +691,7 @@ char *derr = NULL; const char *err = NULL; switch_memory_pool_t *pool; + switch_bool_t load_global = global; switch_assert(path != NULL); @@ -700,11 +701,11 @@ struct_name = switch_core_sprintf(pool, "%s_module_interface", filename); #ifdef WIN32 - dso = switch_dso_open("FreeSwitch.dll", global, &derr); + dso = switch_dso_open("FreeSwitch.dll", load_global, &derr); #elif defined (MACOSX) || defined(DARWIN) - dso = switch_dso_open(SWITCH_PREFIX_DIR "/lib/libfreeswitch.dylib", global, &derr); + dso = switch_dso_open(SWITCH_PREFIX_DIR "/lib/libfreeswitch.dylib", load_global, &derr); #else - dso = switch_dso_open(NULL, global, &derr); + dso = switch_dso_open(NULL, load_global, &derr); #endif if (!derr && dso) { interface_struct_handle = switch_dso_data_sym(dso, struct_name, &derr); @@ -713,7 +714,7 @@ switch_safe_free(derr) if (!interface_struct_handle) { - dso = switch_dso_open(path, global, &derr); + dso = switch_dso_open(path, load_global, &derr); } while (loading) { @@ -731,6 +732,20 @@ break; } + if (interface_struct_handle && interface_struct_handle->switch_api_version != SWITCH_API_VERSION) { + err = "Trying to load an out of date module, please rebuild the module."; + break; + } + + if (!load_global && interface_struct_handle && switch_test_flag(interface_struct_handle, SMODF_GLOBAL_SYMBOLS)) { + load_global = SWITCH_TRUE; + switch_dso_destroy(&dso); + interface_struct_handle = NULL; + dso = switch_dso_open(path, load_global, &derr); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Loading module with global namespace at request of module\n"); + continue; + } + if (interface_struct_handle) { mod_interface_functions = interface_struct_handle; load_func_ptr = mod_interface_functions->load;

1 0

[commit] r10304 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 08 Nov '08

08 Nov '08

Author: andrew Date: Fri Nov 7 21:20:03 2008 New Revision: 10304 Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Log: use switch_true instead Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Fri Nov 7 21:20:03 2008 @@ -1070,8 +1070,8 @@ set_pref_cookie(val); } else if (!strcmp(var, "nodename")) { set_pref_nodename(val); - } else if (!strcmp(var, "shortname") && strcmp(val, "yes") && strcmp(val, "true")) { - prefs.shortname = SWITCH_FALSE; + } else if (!strcmp(var, "shortname")) { + prefs.shortname = switch_true(val); } else if (!strcasecmp(var, "apply-inbound-acl")) { if (prefs.acl_count < MAX_ACL) { prefs.acl[prefs.acl_count++] = strdup(val);

1 0

[commit] r10303 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 08 Nov '08

08 Nov '08

Author: andrew Date: Fri Nov 7 21:06:19 2008 New Revision: 10303 Added: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/erlang_event.conf.xml Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Log: Allow config parameter 'shortname' to be 'true' or 'yes', add sample config file Added: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/erlang_event.conf.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/erlang_event.conf.xml Fri Nov 7 21:06:19 2008 @@ -0,0 +1,9 @@ +<configuration name="erlang_event.conf" description="Erlang Socket Client"> + <settings> + <param name="listen-ip" value="127.0.0.1"/> + <param name="listen-port" value="8031"/> + <param name="cookie" value="ClueCon"/> + <param name="shortname" value="true"/> +  + </settings> +</configuration> Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Fri Nov 7 21:06:19 2008 @@ -1070,7 +1070,7 @@ set_pref_cookie(val); } else if (!strcmp(var, "nodename")) { set_pref_nodename(val); - } else if (!strcmp(var, "shortname") && strcmp(val, "yes")) { + } else if (!strcmp(var, "shortname") && strcmp(val, "yes") && strcmp(val, "true")) { prefs.shortname = SWITCH_FALSE; } else if (!strcasecmp(var, "apply-inbound-acl")) { if (prefs.acl_count < MAX_ACL) {

1 0

[commit] r10302 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 08 Nov '08

08 Nov '08

Author: andrew Date: Fri Nov 7 19:43:55 2008 New Revision: 10302 Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Log: Try to start epmd (erlang port mapper daemon) if ei_publish fails Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Fri Nov 7 19:43:55 2008 @@ -1199,10 +1199,17 @@ /* return value is -1 for error, a descriptor pointing to epmd otherwise */ if ((epmdfd = ei_publish(&ec, prefs.port)) == -1) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to publish port to empd\n"); - /* TODO - start epmd? */ - close_socket(&listen_list.sockfd); - return SWITCH_STATUS_GENERR; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to publish port to empd, trying to start empd manually\n"); + if (system("epmd -daemon")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to start empd manually\n"); + close_socket(&listen_list.sockfd); + return SWITCH_STATUS_GENERR; + } + if ((epmdfd = ei_publish(&ec, prefs.port)) == -1) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to publish port to empd AGAIN\n"); + close_socket(&listen_list.sockfd); + return SWITCH_STATUS_GENERR; + } } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected and published erlang cnode at %s port %u\n", thisnodename, prefs.port);

1 0

[commit] r10301 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 07 Nov '08

07 Nov '08

Author: andrew Date: Fri Nov 7 18:56:50 2008 New Revision: 10301 Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Log: Import recent fixes from mod_event_socket, work on cleanup on unload (still segfaults tho) Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Fri Nov 7 18:56:50 2008 @@ -91,7 +91,6 @@ static struct { int sockfd; - switch_mutex_t *mutex; switch_mutex_t *sock_mutex; listener_t *listeners; uint8_t ready; @@ -124,6 +123,7 @@ static void launch_listener_thread(listener_t *listener); static struct { + switch_mutex_t *listener_mutex; switch_event_node_t *node; } globals; @@ -132,7 +132,7 @@ { listener_t *l; - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); for (l = listen_list.listeners; l; l = l->next) { if (switch_test_flag(l, LFLAG_LOG) && l->level >= node->level) { char *data = strdup(node->data); @@ -157,7 +157,7 @@ } } } - switch_mutex_unlock(listen_list.mutex); + switch_mutex_unlock(globals.listener_mutex); return SWITCH_STATUS_SUCCESS; } @@ -223,7 +223,7 @@ lp = listen_list.listeners; - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); while(lp) { uint8_t send = 0; @@ -279,7 +279,19 @@ } } - switch_mutex_unlock(listen_list.mutex); + switch_mutex_unlock(globals.listener_mutex); +} + + +static void close_socket(int *sock) +{ + switch_mutex_lock(listen_list.sock_mutex); + if (*sock) { + shutdown(*sock, SHUT_RDWR); + close(*sock); + sock = NULL; + } + switch_mutex_unlock(listen_list.sock_mutex); } @@ -292,23 +304,24 @@ switch_log_unbind_logger(socket_logger); - close(listen_list.sockfd); + /*close_socket(&listen_list.sockfd);*/ - switch_yield(500); - - while (prefs.threads) { + while (prefs.threads || prefs.done == 1) { switch_yield(10000); if (++sanity == 1000) { break; } } + switch_event_unbind(&globals.node); - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); + for (l = listen_list.listeners; l; l = l->next) { - close(l->sockfd); + close_socket(&l->sockfd); } - switch_mutex_unlock(listen_list.mutex); + + switch_mutex_unlock(globals.listener_mutex); return SWITCH_STATUS_SUCCESS; } @@ -317,10 +330,10 @@ static void add_listener(listener_t *listener) { /* add me to the listeners so I get events */ - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); listener->next = listen_list.listeners; listen_list.listeners = listener; - switch_mutex_unlock(listen_list.mutex); + switch_mutex_unlock(globals.listener_mutex); } @@ -328,7 +341,7 @@ { listener_t *l, *last = NULL; - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); for (l = listen_list.listeners; l; l = l->next) { if (l == listener) { if (last) { @@ -339,11 +352,21 @@ } last = l; } - switch_mutex_unlock(listen_list.mutex); + switch_mutex_unlock(globals.listener_mutex); } SWITCH_MODULE_LOAD_FUNCTION(mod_erlang_event_load) { + switch_mutex_init(&globals.listener_mutex, SWITCH_MUTEX_NESTED, pool); + + if (switch_event_bind_removable(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL, &globals.node) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); + close_socket(&listen_list.sockfd); + return SWITCH_STATUS_GENERR; + } + + switch_log_bind_logger(socket_logger, SWITCH_LOG_DEBUG, SWITCH_FALSE); + /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); @@ -830,9 +853,9 @@ int status = 1; void *pop; - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); prefs.threads++; - switch_mutex_unlock(listen_list.mutex); + switch_mutex_unlock(globals.listener_mutex); switch_assert(listener != NULL); @@ -984,7 +1007,7 @@ switch_thread_rwlock_wrlock(listener->rwlock); if (listener->sockfd) { - close(listener->sockfd); + close_socket(&listener->sockfd); } switch_thread_rwlock_unlock(listener->rwlock); @@ -1001,9 +1024,9 @@ switch_core_destroy_memory_pool(&pool); } - switch_mutex_lock(listen_list.mutex); + switch_mutex_lock(globals.listener_mutex); prefs.threads--; - switch_mutex_unlock(listen_list.mutex); + switch_mutex_unlock(globals.listener_mutex); return NULL; } @@ -1092,6 +1115,7 @@ struct sockaddr_in server_addr; int on = 1; int clientfd; + int epmdfd; memset(&listen_list, 0, sizeof(listen_list)); config(); @@ -1101,7 +1125,6 @@ return SWITCH_STATUS_TERM; } - switch_mutex_init(&listen_list.mutex, SWITCH_MUTEX_NESTED, pool); switch_mutex_init(&listen_list.sock_mutex, SWITCH_MUTEX_NESTED, pool); /* zero out the struct before we use it */ @@ -1129,7 +1152,7 @@ goto sock_fail; } - if (setsockopt(listen_list.sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) != 0) { + if (setsockopt(listen_list.sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to enable SO_REUSEADDR for socket on %s:%u : %s\n", prefs.ip, prefs.port, strerror(errno)); goto sock_fail; } @@ -1170,12 +1193,15 @@ /* init the ei stuff */ if (ei_connect_xinit(&ec, thishostname, prefs.nodename, thisnodename, (Erl_IpAddr)(&server_addr.sin_addr.s_addr), prefs.cookie, 0) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to init ei connection\n"); + close_socket(&listen_list.sockfd); return SWITCH_STATUS_GENERR; } /* return value is -1 for error, a descriptor pointing to epmd otherwise */ - if (ei_publish(&ec, prefs.port) == -1) { + if ((epmdfd = ei_publish(&ec, prefs.port)) == -1) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to publish port to empd\n"); + /* TODO - start epmd? */ + close_socket(&listen_list.sockfd); return SWITCH_STATUS_GENERR; } @@ -1183,13 +1209,6 @@ listen_list.ready = 1; - if (switch_event_bind_removable(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL, &globals.node) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } - - switch_log_bind_logger(socket_logger, SWITCH_LOG_DEBUG, SWITCH_FALSE); - for (;;) { /* zero out errno because ei_accept doesn't differentiate between a * failed authentication or a socket failure, or a client version @@ -1239,7 +1258,11 @@ } - close(listen_list.sockfd); + /* cleanup epmd registration */ + ei_unpublish(&ec); + close(epmdfd); + + close_socket(&listen_list.sockfd); if (pool) { switch_core_destroy_memory_pool(&pool); @@ -1254,6 +1277,7 @@ switch_safe_free(prefs.acl[x]); } + prefs.done = 2; fail: return SWITCH_STATUS_TERM; }

1 0

[commit] r10300 - freeswitch/trunk/src
by FreeSWITCH SVN 07 Nov '08

07 Nov '08

Author: mikej Date: Fri Nov 7 18:47:01 2008 New Revision: 10300 Modified: freeswitch/trunk/src/switch_dso.c Log: line endings Modified: freeswitch/trunk/src/switch_dso.c ============================================================================== --- freeswitch/trunk/src/switch_dso.c (original) +++ freeswitch/trunk/src/switch_dso.c Fri Nov 7 18:47:01 2008 @@ -1,133 +1,133 @@ -/* - * Cross Platform dso/dll load abstraction - * Copyright(C) 2008 Michael Jerris - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so. - * - * This work is provided under this license on an "as is" basis, without warranty of any kind, - * either expressed or implied, including, without limitation, warranties that the covered code - * is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire - * risk as to the quality and performance of the covered code is with you. Should any covered - * code prove defective in any respect, you (not the initial developer or any other contributor) - * assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty - * constitutes an essential part of this license. No use of any covered code is authorized hereunder - * except under this disclaimer. - * - */ - -#include <switch.h> -#include "switch_dso.h" -#include <stdlib.h> -#include <string.h> - -#ifdef WIN32 - -void switch_dso_destroy(switch_dso_lib_t *lib) { - if (lib && *lib) { - FreeLibrary(*lib); - *lib = NULL; - } -} - -switch_dso_lib_t switch_dso_open(const char *path, int global, char **err) { +/* + * Cross Platform dso/dll load abstraction + * Copyright(C) 2008 Michael Jerris + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so. + * + * This work is provided under this license on an "as is" basis, without warranty of any kind, + * either expressed or implied, including, without limitation, warranties that the covered code + * is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire + * risk as to the quality and performance of the covered code is with you. Should any covered + * code prove defective in any respect, you (not the initial developer or any other contributor) + * assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty + * constitutes an essential part of this license. No use of any covered code is authorized hereunder + * except under this disclaimer. + * + */ + +#include <switch.h> +#include "switch_dso.h" +#include <stdlib.h> +#include <string.h> + +#ifdef WIN32 + +void switch_dso_destroy(switch_dso_lib_t *lib) { + if (lib && *lib) { + FreeLibrary(*lib); + *lib = NULL; + } +} + +switch_dso_lib_t switch_dso_open(const char *path, int global, char **err) { HINSTANCE lib; - - lib = LoadLibraryEx(path, NULL, 0); - - if (!lib) { - LoadLibraryEx(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); - } - - if (!lib) { - DWORD error = GetLastError(); - *err = switch_mprintf("dll open error [%ul]\n", error); - } - - return lib; -} - -switch_dso_func_t switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, char **err) { - FARPROC func = GetProcAddress(lib, sym); - if (!func) { - DWORD error = GetLastError(); - *err = switch_mprintf("dll sym error [%ul]\n", error); - } - return (switch_dso_func_t)func; -} - -void *switch_dso_data_sym(switch_dso_lib_t lib, const char *sym, char **err) { - FARPROC addr = GetProcAddress(lib, sym); - if (!addr) { - DWORD error = GetLastError(); - *err = switch_mprintf("dll sym error [%ul]\n", error); - } - return (void *)(intptr_t)addr; -} - - -#else -/* -** {======================================================================== -** This is an implementation of loadlib based on the dlfcn interface. -** The dlfcn interface is available in Linux, SunOS, Solaris, IRIX, FreeBSD, -** NetBSD, AIX 4.2, HPUX 11, and probably most other Unix flavors, at least -** as an emulation layer on top of native functions. -** ========================================================================= -*/ - - -#include <dlfcn.h> - -void switch_dso_destroy(switch_dso_lib_t *lib) { - if (lib && *lib) { - dlclose(*lib); - *lib = NULL; - } -} - -switch_dso_lib_t switch_dso_open(const char *path, int global, char **err) { - void *lib; - - if (global) { - lib = dlopen(path, RTLD_NOW | RTLD_GLOBAL); - } else { - lib = dlopen(path, RTLD_NOW | RTLD_LOCAL); - } - - if (lib == NULL) { - *err = strdup(dlerror()); - } - return lib; -} - -switch_dso_func_t switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, char **err) { - void *func = dlsym(lib, sym); - if (!func) { - *err = strdup(dlerror()); - } - return (switch_dso_func_t)(intptr_t)func; -} - -void *switch_dso_data_sym(switch_dso_lib_t lib, const char *sym, char **err) { - void *addr = dlsym(lib, sym); - if (!addr) { - *err = strdup(dlerror()); - } - return addr; -} - -#endif -/* }====================================================== */ - -/* For Emacs: - * Local Variables: - * mode:c - * indent-tabs-mode:t - * tab-width:4 - * c-basic-offset:4 - * End: - * For VIM: - * vim:set softtabstop=4 shiftwidth=4 tabstop=4 - */ + + lib = LoadLibraryEx(path, NULL, 0); + + if (!lib) { + LoadLibraryEx(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + } + + if (!lib) { + DWORD error = GetLastError(); + *err = switch_mprintf("dll open error [%ul]\n", error); + } + + return lib; +} + +switch_dso_func_t switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, char **err) { + FARPROC func = GetProcAddress(lib, sym); + if (!func) { + DWORD error = GetLastError(); + *err = switch_mprintf("dll sym error [%ul]\n", error); + } + return (switch_dso_func_t)func; +} + +void *switch_dso_data_sym(switch_dso_lib_t lib, const char *sym, char **err) { + FARPROC addr = GetProcAddress(lib, sym); + if (!addr) { + DWORD error = GetLastError(); + *err = switch_mprintf("dll sym error [%ul]\n", error); + } + return (void *)(intptr_t)addr; +} + + +#else +/* +** {======================================================================== +** This is an implementation of loadlib based on the dlfcn interface. +** The dlfcn interface is available in Linux, SunOS, Solaris, IRIX, FreeBSD, +** NetBSD, AIX 4.2, HPUX 11, and probably most other Unix flavors, at least +** as an emulation layer on top of native functions. +** ========================================================================= +*/ + + +#include <dlfcn.h> + +void switch_dso_destroy(switch_dso_lib_t *lib) { + if (lib && *lib) { + dlclose(*lib); + *lib = NULL; + } +} + +switch_dso_lib_t switch_dso_open(const char *path, int global, char **err) { + void *lib; + + if (global) { + lib = dlopen(path, RTLD_NOW | RTLD_GLOBAL); + } else { + lib = dlopen(path, RTLD_NOW | RTLD_LOCAL); + } + + if (lib == NULL) { + *err = strdup(dlerror()); + } + return lib; +} + +switch_dso_func_t switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, char **err) { + void *func = dlsym(lib, sym); + if (!func) { + *err = strdup(dlerror()); + } + return (switch_dso_func_t)(intptr_t)func; +} + +void *switch_dso_data_sym(switch_dso_lib_t lib, const char *sym, char **err) { + void *addr = dlsym(lib, sym); + if (!addr) { + *err = strdup(dlerror()); + } + return addr; +} + +#endif +/* }====================================================== */ + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 + */

1 0

[commit] r10299 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 07 Nov '08

07 Nov '08

Author: mikej Date: Fri Nov 7 18:46:27 2008 New Revision: 10299 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: fix fifo build Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Fri Nov 7 18:46:27 2008 @@ -29,6 +29,9 @@ * */ #include <switch.h> +#ifdef SWITCH_HAVE_ODBC +#include <switch_odbc.h> +#endif SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_fifo_shutdown); SWITCH_MODULE_LOAD_FUNCTION(mod_fifo_load); @@ -1745,8 +1748,6 @@ const char *simo = switch_xml_attr_soft(member, "simo"); const char *lag = switch_xml_attr_soft(member, "lag"); const char *timeout = switch_xml_attr_soft(member, "timeout"); - - char *sql; char digest[SWITCH_MD5_DIGEST_STRING_SIZE] = { 0 }; switch_md5_string(digest, (void *) member->txt, strlen(member->txt)); @@ -1866,7 +1867,7 @@ fifo_name = argv[1]; originate_string = argv[2]; - if (!strcasecmp(action, "add")) { + if (action && !strcasecmp(action, "add")) { if (argc > 3) { simo_count = atoi(argv[3]); } @@ -1891,7 +1892,7 @@ fifo_member_add(fifo_name, originate_string, simo_count, timeout, lag, expires); stream->write_function(stream, "%s", "+OK\n"); - } else if (!strcasecmp(action, "del")) { + } else if (action && !strcasecmp(action, "del")) { fifo_member_del(fifo_name, originate_string); stream->write_function(stream, "%s", "+OK\n"); } else {

1 0

[commit] r10294 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 07 Nov '08

07 Nov '08

Author: anthm Date: Fri Nov 7 12:36:08 2008 New Revision: 10294 Log: add patch from MODAPP-162 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 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 Fri Nov 7 12:36:08 2008 @@ -2090,7 +2090,7 @@ if (!switch_strlen_zero(vm_storage_dir)) { dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid); } else if ( !switch_strlen_zero(profile->storage_dir) ) { - dir_path = switch_core_session_sprintf(session, "%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, myid); + dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid); } else { dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR, @@ -2244,7 +2244,7 @@ if (!switch_strlen_zero(vm_storage_dir)) { dir_path = switch_mprintf("%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid); } else if (!switch_strlen_zero(profile->storage_dir)) { - dir_path = switch_mprintf("%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, myid); + dir_path = switch_mprintf("%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid); } else { dir_path = switch_mprintf("%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR, @@ -2724,7 +2724,7 @@ if (!switch_strlen_zero(vm_storage_dir)) { dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, id); } else if (!switch_strlen_zero(profile->storage_dir)) { - dir_path = switch_core_session_sprintf(session, "%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, id); + dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id); } else { dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR,

1 0

[commit] r10294 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 07 Nov '08

07 Nov '08

Author: anthm Date: Fri Nov 7 12:36:08 2008 New Revision: 10294 Log: add patch from MODAPP-162 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 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 Fri Nov 7 12:36:08 2008 @@ -2090,7 +2090,7 @@ if (!switch_strlen_zero(vm_storage_dir)) { dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid); } else if ( !switch_strlen_zero(profile->storage_dir) ) { - dir_path = switch_core_session_sprintf(session, "%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, myid); + dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid); } else { dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR, @@ -2244,7 +2244,7 @@ if (!switch_strlen_zero(vm_storage_dir)) { dir_path = switch_mprintf("%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid); } else if (!switch_strlen_zero(profile->storage_dir)) { - dir_path = switch_mprintf("%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, myid); + dir_path = switch_mprintf("%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid); } else { dir_path = switch_mprintf("%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR, @@ -2724,7 +2724,7 @@ if (!switch_strlen_zero(vm_storage_dir)) { dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, id); } else if (!switch_strlen_zero(profile->storage_dir)) { - dir_path = switch_core_session_sprintf(session, "%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, id); + dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id); } else { dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR,

1 0

[commit] r10305 - freeswitch/trunk/conf
by FreeSWITCH SVN 07 Nov '08

07 Nov '08

Author: brian Date: Fri Nov 7 18:26:22 2008 New Revision: 10305 Log: test Modified: freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Fri Nov 7 18:26:22 2008 @@ -121,7 +121,6 @@ Below are some values that should work in most cases. These are for conf/directory/default/example.com.xml - --> <X-PRE-PROCESS cmd="set" data="default_provider=example.com"/> <X-PRE-PROCESS cmd="set" data="default_provider_username=joeuser"/>

1 0