- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5340 - freeswitch/trunk/src
by Freeswitch SVN 13 Jun '07

13 Jun '07

Author: mikej Date: Wed Jun 13 10:48:13 2007 New Revision: 5340 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: cleanup error message. Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Wed Jun 13 10:48:13 2007 @@ -780,7 +780,7 @@ switch_mutex_lock(loadable_modules.mutex); if (switch_core_hash_find(loadable_modules.module_hash, file)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Module %s Already Loaded!\n", file); - *err = "Module already loadedn\n"; + *err = "Module already loaded"; status = SWITCH_STATUS_FALSE; } else if ((status = switch_loadable_module_load_file(path, file, &new_module) == SWITCH_STATUS_SUCCESS)) { if ((status = switch_loadable_module_process(file, new_module)) == SWITCH_STATUS_SUCCESS && runtime) {

1 0

[commit] r5339 - freeswitch/trunk/src
by Freeswitch SVN 13 Jun '07

13 Jun '07

Author: mikej Date: Wed Jun 13 10:45:04 2007 New Revision: 5339 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: silly const stuff Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Wed Jun 13 10:45:04 2007 @@ -650,7 +650,7 @@ switch_module_load_t load_func_ptr = NULL; int loading = 1; const char *err = NULL; - switch_loadable_module_interface_t *module_interface = NULL; + const switch_loadable_module_interface_t *module_interface = NULL; char derr[512] = ""; switch_memory_pool_t *pool; @@ -830,7 +830,7 @@ switch_module_load_t load_func_ptr = NULL; int loading = 1; const char *err = NULL; - switch_loadable_module_interface_t *module_interface = NULL; + const switch_loadable_module_interface_t *module_interface = NULL; switch_memory_pool_t *pool;

1 0

[commit] r5338 - freeswitch/trunk/src
by Freeswitch SVN 13 Jun '07

13 Jun '07

Author: mikej Date: Wed Jun 13 10:41:49 2007 New Revision: 5338 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: silly type stuff Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Wed Jun 13 10:41:49 2007 @@ -641,6 +641,7 @@ switch_loadable_module_t *module = NULL; switch_dso_handle_t *dso = NULL; apr_status_t status = SWITCH_STATUS_SUCCESS; + switch_dso_handle_sym_t interface_struct_handle = NULL; switch_loadable_module_function_table_t *mod_interface_functions = NULL; char *struct_name = NULL; switch_dso_handle_sym_t load_function_handle = NULL; @@ -671,8 +672,9 @@ } struct_name = switch_core_sprintf(pool, "%s_module_interface", filename); - status = switch_dso_sym(&mod_interface_functions, dso, struct_name); - if (mod_interface_functions) { + status = switch_dso_sym(&interface_struct_handle, dso, struct_name); + if (interface_struct_handle) { + mod_interface_functions = interface_struct_handle; load_func_ptr = mod_interface_functions->load; } else { status = switch_dso_sym(&load_function_handle, dso, "switch_module_load");

1 0

[commit] r5337 - in freeswitch/trunk/src: . include mod/endpoints/mod_iax mod/endpoints/mod_sofia
by Freeswitch SVN 13 Jun '07

13 Jun '07

Author: mikej Date: Wed Jun 13 10:35:55 2007 New Revision: 5337 Modified: freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_loadable_module.c Log: add new macros and approach to module loader. Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Wed Jun 13 10:35:55 2007 @@ -146,10 +146,13 @@ #endif #if defined(SWITCH_MOD_DECLARE_STATIC) #define SWITCH_MOD_DECLARE(type) type __cdecl +#define SWITCH_MOD_DECLARE_DATA #elif defined(MOD_EXPORTS) #define SWITCH_MOD_DECLARE(type) __declspec(dllexport) type __cdecl +#define SWITCH_MOD_DECLARE_DATA __declspec(dllexport) #else #define SWITCH_MOD_DECLARE(type) __declspec(dllimport) type __cdecl +#define SWITCH_MOD_DECLARE_DATA __declspec(dllimport) #endif #define SIGHUP SIGTERM #ifndef S_IRUSR @@ -164,6 +167,7 @@ #define SWITCH_DECLARE_NONSTD(type) type #define SWITCH_MOD_DECLARE(type) type #define SWITCH_DECLARE_DATA +#define SWITCH_MOD_DECLARE_DATA #define SWITCH_THREAD_FUNC #endif #ifdef DOXYGEN Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Jun 13 10:35:55 2007 @@ -1045,19 +1045,41 @@ } switch_input_args_t; typedef switch_status_t (*switch_say_callback_t) (switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args); -typedef switch_status_t (*switch_module_load_t) (switch_loadable_module_interface_t **, char *); -typedef switch_status_t (*switch_module_reload_t) (void); -typedef switch_status_t (*switch_module_pause_t) (void); -typedef switch_status_t (*switch_module_resume_t) (void); -typedef switch_status_t (*switch_module_status_t) (void); -typedef switch_status_t (*switch_module_runtime_t) (void); -typedef switch_status_t (*switch_module_shutdown_t) (void); typedef struct switch_xml *switch_xml_t; typedef struct switch_core_time_duration switch_core_time_duration_t; typedef switch_xml_t(*switch_xml_search_function_t) (const char *section, const char *tag_name, const char *key_name, const char *key_value, const char *params, void *user_data); + +#define SWITCH_API_VERSION 1 +#define SWITCH_MODULE_LOAD_ARGS (const switch_loadable_module_interface_t **module_interface, char *filename) +#define SWITCH_MODULE_RUNTIME_ARGS (void) +#define SWITCH_MODULE_SHUTDOWN_ARGS (void) +typedef switch_status_t (*switch_module_load_t) SWITCH_MODULE_LOAD_ARGS ; +typedef switch_status_t (*switch_module_runtime_t) SWITCH_MODULE_RUNTIME_ARGS ; +typedef switch_status_t (*switch_module_shutdown_t) SWITCH_MODULE_SHUTDOWN_ARGS ; +#define SWITCH_MODULE_LOAD_FUNCTION(name) switch_status_t name SWITCH_MODULE_LOAD_ARGS +#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 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_loadable_module_function_table_t; + +#define SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime) \ +static const char modname[] = #name ; \ +SWITCH_MOD_DECLARE_DATA switch_loadable_module_function_table_t name##_module_interface = { \ + SWITCH_API_VERSION, \ + load, \ + shutdown, \ + runtime \ +} + + /* things we don't deserve to know about */ /*! \brief A channel */ struct switch_channel; 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 Wed Jun 13 10:35:55 2007 @@ -31,6 +31,11 @@ */ #include <switch.h> +SWITCH_MODULE_LOAD_FUNCTION(mod_iax_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_iax_shutdown); +SWITCH_MODULE_RUNTIME_FUNCTION(mod_iax_runtime); +SWITCH_MODULE_DEFINITION(mod_iax, mod_iax_load, mod_iax_shutdown, mod_iax_runtime); + #include <iax2.h> #include <iax-client.h> #include <iax2-parser.h> @@ -38,8 +43,6 @@ #include <sys/timeb.h> #endif -static const char modname[] = "mod_iax"; - static switch_memory_pool_t *module_pool = NULL; static int running = 1; @@ -874,8 +877,7 @@ return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } - -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_iax_load) { if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) { @@ -967,7 +969,7 @@ return status; } -SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void) +SWITCH_MODULE_RUNTIME_FUNCTION(mod_iax_runtime) { //int refresh; struct iax_event *iaxevent = NULL; @@ -1217,7 +1219,7 @@ } -SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_iax_shutdown) { int x = 0; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Jun 13 10:35:55 2007 @@ -38,6 +38,10 @@ #include "mod_sofia.h" +SWITCH_MODULE_LOAD_FUNCTION(mod_sofia_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sofia_shutdown); +SWITCH_MODULE_DEFINITION(mod_sofia, mod_sofia_load, mod_sofia_shutdown, NULL); + struct mod_sofia_globals mod_sofia_globals; const switch_endpoint_interface_t sofia_endpoint_interface; static switch_frame_t silence_frame = { 0 }; @@ -1497,7 +1501,7 @@ return cause; } -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_sofia_load) { silence_frame.data = silence_data; @@ -1575,7 +1579,7 @@ } -SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sofia_shutdown) { int sanity = 0; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Wed Jun 13 10:35:55 2007 @@ -45,7 +45,7 @@ #include <switch_odbc.h> #endif -static const char modname[] = "mod_sofia"; +#define MODNAME "mod_sofia" static const switch_state_handler_table_t noop_state_handler = { 0 }; struct sofia_gateway; typedef struct sofia_gateway sofia_gateway_t; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Jun 13 10:35:55 2007 @@ -1931,7 +1931,7 @@ tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), from_user, profile->dialplan, - displayname, from_user, network_ip, NULL, NULL, NULL, modname, context, destination_number); + displayname, from_user, network_ip, NULL, NULL, NULL, MODNAME, context, destination_number); if (tech_pvt->caller_profile) { Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Wed Jun 13 10:35:55 2007 @@ -636,11 +636,13 @@ } -static switch_status_t switch_loadable_module_load_file(char *filename, switch_loadable_module_t **new_module) +static switch_status_t switch_loadable_module_load_file(char *path, char *filename, switch_loadable_module_t **new_module) { switch_loadable_module_t *module = NULL; switch_dso_handle_t *dso = NULL; apr_status_t status = SWITCH_STATUS_SUCCESS; + switch_loadable_module_function_table_t *mod_interface_functions = NULL; + char *struct_name = NULL; switch_dso_handle_sym_t load_function_handle = NULL; switch_dso_handle_sym_t shutdown_function_handle = NULL; switch_dso_handle_sym_t runtime_function_handle = NULL; @@ -651,10 +653,10 @@ char derr[512] = ""; switch_memory_pool_t *pool; - assert(filename != NULL); + assert(path != NULL); *new_module = NULL; - status = switch_dso_load(&dso, filename, loadable_modules.pool); + status = switch_dso_load(&dso, path, loadable_modules.pool); if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); @@ -668,8 +670,14 @@ break; } - status = switch_dso_sym(&load_function_handle, dso, "switch_module_load"); - load_func_ptr = (switch_module_load_t) (intptr_t) load_function_handle; + struct_name = switch_core_sprintf(pool, "%s_module_interface", filename); + status = switch_dso_sym(&mod_interface_functions, dso, struct_name); + if (mod_interface_functions) { + load_func_ptr = mod_interface_functions->load; + } else { + status = switch_dso_sym(&load_function_handle, dso, "switch_module_load"); + load_func_ptr = (switch_module_load_t) (intptr_t) load_function_handle; + } if (load_func_ptr == NULL) { err = "Cannot locate symbol 'switch_module_load' please make sure this is a vaild module."; @@ -701,19 +709,24 @@ if (pool) { switch_core_destroy_memory_pool(&pool); } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Loading module %s\n**%s**\n", filename, err); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Loading module %s\n**%s**\n", path, err); return SWITCH_STATUS_GENERR; } module->pool = pool; - module->filename = switch_core_strdup(module->pool, filename); + module->filename = switch_core_strdup(module->pool, path); module->module_interface = module_interface; module->switch_module_load = load_func_ptr; - switch_dso_sym(&shutdown_function_handle, dso, "switch_module_shutdown"); - module->switch_module_shutdown = (switch_module_shutdown_t) (intptr_t) shutdown_function_handle; - switch_dso_sym(&runtime_function_handle, dso, "switch_module_runtime"); - module->switch_module_runtime = (switch_module_runtime_t) (intptr_t) runtime_function_handle; + if (mod_interface_functions) { + module->switch_module_shutdown = mod_interface_functions->shutdown; + module->switch_module_runtime = mod_interface_functions->runtime; + } else { + switch_dso_sym(&shutdown_function_handle, dso, "switch_module_shutdown"); + module->switch_module_shutdown = (switch_module_shutdown_t) (intptr_t) shutdown_function_handle; + switch_dso_sym(&runtime_function_handle, dso, "switch_module_runtime"); + module->switch_module_runtime = (switch_module_runtime_t) (intptr_t) runtime_function_handle; + } module->lib = dso; @@ -728,7 +741,7 @@ { switch_size_t len = 0; char *path; - char *file; + char *file, *dot; switch_loadable_module_t *new_module = NULL; switch_status_t status; @@ -747,20 +760,19 @@ if (*file == '/') { path = switch_core_strdup(loadable_modules.pool, file); + file = (char *)switch_cut_path(file); + if ((dot = strchr(file, '.'))) { + dot = '\0'; + } } else { - if (strchr(file, '.')) { - len = strlen(dir); - len += strlen(file); - len += 4; - path = (char *) switch_core_alloc(loadable_modules.pool, len); - snprintf(path, len, "%s%s%s", dir, SWITCH_PATH_SEPARATOR, file); - } else { - len = strlen(dir); - len += strlen(file); - len += 8; - path = (char *) switch_core_alloc(loadable_modules.pool, len); - snprintf(path, len, "%s%s%s%s", dir, SWITCH_PATH_SEPARATOR, file, ext); + if ((dot = strchr(file, '.'))) { + dot = '\0'; } + len = strlen(dir); + len += strlen(file); + len += 8; + path = (char *) switch_core_alloc(loadable_modules.pool, len); + snprintf(path, len, "%s%s%s%s", dir, SWITCH_PATH_SEPARATOR, file, ext); } switch_mutex_lock(loadable_modules.mutex); @@ -768,8 +780,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Module %s Already Loaded!\n", file); *err = "Module already loadedn\n"; status = SWITCH_STATUS_FALSE; - } else if ((status = switch_loadable_module_load_file(path, &new_module) == SWITCH_STATUS_SUCCESS)) { - if ((status = switch_loadable_module_process((char *) file, new_module)) == SWITCH_STATUS_SUCCESS && runtime) { + } else if ((status = switch_loadable_module_load_file(path, file, &new_module) == SWITCH_STATUS_SUCCESS)) { + if ((status = switch_loadable_module_process(file, new_module)) == SWITCH_STATUS_SUCCESS && runtime) { if (new_module->switch_module_runtime) { switch_core_launch_thread(switch_loadable_module_exec, new_module, new_module->pool); } @@ -785,37 +797,11 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_unload_module(char *dir, char *fname, const char **err) { - char *path = NULL; - char *file = NULL; switch_loadable_module_t *module = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; -#ifdef WIN32 - const char *ext = ".dll"; -#elif defined (MACOSX) || defined (DARWIN) - const char *ext = ".dylib"; -#else - const char *ext = ".so"; -#endif - - - if (!(file = strdup(fname))) { - abort(); - } - - if (*file == '/') { - path = strdup(file); - } else { - if (strchr(file, '.')) { - path = switch_mprintf("%s%s%s", dir, SWITCH_PATH_SEPARATOR, file); - } else { - path = switch_mprintf("%s%s%s%s", dir, SWITCH_PATH_SEPARATOR, file, ext); - } - } - - switch_mutex_lock(loadable_modules.mutex); - if ((module = switch_core_hash_find(loadable_modules.module_hash, file))) { + if ((module = switch_core_hash_find(loadable_modules.module_hash, fname))) { if (module->perm) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Module is not unloadable.\n"); *err = "Module is not unloadable"; @@ -829,9 +815,6 @@ } switch_mutex_unlock(loadable_modules.mutex); - switch_safe_free(file); - switch_safe_free(path); - return status; }

1 0

[commit] r5336 - freeswitch/trunk/src/mod/applications/mod_soundtouch
by Freeswitch SVN 13 Jun '07

13 Jun '07

Author: mikej Date: Wed Jun 13 09:33:30 2007 New Revision: 5336 Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile Log: use relative path (thanks bret for the report) Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile (original) +++ freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile Wed Jun 13 09:33:30 2007 @@ -8,7 +8,7 @@ LOCAL_LIBADD=$(LA) DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic -include /usr/src/freeswitch.trunk/build/modmake.rules +include $(BASE)/build/modmake.rules $(DIRECTORY): $(GETLIB) $(VERSION).tar.gz

1 0

[commit] r5318 - in freeswitch/trunk: build src src/include src/include/private src/mod/applications/mod_soundtouch
by Freeswitch SVN 13 Jun '07

13 Jun '07

Author: anthm Date: Tue Jun 12 23:09:53 2007 New Revision: 5318 Modified: freeswitch/trunk/build/modules.conf.in freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_media_bug.c Log: update Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Tue Jun 12 23:09:53 2007 @@ -8,6 +8,7 @@ applications/mod_enum #applications/mod_ivrtest #applications/mod_park +#applications/mod_soundtouch applications/mod_playback #applications/mod_rss #applications/mod_skel Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Tue Jun 12 23:09:53 2007 @@ -127,8 +127,10 @@ struct switch_media_bug { switch_buffer_t *raw_write_buffer; switch_buffer_t *raw_read_buffer; - switch_frame_t *replace_frame_in; - switch_frame_t *replace_frame_out; + switch_frame_t *read_replace_frame_in; + switch_frame_t *read_replace_frame_out; + switch_frame_t *write_replace_frame_in; + switch_frame_t *write_replace_frame_out; switch_media_bug_callback_t callback; switch_mutex_t *read_mutex; switch_mutex_t *write_mutex; Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Jun 12 23:09:53 2007 @@ -142,14 +142,27 @@ \brief Obtain a replace frame from a media bug \param bug the bug to get the data from */ -SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_replace_frame(switch_media_bug_t *bug); +SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_write_replace_frame(switch_media_bug_t *bug); /*! \brief Set a return replace frame \param bug the bug to set the frame on \param frame the frame to set */ -SWITCH_DECLARE(void) switch_core_media_bug_set_replace_frame(switch_media_bug_t *bug, switch_frame_t *frame); +SWITCH_DECLARE(void) switch_core_media_bug_set_write_replace_frame(switch_media_bug_t *bug, switch_frame_t *frame); + +/*! + \brief Obtain a replace frame from a media bug + \param bug the bug to get the data from +*/ +SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_read_replace_frame(switch_media_bug_t *bug); + +/*! + \brief Set a return replace frame + \param bug the bug to set the frame on + \param frame the frame to set +*/ +SWITCH_DECLARE(void) switch_core_media_bug_set_read_replace_frame(switch_media_bug_t *bug, switch_frame_t *frame); /*! \brief Remove a media bug from the session Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Jun 12 23:09:53 2007 @@ -196,6 +196,7 @@ SWITCH_ABC_TYPE_READ, SWITCH_ABC_TYPE_WRITE, SWITCH_ABC_TYPE_WRITE_REPLACE, + SWITCH_ABC_TYPE_READ_REPLACE, SWITCH_ABC_TYPE_CLOSE } switch_abc_type_t; @@ -742,14 +743,16 @@ <pre> SMBF_READ_STREAM - Include the Read Stream SMBF_WRITE_STREAM - Include the Write Stream -SMBF_WRITE_STREAM - Replace the Write Stream +SMBF_WRITE_REPLACE - Replace the Write Stream +SMBF_READ_REPLACE - Replace the Read Stream </pre> */ typedef enum { SMBF_BOTH = 0, SMBF_READ_STREAM = (1 << 0), SMBF_WRITE_STREAM = (1 << 1), - SMBF_WRITE_REPLACE = (1 << 2) + SMBF_WRITE_REPLACE = (1 << 2), + SMBF_READ_REPLACE = (1 << 3) } switch_media_bug_flag_t; /*! 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 Tue Jun 12 23:09:53 2007 @@ -215,7 +215,7 @@ assert(sth != NULL); assert(sth->st != NULL); - frame = switch_core_media_bug_get_replace_frame(bug); + frame = switch_core_media_bug_get_write_replace_frame(bug); sth->st->putSamples((SAMPLETYPE *)frame->data, frame->samples); if (sth->st->numSamples() >= frame->samples * 2) { @@ -225,7 +225,7 @@ memset(frame->data, 0, frame->datalen); } - switch_core_media_bug_set_replace_frame(bug, frame); + switch_core_media_bug_set_write_replace_frame(bug, frame); } Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Jun 12 23:09:53 2007 @@ -225,7 +225,7 @@ if (session->bugs) { switch_media_bug_t *bp, *dp, *last = NULL; - + switch_bool_t ok = SWITCH_TRUE; switch_thread_rwlock_rdlock(session->bug_rwlock); for (bp = session->bugs; bp; bp = bp->next) { if (bp->ready && switch_test_flag(bp, SMBF_READ_STREAM)) { @@ -233,23 +233,35 @@ switch_buffer_write(bp->raw_read_buffer, read_frame->data, read_frame->datalen); if (bp->callback) { if (bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_READ) == SWITCH_FALSE || (bp->stop_time && bp->stop_time >= time(NULL))) { - bp->ready = 0; - if (last) { - last->next = bp->next; - } else { - session->bugs = bp->next; - } - switch_mutex_unlock(bp->read_mutex); - dp = bp; - bp = last; - switch_core_media_bug_close(&dp); - if (!bp) { - break; - } - continue; + ok = SWITCH_FALSE; } } switch_mutex_unlock(bp->read_mutex); + } else if (switch_test_flag(bp, SMBF_READ_REPLACE)) { + do_bugs = 0; + if (bp->callback) { + bp->read_replace_frame_in = read_frame; + bp->read_replace_frame_out = NULL; + if ((ok = bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_READ_REPLACE)) == SWITCH_TRUE) { + read_frame = bp->read_replace_frame_out; + } + } + } + + if (ok == SWITCH_FALSE) { + bp->ready = 0; + if (last) { + last->next = bp->next; + } else { + session->bugs = bp->next; + } + dp = bp; + bp = last; + switch_core_media_bug_close(&dp); + if (!bp) { + break; + } + continue; } last = bp; } @@ -497,10 +509,10 @@ } else if (switch_test_flag(bp, SMBF_WRITE_REPLACE)) { do_bugs = 0; if (bp->callback) { - bp->replace_frame_in = write_frame; - bp->replace_frame_out = NULL; + bp->write_replace_frame_in = write_frame; + bp->write_replace_frame_out = NULL; if ((ok = bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_WRITE_REPLACE)) == SWITCH_TRUE) { - write_frame = bp->replace_frame_out; + write_frame = bp->write_replace_frame_out; } } } Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Tue Jun 12 23:09:53 2007 @@ -41,14 +41,24 @@ } -SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_replace_frame(switch_media_bug_t *bug) +SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_write_replace_frame(switch_media_bug_t *bug) { - return bug->replace_frame_in; + return bug->write_replace_frame_in; } -SWITCH_DECLARE(void) switch_core_media_bug_set_replace_frame(switch_media_bug_t *bug, switch_frame_t *frame) +SWITCH_DECLARE(void) switch_core_media_bug_set_write_replace_frame(switch_media_bug_t *bug, switch_frame_t *frame) { - bug->replace_frame_out = frame; + bug->write_replace_frame_out = frame; +} + +SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_read_replace_frame(switch_media_bug_t *bug) +{ + return bug->read_replace_frame_in; +} + +SWITCH_DECLARE(void) switch_core_media_bug_set_read_replace_frame(switch_media_bug_t *bug, switch_frame_t *frame) +{ + bug->read_replace_frame_out = frame; } SWITCH_DECLARE(void *) switch_core_media_bug_get_user_data(switch_media_bug_t *bug) @@ -161,6 +171,18 @@ switch_thread_rwlock_unlock(session->bug_rwlock); } + if (flags & SMBF_READ_REPLACE) { + switch_thread_rwlock_wrlock(session->bug_rwlock); + for (bp = session->bugs; bp; bp = bp->next) { + if (switch_test_flag(bp, SMBF_READ_REPLACE)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Only one bug of this type allowed!\n"); + switch_thread_rwlock_unlock(session->bug_rwlock); + return SWITCH_STATUS_GENERR; + } + } + switch_thread_rwlock_unlock(session->bug_rwlock); + } + if (!(bug = switch_core_session_alloc(session, sizeof(*bug)))) { return SWITCH_STATUS_MEMERR; }

1 0

[commit] r5317 - in freeswitch/trunk/src/mod: applications/mod_bridgecall languages/mod_spidermonkey
by Freeswitch SVN 12 Jun '07

12 Jun '07

Author: anthm Date: Tue Jun 12 17:35:37 2007 New Revision: 5317 Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: doh Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c (original) +++ freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c Tue Jun 12 17:35:37 2007 @@ -36,8 +36,98 @@ static const char modname[] = "mod_bridgecall"; +static void audio_bridge_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *caller_channel; + switch_core_session_t *peer_session = NULL; + unsigned int timelimit = 60; + char *var; + uint8_t no_media_bridge = 0; + switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; + uint8_t do_continue = 0; + + if (switch_strlen_zero(data)) { + return; + } + + caller_channel = switch_core_session_get_channel(session); + assert(caller_channel != NULL); + + if ((var = switch_channel_get_variable(caller_channel, "call_timeout"))) { + timelimit = atoi(var); + } + + if ((var = switch_channel_get_variable(caller_channel, "continue_on_fail"))) { + do_continue = switch_true(var); + } + + if (switch_channel_test_flag(caller_channel, CF_BYPASS_MEDIA) + || ((var = switch_channel_get_variable(caller_channel, SWITCH_BYPASS_MEDIA_VARIABLE)) && switch_true(var))) { + if (!switch_channel_test_flag(caller_channel, CF_ANSWERED) + && !switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) { + switch_channel_set_flag(caller_channel, CF_BYPASS_MEDIA); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already up, delaying point-to-point mode 'till both legs are up.\n"); + no_media_bridge = 1; + } + } + + if (switch_ivr_originate(session, &peer_session, &cause, data, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Originate Failed. Cause: %s\n", switch_channel_cause2str(cause)); + if (!do_continue && cause != SWITCH_CAUSE_NO_ANSWER) { + /* All Causes besides NO_ANSWER terminate the originating session unless continue_on_fail is set. + We will pass the fail cause on when we hangup. */ + switch_channel_hangup(caller_channel, cause); + } + /* Otherwise.. nobody answered. Go back to the dialplan instructions in case there was more to do. */ + return; + } else { + if (no_media_bridge) { + switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session); + switch_frame_t *read_frame; + /* SIP won't let us redir media until the call has been answered #$^#%& so we will proxy any early media until they do */ + while (switch_channel_ready(caller_channel) && switch_channel_ready(peer_channel) + && !switch_channel_test_flag(peer_channel, CF_ANSWERED)) { + switch_status_t status = switch_core_session_read_frame(peer_session, &read_frame, -1, 0); + uint8_t bad = 1; + + if (SWITCH_READ_ACCEPTABLE(status) + && switch_core_session_write_frame(session, read_frame, -1, 0) == SWITCH_STATUS_SUCCESS) { + bad = 0; + } + if (bad) { + switch_channel_hangup(caller_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + switch_channel_hangup(peer_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + goto end; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirecting media to point-to-point mode.\n"); + switch_ivr_nomedia(switch_core_session_get_uuid(session), SMF_FORCE); + switch_ivr_nomedia(switch_core_session_get_uuid(peer_session), SMF_FORCE); + switch_ivr_signal_bridge(session, peer_session); + } else { + if (switch_channel_test_flag(caller_channel, CF_BYPASS_MEDIA)) { + switch_ivr_signal_bridge(session, peer_session); + } else { + switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL); + } + } + end: + if (peer_session) { + switch_core_session_rwunlock(peer_session); + } + } +} - +static const switch_application_interface_t bridge_application_interface = { + /*.interface_name */ "bridge", + /*.application_function */ audio_bridge_function, + /* long_desc */ "Bridge the audio between two sessions", + /* short_desc */ "Bridge Audio", + /* syntax */ "<channel_url>", + /* flags */ SAF_SUPPORT_NOMEDIA +}; static const switch_loadable_module_interface_t mod_bridgecall_module_interface = { /*.module_name = */ modname, 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 Tue Jun 12 17:35:37 2007 @@ -2392,6 +2392,8 @@ switch_channel_set_private(channel, "jss", NULL); } + switch_core_event_hook_remove_state_change(jss->session, hanguphook); + if (channel && switch_test_flag(jss, S_HUP)) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); }

1 0

[commit] r5316 - in freeswitch/trunk: conf src/mod/applications/mod_bridgecall src/mod/applications/mod_soundtouch
by Freeswitch SVN 12 Jun '07

12 Jun '07

Author: anthm Date: Tue Jun 12 17:27:16 2007 New Revision: 5316 Added: freeswitch/trunk/src/mod/applications/mod_soundtouch/ freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp Modified: freeswitch/trunk/conf/default_context.xml freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c Log: add example application to demonstrate media rewriting capability with media bugs Modified: freeswitch/trunk/conf/default_context.xml ============================================================================== --- freeswitch/trunk/conf/default_context.xml (original) +++ freeswitch/trunk/conf/default_context.xml Tue Jun 12 17:27:16 2007 @@ -19,6 +19,23 @@ </condition> </extension> + <extension name="9193"> + <condition field="destination_number" expression="^9193$"> + <action application="set" data="bridge_pre_execute_bleg_app=soundtouch"/> +  + <action application="set" data="bridge_pre_execute_bleg_data=send -4s"/> + <action application="bridge" data="sofia/$${domain}/foo"/> + </condition> + </extension> + + + <extension name="9192"> <condition field="destination_number" expression="^9192$">  Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c (original) +++ freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c Tue Jun 12 17:27:16 2007 @@ -36,98 +36,8 @@ static const char modname[] = "mod_bridgecall"; -static void audio_bridge_function(switch_core_session_t *session, char *data) -{ - switch_channel_t *caller_channel; - switch_core_session_t *peer_session = NULL; - unsigned int timelimit = 60; - char *var; - uint8_t no_media_bridge = 0; - switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; - uint8_t do_continue = 0; - - if (switch_strlen_zero(data)) { - return; - } - - caller_channel = switch_core_session_get_channel(session); - assert(caller_channel != NULL); - - if ((var = switch_channel_get_variable(caller_channel, "call_timeout"))) { - timelimit = atoi(var); - } - - if ((var = switch_channel_get_variable(caller_channel, "continue_on_fail"))) { - do_continue = switch_true(var); - } - - if (switch_channel_test_flag(caller_channel, CF_BYPASS_MEDIA) - || ((var = switch_channel_get_variable(caller_channel, SWITCH_BYPASS_MEDIA_VARIABLE)) && switch_true(var))) { - if (!switch_channel_test_flag(caller_channel, CF_ANSWERED) - && !switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) { - switch_channel_set_flag(caller_channel, CF_BYPASS_MEDIA); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already up, delaying point-to-point mode 'till both legs are up.\n"); - no_media_bridge = 1; - } - } - - if (switch_ivr_originate(session, &peer_session, &cause, data, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Originate Failed. Cause: %s\n", switch_channel_cause2str(cause)); - if (!do_continue && cause != SWITCH_CAUSE_NO_ANSWER) { - /* All Causes besides NO_ANSWER terminate the originating session unless continue_on_fail is set. - We will pass the fail cause on when we hangup. */ - switch_channel_hangup(caller_channel, cause); - } - /* Otherwise.. nobody answered. Go back to the dialplan instructions in case there was more to do. */ - return; - } else { - if (no_media_bridge) { - switch_channel_t *peer_channel = switch_core_session_get_channel(peer_session); - switch_frame_t *read_frame; - /* SIP won't let us redir media until the call has been answered #$^#%& so we will proxy any early media until they do */ - while (switch_channel_ready(caller_channel) && switch_channel_ready(peer_channel) - && !switch_channel_test_flag(peer_channel, CF_ANSWERED)) { - switch_status_t status = switch_core_session_read_frame(peer_session, &read_frame, -1, 0); - uint8_t bad = 1; - - if (SWITCH_READ_ACCEPTABLE(status) - && switch_core_session_write_frame(session, read_frame, -1, 0) == SWITCH_STATUS_SUCCESS) { - bad = 0; - } - if (bad) { - switch_channel_hangup(caller_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - switch_channel_hangup(peer_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - goto end; - } - } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirecting media to point-to-point mode.\n"); - switch_ivr_nomedia(switch_core_session_get_uuid(session), SMF_FORCE); - switch_ivr_nomedia(switch_core_session_get_uuid(peer_session), SMF_FORCE); - switch_ivr_signal_bridge(session, peer_session); - } else { - if (switch_channel_test_flag(caller_channel, CF_BYPASS_MEDIA)) { - switch_ivr_signal_bridge(session, peer_session); - } else { - switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL); - } - } - end: - if (peer_session) { - switch_core_session_rwunlock(peer_session); - } - } -} -static const switch_application_interface_t bridge_application_interface = { - /*.interface_name */ "bridge", - /*.application_function */ audio_bridge_function, - /* long_desc */ "Bridge the audio between two sessions", - /* short_desc */ "Bridge Audio", - /* syntax */ "<channel_url>", - /* flags */ SAF_SUPPORT_NOMEDIA -}; + static const switch_loadable_module_interface_t mod_bridgecall_module_interface = { /*.module_name = */ modname, Added: freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile Tue Jun 12 17:27:16 2007 @@ -0,0 +1,19 @@ + +VERSION=soundtouch-1.3.1 +DIRECTORY=$(switch_srcdir)/libs/$(VERSION) +LA=$(DIRECTORY)/source/SoundTouch/.libs/libSoundTouch.a + +BASE=../../../.. +LOCAL_CFLAGS += -I$(DIRECTORY)/include -DINTEGER_SAMPLES +LOCAL_LIBADD=$(LA) +DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic + +include /usr/src/freeswitch.trunk/build/modmake.rules + +$(DIRECTORY): + $(GETLIB) $(VERSION).tar.gz + cd $(DIRECTORY) && ./configure $(DEFAULT_ARGS) --enable-integer-samples + +$(LA): $(DIRECTORY) + cd $(DIRECTORY) && $(MAKE) + $(TOUCH_TARGET) Added: freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp Tue Jun 12 17:27:16 2007 @@ -0,0 +1,340 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * + * mod_soundtouch.c -- Example of writeable media bugs + * + */ + +#include <stdexcept> +#include <stdio.h> +#include <SoundTouch.h> +using namespace soundtouch; +using namespace std; + + +#include <switch.h> +#define STSTART 1024 * 2 +#define STBLOCK 1024 + +static const char modname[] = "mod_soundtouch"; + +struct soundtouch_helper { + SoundTouch *st; + switch_core_session_t *session; + int send; + float pitch; + float octaves; + float semi; + float rate; + float tempo; + int literal; +}; + +static switch_status_t on_dtmf(switch_core_session_t *session, const char *dtmf) +{ + + switch_media_bug_t *bug; + switch_channel_t *channel = switch_core_session_get_channel(session); + + if ((bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_soundtouch_"))) { + struct soundtouch_helper *sth = (struct soundtouch_helper *) switch_core_media_bug_get_user_data(bug); + + if (sth) { + const char *p; + + if (sth->literal) { + sth->literal = 0; + return SWITCH_STATUS_SUCCESS; + } + + for (p = dtmf; p && *p; p++) { + if (sth->literal) { + sth->literal = 0; + return SWITCH_STATUS_SUCCESS; + } + + switch(*p) { + case '*': + sth->literal++; + break; + case '3': + sth->semi += .5; + sth->st->setPitchSemiTones(sth->semi); + sth->st->flush(); + break; + case '2': + sth->semi = 0; + sth->st->setPitchSemiTones(sth->semi); + sth->st->flush(); + break; + case '1': + sth->semi -= .5; + sth->st->setPitchSemiTones(sth->semi); + sth->st->flush(); + break; + + case '6': + sth->pitch += .2; + sth->st->setPitch(sth->pitch); + sth->st->flush(); + break; + case '5': + sth->pitch = 1; + sth->st->setPitch(sth->pitch); + sth->st->flush(); + break; + case '4': + sth->pitch -= .2; + if (sth->pitch <= 0) { + sth->pitch = .2; + } + sth->st->setPitch(sth->pitch); + sth->st->flush(); + break; + + case '9': + sth->octaves += .2; + sth->st->setPitchOctaves(sth->octaves); + sth->st->flush(); + break; + case '8': + sth->octaves = 0; + sth->st->setPitchOctaves(sth->octaves); + sth->st->flush(); + break; + case '7': + sth->octaves -= .2; + sth->st->setPitchOctaves(sth->octaves); + sth->st->flush(); + break; + + + case '0': + sth->octaves = 0; + sth->st->setPitchOctaves(sth->octaves); + sth->pitch = 1; + sth->st->setPitch(sth->pitch); + sth->semi = 0; + sth->st->setPitchSemiTones(sth->semi); + sth->st->flush(); + + } + + } + } + + return SWITCH_STATUS_FALSE; + } + return SWITCH_STATUS_SUCCESS; +} + + +static switch_bool_t soundtouch_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) +{ + struct soundtouch_helper *sth = (struct soundtouch_helper *) user_data; + + switch (type) { + case SWITCH_ABC_TYPE_INIT: + { + switch_codec_t *read_codec = switch_core_session_get_read_codec(sth->session); + sth->st = new SoundTouch(); + sth->st->setSampleRate(read_codec->implementation->samples_per_second); + sth->st->setChannels(read_codec->implementation->number_of_channels); + + sth->st->setSetting(SETTING_USE_QUICKSEEK, 1); + sth->st->setSetting(SETTING_USE_AA_FILTER, 1); + + if (sth->semi) { + sth->st->setPitchSemiTones(sth->semi); + } + + if (sth->pitch) { + sth->st->setPitch(sth->pitch); + } + + if (sth->octaves) { + sth->st->setPitchOctaves(sth->octaves); + } + + if (sth->rate) { + sth->st->setRate(sth->rate); + } + + if (sth->tempo) { + sth->st->setRate(sth->tempo); + } + + if (sth->send) { + switch_core_event_hook_add_send_dtmf(sth->session, on_dtmf); + } else { + switch_core_event_hook_add_recv_dtmf(sth->session, on_dtmf); + } + } + break; + case SWITCH_ABC_TYPE_CLOSE: + { + delete sth->st; + if (sth->send) { + switch_core_event_hook_remove_send_dtmf(sth->session, on_dtmf); + } else { + switch_core_event_hook_remove_recv_dtmf(sth->session, on_dtmf); + } + } + break; + case SWITCH_ABC_TYPE_READ: + case SWITCH_ABC_TYPE_WRITE: + break; + case SWITCH_ABC_TYPE_WRITE_REPLACE: + { + switch_frame_t *frame; + + assert(sth != NULL); + assert(sth->st != NULL); + + frame = switch_core_media_bug_get_replace_frame(bug); + sth->st->putSamples((SAMPLETYPE *)frame->data, frame->samples); + + if (sth->st->numSamples() >= frame->samples * 2) { + frame->samples = sth->st->receiveSamples((SAMPLETYPE *)frame->data, frame->samples); + frame->datalen = frame->samples * 2; + } else { + memset(frame->data, 0, frame->datalen); + } + + switch_core_media_bug_set_replace_frame(bug, frame); + + + } + default: + break; + } + + return SWITCH_TRUE; +} + +static void soundtouch_start_function(switch_core_session_t *session, char *data) +{ + switch_media_bug_t *bug; + switch_status_t status; + switch_channel_t *channel = switch_core_session_get_channel(session); + struct soundtouch_helper *sth; + char *argv[6]; + int argc; + char *lbuf = NULL; + int x; + + if (switch_channel_get_private(channel, "_soundtouch_")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot run 2 at once on the same channel!\n"); + return; + } + + sth = (struct soundtouch_helper *) switch_core_session_alloc(session, sizeof(*sth)); + assert(sth != NULL); + + + if (data && (lbuf = switch_core_session_strdup(session, data)) + && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + if (!strcasecmp(argv[0], "send") && argc >= 1) { + sth->send = 1; + } else { + sth->send = 0; + } + + for(x = 1; x < argc; x++) { + if (strchr(argv[x], 'p')) { + if ((sth->pitch = atof(argv[x]) < 0)) { + sth->pitch = 0; + } + } else if (strchr(argv[x], 'r')) { + sth->rate = atof(argv[x]); + } else if (strchr(argv[x], 'o')) { + sth->octaves = atof(argv[x]); + } else if (strchr(argv[x], 's')) { + sth->semi = atof(argv[x]); + } else if (strchr(argv[x], 't')) { + if ((sth->tempo = atof(argv[x]) < 0)) { + sth->tempo = 0; + } + } + } + } + + + sth->session = session; + + if ((status = switch_core_media_bug_add(session, soundtouch_callback, sth, 0, SMBF_WRITE_REPLACE, &bug)) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failure!\n"); + return; + } + + switch_channel_set_private(channel, "_soundtouch_", bug); + +} +static const 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_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +{ + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &soundtouch_module_interface; + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[commit] r5315 - freeswitch/trunk/scripts/socket/socket2me
by Freeswitch SVN 12 Jun '07

12 Jun '07

Author: mikej Date: Tue Jun 12 17:07:44 2007 New Revision: 5315 Modified: freeswitch/trunk/scripts/socket/socket2me/Makefile Log: add all target Modified: freeswitch/trunk/scripts/socket/socket2me/Makefile ============================================================================== --- freeswitch/trunk/scripts/socket/socket2me/Makefile (original) +++ freeswitch/trunk/scripts/socket/socket2me/Makefile Tue Jun 12 17:07:44 2007 @@ -1,3 +1,4 @@ +all: socket2me socket2me: socket2me.c $(CC) $(CFLAGS) socket2me.c -o socket2me -l spandsp clean:

1 0

[commit] r5314 - in freeswitch/trunk/src: . include mod/event_handlers/mod_event_socket
by Freeswitch SVN 12 Jun '07

12 Jun '07

Author: anthm Date: Tue Jun 12 17:00:26 2007 New Revision: 5314 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_core_event_hook.h freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_event_hook.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_bridge.c Log: hack up the core with a butcher knife Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Jun 12 17:00:26 2007 @@ -789,7 +789,15 @@ \param dtmf string to send to the session \return SWITCH_STATUS_SUCCESS if the dtmf was written */ -SWITCH_DECLARE(switch_status_t) switch_core_session_send_dtmf(switch_core_session_t *session, char *dtmf); +SWITCH_DECLARE(switch_status_t) switch_core_session_send_dtmf(switch_core_session_t *session, const char *dtmf); + +/*! + \brief RECV DTMF on a session + \param session session to recv DTMF from + \param dtmf string to recv from the session + \return SWITCH_STATUS_SUCCESS if the dtmf is ok to queue +*/ +SWITCH_DECLARE(switch_status_t) switch_core_session_recv_dtmf(switch_core_session_t *session, const char *dtmf); ///\} Modified: freeswitch/trunk/src/include/switch_core_event_hook.h ============================================================================== --- freeswitch/trunk/src/include/switch_core_event_hook.h (original) +++ freeswitch/trunk/src/include/switch_core_event_hook.h Tue Jun 12 17:00:26 2007 @@ -32,7 +32,8 @@ #define SWITCH_EVENT_HOOKS_H #include <switch.h> -SWITCH_BEGIN_EXTERN_C typedef struct switch_io_event_hooks switch_io_event_hooks_t; +SWITCH_BEGIN_EXTERN_C +typedef struct switch_io_event_hooks switch_io_event_hooks_t; typedef struct switch_io_event_hook_outgoing_channel switch_io_event_hook_outgoing_channel_t; typedef struct switch_io_event_hook_receive_message switch_io_event_hook_receive_message_t; @@ -45,9 +46,8 @@ typedef struct switch_io_event_hook_waitfor_read switch_io_event_hook_waitfor_read_t; typedef struct switch_io_event_hook_waitfor_write switch_io_event_hook_waitfor_write_t; typedef struct switch_io_event_hook_send_dtmf switch_io_event_hook_send_dtmf_t; +typedef struct switch_io_event_hook_recv_dtmf switch_io_event_hook_recv_dtmf_t; typedef struct switch_io_event_hook_state_change switch_io_event_hook_state_change_t; - - typedef switch_status_t (*switch_outgoing_channel_hook_t) (switch_core_session_t *, switch_caller_profile_t *, switch_core_session_t *); typedef switch_status_t (*switch_receive_message_hook_t) (switch_core_session_t *, switch_core_session_message_t *); typedef switch_status_t (*switch_receive_event_hook_t) (switch_core_session_t *, switch_event_t *); @@ -58,24 +58,24 @@ typedef switch_status_t (*switch_kill_channel_hook_t) (switch_core_session_t *, int); typedef switch_status_t (*switch_waitfor_read_hook_t) (switch_core_session_t *, int, int); typedef switch_status_t (*switch_waitfor_write_hook_t) (switch_core_session_t *, int, int); -typedef switch_status_t (*switch_send_dtmf_hook_t) (switch_core_session_t *, char *); +typedef switch_status_t (*switch_send_dtmf_hook_t) (switch_core_session_t *, const char *); +typedef switch_status_t (*switch_recv_dtmf_hook_t) (switch_core_session_t *, const char *); typedef switch_status_t (*switch_state_change_hook_t) (switch_core_session_t *); -/*! \brief Node in which to store custom outgoing channel callback hooks */ +/*! \brief Node in which to store custom receive message callback hooks */ struct switch_io_event_hook_outgoing_channel { - /*! the outgoing channel callback hook */ switch_outgoing_channel_hook_t outgoing_channel; struct switch_io_event_hook_outgoing_channel *next; }; /*! \brief Node in which to store custom receive message callback hooks */ struct switch_io_event_hook_receive_message { - /*! the message callback hook */ switch_receive_message_hook_t receive_message; struct switch_io_event_hook_receive_message *next; }; + /*! \brief Node in which to store custom receive message callback hooks */ struct switch_io_event_hook_receive_event { /*! the event callback hook */ @@ -139,9 +139,16 @@ struct switch_io_event_hook_send_dtmf *next; }; +/*! \brief Node in which to store custom recv dtmf channel callback hooks */ +struct switch_io_event_hook_recv_dtmf { + /*! the recv dtmf channel callback hook */ + switch_recv_dtmf_hook_t recv_dtmf; + struct switch_io_event_hook_recv_dtmf *next; +}; + /*! \brief Node in which to store state change callback hooks */ struct switch_io_event_hook_state_change { - /*! the send dtmf channel callback hook */ + /*! the state change channel callback hook */ switch_state_change_hook_t state_change; struct switch_io_event_hook_state_change *next; }; @@ -170,106 +177,82 @@ switch_io_event_hook_waitfor_write_t *waitfor_write; /*! a list of send dtmf hooks */ switch_io_event_hook_send_dtmf_t *send_dtmf; + /*! a list of recv dtmf hooks */ + switch_io_event_hook_recv_dtmf_t *recv_dtmf; /*! a list of state change hooks */ switch_io_event_hook_state_change_t *state_change; }; extern switch_io_event_hooks_t switch_core_session_get_event_hooks(switch_core_session_t *session); +#define NEW_HOOK_DECL_ADD_P(_NAME) SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_##_NAME \ + (switch_core_session_t *session, switch_##_NAME##_hook_t _NAME) +#define NEW_HOOK_DECL_REM_P(_NAME) SWITCH_DECLARE(switch_status_t) switch_core_event_hook_remove_##_NAME \ + (switch_core_session_t *session, switch_##_NAME##_hook_t _NAME) -///\defgroup shooks Session Hook Callbacks -///\ingroup core1 -///\{ - -/*! - \brief Add an event hook to be executed when a session requests an outgoing extension - \param session session to bind hook to - \param outgoing_channel hook to bind - \return SWITCH_STATUS_SUCCESS on suceess -*/ -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_outgoing_channel(switch_core_session_t *session, - switch_outgoing_channel_hook_t outgoing_channel); - -/*! - \brief Add an event hook to be executed when a session sends a message - \param session session to bind hook to - \param receive_message hook to bind - \return SWITCH_STATUS_SUCCESS on suceess -*/ -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_receive_message(switch_core_session_t *session, switch_receive_message_hook_t receive_message); - -/*! - \brief Add an event hook to be executed when a session reads a frame - \param session session to bind hook to - \param read_frame hook to bind - \return SWITCH_STATUS_SUCCESS on suceess -*/ -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_read_frame(switch_core_session_t *session, switch_read_frame_hook_t read_frame); - -/*! - \brief Add an event hook to be executed when a session reads a frame - \param session session to bind hook to - \param video_read_frame hook to bind - \return SWITCH_STATUS_SUCCESS on suceess -*/ -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_video_read_frame(switch_core_session_t *session, switch_read_frame_hook_t video_read_frame); - -/*! - \brief Add an event hook to be executed when a session writes a frame - \param session session to bind hook to - \param write_frame hook to bind - \return SWITCH_STATUS_SUCCESS on suceess -*/ -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_write_frame(switch_core_session_t *session, switch_write_frame_hook_t write_frame); - -/*! - \brief Add an event hook to be executed when a session writes a video frame - \param session session to bind hook to - \param video_write_frame hook to bind - \return SWITCH_STATUS_SUCCESS on suceess -*/ -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_video_write_frame(switch_core_session_t *session, switch_video_write_frame_hook_t video_write_frame); - -/*! - \brief Add an event hook to be executed when a session kills a channel - \param session session to bind hook to - \param kill_channel hook to bind - \return SWITCH_STATUS_SUCCESS on suceess -*/ -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_kill_channel(switch_core_session_t *session, switch_kill_channel_hook_t kill_channel); - -/*! - \brief Add an event hook to be executed when a session waits for a read event - \param session session to bind hook to - \param waitfor_read hook to bind - \return SWITCH_STATUS_SUCCESS on suceess -*/ -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_waitfor_read(switch_core_session_t *session, switch_waitfor_read_hook_t waitfor_read); - -/*! - \brief Add an event hook to be executed when a session waits for a write event - \param session session to bind hook to - \param waitfor_write hook to bind - \return SWITCH_STATUS_SUCCESS on suceess -*/ -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_waitfor_write(switch_core_session_t *session, switch_waitfor_write_hook_t waitfor_write); - -/*! - \brief Add an event hook to be executed when a session sends dtmf - \param session session to bind hook to - \param send_dtmf hook to bind - \return SWITCH_STATUS_SUCCESS on suceess -*/ -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_send_dtmf(switch_core_session_t *session, switch_send_dtmf_hook_t send_dtmf); - -/*! - \brief Add an event hook to be executed when a session receives a state change signal - \param session session to bind hook to - \param state_change hook to bind - \return SWITCH_STATUS_SUCCESS on suceess -*/ -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_state_change(switch_core_session_t *session, switch_state_change_hook_t state_change); +#define NEW_HOOK_DECL(_NAME) NEW_HOOK_DECL_ADD_P(_NAME) \ + { \ + switch_io_event_hook_##_NAME##_t *hook, *ptr; \ + assert(_NAME != NULL); \ + if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { \ + hook->_NAME = _NAME ; \ + if (! session->event_hooks._NAME ) { \ + session->event_hooks._NAME = hook; \ + } else { \ + for (ptr = session->event_hooks._NAME; ptr && ptr->next; ptr = ptr->next); \ + ptr->next = hook; \ + } \ + return SWITCH_STATUS_SUCCESS; \ + } \ + return SWITCH_STATUS_MEMERR; \ + } \ + NEW_HOOK_DECL_REM_P(_NAME) \ + { \ + switch_io_event_hook_##_NAME##_t *ptr, *last = NULL; \ + assert(_NAME != NULL); \ + for (ptr = session->event_hooks._NAME; ptr; ptr = ptr->next) { \ + if (ptr->_NAME == _NAME) { \ + if (last) { \ + last->next = ptr->next; \ + } else { \ + session->event_hooks._NAME = ptr->next; \ + } \ + return SWITCH_STATUS_SUCCESS; \ + } \ + last = ptr; \ + } \ + return SWITCH_STATUS_FALSE; \ + } + + +NEW_HOOK_DECL_ADD_P(outgoing_channel); +NEW_HOOK_DECL_ADD_P(receive_message); +NEW_HOOK_DECL_ADD_P(receive_event); +NEW_HOOK_DECL_ADD_P(state_change); +NEW_HOOK_DECL_ADD_P(read_frame); +NEW_HOOK_DECL_ADD_P(write_frame); +NEW_HOOK_DECL_ADD_P(video_read_frame); +NEW_HOOK_DECL_ADD_P(video_write_frame); +NEW_HOOK_DECL_ADD_P(kill_channel); +NEW_HOOK_DECL_ADD_P(waitfor_read); +NEW_HOOK_DECL_ADD_P(waitfor_write); +NEW_HOOK_DECL_ADD_P(send_dtmf); +NEW_HOOK_DECL_ADD_P(recv_dtmf); + +NEW_HOOK_DECL_REM_P(outgoing_channel); +NEW_HOOK_DECL_REM_P(receive_message); +NEW_HOOK_DECL_REM_P(receive_event); +NEW_HOOK_DECL_REM_P(state_change); +NEW_HOOK_DECL_REM_P(read_frame); +NEW_HOOK_DECL_REM_P(write_frame); +NEW_HOOK_DECL_REM_P(video_read_frame); +NEW_HOOK_DECL_REM_P(video_write_frame); +NEW_HOOK_DECL_REM_P(kill_channel); +NEW_HOOK_DECL_REM_P(waitfor_read); +NEW_HOOK_DECL_REM_P(waitfor_write); +NEW_HOOK_DECL_REM_P(send_dtmf); +NEW_HOOK_DECL_REM_P(recv_dtmf); ///\} SWITCH_END_EXTERN_C 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 Tue Jun 12 17:00:26 2007 @@ -136,11 +136,6 @@ if (event->event_id != SWITCH_EVENT_CUSTOM || (event->subclass && switch_core_hash_find(l->event_hash, event->subclass->name))) { send = 1; } - } else { - int x; - for(x = 0; x <= SWITCH_EVENT_ALL; x++) { - printf("%d ", l->event_list[x]); - } } if (send && switch_test_flag(l, LFLAG_MYEVENTS)) { Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Jun 12 17:00:26 2007 @@ -208,7 +208,11 @@ assert(channel != NULL); - switch_mutex_lock(channel->dtmf_mutex); + switch_mutex_lock(channel->dtmf_mutex); + + if ((status = switch_core_session_recv_dtmf(channel->session, dtmf) != SWITCH_STATUS_SUCCESS)) { + goto done; + } inuse = switch_buffer_inuse(channel->dtmf_buffer); len = strlen(dtmf); @@ -227,6 +231,9 @@ p++; } status = switch_buffer_write(channel->dtmf_buffer, dtmf, wr) ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_MEMERR; + + done: + switch_mutex_unlock(channel->dtmf_mutex); return status; Modified: freeswitch/trunk/src/switch_core_event_hook.c ============================================================================== --- freeswitch/trunk/src/switch_core_event_hook.c (original) +++ freeswitch/trunk/src/switch_core_event_hook.c Tue Jun 12 17:00:26 2007 @@ -31,222 +31,18 @@ #include "switch.h" #include "private/switch_core_pvt.h" -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_outgoing(switch_core_session_t *session, switch_outgoing_channel_hook_t outgoing_channel) -{ - switch_io_event_hook_outgoing_channel_t *hook, *ptr; + - assert(outgoing_channel != NULL); - if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { - hook->outgoing_channel = outgoing_channel; - if (!session->event_hooks.outgoing_channel) { - session->event_hooks.outgoing_channel = hook; - } else { - for (ptr = session->event_hooks.outgoing_channel; ptr && ptr->next; ptr = ptr->next); - ptr->next = hook; - - } - - return SWITCH_STATUS_SUCCESS; - } - - return SWITCH_STATUS_MEMERR; -} - -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_state_change(switch_core_session_t *session, switch_state_change_hook_t state_change) -{ - switch_io_event_hook_state_change_t *hook, *ptr; - - assert(state_change != NULL); - if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { - hook->state_change = state_change; - if (!session->event_hooks.state_change) { - session->event_hooks.state_change = hook; - } else { - for (ptr = session->event_hooks.state_change; ptr && ptr->next; ptr = ptr->next); - ptr->next = hook; - - } - - return SWITCH_STATUS_SUCCESS; - } - - return SWITCH_STATUS_MEMERR; - -} - -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_read_frame(switch_core_session_t *session, switch_read_frame_hook_t read_frame) -{ - switch_io_event_hook_read_frame_t *hook, *ptr; - - assert(read_frame != NULL); - if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { - hook->read_frame = read_frame; - if (!session->event_hooks.read_frame) { - session->event_hooks.read_frame = hook; - } else { - for (ptr = session->event_hooks.read_frame; ptr && ptr->next; ptr = ptr->next); - ptr->next = hook; - - } - - return SWITCH_STATUS_SUCCESS; - } - - return SWITCH_STATUS_MEMERR; - -} - -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_write_frame(switch_core_session_t *session, switch_write_frame_hook_t write_frame) -{ - switch_io_event_hook_write_frame_t *hook, *ptr; - - assert(write_frame != NULL); - if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { - hook->write_frame = write_frame; - if (!session->event_hooks.write_frame) { - session->event_hooks.write_frame = hook; - } else { - for (ptr = session->event_hooks.write_frame; ptr && ptr->next; ptr = ptr->next); - ptr->next = hook; - - } - - return SWITCH_STATUS_SUCCESS; - } - - return SWITCH_STATUS_MEMERR; - -} - -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_video_read_frame(switch_core_session_t *session, switch_video_read_frame_hook_t video_read_frame) -{ - switch_io_event_hook_video_read_frame_t *hook, *ptr; - - assert(video_read_frame != NULL); - if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { - hook->video_read_frame = video_read_frame; - if (!session->event_hooks.video_read_frame) { - session->event_hooks.video_read_frame = hook; - } else { - for (ptr = session->event_hooks.video_read_frame; ptr && ptr->next; ptr = ptr->next); - ptr->next = hook; - - } - - return SWITCH_STATUS_SUCCESS; - } - - return SWITCH_STATUS_MEMERR; - -} - -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_video_write_frame(switch_core_session_t *session, switch_video_write_frame_hook_t video_write_frame) -{ - switch_io_event_hook_video_write_frame_t *hook, *ptr; - - assert(video_write_frame != NULL); - if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { - hook->video_write_frame = video_write_frame; - if (!session->event_hooks.video_write_frame) { - session->event_hooks.video_write_frame = hook; - } else { - for (ptr = session->event_hooks.video_write_frame; ptr && ptr->next; ptr = ptr->next); - ptr->next = hook; - - } - - return SWITCH_STATUS_SUCCESS; - } - - return SWITCH_STATUS_MEMERR; - -} - -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_kill_channel(switch_core_session_t *session, switch_kill_channel_hook_t kill_channel) -{ - switch_io_event_hook_kill_channel_t *hook, *ptr; - - assert(kill_channel != NULL); - if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { - hook->kill_channel = kill_channel; - if (!session->event_hooks.kill_channel) { - session->event_hooks.kill_channel = hook; - } else { - for (ptr = session->event_hooks.kill_channel; ptr && ptr->next; ptr = ptr->next); - ptr->next = hook; - - } - - return SWITCH_STATUS_SUCCESS; - } - - return SWITCH_STATUS_MEMERR; - -} - -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_waitfor_read(switch_core_session_t *session, switch_waitfor_read_hook_t waitfor_read) -{ - switch_io_event_hook_waitfor_read_t *hook, *ptr; - - assert(waitfor_read != NULL); - if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { - hook->waitfor_read = waitfor_read; - if (!session->event_hooks.waitfor_read) { - session->event_hooks.waitfor_read = hook; - } else { - for (ptr = session->event_hooks.waitfor_read; ptr && ptr->next; ptr = ptr->next); - ptr->next = hook; - - } - - return SWITCH_STATUS_SUCCESS; - } - - return SWITCH_STATUS_MEMERR; - -} - -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_waitfor_write(switch_core_session_t *session, switch_waitfor_write_hook_t waitfor_write) -{ - switch_io_event_hook_waitfor_write_t *hook, *ptr; - - assert(waitfor_write != NULL); - if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { - hook->waitfor_write = waitfor_write; - if (!session->event_hooks.waitfor_write) { - session->event_hooks.waitfor_write = hook; - } else { - for (ptr = session->event_hooks.waitfor_write; ptr && ptr->next; ptr = ptr->next); - ptr->next = hook; - - } - - return SWITCH_STATUS_SUCCESS; - } - - return SWITCH_STATUS_MEMERR; - -} - - -SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_send_dtmf(switch_core_session_t *session, switch_send_dtmf_hook_t send_dtmf) -{ - switch_io_event_hook_send_dtmf_t *hook, *ptr; - - assert(send_dtmf != NULL); - if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { - hook->send_dtmf = send_dtmf; - if (!session->event_hooks.send_dtmf) { - session->event_hooks.send_dtmf = hook; - } else { - for (ptr = session->event_hooks.send_dtmf; ptr && ptr->next; ptr = ptr->next); - ptr->next = hook; - - } - - return SWITCH_STATUS_SUCCESS; - } - - return SWITCH_STATUS_MEMERR; - -} +NEW_HOOK_DECL(outgoing_channel) +NEW_HOOK_DECL(receive_message) +NEW_HOOK_DECL(receive_event) +NEW_HOOK_DECL(state_change) +NEW_HOOK_DECL(read_frame) +NEW_HOOK_DECL(write_frame) +NEW_HOOK_DECL(video_read_frame) +NEW_HOOK_DECL(video_write_frame) +NEW_HOOK_DECL(kill_channel) +NEW_HOOK_DECL(waitfor_read) +NEW_HOOK_DECL(waitfor_write) +NEW_HOOK_DECL(send_dtmf) +NEW_HOOK_DECL(recv_dtmf) Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Jun 12 17:00:26 2007 @@ -464,7 +464,7 @@ session->write_resampler->from_len = write_frame->datalen / 2; switch_short_to_float(data, session->write_resampler->from, session->write_resampler->from_len); - + session->write_resampler->to_len = (uint32_t) switch_resample_process(session->write_resampler, session->write_resampler->from, @@ -497,7 +497,7 @@ } else if (switch_test_flag(bp, SMBF_WRITE_REPLACE)) { do_bugs = 0; if (bp->callback) { - bp->replace_frame_in = frame; + bp->replace_frame_in = write_frame; bp->replace_frame_out = NULL; if ((ok = bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_WRITE_REPLACE)) == SWITCH_TRUE) { write_frame = bp->replace_frame_out; @@ -790,14 +790,34 @@ } -SWITCH_DECLARE(switch_status_t) switch_core_session_send_dtmf(switch_core_session_t *session, char *dtmf) +SWITCH_DECLARE(switch_status_t) switch_core_session_recv_dtmf(switch_core_session_t *session, const char *dtmf) +{ + switch_io_event_hook_recv_dtmf_t *ptr; + switch_status_t status; + + for (ptr = session->event_hooks.recv_dtmf; ptr; ptr = ptr->next) { + if ((status = ptr->recv_dtmf(session, dtmf)) != SWITCH_STATUS_SUCCESS) { + return status; + } + } + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_DECLARE(switch_status_t) switch_core_session_send_dtmf(switch_core_session_t *session, const char *dtmf) { switch_io_event_hook_send_dtmf_t *ptr; switch_status_t status = SWITCH_STATUS_FALSE; - + + + for (ptr = session->event_hooks.send_dtmf; ptr; ptr = ptr->next) { + if ((status = ptr->send_dtmf(session, dtmf)) != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_SUCCESS; + } + } + if (session->endpoint_interface->io_routines->send_dtmf) { if (strchr(dtmf, 'w') || strchr(dtmf, 'W')) { - char *d; + const char *d; for (d = dtmf; d && *d; d++) { char digit[2] = { 0 }; @@ -815,16 +835,9 @@ } } } else { - status = session->endpoint_interface->io_routines->send_dtmf(session, dtmf); + status = session->endpoint_interface->io_routines->send_dtmf(session, (char *)dtmf); } - if (status == SWITCH_STATUS_SUCCESS) { - for (ptr = session->event_hooks.send_dtmf; ptr; ptr = ptr->next) { - if ((status = ptr->send_dtmf(session, dtmf)) != SWITCH_STATUS_SUCCESS) { - break; - } - } - } } return status; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Jun 12 17:00:26 2007 @@ -871,6 +871,14 @@ context = new_profile->context; } + if (switch_strlen_zero(context)) { + context = "default"; + } + + if (switch_strlen_zero(dialplan)) { + context = "XML"; + } + switch_channel_set_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE, NULL); if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Tue Jun 12 17:00:26 2007 @@ -120,7 +120,6 @@ char dtmf[128]; switch_channel_dequeue_dtmf(chan_a, dtmf, sizeof(dtmf)); switch_core_session_send_dtmf(session_b, dtmf); - if (input_callback) { if (input_callback(session_a, dtmf, SWITCH_INPUT_TYPE_DTMF, user_data, 0) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s ended call via DTMF\n", switch_channel_get_name(chan_a)); @@ -526,13 +525,13 @@ switch_copy_string(b_leg->b_uuid, switch_core_session_get_uuid(session), sizeof(b_leg->b_uuid)); b_leg->stream_id = stream_id; b_leg->input_callback = input_callback; - b_leg->session_data = session_data; + b_leg->session_data = peer_session_data; a_leg->session = session; switch_copy_string(a_leg->b_uuid, switch_core_session_get_uuid(peer_session), sizeof(a_leg->b_uuid)); - b_leg->stream_id = stream_id; - b_leg->input_callback = input_callback; - b_leg->session_data = peer_session_data; + a_leg->stream_id = stream_id; + a_leg->input_callback = input_callback; + a_leg->session_data = session_data; switch_channel_add_state_handler(peer_channel, &audio_bridge_peer_state_handlers); @@ -543,6 +542,8 @@ if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) { switch_event_t *event; switch_core_session_message_t msg = { 0 }; + const switch_application_interface_t *application_interface; + char *app, *data; switch_channel_set_state(peer_channel, CS_HOLD); @@ -555,6 +556,21 @@ switch_channel_set_variable(caller_channel, SWITCH_BRIDGE_VARIABLE, switch_core_session_get_uuid(peer_session)); switch_channel_set_variable(peer_channel, SWITCH_BRIDGE_VARIABLE, switch_core_session_get_uuid(session)); + if ((app = switch_channel_get_variable(caller_channel, "bridge_pre_execute_aleg_app"))) { + data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_aleg_data"); + if ((application_interface = switch_loadable_module_get_application_interface(app))) { + switch_core_session_exec(session, application_interface, data); + } + } + + if ((app = switch_channel_get_variable(caller_channel, "bridge_pre_execute_bleg_app"))) { + data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_bleg_data"); + if ((application_interface = switch_loadable_module_get_application_interface(app))) { + switch_core_session_exec(peer_session, application_interface, data); + } + } + + msg.message_id = SWITCH_MESSAGE_INDICATE_BRIDGE; msg.from = __FILE__; msg.string_arg = switch_core_session_strdup(peer_session, switch_core_session_get_uuid(session));

1 0