September 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9657 - freeswitch/trunk/src
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: mikej Date: Fri Sep 26 12:16:52 2008 New Revision: 9657 Modified: freeswitch/trunk/src/switch_core.c Log: fix windows build Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Sep 26 12:16:52 2008 @@ -38,9 +38,10 @@ #include "private/switch_core_pvt.h" #ifndef WIN32 #include <switch_private.h> -#endif - +#ifdef HAVE_SETRLIMIT #include <sys/resource.h> +#endif +#endif SWITCH_DECLARE_DATA switch_directories SWITCH_GLOBAL_dirs = { 0 }; @@ -1447,12 +1448,6 @@ { struct system_thread_handle *sth = (struct system_thread_handle *)obj; -/* struct rlimit rlim; - - getrlimit(RLIMIT_STACK, &rlim); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "rlim_cur: %d rlim_max: %d\n", (int)rlim.rlim_cur, (int)rlim.rlim_max); -*/ - sth->ret = system(sth->cmd); switch_mutex_lock(sth->mutex); @@ -1471,7 +1466,7 @@ int ret = 0; struct system_thread_handle *sth; switch_memory_pool_t *pool; -#ifndef __FreeBSD__ +#ifdef HAVE_SETRLIMIT struct rlimit rlim; rlim.rlim_cur = SWITCH_SYSTEM_THREAD_STACKSIZE; @@ -1498,7 +1493,6 @@ switch_threadattr_create(&thd_attr, sth->pool); switch_threadattr_stacksize_set(thd_attr, SWITCH_SYSTEM_THREAD_STACKSIZE); -// switch_threadattr_priority_increase(thd_attr); switch_thread_create(&thread, thd_attr, system_thread, sth, sth->pool); if (wait) {

1 0

[commit] r9656 - freeswitch/trunk/libs/srtp
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: mikej Date: Fri Sep 26 12:07:21 2008 New Revision: 9656 Modified: freeswitch/trunk/libs/srtp/ (props changed) Log: svn:ignore

1 0

[commit] r9655 - in freeswitch/trunk/src: include mod/applications/mod_dptools
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: anthm Date: Fri Sep 26 12:04:16 2008 New Revision: 9655 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add patch from MODAPP-132 Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Sep 26 12:04:16 2008 @@ -127,6 +127,7 @@ #define SWITCH_BRIDGE_UUID_VARIABLE "bridge_uuid" #define SWITCH_CONTINUE_ON_FAILURE_VARIABLE "continue_on_fail" #define SWITCH_PLAYBACK_TERMINATORS_VARIABLE "playback_terminators" +#define SWITCH_PLAYBACK_TERMINATOR_USED "playback_terminator_used" #define SWITCH_CACHE_SPEECH_HANDLES_VARIABLE "cache_speech_handles" #define SWITCH_CACHE_SPEECH_HANDLES_OBJ_NAME "__cache_speech_handles_obj__" #define SWITCH_BYPASS_MEDIA_VARIABLE "bypass_media" Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Fri Sep 26 12:04:16 2008 @@ -1274,6 +1274,8 @@ static switch_status_t on_dtmf(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen) { + char sbuf[3]; + switch (itype) { case SWITCH_INPUT_TYPE_DTMF: { @@ -1292,6 +1294,8 @@ for (p = terminators; p && *p; p++) { if (*p == dtmf->digit) { + switch_snprintf(sbuf, sizeof(sbuf), "%c", *p); + switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, sbuf ); return SWITCH_STATUS_BREAK; } } @@ -1318,6 +1322,9 @@ args.buf = buf; args.buflen = sizeof(buf); + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "" ); + switch_ivr_sleep(session, ms, &args); } } @@ -1389,6 +1396,9 @@ args.input_callback = on_dtmf; args.buf = buf; args.buflen = sizeof(buf); + + switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "" ); + switch_ivr_speak_text(session, engine, voice, text, &args); } @@ -1613,6 +1623,10 @@ switch_channel_pre_answer(switch_core_session_get_channel(session)); args.input_callback = on_dtmf; + + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "" ); + switch_ivr_play_file(session, NULL, data, &args); } @@ -1640,6 +1654,10 @@ } args.input_callback = on_dtmf; + + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "" ); + switch_ivr_gentones(session, tone_script, loops, &args); } @@ -1729,6 +1747,9 @@ } args.input_callback = on_dtmf; + + switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "" ); + status = switch_ivr_record_file(session, &fh, path, &args, limit); if (!switch_channel_ready(channel) || (status != SWITCH_STATUS_SUCCESS && !SWITCH_STATUS_IS_BREAK(status))) {

