February 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12256 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mrene Date: Mon Feb 23 14:46:46 2009 New Revision: 12256 Log: Use the core-provided memory pool instead of creating a new one Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Mon Feb 23 14:46:46 2009 @@ -1070,10 +1070,7 @@ return SWITCH_STATUS_FALSE; #endif - if (switch_core_new_memory_pool(&globals.pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to create global memory pool\n"); - return SWITCH_STATUS_FALSE; - } + globals.pool = pool; if (lcr_load_config() != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to load lcr config file\n"); @@ -1110,7 +1107,7 @@ switch_odbc_handle_disconnect(globals.master_odbc); switch_odbc_handle_destroy(&globals.master_odbc); switch_core_hash_destroy(&globals.profile_hash); - switch_core_destroy_memory_pool(&globals.pool); + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12255 - in freeswitch/trunk/src: . mod/languages/mod_spidermonkey
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: anthm Date: Mon Feb 23 13:52:29 2009 New Revision: 12255 Log: avoid operations on closed file handles in embedded languages Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_core_file.c freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Feb 23 13:52:29 2009 @@ -1190,6 +1190,10 @@ switch_file_handle_t *fh = cb_state->extra; struct js_session *jss = cb_state->session_state; + if (!switch_test_flag(fh, SWITCH_FILE_OPEN)) { + return SWITCH_STATUS_FALSE; + } + if ((status = js_common_callback(session, input, itype, buf, buflen)) != SWITCH_STATUS_SUCCESS) { return status; } Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Mon Feb 23 13:52:29 2009 @@ -332,6 +332,10 @@ switch_assert(fh != NULL); switch_assert(fh->file_interface != NULL); + if (!switch_test_flag(fh, SWITCH_FILE_OPEN)) { + return SWITCH_STATUS_FALSE; + } + if (!fh->file_interface->file_seek) { return SWITCH_STATUS_FALSE; } @@ -349,6 +353,10 @@ switch_assert(fh != NULL); switch_assert(fh->file_interface != NULL); + if (!switch_test_flag(fh, SWITCH_FILE_OPEN)) { + return SWITCH_STATUS_FALSE; + } + if (!fh->file_interface->file_set_string) { return SWITCH_STATUS_FALSE; } @@ -361,6 +369,10 @@ switch_assert(fh != NULL); switch_assert(fh->file_interface != NULL); + if (!switch_test_flag(fh, SWITCH_FILE_OPEN)) { + return SWITCH_STATUS_FALSE; + } + if (!fh->file_interface->file_get_string) { return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Mon Feb 23 13:52:29 2009 @@ -1207,6 +1207,10 @@ } if (fhp) { + if (!switch_test_flag(fhp, SWITCH_FILE_OPEN)) { + return SWITCH_STATUS_FALSE; + } + if (!strncasecmp(result, "speed", 5)) { char *p;

1 0

[commit] r12254 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mrene Date: Mon Feb 23 13:31:27 2009 New Revision: 12254 Log: doh Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Mon Feb 23 13:31:27 2009 @@ -150,6 +150,8 @@ switch_safe_free(globals.dn); switch_safe_free(globals.pass); switch_safe_free(globals.base); + + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12253 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mrene Date: Mon Feb 23 13:29:11 2009 New Revision: 12253 Log: I need coffee Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Mon Feb 23 13:29:11 2009 @@ -143,7 +143,7 @@ } -SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_enum_shutdown) +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_dialplan_directory_shutdown) { switch_safe_free(globals.directory_name); switch_safe_free(globals.host);

1 0

[commit] r12252 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mrene Date: Mon Feb 23 13:23:54 2009 New Revision: 12252 Log: Missing prototype Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Mon Feb 23 13:23:54 2009 @@ -35,6 +35,7 @@ #include <fcntl.h> SWITCH_MODULE_LOAD_FUNCTION(mod_dialplan_directory_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_dialplan_directory_shutdown); SWITCH_MODULE_DEFINITION(mod_dialplan_directory, mod_dialplan_directory_load, mod_dialplan_directory_shutdown, NULL); static struct {

1 0

[commit] r12251 - in freeswitch/trunk/src/mod: applications/mod_easyroute applications/mod_enum dialplans/mod_dialplan_directory endpoints/mod_alsa endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_reference endpoints/mod_skypiax event_handlers/mod_erlang_event event_handlers/mod_event_multicast event_handlers/mod_event_socket loggers/mod_syslog xml_int/mod_xml_rpc
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mrene Date: Mon Feb 23 13:17:24 2009 New Revision: 12251 Log: Leaking on unload is strictly forbidden Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Mon Feb 23 13:17:24 2009 @@ -426,6 +426,14 @@ #ifdef SWITCH_HAVE_ODBC switch_odbc_handle_disconnect(globals.master_odbc); #endif + + switch_safe_free(globals.db_username); + switch_safe_free(globals.db_password); + switch_safe_free(globals.db_dsn); + switch_safe_free(globals.default_techprofile); + switch_safe_free(globals.default_gateway); + switch_safe_free(globals.custom_query); + return SWITCH_STATUS_UNLOAD; } Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Mon Feb 23 13:17:24 2009 @@ -850,6 +850,9 @@ if (globals.pool) { switch_core_destroy_memory_pool(&globals.pool); } + + switch_safe_free(globals.root); + switch_safe_free(globals.isn_root); return SWITCH_STATUS_UNLOAD; } Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Mon Feb 23 13:17:24 2009 @@ -35,7 +35,7 @@ #include <fcntl.h> SWITCH_MODULE_LOAD_FUNCTION(mod_dialplan_directory_load); -SWITCH_MODULE_DEFINITION(mod_dialplan_directory, mod_dialplan_directory_load, NULL, NULL); +SWITCH_MODULE_DEFINITION(mod_dialplan_directory, mod_dialplan_directory_load, mod_dialplan_directory_shutdown, NULL); static struct { char *directory_name; @@ -142,11 +142,23 @@ } +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_enum_shutdown) +{ + switch_safe_free(globals.directory_name); + switch_safe_free(globals.host); + switch_safe_free(globals.dn); + switch_safe_free(globals.pass); + switch_safe_free(globals.base); +} + + SWITCH_MODULE_LOAD_FUNCTION(mod_dialplan_directory_load) { switch_dialplan_interface_t *dp_interface; + memset(&globals, 0, sizeof(globals)); load_config(); + /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_DIALPLAN(dp_interface, "directory", directory_dialplan_hunt); Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Mon Feb 23 13:17:24 2009 @@ -813,7 +813,7 @@ return SWITCH_STATUS_TERM; } - + memset(&globals, 0, sizeof(globals)); if ((status = load_config()) != SWITCH_STATUS_SUCCESS) { return status; @@ -939,6 +939,14 @@ switch_core_codec_destroy(&globals.write_codec); } switch_core_hash_destroy(&globals.call_hash); + + switch_safe_free(globals.dialplan); + switch_safe_free(globals.cid_name); + switch_safe_free(globals.cid_num); + switch_safe_free(globals.ring_file); + switch_safe_free(globals.hold_file); + switch_safe_free(globals.timer_name); + switch_safe_free(globals.device_name); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon Feb 23 13:17:24 2009 @@ -1748,6 +1748,8 @@ switch_api_interface_t *api_interface; module_pool = pool; + + memset(&globals, 0, sizeof(globals)); load_config(); @@ -1889,6 +1891,11 @@ switch_core_hash_destroy(&globals.profile_hash); + + switch_safe_free(globals.dialplan); + switch_safe_free(globals.codec_string); + switch_safe_free(globals.codec_rates_string); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Mon Feb 23 13:17:24 2009 @@ -802,6 +802,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_iax_load) { + memset(&globals, 0, sizeof(globals)); + module_pool = pool; *module_interface = switch_loadable_module_create_module_interface(pool, modname); @@ -1148,6 +1150,12 @@ } switch_yield(20000); } + + switch_safe_free(globals.dialplan); + switch_safe_free(globals.codec_string); + switch_safe_free(globals.codec_rates_string); + switch_safe_free(globals.ip); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c Mon Feb 23 13:17:24 2009 @@ -532,6 +532,8 @@ module_pool = pool; + memset(&globals, 0, sizeof(globals)); + load_config(); *module_interface = switch_loadable_module_create_module_interface(pool, modname); @@ -565,6 +567,13 @@ } switch_yield(20000); } + + /* Free dynamically allocated strings */ + switch_safe_free(globals.dialplan); + switch_safe_free(globals.codec_string); + switch_safe_free(globals.codec_rates_string); + switch_safe_free(globals.ip); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Mon Feb 23 13:17:24 2009 @@ -1071,6 +1071,13 @@ globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread); } } + + switch_safe_free(globals.dialplan); + switch_safe_free(globals.context); + switch_safe_free(globals.destination); + switch_safe_free(globals.codec_string); + switch_safe_free(globals.codec_rates_string); + return SWITCH_STATUS_SUCCESS; } 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 Mon Feb 23 13:17:24 2009 @@ -1296,7 +1296,9 @@ { switch_application_interface_t *app_interface; switch_api_interface_t *api_interface; - + + memset(&prefs, 0, sizeof(prefs)); + switch_mutex_init(&globals.listener_mutex, SWITCH_MUTEX_NESTED, pool); /* intialize the unique reference stuff */ @@ -1517,6 +1519,10 @@ switch_sleep(1500000); /* sleep for 1.5 seconds */ + switch_safe_free(prefs.ip); + switch_safe_free(prefs.cookie); + switch_safe_free(prefs.nodename); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Mon Feb 23 13:17:24 2009 @@ -267,6 +267,9 @@ switch_core_hash_destroy(&globals.event_hash); + switch_safe_free(globals.address); + switch_safe_free(globals.bindings); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Feb 23 13:17:24 2009 @@ -471,6 +471,9 @@ switch_event_unbind(&globals.node); + switch_safe_free(prefs.ip); + switch_safe_free(prefs.password); + return SWITCH_STATUS_SUCCESS; } @@ -933,6 +936,8 @@ switch_application_interface_t *app_interface; switch_api_interface_t *api_interface; + memset(&globals, 0, sizeof(globals)); + switch_mutex_init(&globals.listener_mutex, SWITCH_MUTEX_NESTED, pool); memset(&listen_list, 0, sizeof(listen_list)); Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Mon Feb 23 13:17:24 2009 @@ -152,6 +152,8 @@ { switch_status_t status; *module_interface = &console_module_interface; + + memset(&globals, 0, sizeof(globals)); if ((status = load_config()) != SWITCH_STATUS_SUCCESS) { return status; @@ -162,6 +164,9 @@ setlogmask(LOG_UPTO(LOG_DEBUG)); switch_log_bind_logger(mod_syslog_logger, log_level, SWITCH_FALSE); + switch_safe_free(globals.ident); + switch_safe_free(globals.format); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Mon Feb 23 13:17:24 2009 @@ -851,6 +851,10 @@ switch_yield(100000); } while (globals.running); + switch_safe_free(globals.realm); + switch_safe_free(globals.user); + switch_safe_free(globals.pass); + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12250 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mrene Date: Mon Feb 23 12:48:40 2009 New Revision: 12250 Log: SWITCH_DECLARE_GLOBAL_STRING_FUNC allocated stuff have to be freed on module shutdown Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Mon Feb 23 12:48:40 2009 @@ -973,6 +973,13 @@ switch_core_hash_destroy(&globals.call_hash); switch_event_free_subclass(MY_EVENT_RINGING); + + switch_safe_free(globals.dialplan); + switch_safe_free(globals.cid_name); + switch_safe_free(globals.cid_num); + switch_safe_free(globals.ring_file); + switch_safe_free(globals.hold_file); + switch_safe_free(globals.timer_name); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12249 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: andrew Date: Mon Feb 23 12:34:08 2009 New Revision: 12249 Log: Bind to 0.0.0.0 instead of 127.0.0.1 by default; like most erlang nodes do. Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/erlang_event.conf.xml freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c Mon Feb 23 12:34:08 2009 @@ -316,6 +316,9 @@ { switch_status_t rv; struct sockaddr_in server_addr; + struct hostent *nodehost; + char thishostname[EI_MAXHOSTNAMELEN+1] = ""; + char thisnodename[MAXNODELEN+1]; /* zero out the struct before we use it */ memset(&server_addr, 0, sizeof(server_addr)); @@ -334,14 +337,13 @@ server_addr.sin_family = AF_INET; server_addr.sin_port = htons(prefs.port); - struct hostent *nodehost = gethostbyaddr(&server_addr.sin_addr.s_addr, sizeof(server_addr.sin_addr.s_addr), AF_INET); - - char *thishostname = nodehost->h_name; - char thisnodename[MAXNODELEN+1]; + if ((nodehost = gethostbyaddr(&server_addr.sin_addr.s_addr, sizeof(server_addr.sin_addr.s_addr), AF_INET))) + memcpy(thishostname, nodehost->h_name, EI_MAXHOSTNAMELEN); - if (!strcmp(thishostname, "localhost")) + if (switch_strlen_zero_buf(thishostname)) { gethostname(thishostname, EI_MAXHOSTNAMELEN); - + } + if (prefs.shortname) { char *off; if ((off = strchr(thishostname, '.'))) { Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/erlang_event.conf.xml ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/erlang_event.conf.xml (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/erlang_event.conf.xml Mon Feb 23 12:34:08 2009 @@ -1,6 +1,6 @@ <configuration name="erlang_event.conf" description="Erlang Socket Client"> <settings> - <param name="listen-ip" value="127.0.0.1"/> + <param name="listen-ip" value="0.0.0.0"/> <param name="listen-port" value="8031"/> <param name="cookie" value="ClueCon"/> <param name="shortname" value="true"/> 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 Mon Feb 23 12:34:08 2009 @@ -932,7 +932,7 @@ } if (switch_strlen_zero(prefs.ip)) { - set_pref_ip("127.0.0.1"); + set_pref_ip("0.0.0.0"); } if (switch_strlen_zero(prefs.cookie)) { @@ -1423,7 +1423,7 @@ } } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected and published erlang cnode at %s\n", ec.thisnodename); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected to epmd and published erlang cnode at %s\n", ec.thisnodename); listen_list.ready = 1;

1 0

[commit] r12248 - freeswitch/trunk/src
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: anthm Date: Mon Feb 23 12:33:59 2009 New Revision: 12248 Log: declinatio mortuus obfirmo! Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Mon Feb 23 12:33:59 2009 @@ -1830,7 +1830,7 @@ { char path_buf[1024]; uint8_t hasmain = 0, errcnt = 0; - switch_xml_t new_main; + switch_xml_t new_main, r = NULL; switch_mutex_lock(XML_LOCK); @@ -1838,8 +1838,8 @@ hasmain++; if (!reload) { - switch_mutex_unlock(XML_LOCK); - return switch_xml_root(); + r = switch_xml_root(); + goto done; } switch_thread_rwlock_wrlock(RWLOCK); } @@ -1871,8 +1871,6 @@ switch_thread_rwlock_unlock(RWLOCK); } - switch_mutex_unlock(XML_LOCK); - if (errcnt == 0) { switch_event_t *event; if (switch_event_create(&event, SWITCH_EVENT_RELOADXML) == SWITCH_STATUS_SUCCESS) { @@ -1880,10 +1878,14 @@ switch_event_destroy(&event); } } - return switch_xml_root(); + r = switch_xml_root(); } - return NULL; + done: + + switch_mutex_unlock(XML_LOCK); + + return r; } SWITCH_DECLARE(switch_status_t) switch_xml_init(switch_memory_pool_t *pool, const char **err) @@ -1908,14 +1910,19 @@ SWITCH_DECLARE(switch_status_t) switch_xml_destroy(void) { + switch_status_t status = SWITCH_STATUS_FALSE; + switch_mutex_lock(XML_LOCK); + if (MAIN_XML_ROOT) { switch_xml_t xml = MAIN_XML_ROOT; MAIN_XML_ROOT = NULL; switch_xml_free(xml); - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; } - return SWITCH_STATUS_FALSE; + switch_mutex_unlock(XML_LOCK); + + return status; } SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(const char *file_path, switch_xml_t *node, switch_event_t *params)

1 0

[commit] r12247 - freeswitch/trunk/libs/win32
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mikej Date: Mon Feb 23 12:17:27 2009 New Revision: 12247 Log: fix version generator on windows (FSBUILD-115/FSBUILD-69) Modified: freeswitch/trunk/libs/win32/util.vbs Modified: freeswitch/trunk/libs/win32/util.vbs ============================================================================== --- freeswitch/trunk/libs/win32/util.vbs (original) +++ freeswitch/trunk/libs/win32/util.vbs Mon Feb 23 12:17:27 2009 @@ -254,6 +254,9 @@ Wget ToolsBase & "fs_svnversion.exe", tmpFolder End If + If Not FSO.FileExists(tmpFolder & "libdb44.dll") Then + Wget ToolsBase & "libdb44.dll", tmpFolder + End If If Not FSO.FileExists(tmpFolder & "libsvn_diff-1.dll") Then Wget ToolsBase & "libsvn_diff-1.dll", tmpFolder End If

1 0