- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7225 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: mikej Date: Mon Jan 14 16:58:36 2008 New Revision: 7225 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: user endpoint shouldn't need an a leg. 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 Mon Jan 14 16:58:36 2008 @@ -1419,7 +1419,7 @@ goto done; } - user = switch_core_session_strdup(session, outbound_profile->destination_number); + user = strdup(outbound_profile->destination_number); if (!(domain = strchr(user, '@'))) { goto done; @@ -1464,15 +1464,20 @@ switch_channel_t *channel; switch_originate_flag_t myflags = SOF_NONE; - channel = switch_core_session_get_channel(session); - if ((var = switch_channel_get_variable(channel, "call_timeout"))) { - timelimit = atoi(var); - } - - switch_channel_set_variable(channel, "dialed_user", user); - switch_channel_set_variable(channel, "dialed_domain", domain); + if (session) { + channel = switch_core_session_get_channel(session); + if ((var = switch_channel_get_variable(channel, "call_timeout"))) { + timelimit = atoi(var); + } + + switch_channel_set_variable(channel, "dialed_user", user); + switch_channel_set_variable(channel, "dialed_domain", domain); + + d_dest = switch_channel_expand_variables(channel, dest); - d_dest = switch_channel_expand_variables(channel, dest); + } else { + d_dest = strdup(dest); + } if ((flags & SOF_FORKED_DIAL)) { myflags |= SOF_NOBLOCK; @@ -1519,6 +1524,7 @@ switch_xml_free(xml); } + switch_safe_free(user); return cause; }

1 0

[commit] r7224 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: anthm Date: Mon Jan 14 16:52:38 2008 New Revision: 7224 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: put a 5 packet pause between digits so you can hear the spaces 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 Mon Jan 14 16:52:38 2008 @@ -546,7 +546,7 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); - if (0 && !(tech_pvt->profile->pflags & PFLAG_RUNNING)) { + if (!(tech_pvt->profile->pflags & PFLAG_RUNNING)) { switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_NORMAL_CLEARING); return SWITCH_STATUS_FALSE; }

1 0