1 0

[commit] r9654 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: anthm Date: Fri Sep 26 12:02:04 2008 New Revision: 9654 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: add patch from MODFORM-13 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 Fri Sep 26 12:02:04 2008 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Cesar Cepeda <cesar(a)auronix.com> * * * mod_local_stream.c -- Local Streaming Audio @@ -79,6 +80,7 @@ int shuffle; switch_thread_rwlock_t *rwlock; int ready; + int stopped; }; typedef struct local_stream_source local_stream_source_t; @@ -133,7 +135,7 @@ source->ready = 1; } - while (RUNNING) { + while (RUNNING && !source->stopped) { const char *fname; if (switch_dir_open(&source->dir_handle, source->location, source->pool) != SWITCH_STATUS_SUCCESS) { @@ -246,7 +248,7 @@ source->dir_handle = NULL; } - done: + done: source->ready = 0; switch_mutex_lock(globals.mutex); switch_core_hash_delete(globals.source_hash, source->name); @@ -337,7 +339,7 @@ source->total++; switch_mutex_unlock(source->mutex); - end: + end: switch_safe_free(alt_path); return status; } @@ -435,6 +437,7 @@ source->channels = 1; source->timer_name = "soft"; source->prebuf = DEFAULT_PREBUFFER_SIZE; + source->stopped = 0; for (param = switch_xml_child(directory, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -488,8 +491,211 @@ RUNNING = 0; } +#define STOP_LOCAL_STREAM_SYNTAX "<local_stream_name>" +SWITCH_STANDARD_API(stop_local_stream_function) +{ + local_stream_source_t *source = NULL; + char *mycmd = NULL, *argv[1] = { 0 }; + char *local_stream_name = NULL; + int argc = 0; + + + if (switch_strlen_zero(cmd)) { + goto usage; + } + + if (!(mycmd = strdup(cmd))) { + goto usage; + } + + if ((argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 1) { + goto usage; + } + + local_stream_name = argv[0]; + if (switch_strlen_zero(local_stream_name)) { + goto usage; + } + + switch_mutex_lock(globals.mutex); + source = switch_core_hash_find(globals.source_hash, local_stream_name); + switch_mutex_unlock(globals.mutex); + + if (!source) { + stream->write_function(stream, "-ERR Cannot locate local_stream %s!\n",local_stream_name); + goto done; + } + + source->stopped = 1; + stream->write_function(stream,"+OK"); + goto done; + + usage: + stream->write_function(stream, "-USAGE: %s\n", STOP_LOCAL_STREAM_SYNTAX); + switch_safe_free(mycmd); + + done: + + switch_safe_free(mycmd); + return SWITCH_STATUS_SUCCESS; +} + +#define START_LOCAL_STREAM_SYNTAX "<local_stream_name> [<path>] [<rate>] [<shuffle>] [<prebuf>] [<channels>] [<interval>] [<timer_name>]" +SWITCH_STANDARD_API(start_local_stream_function) +{ + local_stream_source_t *source = NULL; + switch_memory_pool_t *pool; + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; + char *mycmd = NULL, *argv[8] = { 0 }; + char *local_stream_name = NULL, *path = NULL, *timer_name = NULL; + uint32_t prebuf = 1; + int rate = 8000, shuffle = 1, interval = 20; + uint8_t channels = 1; + int argc = 0; + char *cf = "local_stream.conf"; + switch_xml_t cfg, xml, directory, param; + + if (switch_strlen_zero(cmd)) { + goto usage; + } + + if (!(mycmd = strdup(cmd))) { + goto usage; + } + + if ((argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 1) { + goto usage; + } + + local_stream_name = argv[0]; + path = argv[1] ? argv[1] : NULL; + rate = argv[2] ? atoi(argv[2]) : 8000; + shuffle = argv[3] ? switch_true(argv[3]) : 1; + prebuf = argv[4] ? atoi(argv[4]) : DEFAULT_PREBUFFER_SIZE; + channels = argv[5] ? (uint8_t)atoi(argv[5]) : 1; + interval = argv[6] ? atoi(argv[6]) : 20; + if (!SWITCH_ACCEPTABLE_INTERVAL(interval)){ + interval = 20; + } + timer_name = argv[7] ? argv[7] : "soft"; + + if (!path){ + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + stream->write_function(stream, "-ERR unable to open file %s!\n",cf); + goto done; + } + + for (directory = switch_xml_child(cfg, "directory"); directory; directory = directory->next) { + char *name = (char *) switch_xml_attr(directory, "name"); + if (strcasecmp(name, local_stream_name)){ + continue; + } + else { + path = (char *) switch_xml_attr(directory, "path"); + if (!(name && path)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid config!\n"); + continue; + } + + for (param = switch_xml_child(directory, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "rate")) { + int tmp = atoi(val); + if (tmp == 8000 || tmp == 16000 || tmp == 32000) { + rate = tmp; + } + } else if (!strcasecmp(var, "shuffle")) { + shuffle = switch_true(val); + } else if (!strcasecmp(var, "prebuf")) { + int tmp = atoi(val); + if (tmp > 0) { + prebuf = (uint32_t) tmp; + } + } else if (!strcasecmp(var, "channels")) { + int tmp = atoi(val); + if (tmp == 1 || tmp == 2) { + channels = (uint8_t) tmp; + } + } else if (!strcasecmp(var, "interval")) { + int tmp = atoi(val); + if (SWITCH_ACCEPTABLE_INTERVAL(tmp)) { + interval = tmp; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "Interval must be multipe of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL); + } + } else if (!strcasecmp(var, "timer-name")) { + timer_name = switch_core_strdup(source->pool, val); + } + } + break; + } + + } + switch_xml_free(xml); + } + + if (switch_strlen_zero(local_stream_name) || switch_strlen_zero(path)) { + goto usage; + } + + switch_mutex_lock(globals.mutex); + source = switch_core_hash_find(globals.source_hash, local_stream_name); + switch_mutex_unlock(globals.mutex); + if (source) { + source->stopped = 0; + stream->write_function(stream,"+OK"); + goto done; + } + + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool for new local_stream\n"); + stream->write_function(stream, "-ERR unable to allocate memory for local_stream %s!\n",local_stream_name); + goto done; + } + + source = switch_core_alloc(pool, sizeof(*source)); + assert(source != NULL); + source->pool = pool; + + source->name = switch_core_strdup(source->pool, local_stream_name); + source->location = switch_core_strdup(source->pool, path); + source->rate = rate; + source->interval = interval; + source->channels = channels; + source->timer_name = switch_core_strdup(source->pool,timer_name); + source->prebuf = prebuf; + source->stopped = 0; + + source->samples = switch_samples_per_frame(source->rate, source->interval); + + switch_mutex_init(&source->mutex, SWITCH_MUTEX_NESTED, source->pool); + + switch_threadattr_create(&thd_attr, source->pool); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_thread_create(&thread, thd_attr, read_stream_thread, source, source->pool); + + stream->write_function(stream,"+OK"); + goto done; + + usage: + stream->write_function(stream, "-USAGE: %s\n", START_LOCAL_STREAM_SYNTAX); + switch_safe_free(mycmd); + + done: + + switch_safe_free(mycmd); + return SWITCH_STATUS_SUCCESS; +} + SWITCH_MODULE_LOAD_FUNCTION(mod_local_stream_load) { + switch_api_interface_t *commands_api_interface; switch_file_interface_t *file_interface; supported_formats[0] = "local_stream"; @@ -510,6 +716,9 @@ switch_core_hash_init(&globals.source_hash, pool); launch_threads(); + SWITCH_ADD_API(commands_api_interface, "stop_local_stream", "Stops and unloads a local_stream", stop_local_stream_function, STOP_LOCAL_STREAM_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "start_local_stream", "Starts a new local_stream", start_local_stream_function, START_LOCAL_STREAM_SYNTAX); + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r9653 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/applications/mod_dptools mod/languages/mod_lua/lua mod/languages/mod_spidermonkey
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: anthm Date: Fri Sep 26 11:50:12 2008 New Revision: 9653 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/languages/mod_lua/lua/loslib.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_utils.c Log: add patch from MODAPP-86 Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Fri Sep 26 11:50:12 2008 @@ -1654,6 +1654,8 @@ SWITCH_DECLARE(switch_status_t) switch_console_set_complete(const char *string); SWITCH_DECLARE(switch_status_t) switch_console_set_alias(const char *string); +SWITCH_DECLARE(int) switch_system(char *cmd, switch_bool_t wait); + ///\} /*! Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Sep 26 11:50:12 2008 @@ -346,6 +346,7 @@ #define SWITCH_MAX_STACKS 32 #define SWITCH_THREAD_STACKSIZE 240 * 1024 +#define SWITCH_SYSTEM_THREAD_STACKSIZE 8192 * 1024 #define SWITCH_MAX_INTERVAL 120 /* we only do up to 120ms */ #define SWITCH_INTERVAL_PAD 10 /* A little extra buffer space to be safe */ #define SWITCH_MAX_SAMPLE_LEN 32 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 Fri Sep 26 11:50:12 2008 @@ -2518,7 +2518,7 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Executing command: %s\n", cmd); - if (system(cmd) < 0) { + if (switch_system(cmd, SWITCH_TRUE) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Failed to execute command: %s\n", cmd); } stream->write_function(stream, "+OK\n"); Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Fri Sep 26 11:50:12 2008 @@ -1185,7 +1185,7 @@ SWITCH_STANDARD_APP(system_session_function) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Executing command: %s\n", data); - if (system(data) < 0) { + if (switch_system(data, SWITCH_TRUE) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Failed to execute command: %s\n", data); } } Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/loslib.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/loslib.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/loslib.c Fri Sep 26 11:50:12 2008 @@ -36,7 +36,7 @@ static int os_execute (lua_State *L) { - lua_pushinteger(L, system(luaL_optstring(L, 1, NULL))); + lua_pushinteger(L, switch_system(luaL_optstring(L, 1, NULL), SWITCH_TRUE)); return 1; } 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 Fri Sep 26 11:50:12 2008 @@ -3427,7 +3427,7 @@ *rval = BOOLEAN_TO_JSVAL(JS_FALSE); if (argc > 0 && (cmd = JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) { - *rval = INT_TO_JSVAL(system(cmd)); + *rval = INT_TO_JSVAL(switch_system(cmd, SWITCH_TRUE)); return JS_TRUE; } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Sep 26 11:50:12 2008 @@ -40,6 +40,8 @@ #include <switch_private.h> #endif +#include <sys/resource.h> + SWITCH_DECLARE_DATA switch_directories SWITCH_GLOBAL_dirs = { 0 }; /* The main runtime obj we keep this hidden for ourselves */ @@ -1432,6 +1434,82 @@ switch_core_memory_reclaim(); } + +struct system_thread_handle { + const char * cmd; + switch_thread_cond_t *cond; + switch_mutex_t *mutex; + switch_memory_pool_t *pool; + int ret; +}; + +static void *SWITCH_THREAD_FUNC system_thread(switch_thread_t *thread, void *obj) +{ + struct system_thread_handle *sth = (struct system_thread_handle *)obj; + +/* struct rlimit rlim; + + getrlimit(RLIMIT_STACK, &rlim); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "rlim_cur: %d rlim_max: %d\n", (int)rlim.rlim_cur, (int)rlim.rlim_max); +*/ + + sth->ret = system(sth->cmd); + + switch_mutex_lock(sth->mutex); + switch_thread_cond_signal(sth->cond); + switch_mutex_unlock(sth->mutex); + + switch_core_destroy_memory_pool(&sth->pool); + + return NULL; +} + +SWITCH_DECLARE(int) switch_system(char *cmd, switch_bool_t wait) +{ + switch_thread_t *thread; + switch_threadattr_t *thd_attr; + int ret = 0; + struct system_thread_handle *sth; + switch_memory_pool_t *pool; +#ifndef __FreeBSD__ + struct rlimit rlim; + + rlim.rlim_cur = SWITCH_SYSTEM_THREAD_STACKSIZE; + rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE;; + setrlimit(RLIMIT_STACK, &rlim); +#endif + + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + return 1; + } + + if (!(sth = switch_core_alloc(pool, sizeof(struct system_thread_handle)))) { + switch_core_destroy_memory_pool(&pool); + return 1; + } + + sth->pool = pool; + sth->cmd = switch_core_strdup(pool, cmd); + + switch_thread_cond_create(&sth->cond, sth->pool); + switch_mutex_init(&sth->mutex, SWITCH_MUTEX_NESTED, sth->pool); + switch_mutex_lock(sth->mutex); + + switch_threadattr_create(&thd_attr, sth->pool); + switch_threadattr_stacksize_set(thd_attr, SWITCH_SYSTEM_THREAD_STACKSIZE); +// switch_threadattr_priority_increase(thd_attr); + switch_thread_create(&thread, thd_attr, system_thread, sth, sth->pool); + + if (wait) { + switch_thread_cond_wait(sth->cond, sth->mutex); + ret = sth->ret; + } + switch_mutex_unlock(sth->mutex); + + return ret; +} + /* For Emacs: * Local Variables: * mode:c Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri Sep 26 11:50:12 2008 @@ -479,7 +479,7 @@ #else switch_snprintf(buf, B64BUFFLEN, "/bin/cat %s | %s %s %s", filename, runtime.mailer_app, runtime.mailer_app_args, to); #endif - if (system(buf)) { + if (switch_system(buf, SWITCH_TRUE) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to execute command: %s\n", buf); }

1 0

[commit] r9652 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 26 Sep '08

26 Sep '08

Author: anthm Date: Fri Sep 26 10:37:50 2008 New Revision: 9652 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update 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 Fri Sep 26 10:37:50 2008 @@ -2099,6 +2099,63 @@ return cause; } + +static int notify_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + + nua_handle_t *nh; + sofia_profile_t *ext_profile = NULL, *profile = (sofia_profile_t *) pArg; + char *user = argv[0]; + char *host = argv[1]; + char *contact_in = argv[2]; + char *profile_name = argv[3]; + char *ct = argv[4]; + char *es = argv[5]; + char *body = argv[6]; + char *id = NULL; + char *p , *contact; + + + if (profile_name && strcasecmp(profile_name, profile->name)) { + if ((ext_profile = sofia_glue_find_profile(profile_name))) { + profile = ext_profile; + } + } + + id = switch_mprintf("sip:%s@%s", user, host); + switch_assert(id); + contact = sofia_glue_get_url_from_contact(contact_in, 1); + + if ((p = strstr(contact, ";fs_"))) { + *p = '\0'; + } + + nh = nua_handle(profile->nua, + NULL, + NUTAG_URL(contact), + SIPTAG_FROM_STR(id), + SIPTAG_TO_STR(id), + SIPTAG_CONTACT_STR(profile->url), + TAG_END()); + + nua_notify(nh, + NUTAG_NEWSUB(1), + SIPTAG_EVENT_STR(es), + SIPTAG_CONTENT_TYPE_STR(ct), + TAG_IF(!switch_strlen_zero(body), SIPTAG_PAYLOAD_STR(body)), + TAG_END()); + + + free(id); + free(contact); + + if (ext_profile) { + sofia_glue_release_profile(ext_profile); + } + + return 0; +} + static void general_event_handler(switch_event_t *event) { switch (event->event_id) { @@ -2111,47 +2168,20 @@ const char *host = switch_event_get_header(event, "host"); const char *body = switch_event_get_body(event); sofia_profile_t *profile; - nua_handle_t *nh; if (profile_name && ct && es && user && host && (profile = sofia_glue_find_profile(profile_name))) { - char *id = NULL; - char *contact, *p; - char buf[512] = ""; - - if (!sofia_reg_find_reg_url(profile, user, host, buf, sizeof(buf))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find user %s@%s\n", user, host); - return; - } - - id = switch_mprintf("sip:%s@%s", user, host); - - switch_assert(id); - contact = sofia_glue_get_url_from_contact(buf, 0); - - if ((p = strstr(contact, ";fs_"))) { - *p = '\0'; - } - - nh = nua_handle(profile->nua, - NULL, - NUTAG_URL(contact), - SIPTAG_FROM_STR(id), - SIPTAG_TO_STR(id), - SIPTAG_CONTACT_STR(profile->url), - TAG_END()); + char *sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q','%q','%q' " + "from sip_registrations where sip_user='%s' and sip_host='%q'", + ct, es, body, user, host + ); - nua_notify(nh, - NUTAG_NEWSUB(1), - SIPTAG_EVENT_STR(es), - SIPTAG_CONTENT_TYPE_STR(ct), - TAG_IF(!switch_strlen_zero(body), SIPTAG_PAYLOAD_STR(body)), - TAG_END()); - - free(id); + switch_mutex_lock(profile->ireg_mutex); + sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, sql, notify_callback, profile); + switch_mutex_unlock(profile->ireg_mutex); sofia_glue_release_profile(profile); } - + } break; case SWITCH_EVENT_SEND_MESSAGE:

