- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10376 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 13 Nov '08

13 Nov '08

Author: anthm Date: Thu Nov 13 13:03:36 2008 New Revision: 10376 Log: fix win32 build Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Thu Nov 13 13:03:36 2008 @@ -2661,8 +2661,8 @@ if ((psession = switch_core_session_locate(uuid))) { switch_channel_t *channel = switch_core_session_get_channel(psession); + int x, y = 0; argc = switch_separate_string(vars, ';', argv, (sizeof(argv) / sizeof(argv[0]))); - int x, y = 0; for (x = 0 ; x < argc; x++) { var_name = argv[x];

1 0

[commit] r10375 - in freeswitch/trunk/src: . include include/private mod/dialplans/mod_dialplan_asterisk mod/languages/mod_spidermonkey
by FreeSWITCH SVN 13 Nov '08

13 Nov '08

Author: anthm Date: Thu Nov 13 12:40:25 2008 New Revision: 10375 Log: more ref checking Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_core_codec.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_menu.c freeswitch/trunk/src/switch_ivr_originate.c 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 Thu Nov 13 12:40:25 2008 @@ -94,7 +94,7 @@ struct switch_core_session { switch_memory_pool_t *pool; switch_thread_t *thread; - const switch_endpoint_interface_t *endpoint_interface; + switch_endpoint_interface_t *endpoint_interface; switch_size_t id; switch_session_flag_t flags; int thread_running; Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Nov 13 12:40:25 2008 @@ -508,7 +508,7 @@ \param pool the pool to use for the allocation (a new one will be used if NULL) \return the newly created session */ -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_uuid(_In_ const switch_endpoint_interface_t *endpoint_interface, +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_uuid(_In_ switch_endpoint_interface_t *endpoint_interface, _Inout_opt_ switch_memory_pool_t **pool, _In_opt_z_ const char *use_uuid); #define switch_core_session_request(_ep, _p) switch_core_session_request_uuid(_ep, _p, NULL) Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Thu Nov 13 12:40:25 2008 @@ -81,6 +81,7 @@ /*! the table of management interfaces the module has implmented */ switch_management_interface_t *management_interface; switch_thread_rwlock_t *rwlock; + int refs; switch_memory_pool_t *pool; }; Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Thu Nov 13 12:40:25 2008 @@ -172,6 +172,7 @@ void *private_info; switch_thread_rwlock_t *rwlock; + int refs; /* parent */ switch_loadable_module_interface_t *parent; @@ -226,6 +227,7 @@ /*! function to deallocate the timer */ switch_status_t (*timer_destroy) (switch_timer_t *); switch_thread_rwlock_t *rwlock; + int refs; switch_loadable_module_interface_t *parent; struct switch_timer_interface *next; }; @@ -237,6 +239,7 @@ /*! the function to read an extension and set a channels dialpan */ switch_dialplan_hunt_function_t hunt_function; switch_thread_rwlock_t *rwlock; + int refs; switch_loadable_module_interface_t *parent; struct switch_dialplan_interface *next; }; @@ -262,6 +265,7 @@ /*! list of supported file extensions */ char **extens; switch_thread_rwlock_t *rwlock; + int refs; switch_loadable_module_interface_t *parent; struct switch_file_interface *next; }; @@ -269,7 +273,7 @@ /*! an abstract representation of a file handle (some parameters based on compat with libsndfile) */ struct switch_file_handle { /*! the interface of the module that implemented the current file type */ - const switch_file_interface_t *file_interface; + switch_file_interface_t *file_interface; /*! flags to control behaviour */ uint32_t flags; /*! a file descriptor if neceessary */ @@ -340,6 +344,7 @@ /*! function to read results from the ASR */ switch_status_t (*asr_get_results) (switch_asr_handle_t *ah, char **xmlstr, switch_asr_flag_t *flags); switch_thread_rwlock_t *rwlock; + int refs; switch_loadable_module_interface_t *parent; struct switch_asr_interface *next; }; @@ -347,7 +352,7 @@ /*! an abstract representation of an asr speech interface. */ struct switch_asr_handle { /*! the interface of the module that implemented the current speech interface */ - const switch_asr_interface_t *asr_interface; + switch_asr_interface_t *asr_interface; /*! flags to control behaviour */ uint32_t flags; /*! The Name */ @@ -382,6 +387,7 @@ void (*speech_numeric_param_tts) (switch_speech_handle_t *sh, char *param, int val); void (*speech_float_param_tts) (switch_speech_handle_t *sh, char *param, double val); switch_thread_rwlock_t *rwlock; + int refs; switch_loadable_module_interface_t *parent; struct switch_speech_interface *next; }; @@ -390,7 +396,7 @@ /*! an abstract representation of a asr/tts speech interface. */ struct switch_speech_handle { /*! the interface of the module that implemented the current speech interface */ - const switch_speech_interface_t *speech_interface; + switch_speech_interface_t *speech_interface; /*! flags to control behaviour */ uint32_t flags; /*! The Name */ @@ -416,6 +422,7 @@ /*! function to pass down to the module */ switch_say_callback_t say_function; switch_thread_rwlock_t *rwlock; + int refs; switch_loadable_module_interface_t *parent; struct switch_say_interface *next; }; @@ -427,6 +434,7 @@ /*! function to open the directory interface */ switch_status_t (*chat_send) (char *proto, char *from, char *to, char *subject, char *body, char *hint); switch_thread_rwlock_t *rwlock; + int refs; switch_loadable_module_interface_t *parent; struct switch_chat_interface *next; }; @@ -438,6 +446,7 @@ /*! function to open the directory interface */ switch_status_t (*management_function) (char *relative_oid, switch_management_action_t action, char *data, switch_size_t datalen); switch_thread_rwlock_t *rwlock; + int refs; switch_loadable_module_interface_t *parent; struct switch_management_interface *next; }; @@ -457,6 +466,7 @@ /*! function to advance to the next name/value pair in the current record */ switch_status_t (*directory_next_pair) (switch_directory_handle_t *dh, char **var, char **val); switch_thread_rwlock_t *rwlock; + int refs; switch_loadable_module_interface_t *parent; struct switch_directory_interface *next; }; @@ -464,7 +474,7 @@ /*! an abstract representation of a directory interface. */ struct switch_directory_handle { /*! the interface of the module that implemented the current directory interface */ - const switch_directory_interface_t *directory_interface; + switch_directory_interface_t *directory_interface; /*! flags to control behaviour */ uint32_t flags; @@ -515,7 +525,7 @@ /*! an abstract handle to a codec module */ struct switch_codec { /*! the codec interface table this handle uses */ - const switch_codec_interface_t *codec_interface; + switch_codec_interface_t *codec_interface; /*! the specific implementation of the above codec */ const switch_codec_implementation_t *implementation; /*! fmtp line from remote sdp */ @@ -582,6 +592,7 @@ switch_codec_implementation_t *implementations; uint32_t codec_id; switch_thread_rwlock_t *rwlock; + int refs; switch_loadable_module_interface_t *parent; struct switch_codec_interface *next; }; @@ -601,6 +612,7 @@ /*! flags to control behaviour */ uint32_t flags; switch_thread_rwlock_t *rwlock; + int refs; switch_loadable_module_interface_t *parent; struct switch_application_interface *next; }; @@ -616,12 +628,13 @@ /*! an example of the api syntax */ const char *syntax; switch_thread_rwlock_t *rwlock; + int refs; switch_loadable_module_interface_t *parent; struct switch_api_interface *next; }; -#define PROTECT_INTERFACE(_it) switch_thread_rwlock_rdlock(_it->parent->rwlock); switch_thread_rwlock_rdlock(_it->rwlock) -#define UNPROTECT_INTERFACE(_it) switch_thread_rwlock_unlock(_it->rwlock); switch_thread_rwlock_unlock(_it->parent->rwlock); _it = NULL +#define PROTECT_INTERFACE(_it) if (!_it->refs) {switch_thread_rwlock_rdlock(_it->parent->rwlock); switch_thread_rwlock_rdlock(_it->rwlock); _it->refs++; _it->parent->refs++;} +#define UNPROTECT_INTERFACE(_it) if (_it->refs) {switch_thread_rwlock_unlock(_it->rwlock); switch_thread_rwlock_unlock(_it->parent->rwlock); _it->refs--; _it->parent->refs--; _it = NULL;} SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Thu Nov 13 12:40:25 2008 @@ -38,7 +38,7 @@ static switch_status_t exec_app(switch_core_session_t *session, char *app, char *arg) { - const switch_application_interface_t *application_interface; + switch_application_interface_t *application_interface; switch_status_t status = SWITCH_STATUS_FALSE; if ((application_interface = switch_loadable_module_get_application_interface(app))) { 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 Thu Nov 13 12:40:25 2008 @@ -2199,7 +2199,7 @@ /* you can execute some apps before you answer CHANNEL_SANITY_CHECK(); */ if (argc > 0) { - const switch_application_interface_t *application_interface; + switch_application_interface_t *application_interface; char *app_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); char *app_arg = NULL; jsrefcount saveDepth; Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Thu Nov 13 12:40:25 2008 @@ -378,7 +378,7 @@ uint32_t rate, int ms, int channels, uint32_t flags, const switch_codec_settings_t *codec_settings, switch_memory_pool_t *pool) { - const switch_codec_interface_t *codec_interface; + switch_codec_interface_t *codec_interface; const switch_codec_implementation_t *iptr, *implementation = NULL; const char *mode = fmtp; Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu Nov 13 12:40:25 2008 @@ -789,7 +789,7 @@ { switch_memory_pool_t *pool; switch_event_t *event; - const switch_endpoint_interface_t *endpoint_interface = (*session)->endpoint_interface; + switch_endpoint_interface_t *endpoint_interface = (*session)->endpoint_interface; switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Close Channel %s [%s]\n", @@ -998,7 +998,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_uuid(const switch_endpoint_interface_t +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_uuid(switch_endpoint_interface_t *endpoint_interface, switch_memory_pool_t **pool, const char *use_uuid) { switch_memory_pool_t *usepool; @@ -1110,14 +1110,13 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_by_name(const char *endpoint_name, switch_memory_pool_t **pool) { - const switch_endpoint_interface_t *endpoint_interface, *e; + switch_endpoint_interface_t *endpoint_interface; if ((endpoint_interface = switch_loadable_module_get_endpoint_interface(endpoint_name)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not locate channel type %s\n", endpoint_name); return NULL; } - e = endpoint_interface; - UNPROTECT_INTERFACE(e); + return switch_core_session_request(endpoint_interface, pool); } @@ -1187,7 +1186,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_execute_application(switch_core_session_t *session, const char *app, const char *arg) { - const switch_application_interface_t *application_interface; + switch_application_interface_t *application_interface; char *expanded = NULL; const char *var; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Nov 13 12:40:25 2008 @@ -344,7 +344,7 @@ } if (cmd_hash == CMD_EXECUTE) { - const switch_application_interface_t *application_interface; + switch_application_interface_t *application_interface; char *app_name = switch_event_get_header(event, "execute-app-name"); char *app_arg = switch_event_get_header(event, "execute-app-arg"); char *loop_h = switch_event_get_header(event, "loops"); Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Thu Nov 13 12:40:25 2008 @@ -463,7 +463,7 @@ break; case SWITCH_IVR_ACTION_EXECAPP: { - const switch_application_interface_t *application_interface; + switch_application_interface_t *application_interface; char *app_name; char *app_arg = NULL; Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Thu Nov 13 12:40:25 2008 @@ -99,7 +99,7 @@ if (!strcasecmp(collect->key, "exec")) { char *data; - const switch_application_interface_t *application_interface; + switch_application_interface_t *application_interface; char *app_name, *app_data; if (!(data = collect->file)) {

1 0

[commit] r10374 - freeswitch/trunk/src/mod/formats/mod_local_stream
by FreeSWITCH SVN 13 Nov '08

13 Nov '08

Author: brian Date: Thu Nov 13 11:54:53 2008 New Revision: 10374 Log: increase prebuffer Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Thu Nov 13 11:54:53 2008 @@ -32,7 +32,7 @@ */ #include <switch.h> /* for apr_pstrcat */ -#define DEFAULT_PREBUFFER_SIZE 1024 * 16 +#define DEFAULT_PREBUFFER_SIZE 1024 * 32 SWITCH_MODULE_LOAD_FUNCTION(mod_local_stream_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_local_stream_shutdown);

1 0

[commit] r10373 - freeswitch/trunk/src
by FreeSWITCH SVN 13 Nov '08

13 Nov '08

Author: anthm Date: Thu Nov 13 11:36:55 2008 New Revision: 10373 Log: mac can't handle 1ms conditional broadcasts Modified: freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Thu Nov 13 11:36:55 2008 @@ -35,6 +35,10 @@ #include <stdio.h> #include "private/switch_core_pvt.h" +#if defined(DARWIN) +#define DISABLE_1MS_COND +#endif + #ifndef UINT32_MAX #define UINT32_MAX 0xffffffff #endif @@ -84,6 +88,27 @@ static timer_matrix_t TIMER_MATRIX[MAX_ELEMENTS + 1]; +static void do_sleep(switch_interval_time_t t) +{ +#if defined(WIN32) + if (t < 1000) { + t = 1000; + } +#endif + +#if defined(DARWIN) + struct timespec ts; + ts.tv_sec = t / APR_USEC_PER_SEC; + ts.tv_nsec = (t % APR_USEC_PER_SEC) * 1000; + + nanosleep(&ts, NULL); + sched_yield(); +#else + apr_sleep(t); +#endif + +} + SWITCH_DECLARE(switch_time_t) switch_timestamp_now(void) { return runtime.timestamp ? runtime.timestamp : switch_time_now(); @@ -141,27 +166,25 @@ SWITCH_DECLARE(void) switch_micro_sleep(switch_interval_time_t t) { - apr_sleep(t); + do_sleep(t); } SWITCH_DECLARE(void) switch_sleep(switch_interval_time_t t) { - if (t <= 1000) { -#if defined(WIN32) - Sleep(1); -#else - apr_sleep(t); -#endif + if (t < 1000) { + do_sleep(t); return; } +#ifndef DISABLE_1MS_COND if (globals.use_cond_yield == 1) { switch_cond_yield((uint32_t)(t / 1000)); return; } - - apr_sleep(t); +#endif + + do_sleep(t); } @@ -170,7 +193,7 @@ if (!ms) return; if (globals.use_cond_yield != 1) { - apr_sleep(ms * 1000); + do_sleep(ms * 1000); return; } @@ -188,7 +211,7 @@ int sanity = 0; while (globals.STARTED == 0) { - apr_sleep(100000); + do_sleep(100000); if (++sanity == 10) { break; } @@ -199,9 +222,6 @@ } if ((private_info = switch_core_alloc(timer->memory_pool, sizeof(*private_info)))) { -#if defined(WIN32) - timeBeginPeriod(1); -#endif switch_mutex_lock(globals.mutex); if (!TIMER_MATRIX[timer->interval].mutex) { switch_mutex_init(&TIMER_MATRIX[timer->interval].mutex, SWITCH_MUTEX_NESTED, module_pool); @@ -284,7 +304,7 @@ #else while (globals.RUNNING == 1 && private_info->ready && TIMER_MATRIX[timer->interval].tick < private_info->reference) { check_roll(); - apr_sleep(1000); + do_sleep(1000); } #endif @@ -368,7 +388,7 @@ runtime.initiated = runtime.reference; break; } - apr_sleep(STEP_MIC); + do_sleep(STEP_MIC); last = ts; } } @@ -377,10 +397,11 @@ last = 0; fwd_errs = rev_errs = 0; - +#ifndef DISABLE_1MS_COND switch_mutex_init(&TIMER_MATRIX[1].mutex, SWITCH_MUTEX_NESTED, module_pool); switch_thread_cond_create(&TIMER_MATRIX[1].cond, module_pool); - +#endif + globals.use_cond_yield = globals.RUNNING == 1; while (globals.RUNNING == 1) { @@ -403,7 +424,7 @@ } else { rev_errs = 0; } - apr_sleep(STEP_MIC); + do_sleep(STEP_MIC); last = ts; } @@ -448,6 +469,7 @@ tick = 0; } +#ifndef DISABLE_1MS_COND TIMER_MATRIX[1].tick++; if (switch_mutex_trylock(TIMER_MATRIX[1].mutex) == SWITCH_STATUS_SUCCESS) { switch_thread_cond_broadcast(TIMER_MATRIX[1].cond); @@ -457,7 +479,7 @@ TIMER_MATRIX[1].tick = 0; TIMER_MATRIX[1].roll++; } - +#endif if ((current_ms % MS_PER_TICK) == 0) { for (x = MS_PER_TICK; x <= MAX_ELEMENTS; x += MS_PER_TICK) { @@ -680,6 +702,10 @@ switch_timer_interface_t *timer_interface; module_pool = pool; +#if defined(WIN32) + timeBeginPeriod(1); +#endif + memset(&globals, 0, sizeof(globals)); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); @@ -711,7 +737,7 @@ switch_mutex_unlock(globals.mutex); while (globals.RUNNING == -1) { - apr_sleep(10000); + do_sleep(10000); } } #if defined(WIN32)

1 0

[commit] r10372 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 13 Nov '08

13 Nov '08

Author: anthm Date: Thu Nov 13 11:36:22 2008 New Revision: 10372 Log: oops i found this on one of my boxes and never comitted it Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Thu Nov 13 11:36:22 2008 @@ -2639,6 +2639,62 @@ return SWITCH_STATUS_SUCCESS; } + +#define SETVAR_MULTI_SYNTAX "<uuid> <var>=<value>;<var>=<value>..." +SWITCH_STANDARD_API(uuid_setvar_multi_function) +{ + switch_core_session_t *psession = NULL; + char *mycmd = NULL, *vars, *argv[2] = { 0 }; + int argc = 0; + char *var_name, *var_value; + + if (session) { + return SWITCH_STATUS_FALSE; + } + + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + char *uuid = mycmd; + if (!(vars = strchr(uuid, ' '))) { + goto done; + } + *vars++ = '\0'; + + if ((psession = switch_core_session_locate(uuid))) { + switch_channel_t *channel = switch_core_session_get_channel(psession); + argc = switch_separate_string(vars, ';', argv, (sizeof(argv) / sizeof(argv[0]))); + int x, y = 0; + + for (x = 0 ; x < argc; x++) { + var_name = argv[x]; + if ((var_value = strchr(var_name, '='))) { + *var_value++ = '\0'; + } + if (switch_strlen_zero(var_name)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); + stream->write_function(stream, "-ERR No variable specified\n"); + } else { + switch_channel_set_variable(channel, var_name, var_value); + y++; + } + } + + switch_core_session_rwunlock(psession); + if (y) { + stream->write_function(stream, "+OK\n"); + goto done; + } + } else { + stream->write_function(stream, "-ERR No Such Channel!\n"); + } + } + + stream->write_function(stream, "-USAGE: %s\n", SETVAR_SYNTAX); + + done: + switch_safe_free(mycmd); + return SWITCH_STATUS_SUCCESS; +} + #define GETVAR_SYNTAX "<uuid> <var>" SWITCH_STANDARD_API(uuid_getvar_function) { @@ -2970,6 +3026,7 @@ SWITCH_ADD_API(commands_api_interface, "uuid_session_heartbeat", "uuid_session_heartbeat", uuid_session_heartbeat_function, HEARTBEAT_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_bridge", "uuid_bridge", uuid_bridge_function, ""); SWITCH_ADD_API(commands_api_interface, "uuid_setvar", "uuid_setvar", uuid_setvar_function, SETVAR_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_setvar_multi", "uuid_setvar_multi", uuid_setvar_multi_function, SETVAR_MULTI_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_getvar", "uuid_getvar", uuid_getvar_function, GETVAR_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_dump", "uuid_dump", uuid_dump_function, DUMP_SYNTAX); SWITCH_ADD_API(commands_api_interface, "global_setvar", "global_setvar", global_setvar_function, GLOBAL_SETVAR_SYNTAX);

1 0

[commit] r10371 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 13 Nov '08

13 Nov '08

Author: gmaruzz Date: Thu Nov 13 11:08:28 2008 New Revision: 10371 Log: skypiax: at the moment it's an hack made of ad hoc band aids. But it can accept incoming calls and originate outbound calls, audio is going back and forth, and so are DTMFs. It works just for one call. Crashes on exit. Now I got a vague idea of how an endpoint is working on FS. During the next days, a fairly thorough rewrite. Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Thu Nov 13 11:08:28 2008 @@ -220,6 +220,7 @@ static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig); int option_debug = 100; +switch_core_session_t *global_session = NULL; static switch_status_t skypiax_codec(private_t *tech_pvt, int sample_rate, int codec_ms) { @@ -687,12 +688,11 @@ { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "skypiax_docec FAILED\n"); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "skypiax_docec SUCCESS\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "skypiax_codec SUCCESS\n"); } DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } - /* State methods they get called when the state changes to the specific state returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next @@ -1018,7 +1018,7 @@ return SWITCH_STATUS_SUCCESS; } - +#ifdef NOTDEF //FIXME: moved below /* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines that allocate memory or you will have 1 channel with memory allocated from another channel's pool! */ @@ -1033,6 +1033,7 @@ switch_core_session_add_stream(*new_session, NULL); if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) != 0) { + tech_pvt->p = SKYPIAX_CONFIGS[2]; //FIXME channel = switch_core_session_get_channel(*new_session); tech_init(tech_pvt, *new_session, NULL); } else { @@ -1044,7 +1045,7 @@ if (outbound_profile) { char name[128]; - snprintf(name, sizeof(name), "SKYPIAX/%s", outbound_profile->destination_number); + snprintf(name, sizeof(name), "skypiax/%s", outbound_profile->destination_number); switch_channel_set_name(channel, name); caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); @@ -1057,6 +1058,7 @@ } + skypiax_skype_call(tech_pvt->p, outbound_profile->destination_number, 30); switch_channel_set_flag(channel, CF_OUTBOUND); switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); @@ -1067,6 +1069,7 @@ return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } +#endif // NOTDEF //FIXME: moved below static switch_status_t channel_receive_event(switch_core_session_t *session, switch_event_t *event) { @@ -1727,6 +1730,7 @@ DEBUGA_SKYPE("We missed skype_call %s\n", SKYPIAX_P_LOG, id); } else if (!strcasecmp(value, "FINISHED")) { + global_session = NULL; //FIXME p->skype_callflow = CALLFLOW_STATUS_FINISHED; if (option_debug) DEBUGA_SKYPE("skype_call %s now is DOWN\n", SKYPIAX_P_LOG, id); @@ -1873,7 +1877,7 @@ //FIXME *new_session=switch_loadable_module_create_interface(skypiax_endpoint_interface, pool); #ifndef NOTDEF - if (1) { + if (!global_session) { //FIXME FIXME FIXME switch_core_session_t *session = NULL; private_t *tech_pvt = NULL; switch_channel_t *channel = NULL; @@ -1897,9 +1901,9 @@ #if 1 if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), - "SKYPIAX", + "skypiax", "XML", - "calling_name", + "gmaruzz_from_skype", "calling_number", NULL, "calling_ani", @@ -1909,7 +1913,7 @@ "default", "5000")) != 0) { char name[128]; - switch_snprintf(name, sizeof(name), "Skypiax/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); + switch_snprintf(name, sizeof(name), "skypiax/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff); switch_channel_set_name(channel, name); switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); } @@ -1942,6 +1946,33 @@ } #endif //0 } + } else { + switch_core_session_t *session = NULL; + private_t *tech_pvt = NULL; + switch_channel_t *channel = NULL; + + WARNINGA("skype_call: HERE\n", SKYPIAX_P_LOG); + usleep(50000); + tech_pvt = p->tech_pvt; + WARNINGA("skype_call: HERE\n", SKYPIAX_P_LOG); + usleep(50000); + //session = tech_pvt->session; + session = global_session; + WARNINGA("skype_call: HERE\n", SKYPIAX_P_LOG); + usleep(5000000); + channel = switch_core_session_get_channel(session); + + WARNINGA("skype_call: HERE\n", SKYPIAX_P_LOG); + usleep(50000); + + + switch_channel_mark_pre_answered(channel); + + //switch_channel_set_state(channel, CS_EXECUTE); + WARNINGA("skype_call: HERE\n", SKYPIAX_P_LOG); + usleep(50000); + + } #endif //NOTDEF /**************************/ @@ -1972,6 +2003,100 @@ return 0; } +int skypiax_skype_call(struct skypiax_config *p, char *idest, int timeout, switch_core_session_t *session) +{ + char rdest[80]; + + if (option_debug > 10) { + DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + } +usleep(5000); + + //FIXME strncpy(rdest, idest, sizeof(rdest) - 1); + strncpy(rdest, "echo123", sizeof(rdest) - 1); + if (option_debug) + DEBUGA_SKYPE("Calling Skype, rdest is: %s\n", SKYPIAX_P_LOG, rdest); + //skypiax_skype_write(p, "GET AGC"); + //usleep(10000); + skypiax_skype_write(p, "SET AGC OFF"); + usleep(10000); + //skypiax_skype_write(p, "GET AGC"); + //usleep(10000); + //skypiax_skype_write(p, "GET AEC"); + //usleep(10000); + skypiax_skype_write(p, "SET AEC OFF"); + usleep(10000); + //skypiax_skype_write(p, "GET AEC"); + //usleep(300000); + + char msg_to_skype[1024]; + sprintf(msg_to_skype, "CALL %s", rdest); + if (skypiax_skype_write(p, msg_to_skype) < 0) { + + ERRORA("failed to communicate with Skype client, now exit\n", SKYPIAX_P_LOG); + if (option_debug > 10) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } + global_session = session; + //p->skype_call_ongoing = 1; + + //if (p->owner) { + //ast_setstate(p->owner, AST_STATE_RINGING); + //} + //FIXME ast_queue_control(p->owner, AST_CONTROL_RINGING); + return 0; +} + +static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_event_t *var_event, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags) +{ + if ((*new_session = switch_core_session_request(skypiax_endpoint_interface, pool)) != 0) { + private_t *tech_pvt; + switch_channel_t *channel; + switch_caller_profile_t *caller_profile; + + switch_core_session_add_stream(*new_session, NULL); + if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) != 0) { + tech_pvt->p = &SKYPIAX_CONFIGS[2]; //FIXME + channel = switch_core_session_get_channel(*new_session); + tech_init(tech_pvt, *new_session, NULL); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); + switch_core_session_destroy(new_session); + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + } + + if (outbound_profile) { + char name[128]; + + snprintf(name, sizeof(name), "skypiax/%s", outbound_profile->destination_number); + switch_channel_set_name(channel, name); + + caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); + switch_channel_set_caller_profile(channel, caller_profile); + tech_pvt->caller_profile = caller_profile; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n"); + switch_core_session_destroy(new_session); + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + } + + + skypiax_skype_call(tech_pvt->p, outbound_profile->destination_number, 30, *new_session); + + switch_channel_set_flag(channel, CF_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); + switch_channel_set_state(channel, CS_INIT); + return SWITCH_CAUSE_SUCCESS; + } + + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + +} + /*! * \brief This thread runs during a call, and monitor the interface serial port for signaling, like hangup, caller id, etc *

1 0

[commit] r10370 - freeswitch/trunk/src
by FreeSWITCH SVN 13 Nov '08

13 Nov '08

Author: brian Date: Thu Nov 13 02:36:06 2008 New Revision: 10370 Log: don't pass timestamps here either if samples per packet don't match Modified: freeswitch/trunk/src/switch_core_io.c Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Thu Nov 13 02:36:06 2008 @@ -266,7 +266,11 @@ case SWITCH_STATUS_SUCCESS: session->raw_read_frame.samples = session->raw_read_frame.datalen / sizeof(int16_t); session->raw_read_frame.rate = read_frame->rate; - session->raw_read_frame.timestamp = read_frame->timestamp; + if (read_frame->codec->implementation->samples_per_packet != session->read_codec->implementation->samples_per_packet) { + session->raw_read_frame.timestamp = 0; + } else { + session->raw_read_frame.timestamp = read_frame->timestamp; + } session->raw_read_frame.ssrc = read_frame->ssrc; session->raw_read_frame.seq = read_frame->seq; session->raw_read_frame.m = read_frame->m;

1 0

[commit] r10369 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 13 Nov '08

13 Nov '08

Author: gmaruzz Date: Wed Nov 12 23:22:35 2008 New Revision: 10369 Log: skypiax: now it reads both DTMFs and audio, and the IVR's echo works (it echoes your voice from skype back to you) :-) Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Wed Nov 12 23:22:35 2008 @@ -583,7 +583,39 @@ } return 0; } +static switch_status_t skypiax_skypeaudio_read(private_t *tech_pvt) +{ + struct skypiax_config *p; + short buf[640]; + int samples; + + p = tech_pvt->p; + + //DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); + + + memset(buf, '\0', sizeof(buf)); + + + //if ((samples = read(p->audiopipe[0], buf, SAMPLES_PER_FRAME * sizeof(short))) != 320) + if ((samples = read(p->audiopipe[0], tech_pvt->read_frame.data, SAMPLES_PER_FRAME * sizeof(short))) != 320) { + DEBUGA_SKYPE("read=====> NOT GOOD samples=%d expected=%d\n", SKYPIAX_P_LOG, samples, + 320); + usleep(1000); + //do nothing + } else { + tech_pvt->read_frame.datalen=samples; + //DEBUGA_SKYPE("read=====> GOOD samples=%d\n", SKYPIAX_P_LOG, samples); + /* A real frame */ + } + + //DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + + return SWITCH_STATUS_SUCCESS; +} + #ifdef NOTDEF +//cicopet struct ast_frame *skypiax_skypeaudio_read(struct skypiax_config *p) { static struct ast_frame f; @@ -825,6 +857,15 @@ *frame = NULL; +if ( skypiax_skypeaudio_read(tech_pvt) != SWITCH_STATUS_SUCCESS ) { + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "skypiax_skypeaudio_read ERROR\n"); + +} else { + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "skypiax_skypeaudio_read SUCCESS\n"); + +} + while (switch_test_flag(tech_pvt, TFLAG_IO)) { if (switch_test_flag(tech_pvt, TFLAG_BREAK)) { switch_clear_flag(tech_pvt, TFLAG_BREAK);

1 0

[commit] r10368 - freeswitch/trunk/src/include
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: mikej Date: Wed Nov 12 16:17:22 2008 New Revision: 10368 Log: bump api version for modules. Modified: freeswitch/trunk/src/include/switch_types.h Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Nov 12 16:17:22 2008 @@ -1355,7 +1355,7 @@ typedef struct switch_network_list switch_network_list_t; -#define SWITCH_API_VERSION 2 +#define SWITCH_API_VERSION 3 #define SWITCH_MODULE_LOAD_ARGS (switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) #define SWITCH_MODULE_RUNTIME_ARGS (void) #define SWITCH_MODULE_SHUTDOWN_ARGS (void)

1 0

[commit] r10367 - freeswitch/trunk/src
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: brian Date: Wed Nov 12 15:45:18 2008 New Revision: 10367 Log: SYSTEM_SHUTDOWN to MANAGER_REQUEST since its not really a shutdown in these scenarios Modified: freeswitch/trunk/src/switch_loadable_module.c Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Wed Nov 12 15:45:18 2008 @@ -423,7 +423,7 @@ for (ptr = old_module->module_interface->endpoint_interface; ptr; ptr = ptr->next) { if (ptr->interface_name) { - switch_core_session_hupall_endpoint(ptr, SWITCH_CAUSE_SYSTEM_SHUTDOWN); + switch_core_session_hupall_endpoint(ptr, SWITCH_CAUSE_MANAGER_REQUEST); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Write lock interface '%s' to wait for existing references.\n", ptr->interface_name); if (switch_thread_rwlock_trywrlock_timeout(ptr->rwlock, 10) == SWITCH_STATUS_SUCCESS) { switch_thread_rwlock_unlock(ptr->rwlock); @@ -455,8 +455,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deleting Codec '%s' (%s) %dhz %dms\n", impl->iananame, ptr->interface_name, impl->actual_samples_per_second, impl->microseconds_per_packet / 1000); - switch_core_session_hupall_matching_var("read_codec", impl->iananame, SWITCH_CAUSE_SYSTEM_SHUTDOWN); - switch_core_session_hupall_matching_var("write_codec", impl->iananame, SWITCH_CAUSE_SYSTEM_SHUTDOWN); + switch_core_session_hupall_matching_var("read_codec", impl->iananame, SWITCH_CAUSE_MANAGER_REQUEST); + switch_core_session_hupall_matching_var("write_codec", impl->iananame, SWITCH_CAUSE_MANAGER_REQUEST); if (switch_core_hash_find(loadable_modules.codec_hash, impl->iananame)) { switch_core_hash_delete(loadable_modules.codec_hash, impl->iananame); } @@ -508,7 +508,7 @@ for (ptr = old_module->module_interface->application_interface; ptr; ptr = ptr->next) { if (ptr->interface_name) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deleting Application '%s'\n", ptr->interface_name); - switch_core_session_hupall_matching_var(SWITCH_CURRENT_APPLICATION_VARIABLE, ptr->interface_name, SWITCH_CAUSE_SYSTEM_SHUTDOWN); + switch_core_session_hupall_matching_var(SWITCH_CURRENT_APPLICATION_VARIABLE, ptr->interface_name, SWITCH_CAUSE_MANAGER_REQUEST); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Write lock interface '%s' to wait for existing references.\n", ptr->interface_name); if (switch_thread_rwlock_trywrlock_timeout(ptr->rwlock, 10) == SWITCH_STATUS_SUCCESS) { switch_thread_rwlock_unlock(ptr->rwlock);

1 0