- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9357 - freeswitch/trunk/src/mod/applications/mod_soundtouch
by Freeswitch SVN 22 Aug '08

22 Aug '08

Author: brian Date: Fri Aug 22 16:48:40 2008 New Revision: 9357 Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp Log: fix mod_soundtouch Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp (original) +++ freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp Fri Aug 22 16:48:40 2008 @@ -304,35 +304,16 @@ switch_channel_set_private(channel, "_soundtouch_", bug); } -static switch_application_interface_t soundtouch_application_interface = { - /*.interface_name */ "soundtouch", - /*.application_function */ soundtouch_start_function, - /* long_desc */ "Alter the audio stream", - /* short_desc */ "Alter the audio stream", - /* syntax */ "[send|recv] [-]<X>s [.]<X>p", - /* flags */ SAF_NONE, - /* next */ - -}; - -static switch_loadable_module_interface_t soundtouch_module_interface = { - /*.module_name */ modname, - /*.endpoint_interface */ NULL, - /*.timer_interface */ NULL, - /*.dialplan_interface */ NULL, - /*.codec_interface */ NULL, - /*.application_interface */ &soundtouch_application_interface, - /*.api_interface */ NULL, - /*.file_interface */ NULL, - /*.speech_interface */ NULL, - /*.directory_interface */ NULL -}; - SWITCH_MODULE_LOAD_FUNCTION(mod_soundtouch_load) { + switch_application_interface_t *app_interface; + /* connect my internal structure to the blank pointer passed to me */ - *module_interface = &soundtouch_module_interface; + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + SWITCH_ADD_APP(app_interface, "soundtouch", "Alter the audio stream", "Alter the audio stream", + soundtouch_start_function, "[send|recv] [-]<X>s [.]<X>p", SAF_NONE); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[commit] r9356 - freeswitch/trunk/src/mod/applications/mod_stress
by Freeswitch SVN 22 Aug '08

22 Aug '08

Author: anthm Date: Fri Aug 22 16:47:32 2008 New Revision: 9356 Modified: freeswitch/trunk/src/mod/applications/mod_stress/mod_stress.cpp Log: update Modified: freeswitch/trunk/src/mod/applications/mod_stress/mod_stress.cpp ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_stress/mod_stress.cpp (original) +++ freeswitch/trunk/src/mod/applications/mod_stress/mod_stress.cpp Fri Aug 22 16:47:32 2008 @@ -170,10 +170,11 @@ if (sth->stress) { switch_event_t *event, *dup; - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stress %0.2f\n"); + if (switch_event_create(&event, SWITCH_EVENT_DETECTED_SPEECH) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Speech-Type", "stress-level"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Stress-Level", "%02f", sth->stress); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Stress-Level", "%0.2f", sth->stress); if (switch_event_dup(&dup, event) == SWITCH_STATUS_SUCCESS) { switch_event_fire(&dup); }

1 0

[commit] r9355 - in freeswitch/trunk/src: . include
by Freeswitch SVN 22 Aug '08

22 Aug '08

Author: anthm Date: Fri Aug 22 15:00:56 2008 New Revision: 9355 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_loadable_module.c Log: update Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Aug 22 15:00:56 2008 @@ -206,7 +206,8 @@ SCF_USE_SQL = (1 << 0), SCF_NO_NEW_SESSIONS = (1 << 1), SCF_SHUTTING_DOWN = (1 << 2), - SCF_CRASH_PROT = (1 << 3) + SCF_CRASH_PROT = (1 << 3), + SCF_VG = (1 << 4) } switch_core_flag_enum_t; typedef uint32_t switch_core_flag_t; Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Fri Aug 22 15:00:56 2008 @@ -236,6 +236,7 @@ "\t-core -- dump cores\n" #endif "\t-hp -- enable high priority settings\n" + "\t-vg -- run under valgrind\n" "\t-nosql -- disable internal sql scoreboard\n" "\t-stop -- stop freeswitch\n" "\t-nc -- do not output to a console and background\n" @@ -387,6 +388,11 @@ known_opt++; } + if (argv[x] && !strcmp(argv[x], "-vg")) { + flags |= SCF_VG; + known_opt++; + } + if (argv[x] && !strcmp(argv[x], "-stop")) { die++; known_opt++; Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Fri Aug 22 15:00:56 2008 @@ -1109,8 +1109,9 @@ static void do_shutdown(switch_loadable_module_t *module, switch_bool_t shutdown, switch_bool_t unload) { + int32_t flags = switch_core_flags(); switch_assert(module != NULL); - + if (shutdown) { switch_loadable_module_unprocess(module); if (module->switch_module_shutdown) { @@ -1121,7 +1122,7 @@ } } - if (unload && module->status != SWITCH_STATUS_NOUNLOAD) { + if (unload && module->status != SWITCH_STATUS_NOUNLOAD && !(flags & SCF_VG)) { switch_memory_pool_t *pool; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s unloaded.\n", module->module_interface->module_name); switch_dso_unload(module->lib);