1 0

[commit] r9651 - freeswitch/trunk/src/mod/languages/mod_managed
by Freeswitch SVN 25 Sep '08

25 Sep '08

Author: mikej Date: Thu Sep 25 18:02:32 2008 New Revision: 9651 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h Log: silence some warnings due to opaque structure definitions. Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h Thu Sep 25 18:02:32 2008 @@ -39,6 +39,35 @@ #include <switch_cpp.h> #ifdef _MANAGED +// this section remove linker error LNK4248 for these opaque structures + struct switch_core_session {char foo[];}; + struct apr_pool_t {char foo[];}; + struct switch_channel {char foo[];}; + struct apr_thread_t {char foo[];}; + struct switch_hash {char foo[];}; + struct apr_thread_mutex_t {char foo[];}; + struct switch_network_list {char foo[];}; + struct switch_xml_binding {char foo[];}; + struct apr_sockaddr_t {char foo[];}; + struct switch_core_port_allocator {char foo[];}; + struct switch_media_bug {char foo[];}; + struct switch_rtp {char foo[];}; + struct sqlite3_stmt {char foo[];}; + struct switch_buffer {char foo[];}; + struct switch_ivr_menu {char foo[];}; + struct switch_event_node {char foo[];}; + struct switch_ivr_digit_stream_parser {char foo[];}; + struct sqlite3 {char foo[];}; + struct switch_ivr_digit_stream {char foo[];}; + struct real_pcre {char foo[];}; + struct HashElem {char foo[];}; + struct switch_ivr_menu_xml_ctx {char foo[];}; + struct apr_file_t {char foo[];}; + struct apr_thread_rwlock_t {char foo[];}; + struct apr_pollfd_t {char foo[];}; + struct apr_queue_t {char foo[];}; + struct apr_socket_t {char foo[];}; +// LNK Error typedef char* (CALLBACK* inputtype)(void * input, switch_input_type_t type); typedef void (CALLBACK* hanguptype)();