[commit] r7223 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: anthm Date: Mon Jan 14 16:51:31 2008 New Revision: 7223 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Log: put a 5 packet pause between digits so you can hear the spaces 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 Mon Jan 14 16:51:31 2008 @@ -546,7 +546,7 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); - if (!(tech_pvt->profile->pflags & PFLAG_RUNNING)) { + if (0 && !(tech_pvt->profile->pflags & PFLAG_RUNNING)) { switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_NORMAL_CLEARING); return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Jan 14 16:51:31 2008 @@ -139,6 +139,7 @@ uint32_t ts; uint32_t last_write_ts; uint32_t last_write_samplecount; + uint32_t next_write_samplecount; uint32_t flags; switch_memory_pool_t *pool; switch_sockaddr_t *from_addr; @@ -843,6 +844,7 @@ if (rtp_session->timer.interval) { switch_core_timer_check(&rtp_session->timer); rtp_session->last_write_samplecount = rtp_session->timer.samplecount; + rtp_session->next_write_samplecount = rtp_session->timer.samplecount + samples * 5; } rtp_session->dtmf_data.out_digit_dur = 0; } @@ -851,6 +853,13 @@ if (!rtp_session->dtmf_data.out_digit_dur && rtp_session->dtmf_data.dtmf_queue && switch_queue_size(rtp_session->dtmf_data.dtmf_queue)) { void *pop; + if (rtp_session->timer.interval) { + switch_core_timer_check(&rtp_session->timer); + if (rtp_session->timer.samplecount < rtp_session->next_write_samplecount) { + return; + } + } + if (switch_queue_trypop(rtp_session->dtmf_data.dtmf_queue, &pop) == SWITCH_STATUS_SUCCESS) { switch_dtmf_t *rdigit = pop; int64_t offset;

1 0

[commit] r7222 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: anthm Date: Mon Jan 14 16:31:17 2008 New Revision: 7222 Added: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/ freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c Log: add mod_spidermonkey_curl (pressuerman must doc) Added: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/Makefile Mon Jan 14 16:31:17 2008 @@ -0,0 +1,2 @@ +WANT_CURL=yes +include ../mod_spidermonkey/sm.mak Added: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c Mon Jan 14 16:31:17 2008 @@ -0,0 +1,237 @@ +/* + * 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_spidermonkey_teletone.c -- TeleTone Javascript Module + * + */ +#include "mod_spidermonkey.h" +#include <curl/curl.h> + +static const char modname[] = "CURL"; + +struct curl_obj { + CURL *curl_handle; + JSContext *cx; + JSObject *obj; + JSFunction *function; + jsrefcount saveDepth; + jsval ret; +}; + + +static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data) +{ + register unsigned int realsize = (unsigned int) (size * nmemb); + struct curl_obj *co = data; + uintN argc = 0; + jsval argv[4]; + + + if (!co) { + return 0; + } + if (co->function) { + char *ret; + argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(co->cx, (char *)ptr)); + + JS_ResumeRequest(co->cx, co->saveDepth); + JS_CallFunction(co->cx, co->obj, co->function, argc, argv, &co->ret); + co->saveDepth = JS_SuspendRequest(co->cx); + + if ((ret = JS_GetStringBytes(JS_ValueToString(co->cx, co->ret)))) { + if (!strcmp(ret, "true") || !strcmp(ret, "undefined")) { + return realsize; + } else { + return 0; + } + } + } + + return realsize; +} + + +/* Curl Object */ +/*********************************************************************************/ +static JSBool curl_construct(JSContext *cx, JSObject *obj, uintN argc, jsval * argv, jsval * rval) +{ + struct curl_obj *co = NULL; + + co = malloc(sizeof(*co)); + switch_assert(co); + + memset(co, 0, sizeof(*co)); + + co->cx = cx; + co->obj = obj; + + JS_SetPrivate(cx, obj, co); + + return JS_TRUE; +} + +static void curl_destroy(JSContext *cx, JSObject *obj) +{ + struct curl_obj *co = JS_GetPrivate(cx, obj); + switch_safe_free(co); + JS_SetPrivate(cx, obj, NULL); +} + +static JSBool curl_run(JSContext *cx, JSObject *obj, uintN argc, jsval * argv, jsval * rval) +{ + struct curl_obj *co = JS_GetPrivate(cx, obj); + char *method = NULL, *url, *cred = NULL; + char *url_p = NULL, *data = NULL, *durl = NULL; + long httpRes = 0; + struct curl_slist *headers = NULL; + + if (argc < 2 || !co) { + return JS_FALSE; + } + + + method = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + url = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + + co->curl_handle = curl_easy_init(); + if (!strncasecmp(url, "https", 5)) { + curl_easy_setopt(co->curl_handle, CURLOPT_SSL_VERIFYPEER, 0); + curl_easy_setopt(co->curl_handle, CURLOPT_SSL_VERIFYHOST, 0); + } + headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded"); + + if (argc > 2) { + data = JS_GetStringBytes(JS_ValueToString(cx, argv[2])); + } + + if (argc > 3) { + co->function = JS_ValueToFunction(cx, argv[3]); + } + + if (argc > 4) { + cred = JS_GetStringBytes(JS_ValueToString(cx, argv[4])); + if (!switch_strlen_zero(cred)) { + curl_easy_setopt(co->curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY); + curl_easy_setopt(co->curl_handle, CURLOPT_USERPWD, cred); + } + } + + + curl_easy_setopt(co->curl_handle, CURLOPT_HTTPHEADER, headers); + + url_p = url; + + if (!strcasecmp(method, "post")) { + curl_easy_setopt(co->curl_handle, CURLOPT_POST, 1); + if (!data) { + data = ""; + } + curl_easy_setopt(co->curl_handle, CURLOPT_POSTFIELDS, data); + } else if (!switch_strlen_zero(data)) { + durl = switch_mprintf("%s?%s", url, data); + url_p = durl; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Running: method: [%s] url: [%s] data: [%s] cred=[%s] cb: [%s]\n", + method, url_p, data, switch_str_nil(cred), co->function ? "yes" : "no"); + + curl_easy_setopt(co->curl_handle, CURLOPT_URL, url_p); + curl_easy_setopt(co->curl_handle, CURLOPT_WRITEFUNCTION, file_callback); + curl_easy_setopt(co->curl_handle, CURLOPT_WRITEDATA, (void *) co); + + curl_easy_setopt(co->curl_handle, CURLOPT_USERAGENT, "freeswitch-spidermonkey-curl/1.0"); + + co->saveDepth = JS_SuspendRequest(cx); + curl_easy_perform(co->curl_handle); + + curl_easy_getinfo(co->curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); + curl_easy_cleanup(co->curl_handle); + curl_slist_free_all(headers); + co->curl_handle = NULL; + co->function = NULL; + JS_ResumeRequest(cx, co->saveDepth); + switch_safe_free(durl); + + + return JS_FALSE; +} + +static JSFunctionSpec curl_methods[] = { + {"run", curl_run, 2}, + {0} +}; + + +static JSPropertySpec curl_props[] = { + {0} +}; + +static JSBool curl_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval * vp) +{ + JSBool res = JS_TRUE; + return res; +} + +JSClass curl_class = { + modname, JSCLASS_HAS_PRIVATE, + JS_PropertyStub, JS_PropertyStub, curl_getProperty, DEFAULT_SET_PROPERTY, + JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, curl_destroy, NULL, NULL, NULL, + curl_construct +}; + + +switch_status_t curl_load(JSContext *cx, JSObject *obj) +{ + JS_InitClass(cx, obj, NULL, &curl_class, curl_construct, 3, curl_props, curl_methods, curl_props, curl_methods); + return SWITCH_STATUS_SUCCESS; +} + + +const sm_module_interface_t curl_module_interface = { + /*.name = */ modname, + /*.spidermonkey_load */ curl_load, + /*.next */ NULL +}; + +SWITCH_MOD_DECLARE(switch_status_t) spidermonkey_init(const sm_module_interface_t ** module_interface) +{ + curl_global_init(CURL_GLOBAL_ALL); + *module_interface = &curl_module_interface; + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[commit] r7221 - freeswitch/trunk/src
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: mikej Date: Mon Jan 14 16:27:40 2008 New Revision: 7221 Modified: freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_rtp.c Log: don't send very large dtmf strings or block on very large dtmf strings. Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Mon Jan 14 16:27:40 2008 @@ -973,6 +973,11 @@ return SWITCH_STATUS_FALSE; } + if (strlen(dtmf_string) > 99) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Attempt to send very large dtmf string ignored!\n"); + return SWITCH_STATUS_FALSE; + } + string = switch_core_session_strdup(session, dtmf_string); argc = switch_separate_string(string, '+', argv, (sizeof(argv) / sizeof(argv[0]))); Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Jan 14 16:27:40 2008 @@ -1202,7 +1202,10 @@ if ((rdigit = malloc(sizeof(*rdigit))) != 0) { *rdigit = *dtmf; - switch_queue_push(rtp_session->dtmf_data.dtmf_queue, rdigit); + if ((switch_queue_trypush(rtp_session->dtmf_data.dtmf_queue, rdigit)) != SWITCH_STATUS_SUCCESS) { + free(rdigit); + return SWITCH_STATUS_FALSE; + } } else { abort(); } @@ -1222,7 +1225,10 @@ if ((rdigit = malloc(sizeof(*rdigit))) != 0) { *rdigit = *dtmf; - switch_queue_push(rtp_session->dtmf_data.dtmf_inqueue, rdigit); + if ((switch_queue_trypush(rtp_session->dtmf_data.dtmf_inqueue, rdigit)) != SWITCH_STATUS_SUCCESS) { + free(rdigit); + return SWITCH_STATUS_FALSE; + } } else { abort(); }

1 0

[commit] r7220 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: brian Date: Mon Jan 14 15:35:41 2008 New Revision: 7220 Modified: freeswitch/trunk/conf/autoload_configs/spidermonkey.conf.xml Log: add these modules Modified: freeswitch/trunk/conf/autoload_configs/spidermonkey.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/spidermonkey.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/spidermonkey.conf.xml Mon Jan 14 15:35:41 2008 @@ -2,6 +2,7 @@ <modules> <load module="mod_spidermonkey_teletone"/> <load module="mod_spidermonkey_core_db"/> + <load module="mod_spidermonkey_socket"/>  </modules> </configuration>

1 0

[commit] r7219 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: brian Date: Mon Jan 14 15:14:40 2008 New Revision: 7219 Modified: freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml Log: doh Modified: freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml Mon Jan 14 15:14:40 2008 @@ -1,7 +1,4 @@ <configuration name="local_stream.conf" description="stream files from local dir"> - -  - <directory name="moh/8000" path="$${base_dir}/sounds/music/8000"> <param name="rate" value="8000"/> <param name="shuffle" value="true"/>

1 0

[commit] r7218 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: brian Date: Mon Jan 14 15:10:00 2008 New Revision: 7218 Modified: freeswitch/trunk/conf/directory/default/brian.xml Log: tweak Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Mon Jan 14 15:10:00 2008 @@ -52,6 +52,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Brian West"/> <variable name="effective_caller_id_number" value="1000"/> +  + <variable name="process_cdr" value="true"/>

1 0

[commit] r7217 - in freeswitch/trunk/src: . mod/formats/mod_local_stream
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: anthm Date: Mon Jan 14 14:20:59 2008 New Revision: 7217 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/switch_buffer.c freeswitch/trunk/src/switch_core_media_bug.c freeswitch/trunk/src/switch_ivr_async.c Log: tighten up media bug code 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 Mon Jan 14 14:20:59 2008 @@ -411,7 +411,12 @@ source->channels = (uint8_t)tmp; } } else if (!strcasecmp(var, "interval")) { - source->interval = atoi(val); + int tmp = atoi(val); + if (tmp >= 10) { + source->interval = tmp; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't set interval to less than 10\n"); + } } else if (!strcasecmp(var, "timer-name")) { source->timer_name = switch_core_strdup(source->pool, val); } Modified: freeswitch/trunk/src/switch_buffer.c ============================================================================== --- freeswitch/trunk/src/switch_buffer.c (original) +++ freeswitch/trunk/src/switch_buffer.c Mon Jan 14 14:20:59 2008 @@ -252,7 +252,7 @@ } */ if (switch_test_flag(buffer, SWITCH_BUFFER_FLAG_DYNAMIC)) { - if (freespace < datalen && (!buffer->max_len || (buffer->datalen + datalen <= buffer->max_len))) { + if (freespace < datalen && (!buffer->max_len || (buffer->used + datalen <= buffer->max_len))) { switch_size_t new_size, new_block_size; new_size = buffer->datalen + datalen; 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 Mon Jan 14 14:20:59 2008 @@ -103,6 +103,8 @@ maxlen = sizeof(data) > frame->buflen ? frame->buflen : sizeof(data); + + if ((rdlen = rlen > wlen ? wlen : rlen) > maxlen) { rdlen = maxlen; } @@ -222,7 +224,7 @@ bug->user_data = user_data; bug->session = session; bug->flags = flags; - bug->ready = 1; + bug->stop_time = stop_time; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attaching BUG to %s\n", switch_channel_get_name(session->channel)); bytes = session->read_codec->implementation->bytes_per_frame; @@ -231,7 +233,7 @@ bug->flags = (SMBF_READ_STREAM | SMBF_WRITE_STREAM); } - if (switch_test_flag(bug, SMBF_READ_STREAM)) { + if (switch_test_flag(bug, SMBF_READ_STREAM) || switch_test_flag(bug, SMBF_READ_PING)) { switch_buffer_create_dynamic(&bug->raw_read_buffer, bytes * SWITCH_BUFFER_BLOCK_FRAMES, bytes * SWITCH_BUFFER_START_FRAMES, MAX_BUG_BUFFER); switch_mutex_init(&bug->read_mutex, SWITCH_MUTEX_NESTED, session->pool); } @@ -242,7 +244,7 @@ switch_buffer_create_dynamic(&bug->raw_write_buffer, bytes * SWITCH_BUFFER_BLOCK_FRAMES, bytes * SWITCH_BUFFER_START_FRAMES, MAX_BUG_BUFFER); switch_mutex_init(&bug->write_mutex, SWITCH_MUTEX_NESTED, session->pool); } - + bug->ready = 1; switch_thread_rwlock_wrlock(session->bug_rwlock); bug->next = session->bugs; session->bugs = bug; Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon Jan 14 14:20:59 2008 @@ -411,7 +411,6 @@ uint32_t flags; }; - static switch_bool_t eavesdrop_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) { struct eavesdrop_pvt *ep = (struct eavesdrop_pvt *) user_data; @@ -432,7 +431,7 @@ if (ep->buffer) { if (switch_core_media_bug_read(bug, &frame) == SWITCH_STATUS_SUCCESS) { switch_buffer_lock(ep->buffer); - switch_buffer_zwrite(ep->buffer, frame.data, frame.datalen); + switch_buffer_zwrite(ep->buffer, frame.data, frame.datalen); switch_buffer_unlock(ep->buffer); } } else { @@ -444,6 +443,7 @@ case SWITCH_ABC_TYPE_READ_REPLACE: { + if (switch_test_flag(ep, ED_MUX_READ)) { switch_frame_t *rframe = switch_core_media_bug_get_read_replace_frame(bug); @@ -496,9 +496,9 @@ switch_status_t status = SWITCH_STATUS_FALSE; switch_channel_t *channel = switch_core_session_get_channel(session); switch_codec_t *read_codec = switch_core_session_get_read_codec(session); - + if ((tsession = switch_core_session_locate(uuid))) { - struct eavesdrop_pvt ep = { 0 }; + struct eavesdrop_pvt *ep; switch_media_bug_t *bug = NULL; switch_channel_t *tchannel = switch_core_session_get_channel(tsession); switch_frame_t *read_frame, write_frame = { 0 }; @@ -506,7 +506,8 @@ int16_t buf[1024]; switch_codec_t *tread_codec = switch_core_session_get_read_codec(tsession); - + ep = switch_core_session_alloc(session, sizeof(*ep)); + switch_channel_pre_answer(channel); if (switch_core_codec_init(&codec, @@ -527,22 +528,22 @@ write_frame.buflen = sizeof(buf); write_frame.rate = read_codec->implementation->actual_samples_per_second; - ep.flags = flags; - switch_mutex_init(&ep.mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(tsession)); - switch_buffer_create_dynamic(&ep.buffer, 1024, 2048, 2048); - switch_buffer_add_mutex(ep.buffer, ep.mutex); - - switch_mutex_init(&ep.w_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(tsession)); - switch_buffer_create_dynamic(&ep.w_buffer, 1024, 2048, 2048); - switch_buffer_add_mutex(ep.w_buffer, ep.w_mutex); - - switch_mutex_init(&ep.r_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(tsession)); - switch_buffer_create_dynamic(&ep.r_buffer, 1024, 2048, 2048); - switch_buffer_add_mutex(ep.r_buffer, ep.r_mutex); + ep->flags = flags; + switch_mutex_init(&ep->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(tsession)); + switch_buffer_create_dynamic(&ep->buffer, 2048, 2048, 8192); + switch_buffer_add_mutex(ep->buffer, ep->mutex); + + switch_mutex_init(&ep->w_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(tsession)); + switch_buffer_create_dynamic(&ep->w_buffer, 2048, 2048, 8192); + switch_buffer_add_mutex(ep->w_buffer, ep->w_mutex); + + switch_mutex_init(&ep->r_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(tsession)); + switch_buffer_create_dynamic(&ep->r_buffer, 2048, 2048, 8192); + switch_buffer_add_mutex(ep->r_buffer, ep->r_mutex); - if (switch_core_media_bug_add(tsession, eavesdrop_callback, &ep, 0, - SMBF_READ_STREAM | SMBF_WRITE_STREAM | SMBF_READ_REPLACE | SMBF_WRITE_REPLACE | SMBF_READ_PING, + if (switch_core_media_bug_add(tsession, eavesdrop_callback, ep, 0, + SMBF_READ_STREAM | SMBF_WRITE_STREAM | SMBF_READ_REPLACE | SMBF_WRITE_REPLACE | SMBF_READ_PING, &bug) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot attach bug\n"); goto end; @@ -552,7 +553,8 @@ uint32_t len = sizeof(buf); switch_event_t *event = NULL; char *fcommand = NULL; - + char db[2] = ""; + status = switch_core_session_read_frame(session, &read_frame, 1000, 0); if (!SWITCH_READ_ACCEPTABLE(status)) { @@ -570,7 +572,8 @@ if ((flags & ED_DTMF) && switch_channel_has_dtmf(channel)) { switch_dtmf_t dtmf = {0}; switch_channel_dequeue_dtmf(channel, &dtmf); - *fcommand = dtmf.digit; + db[0] = dtmf.digit; + fcommand = db; } if (fcommand) { @@ -580,20 +583,20 @@ switch (*d) { case '1': - switch_set_flag((&ep), ED_MUX_READ); - switch_clear_flag((&ep), ED_MUX_WRITE); + switch_set_flag(ep, ED_MUX_READ); + switch_clear_flag(ep, ED_MUX_WRITE); break; case '2': - switch_set_flag((&ep), ED_MUX_WRITE); - switch_clear_flag((&ep), ED_MUX_READ); + switch_set_flag(ep, ED_MUX_WRITE); + switch_clear_flag(ep, ED_MUX_READ); break; case '3': - switch_set_flag((&ep), ED_MUX_READ); - switch_set_flag((&ep), ED_MUX_WRITE); + switch_set_flag(ep, ED_MUX_READ); + switch_set_flag(ep, ED_MUX_WRITE); break; case '0': - switch_clear_flag((&ep), ED_MUX_READ); - switch_clear_flag((&ep), ED_MUX_WRITE); + switch_clear_flag(ep, ED_MUX_READ); + switch_clear_flag(ep, ED_MUX_WRITE); break; default: z = 0; @@ -602,41 +605,48 @@ } if (z) { - switch_buffer_lock(ep.r_buffer); - switch_buffer_zero(ep.r_buffer); - switch_buffer_unlock(ep.r_buffer); + if (ep->r_buffer) { + switch_buffer_lock(ep->r_buffer); + switch_buffer_zero(ep->r_buffer); + switch_buffer_unlock(ep->r_buffer); + } - switch_buffer_lock(ep.w_buffer); - switch_buffer_zero(ep.w_buffer); - switch_buffer_unlock(ep.w_buffer); + if (ep->w_buffer) { + switch_buffer_lock(ep->w_buffer); + switch_buffer_zero(ep->w_buffer); + switch_buffer_unlock(ep->w_buffer); + } } } } if (!switch_test_flag(read_frame, SFF_CNG)) { - switch_buffer_lock(ep.r_buffer); - switch_buffer_zwrite(ep.r_buffer, read_frame->data, read_frame->datalen); - switch_buffer_unlock(ep.r_buffer); + switch_buffer_lock(ep->r_buffer); + switch_buffer_zwrite(ep->r_buffer, read_frame->data, read_frame->datalen); + switch_buffer_unlock(ep->r_buffer); - switch_buffer_lock(ep.w_buffer); - switch_buffer_zwrite(ep.w_buffer, read_frame->data, read_frame->datalen); - switch_buffer_unlock(ep.w_buffer); + switch_buffer_lock(ep->w_buffer); + switch_buffer_zwrite(ep->w_buffer, read_frame->data, read_frame->datalen); + switch_buffer_unlock(ep->w_buffer); } - if (len > tread_codec->implementation->samples_per_frame * 2) { - len = tread_codec->implementation->samples_per_frame * 2; + if (len > tread_codec->implementation->bytes_per_frame) { + len = tread_codec->implementation->bytes_per_frame; } - if (switch_buffer_inuse(ep.buffer) >= len) { - switch_buffer_lock(ep.buffer); - write_frame.datalen = (uint32_t)switch_buffer_read(ep.buffer, buf, len); - write_frame.samples = write_frame.datalen / 2; - if (switch_core_session_write_frame(session, &write_frame, 1000, 0) != SWITCH_STATUS_SUCCESS) { - goto end; + if (switch_buffer_inuse(ep->buffer) >= len) { + switch_buffer_lock(ep->buffer); + while (switch_buffer_inuse(ep->buffer) >= len) { + write_frame.datalen = (uint32_t)switch_buffer_read(ep->buffer, buf, len); + write_frame.samples = write_frame.datalen / 2; + if ((status = switch_core_session_write_frame(session, &write_frame, 1000, 0)) != SWITCH_STATUS_SUCCESS) { + break; + } } - switch_buffer_unlock(ep.buffer); + switch_buffer_unlock(ep->buffer); } + } @@ -648,16 +658,16 @@ switch_core_media_bug_remove(tsession, &bug); } - if (ep.buffer) { - switch_buffer_destroy(&ep.buffer); + if (ep->buffer) { + switch_buffer_destroy(&ep->buffer); } - if (ep.r_buffer) { - switch_buffer_destroy(&ep.r_buffer); + if (ep->r_buffer) { + switch_buffer_destroy(&ep->r_buffer); } - if (ep.w_buffer) { - switch_buffer_destroy(&ep.w_buffer); + if (ep->w_buffer) { + switch_buffer_destroy(&ep->w_buffer); } switch_core_session_rwunlock(tsession);

1 0

[commit] r7216 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 14 Jan '08

14 Jan '08

Author: brian Date: Mon Jan 14 14:09:16 2008 New Revision: 7216 Modified: freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml Log: fix local_stream config file Modified: freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml Mon Jan 14 14:09:16 2008 @@ -1,16 +1,20 @@ <configuration name="local_stream.conf" description="stream files from local dir"> -<directory name="moh/8000" path="$${base_dir}/sounds/music/8000"> - <param name="rate" value="8000"/> - <param name="shuffle" value="true"/> - <param name="channels" value="1"/> - <param name="interval" value="2"/> - <param name="timer_name" value="soft"/> -</directory> -<directory name="moh/16000" path="$${base_dir}/sounds/music/16000"> - <param name="rate" value="16000"/> - <param name="shuffle" value="true"/> - <param name="channels" value="1"/> - <param name="interval" value="2"/> - <param name="timer_name" value="soft"/> -</directory> + +  + + <directory name="moh/8000" path="$${base_dir}/sounds/music/8000"> + <param name="rate" value="8000"/> + <param name="shuffle" value="true"/> + <param name="channels" value="1"/> + <param name="interval" value="20"/> + <param name="timer_name" value="soft"/> + </directory> + + <directory name="moh/16000" path="$${base_dir}/sounds/music/16000"> + <param name="rate" value="16000"/> + <param name="shuffle" value="true"/> + <param name="channels" value="1"/> + <param name="interval" value="20"/> + <param name="timer_name" value="soft"/> + </directory> </configuration>

1 0