1 0

[commit] r9354 - freeswitch/trunk/src
by Freeswitch SVN 22 Aug '08

22 Aug '08

Author: anthm Date: Fri Aug 22 14:05:42 2008 New Revision: 9354 Modified: freeswitch/trunk/src/switch_pcm.c freeswitch/trunk/src/switch_time.c Log: update Modified: freeswitch/trunk/src/switch_pcm.c ============================================================================== --- freeswitch/trunk/src/switch_pcm.c (original) +++ freeswitch/trunk/src/switch_pcm.c Fri Aug 22 14:05:42 2008 @@ -38,7 +38,8 @@ #define SWITCH_MOD_DECLARE_DATA __declspec(dllexport) #endif SWITCH_MODULE_LOAD_FUNCTION(core_pcm_load); -SWITCH_MODULE_DEFINITION(CORE_PCM_MODULE, core_pcm_load, NULL, NULL); +SWITCH_MODULE_SHUTDOWN_FUNCTION(core_pcm_shutdown); +SWITCH_MODULE_DEFINITION(CORE_PCM_MODULE, core_pcm_load, core_pcm_shutdown, NULL); static switch_status_t switch_raw_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) { @@ -343,6 +344,11 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_MODULE_SHUTDOWN_FUNCTION(core_pcm_shutdown) +{ + return SWITCH_STATUS_NOUNLOAD; +} + /* For Emacs: * Local Variables: * mode:c Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Fri Aug 22 14:05:42 2008 @@ -466,7 +466,7 @@ #endif - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_NOUNLOAD; } /* For Emacs:

1 0

[commit] r9353 - in freeswitch/trunk/src: . mod/loggers/mod_logfile
by Freeswitch SVN 22 Aug '08

22 Aug '08