1 0

[commit] r9650 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Sep '08

25 Sep '08

Author: anthm Date: Thu Sep 25 16:59:09 2008 New Revision: 9650 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: make proxy mode pull the port from m=image as well Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Sep 25 16:59:09 2008 @@ -806,6 +806,10 @@ port_ptr = p + 8; } + if ((p = (char *) switch_stristr("m=image ", tech_pvt->remote_sdp_str))) { + port_ptr = p + 8; + } + if ((p = (char *) switch_stristr("m=video ", tech_pvt->remote_sdp_str))) { vid_port_ptr = p + 8; } @@ -945,7 +949,7 @@ has_ip++; - } else if (!strncmp("m=audio ", p, 8)) { + } else if (!strncmp("m=audio ", p, 8) || (!strncmp("m=image ", p, 8))) { strncpy(q,p,8); p += 8; q += 8;

1 0

[commit] r9649 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by Freeswitch SVN 25 Sep '08

25 Sep '08

Author: anthm Date: Thu Sep 25 15:53:43 2008 New Revision: 9649 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_play_say.c Log: tweak Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Thu Sep 25 15:53:43 2008 @@ -275,9 +275,8 @@ /*! \brief - NEEDDESC - \param session the session to act on - \return SWITCH_STATUS_SUCCESS if all is well - maybe more XXX FIXME */ -SWITCH_DECLARE(void) switch_ivr_session_echo(switch_core_session_t *session); +SWITCH_DECLARE(void) switch_ivr_session_echo(switch_core_session_t *session, switch_input_args_t *args); /*! \brief Stop looking for TONES Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Thu Sep 25 15:53:43 2008 @@ -1238,7 +1238,7 @@ SWITCH_STANDARD_APP(echo_function) { - switch_ivr_session_echo(session); + switch_ivr_session_echo(session, NULL); } SWITCH_STANDARD_APP(park_function) Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Thu Sep 25 15:53:43 2008 @@ -37,20 +37,20 @@ static void switch_core_standard_on_init(switch_core_session_t *session) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard INIT %s\n", switch_channel_get_name(session->channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard INIT\n", switch_channel_get_name(session->channel)); } static void switch_core_standard_on_hangup(switch_core_session_t *session) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard HANGUP %s, cause: %s\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard HANGUP, cause: %s\n", switch_channel_get_name(session->channel), switch_channel_cause2str(switch_channel_get_cause(session->channel))); } static void switch_core_standard_on_reset(switch_core_session_t *session) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard RESET %s\n", switch_channel_get_name(session->channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard RESET\n", switch_channel_get_name(session->channel)); } static void switch_core_standard_on_routing(switch_core_session_t *session) @@ -61,7 +61,7 @@ char *expanded = NULL; char *dpstr = NULL; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard ROUTING %s\n", switch_channel_get_name(session->channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard ROUTING\n", switch_channel_get_name(session->channel)); if ((caller_profile = switch_channel_get_caller_profile(session->channel)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't get profile!\n"); @@ -126,7 +126,7 @@ { switch_caller_extension_t *extension; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard EXECUTE\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard EXECUTE\n", switch_channel_get_name(session->channel)); top: switch_channel_clear_flag(session->channel, CF_RESET); @@ -164,20 +164,19 @@ static void switch_core_standard_on_exchange_media(switch_core_session_t *session) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard LOOPBACK\n"); - switch_ivr_session_echo(session); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard EXCHANGE_MEDIA\n", switch_channel_get_name(session->channel)); } static void switch_core_standard_on_soft_execute(switch_core_session_t *session) { switch_assert(session != NULL); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard TRANSMIT\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard SOFT_EXECUTE\n", switch_channel_get_name(session->channel)); } static void switch_core_standard_on_park(switch_core_session_t *session) { switch_assert(session != NULL); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard PARK\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard PARK\n", switch_channel_get_name(session->channel)); switch_channel_clear_flag(session->channel, CF_TRANSFER); switch_core_session_reset(session, SWITCH_TRUE); switch_ivr_park(session, NULL); @@ -186,13 +185,13 @@ static void switch_core_standard_on_consume_media(switch_core_session_t *session) { switch_assert(session != NULL); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard HOLD\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard CONSUME_MEDIA\n", switch_channel_get_name(session->channel)); } static void switch_core_standard_on_hibernate(switch_core_session_t *session) { switch_assert(session != NULL); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard HIBERNATE\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard HIBERNATE\n", switch_channel_get_name(session->channel)); } #include <sqlite3.h> Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Thu Sep 25 15:53:43 2008 @@ -67,7 +67,7 @@ } #endif -SWITCH_DECLARE(void) switch_ivr_session_echo(switch_core_session_t *session) +SWITCH_DECLARE(void) switch_ivr_session_echo(switch_core_session_t *session, switch_input_args_t *args) { switch_status_t status; switch_frame_t *read_frame; @@ -95,6 +95,47 @@ if (!SWITCH_READ_ACCEPTABLE(status)) { break; } + + if (switch_core_session_private_event_count(session)) { + switch_ivr_parse_all_events(session); + } + + if (args && (args->input_callback || args->buf || args->buflen)) { + switch_dtmf_t dtmf; + + /* + dtmf handler function you can hook up to be executed when a digit is dialed during playback + if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. + */ + if (switch_channel_has_dtmf(channel)) { + if (!args->input_callback && !args->buf) { + status = SWITCH_STATUS_BREAK; + break; + } + switch_channel_dequeue_dtmf(channel, &dtmf); + if (args->input_callback) { + status = args->input_callback(session, (void *) &dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen); + } else { + switch_copy_string((char *) args->buf, (void *) &dtmf, args->buflen); + status = SWITCH_STATUS_BREAK; + } + } + + if (args->input_callback) { + switch_event_t *event = NULL; + + if (switch_core_session_dequeue_event(session, &event) == SWITCH_STATUS_SUCCESS) { + status = args->input_callback(session, event, SWITCH_INPUT_TYPE_EVENT, args->buf, args->buflen); + switch_event_destroy(&event); + } + } + + if (status != SWITCH_STATUS_SUCCESS) { + break; + } + } + + switch_core_session_write_frame(session, read_frame, SWITCH_IO_FLAG_NONE, 0); #ifndef SWITCH_VIDEO_IN_THREADS Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Thu Sep 25 15:53:43 2008 @@ -657,6 +657,10 @@ break; } + if (switch_core_session_private_event_count(session)) { + switch_ivr_parse_all_events(session); + } + if (args && (args->input_callback || args->buf || args->buflen)) { /* dtmf handler function you can hook up to be executed when a digit is dialed during gentones

1 0

[commit] r9648 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Sep '08

25 Sep '08

Author: anthm Date: Thu Sep 25 13:39:08 2008 New Revision: 9648 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: sigh Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Sep 25 13:39:08 2008 @@ -1931,6 +1931,13 @@ if (tech_pvt->te) { switch_rtp_set_telephony_event(tech_pvt->rtp_session, tech_pvt->te); } + + if (sofia_test_pflag(tech_pvt->profile, PFLAG_SUPPRESS_CNG) || + ((val = switch_channel_get_variable(tech_pvt->channel, "supress_cng")) && switch_true(val)) || + ((val = switch_channel_get_variable(tech_pvt->channel, "suppress_cng")) && switch_true(val))) { + tech_pvt->cng_pt = 0; + } + if (tech_pvt->cng_pt && !(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set comfort noise payload to %u\n", tech_pvt->cng_pt); switch_rtp_set_cng_pt(tech_pvt->rtp_session, tech_pvt->cng_pt);

1 0