- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5555 - freeswitch/trunk/conf
by Freeswitch SVN 03 Aug '07

03 Aug '07

Author: mikej Date: Fri Aug 3 00:23:24 2007 New Revision: 5555 Modified: freeswitch/trunk/conf/xml_cdr.conf.xml Log: fix for FSBUILD-11 Modified: freeswitch/trunk/conf/xml_cdr.conf.xml ============================================================================== --- freeswitch/trunk/conf/xml_cdr.conf.xml (original) +++ freeswitch/trunk/conf/xml_cdr.conf.xml Fri Aug 3 00:23:24 2007 @@ -10,7 +10,7 @@   -  +

1 0

[commit] r5554 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 03 Aug '07

03 Aug '07

Author: mikej Date: Fri Aug 3 00:21:29 2007 New Revision: 5554 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: fix for MDXMLINT-8 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Fri Aug 3 00:21:29 2007 @@ -72,6 +72,7 @@ xml_binding_t *binding = (xml_binding_t *) user_data; char *file_url; struct curl_slist *slist = NULL; + long httpRes; if (!binding) { return NULL; @@ -126,6 +127,7 @@ } curl_easy_perform(curl_handle); + curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE,&httpRes); curl_easy_cleanup(curl_handle); close(config_data.fd); } else { @@ -134,8 +136,13 @@ switch_safe_free(data); - if (!(xml = switch_xml_parse_file(filename))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing Result!\n"); + if(httpRes==200) { + if (!(xml = switch_xml_parse_file(filename))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing Result!\n"); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received HTTP error %ld trying to fetch %s\n",httpRes,key_value); + xml=NULL; } unlink(filename);

1 0

[commit] r5553 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 03 Aug '07

03 Aug '07

Author: mikej Date: Fri Aug 3 00:06:58 2007 New Revision: 5553 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix for MODLANG-37 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 Aug 3 00:06:58 2007 @@ -1527,15 +1527,15 @@ CHANNEL_SANITY_CHECK(); - if (argc > 0) { - tts_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); - } - if (argc > 1) { - voice_name = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); - } - if (argc > 2) { - text = JS_GetStringBytes(JS_ValueToString(cx, argv[2])); - } + if (argc < 3) { + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_FALSE; + } + + tts_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + voice_name = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + text = JS_GetStringBytes(JS_ValueToString(cx, argv[2])); + if (argc > 3) { if ((function = JS_ValueToFunction(cx, argv[3]))) { memset(&cb_state, 0, sizeof(cb_state));

1 0

[commit] r5552 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 03 Aug '07

03 Aug '07

Author: mikej Date: Thu Aug 2 23:44:27 2007 New Revision: 5552 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix for FSCORE-41 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 Aug 2 23:44:27 2007 @@ -264,7 +264,7 @@ #define TONE_DETECT_SYNTAX "<uuid> <key> <tone_spec> [<flags> <timeout> <app> <args>]" SWITCH_STANDARD_API(tone_detect_session_function) { - char *argv[6] = { 0 }; + char *argv[7] = { 0 }; int argc; char *mydata = NULL; time_t to = 0;

1 0

[commit] r5551 - freeswitch/trunk/src
by Freeswitch SVN 03 Aug '07

03 Aug '07

Author: mikej Date: Thu Aug 2 23:40:05 2007 New Revision: 5551 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: fix for FSCORE-42 Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Thu Aug 2 23:40:05 2007 @@ -623,7 +623,7 @@ return SWITCH_STATUS_MEMERR; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Adding tone spec %s index %d\n", tone_spec, cont->index); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding tone spec %s index %d\n", tone_spec, cont->index); i = 0; p = (char *) tone_spec;

1 0

[commit] r5550 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 03 Aug '07

03 Aug '07

Author: mikej Date: Thu Aug 2 23:33:50 2007 New Revision: 5550 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: fix for MODENDP-14. Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Aug 2 23:33:50 2007 @@ -6,7 +6,7 @@ * * 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 + * the License. You may obtain a copy of the License ` * http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" basis, @@ -270,7 +270,9 @@ unsigned int pos = 0; switch_core_file_seek(&fh, &pos, 0, SEEK_SET); } - WriteAudioStream(globals.ring_stream, abuf, (long) olen, &globals.timer); + if (globals.ring_stream) { + WriteAudioStream(globals.ring_stream, abuf, (long) olen, &globals.timer); + } } } switch_clear_flag_locked((&globals), GFLAG_RING);

1 0

[commit] r5549 - freeswitch/trunk/src
by Freeswitch SVN 03 Aug '07

03 Aug '07

Author: mikej Date: Thu Aug 2 23:28:40 2007 New Revision: 5549 Modified: freeswitch/trunk/src/switch_xml.c Log: revert svn r5547 due to it not being cross platform. Replacement patch to follow. Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Thu Aug 2 23:28:40 2007 @@ -65,14 +65,9 @@ #endif #endif -#include <dirent.h> -#include <glob.h> - #define SWITCH_XML_WS "\t\r\n " // whitespace #define SWITCH_XML_ERRL 128 // maximum error string length -static int preprocess(const char *file, int write_fd, int rlevel); - typedef struct switch_xml_root *switch_xml_root_t; struct switch_xml_root { // additional data for the root tag struct switch_xml xml; // is a super-struct built on top of switch_xml struct @@ -938,49 +933,6 @@ } -static int preprocess_glob(const char *pattern, int write_fd, int rlevel) -{ - glob_t globbuf; - int i; - - if (glob(pattern, GLOB_NOCHECK|GLOB_MARK, NULL, &globbuf)) { - globfree(&globbuf); - return -1; - } - - for (i = 0; i < globbuf.gl_pathc; i++) { - char *path = globbuf.gl_pathv[i]; - if (*(path + strlen(path)) != '/') { - if (preprocess(path, write_fd, rlevel) < 0) { - fprintf(stderr, "Error including %s (%s)\n", path, strerror(errno)); - } - - } else { - char *filename = NULL; - struct dirent *entry; - DIR *dir; - - dir = opendir(path); - if (!dir) { - fprintf(stderr, "Error including %s (%s)\n", path, strerror(errno)); - continue; - } - while ((entry = readdir(dir)) != NULL) { - if (strcmp(entry->d_name, ".") == 0) continue; - if (strcmp(entry->d_name, "..") == 0) continue; - filename = switch_mprintf("%s%s", path, entry->d_name); - if (preprocess(filename, write_fd, rlevel) < 0) { - fprintf(stderr, "Error including %s (%s)\n", filename, strerror(errno)); - } - switch_safe_free(filename); - } - closedir(dir); - } - } - globfree(&globbuf); - return write_fd; -} - static int preprocess(const char *file, int write_fd, int rlevel) { int read_fd = -1; @@ -1066,7 +1018,9 @@ fme = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, arg); ifile = fme; } - preprocess_glob(ifile, write_fd, rlevel + 1); + if (preprocess(ifile, write_fd, rlevel + 1) < 0) { + fprintf(stderr, "Error including %s (%s)\n", ifile, strerror(errno)); + } switch_safe_free(fme); } /* else NO OP */ }

1 0

[commit] r5548 - in freeswitch/trunk/src: . include
by Freeswitch SVN 02 Aug '07

02 Aug '07

Author: anthm Date: Wed Aug 1 20:54:39 2007 New Revision: 5548 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/switch_ivr_play_say.c Log: fix core to actually work right with tts fixing a probably long standing bug with 30ms channels 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 Wed Aug 1 20:54:39 2007 @@ -365,6 +365,7 @@ /*! The Rate */ uint32_t rate; uint32_t speed; + uint32_t samples; char voice[80]; char engine[80]; /*! the handle's memory pool */ 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 Wed Aug 1 20:54:39 2007 @@ -1156,7 +1156,7 @@ int lead_in_out = 10; switch_status_t status = SWITCH_STATUS_SUCCESS; switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - uint32_t rate = 0, samples = 0; + uint32_t rate = 0; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -1170,9 +1170,8 @@ write_frame.data = abuf; write_frame.buflen = sizeof(abuf); - samples = (uint32_t) (sh->rate / 50); - len = samples * 2; - + len = sh->samples * 2; + flags = 0; switch_sleep(200000); switch_core_speech_feed_tts(sh, text, &flags); @@ -1345,7 +1344,6 @@ { switch_channel_t *channel; int interval = 0; - uint32_t samples = 0; uint32_t len = 0; switch_frame_t write_frame = { 0 }; switch_timer_t timer; @@ -1366,9 +1364,9 @@ timer_name = switch_channel_get_variable(channel, "timer_name"); switch_core_session_reset(session); - + read_codec = switch_core_session_get_read_codec(session); + if (rate == 0) { - read_codec = switch_core_session_get_read_codec(session); rate = read_codec->implementation->samples_per_second; } @@ -1382,9 +1380,9 @@ switch_channel_answer(channel); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "OPEN TTS %s\n", tts_name); - interval = 20; - samples = (uint32_t) (rate / 50); - len = samples * 2; + interval = read_codec->implementation->microseconds_per_frame / 1000; + sh.samples = switch_bytes_per_frame(rate, interval); + len = sh.samples * 2; codec_name = "L16"; @@ -1402,7 +1400,7 @@ } if (timer_name) { - if (switch_core_timer_init(&timer, timer_name, interval, (int) samples, pool) != SWITCH_STATUS_SUCCESS) { + if (switch_core_timer_init(&timer, timer_name, interval, (int) sh.samples, pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); switch_core_codec_destroy(write_frame.codec); flags = 0;

1 0

[commit] r5547 - freeswitch/trunk/src
by Freeswitch SVN 27 Jul '07

27 Jul '07

Author: silik0n Date: Fri Jul 27 10:47:07 2007 New Revision: 5547 Modified: freeswitch/trunk/src/switch_xml.c Log: All wildcard support for configuration include files ie:  Contributed by CopperCom Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Fri Jul 27 10:47:07 2007 @@ -65,9 +65,14 @@ #endif #endif +#include <dirent.h> +#include <glob.h> + #define SWITCH_XML_WS "\t\r\n " // whitespace #define SWITCH_XML_ERRL 128 // maximum error string length +static int preprocess(const char *file, int write_fd, int rlevel); + typedef struct switch_xml_root *switch_xml_root_t; struct switch_xml_root { // additional data for the root tag struct switch_xml xml; // is a super-struct built on top of switch_xml struct @@ -933,6 +938,49 @@ } +static int preprocess_glob(const char *pattern, int write_fd, int rlevel) +{ + glob_t globbuf; + int i; + + if (glob(pattern, GLOB_NOCHECK|GLOB_MARK, NULL, &globbuf)) { + globfree(&globbuf); + return -1; + } + + for (i = 0; i < globbuf.gl_pathc; i++) { + char *path = globbuf.gl_pathv[i]; + if (*(path + strlen(path)) != '/') { + if (preprocess(path, write_fd, rlevel) < 0) { + fprintf(stderr, "Error including %s (%s)\n", path, strerror(errno)); + } + + } else { + char *filename = NULL; + struct dirent *entry; + DIR *dir; + + dir = opendir(path); + if (!dir) { + fprintf(stderr, "Error including %s (%s)\n", path, strerror(errno)); + continue; + } + while ((entry = readdir(dir)) != NULL) { + if (strcmp(entry->d_name, ".") == 0) continue; + if (strcmp(entry->d_name, "..") == 0) continue; + filename = switch_mprintf("%s%s", path, entry->d_name); + if (preprocess(filename, write_fd, rlevel) < 0) { + fprintf(stderr, "Error including %s (%s)\n", filename, strerror(errno)); + } + switch_safe_free(filename); + } + closedir(dir); + } + } + globfree(&globbuf); + return write_fd; +} + static int preprocess(const char *file, int write_fd, int rlevel) { int read_fd = -1; @@ -1018,9 +1066,7 @@ fme = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, arg); ifile = fme; } - if (preprocess(ifile, write_fd, rlevel + 1) < 0) { - fprintf(stderr, "Error including %s (%s)\n", ifile, strerror(errno)); - } + preprocess_glob(ifile, write_fd, rlevel + 1); switch_safe_free(fme); } /* else NO OP */ }

1 0

[commit] r5546 - freeswitch/trunk/src
by Freeswitch SVN 26 Jul '07

26 Jul '07

Author: anthm Date: Wed Jul 25 20:51:32 2007 New Revision: 5546 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: small tweak to last commit Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Wed Jul 25 20:51:32 2007 @@ -187,22 +187,23 @@ msg.from = __FILE__; switch_core_session_receive_message(session_a, &msg); + if (switch_channel_get_state(chan_a) < CS_HANGUP) { + if ((app_name = switch_channel_get_variable(chan_a, SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE))) { + switch_caller_extension_t *extension = NULL; + if ((extension = switch_caller_extension_new(session_a, app_name, app_name)) == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); + goto end; + } + app_arg = switch_channel_get_variable(chan_a, SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE); - if ((app_name = switch_channel_get_variable(chan_a, SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE))) { - switch_caller_extension_t *extension = NULL; - if ((extension = switch_caller_extension_new(session_a, app_name, app_name)) == 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); - goto end; - } - app_arg = switch_channel_get_variable(chan_a, SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE); - - switch_caller_extension_add_application(session_a, extension, (char *) app_name, app_arg); - switch_channel_set_caller_extension(chan_a, extension); + switch_caller_extension_add_application(session_a, extension, (char *) app_name, app_arg); + switch_channel_set_caller_extension(chan_a, extension); - if (switch_channel_get_state(chan_a) == CS_EXECUTE) { - switch_channel_set_flag(chan_a, CF_RESET); - } else { - switch_channel_set_state(chan_a, CS_EXECUTE); + if (switch_channel_get_state(chan_a) == CS_EXECUTE) { + switch_channel_set_flag(chan_a, CF_RESET); + } else { + switch_channel_set_state(chan_a, CS_EXECUTE); + } } }

1 0