Author: anthm Date: Fri Aug 22 13:57:15 2008 New Revision: 9353 Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_loadable_module.c Log: improve unload stuff Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Fri Aug 22 13:57:15 2008 @@ -376,16 +376,30 @@ switch_log_bind_logger(mod_logfile_logger, SWITCH_LOG_DEBUG, SWITCH_FALSE); - return SWITCH_STATUS_NOUNLOAD; + return SWITCH_STATUS_SUCCESS; } SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_logfile_shutdown) { - /* TODO: Need to finish processing pending log messages before we close the file handle */ + switch_hash_index_t *hi; + const void *var; + void *val; - //switch_file_close(globals->log_afd); + switch_log_unbind_logger(mod_logfile_logger); switch_event_unbind(&globals.node); + for (hi = switch_hash_first(NULL, profile_hash); hi; hi = switch_hash_next(hi)) { + logfile_profile_t *profile; + switch_hash_this(hi, &var, NULL, &val); + if ((profile = (logfile_profile_t *) val)) { + switch_file_close(profile->log_afd); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Closing %s\n", profile->logfile); + printf("WTF\n"); + } + } + + + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri Aug 22 13:57:15 2008 @@ -445,7 +445,7 @@ for (hi = switch_hash_first(NULL, CUSTOM_HASH); hi; hi = switch_hash_next(hi)) { switch_event_subclass_t *subclass; - switch_hash_this(hi, &var, NULL, &val);; + switch_hash_this(hi, &var, NULL, &val); if ((subclass = (switch_event_subclass_t *) val)) { FREE(subclass->name); FREE(subclass->owner); Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Fri Aug 22 13:57:15 2008 @@ -51,6 +51,7 @@ switch_module_runtime_t switch_module_runtime; switch_module_shutdown_t switch_module_shutdown; switch_memory_pool_t *pool; + switch_status_t status; }; struct switch_loadable_module_container { @@ -73,7 +74,7 @@ }; static struct switch_loadable_module_container loadable_modules; -static void do_shutdown(switch_loadable_module_t *module); +static void do_shutdown(switch_loadable_module_t *module, switch_bool_t shutdown, switch_bool_t unload); static void *switch_loadable_module_exec(switch_thread_t *thread, void *obj) { @@ -867,7 +868,7 @@ status = SWITCH_STATUS_NOUNLOAD; goto end; } else { - do_shutdown(module); + do_shutdown(module, SWITCH_TRUE, SWITCH_TRUE); } switch_core_hash_delete(loadable_modules.module_hash, fname); } else { @@ -1106,28 +1107,31 @@ return SWITCH_STATUS_SUCCESS; } -static void do_shutdown(switch_loadable_module_t *module) +static void do_shutdown(switch_loadable_module_t *module, switch_bool_t shutdown, switch_bool_t unload) { switch_assert(module != NULL); - switch_loadable_module_unprocess(module); - if (module->switch_module_shutdown) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping: %s\n", module->module_interface->module_name); - if (module->switch_module_shutdown() == SWITCH_STATUS_UNLOAD) { - switch_memory_pool_t *pool; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s unloaded.\n", module->module_interface->module_name); - switch_dso_unload(module->lib); - module->lib = NULL; - if ((pool = module->pool)) { - module = NULL; - switch_core_destroy_memory_pool(&pool); - } + if (shutdown) { + switch_loadable_module_unprocess(module); + if (module->switch_module_shutdown) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping: %s\n", module->module_interface->module_name); + module->status = module->switch_module_shutdown(); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s shutdown.\n", module->module_interface->module_name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s has no shutdown routine\n", module->module_interface->module_name); + } + } + + if (unload && module->status != SWITCH_STATUS_NOUNLOAD) { + switch_memory_pool_t *pool; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s unloaded.\n", module->module_interface->module_name); + switch_dso_unload(module->lib); + module->lib = NULL; + if ((pool = module->pool)) { + module = NULL; + switch_core_destroy_memory_pool(&pool); } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s has no shutdown routine\n", module->module_interface->module_name); } + } SWITCH_DECLARE(void) switch_loadable_module_shutdown(void) @@ -1139,7 +1143,17 @@ for (hi = switch_hash_first(NULL, loadable_modules.module_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); module = (switch_loadable_module_t *) val; - do_shutdown(module); + if (!module->perm) { + do_shutdown(module, SWITCH_TRUE, SWITCH_FALSE); + } + } + + for (hi = switch_hash_first(NULL, loadable_modules.module_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, NULL, NULL, &val); + module = (switch_loadable_module_t *) val; + if (!module->perm) { + do_shutdown(module, SWITCH_FALSE, SWITCH_TRUE); + } } switch_core_hash_destroy(&loadable_modules.module_hash);

1 0

[commit] r9352 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 22 Aug '08

22 Aug '08

Author: brian Date: Fri Aug 22 13:29:59 2008 New Revision: 9352 Modified: freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml Log: add option to voicemail config file Modified: freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml Fri Aug 22 13:29:59 2008 @@ -18,6 +18,7 @@ <param name="config-menu-key" value="5"/> <param name="record-greeting-key" value="1"/> <param name="choose-greeting-key" value="2"/> + <param name="change-pass-key" value="6"/> <param name="record-name-key" value="3"/> <param name="record-file-key" value="3"/> <param name="listen-file-key" value="1"/>

1 0

[commit] r9351 - freeswitch/trunk/src
by Freeswitch SVN 22 Aug '08

22 Aug '08

Author: anthm Date: Fri Aug 22 13:18:26 2008 New Revision: 9351 Modified: freeswitch/trunk/src/switch_core_sqldb.c Log: remove stuff from the db on unload Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Fri Aug 22 13:18:26 2008 @@ -355,6 +355,15 @@ } break; } + case SWITCH_EVENT_MODULE_UNLOAD: + { + const char *type = switch_event_get_header_nil(event, "type"); + const char *name = switch_event_get_header_nil(event, "name"); + if (!switch_strlen_zero(type) && !switch_strlen_zero(name)) { + sql = switch_mprintf("delete from interfaces where type='%q' and name='%q'", type, name); + } + break; + } default: break; }

1 0

[commit] r9350 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 22 Aug '08

22 Aug '08

Author: brian Date: Fri Aug 22 13:18:11 2008 New Revision: 9350 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: woops 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 Aug 22 13:18:11 2008 @@ -1403,7 +1403,7 @@ switch_snprintf(msg_count, sizeof(msg_count), "%d:urgent-new", total_new_urgent_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, &args)); informed++; - if (!switch_strlen_zero_buf(global_buf) { + if (!switch_strlen_zero_buf(global_buf)) { vm_check_state = VM_CHECK_MENU; continue; } @@ -1412,7 +1412,7 @@ switch_snprintf(msg_count, sizeof(msg_count), "%d:new", total_new_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, &args)); informed++; - if (!switch_strlen_zero_buf(global_buf) { + if (!switch_strlen_zero_buf(global_buf)) { vm_check_state = VM_CHECK_MENU; continue; }

1 0

[commit] r9349 - in freeswitch/trunk/src: include mod/applications/mod_voicemail
by Freeswitch SVN 22 Aug '08

22 Aug '08

Author: mikej Date: Fri Aug 22 13:14:19 2008 New Revision: 9349 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: new macro Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Aug 22 13:14:19 2008 @@ -59,7 +59,8 @@ \param s the string to test \return true value if the string is NULL or zero length */ -#define switch_strlen_zero(s) (!s || *s == '\0') +#define switch_strlen_zero(s) (!s || *(s) == '\0') +#define switch_strlen_zero_buf(s) (*(s) == '\0') static inline switch_bool_t switch_is_moh(const char *s) { if (switch_strlen_zero(s) || !strcasecmp(s, "silence") || !strcasecmp(s, "indicate_hold")) { 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 Aug 22 13:14:19 2008 @@ -1403,7 +1403,7 @@ switch_snprintf(msg_count, sizeof(msg_count), "%d:urgent-new", total_new_urgent_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, &args)); informed++; - if ((*global_buf =! '\0')) { + if (!switch_strlen_zero_buf(global_buf) { vm_check_state = VM_CHECK_MENU; continue; } @@ -1412,7 +1412,7 @@ switch_snprintf(msg_count, sizeof(msg_count), "%d:new", total_new_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, &args)); informed++; - if ((*global_buf =! '\0')) { + if (!switch_strlen_zero_buf(global_buf) { vm_check_state = VM_CHECK_MENU; continue; } @@ -1621,7 +1621,7 @@ char input[10] = ""; char key_buf[80] = ""; play_msg_type = MSG_NONE; - if (!switch_strlen_zero(global_buf)) { + if (!switch_strlen_zero_buf(global_buf)) { switch_set_string(input, global_buf); *global_buf = '\0'; status = SWITCH_STATUS_SUCCESS;

1 0

[commit] r9348 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 22 Aug '08

22 Aug '08

Author: brian Date: Fri Aug 22 13:05:11 2008 New Revision: 9348 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: fix voicemail menu 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 Aug 22 13:05:11 2008 @@ -215,7 +215,7 @@ " username VARCHAR(255),\n" " domain VARCHAR(255),\n" " name_path VARCHAR(255),\n" - " greeting_path VARCHAR(255)\n" + " greeting_path VARCHAR(255),\n" " password VARCHAR(255)\n" ");\n"; @@ -1621,7 +1621,7 @@ char input[10] = ""; char key_buf[80] = ""; play_msg_type = MSG_NONE; - if ((*global_buf =! '\0')) { + if (!switch_strlen_zero(global_buf)) { switch_set_string(input, global_buf); *global_buf = '\0'; status = SWITCH_STATUS_SUCCESS;

1 0