November 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6363 - freeswitch/trunk/docs/phrase
by Freeswitch SVN 20 Nov '07

20 Nov '07

Author: brian Date: Tue Nov 20 12:46:23 2007 New Revision: 6363 Modified: freeswitch/trunk/docs/phrase/phrase_en.xml Log: tweak Modified: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Tue Nov 20 12:46:23 2007 @@ -174,7 +174,7 @@ <prompt phrase="login incorrect" filename="vm-fail_auth.wav"/> <prompt phrase="welcome to your voicemail" filename="vm-hello.wav"/> <prompt phrase="goodbye" filename="vm-goodbye.wav"/> - <prompt phrase="at the tone, record your name, press any key or stop talking to end the recording." filename="vm-record_name1.wav"/> + <prompt phrase="at the tone please record your name, press any key or stop talking to end the recording." filename="vm-record_name1.wav"/> <prompt phrase="choose a greeting between 1 and 3" filename="vm-choose_greeting.wav"/> <prompt phrase="invalid value" filename="vm-choose_greeting_fail.wav"/> <prompt phrase="too many failed attempts" filename="vm-abort.wav"/>

1 0

[commit] r6362 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 20 Nov '07

20 Nov '07

Author: mikej Date: Tue Nov 20 11:56:42 2007 New Revision: 6362 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix this for everyone. Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Nov 20 11:56:42 2007 @@ -2366,7 +2366,7 @@ *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, config_data.buffer)); } else { char errmsg[256]; - snprintf(errmsg, 256, "~throw new Error(\"Curl returned error %d.\");", code); + snprintf(errmsg, 256, "~throw new Error(\"Curl returned error %u.\");", (unsigned)code); eval_some_js(errmsg, cx, obj, rval); }

1 0

[commit] r6361 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 20 Nov '07

20 Nov '07

Author: brian Date: Tue Nov 20 11:45:33 2007 New Revision: 6361 Modified: freeswitch/trunk/conf/autoload_configs/xml_curl.conf.xml Log: that domain actually exists now Modified: freeswitch/trunk/conf/autoload_configs/xml_curl.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/xml_curl.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/xml_curl.conf.xml Tue Nov 20 11:45:33 2007 @@ -5,7 +5,7 @@ what's in this file only on-the-fly (leave it commented if you dont need it) -->  - <param name="gateway-url" value="http://www.mydomain.com/test.cgi" bindings="dialplan"/> +

1 0

[commit] r6360 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 20 Nov '07

20 Nov '07

Author: brian Date: Tue Nov 20 10:54:52 2007 New Revision: 6360 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: how did linux not complain about this Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Nov 20 10:54:52 2007 @@ -2366,7 +2366,7 @@ *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, config_data.buffer)); } else { char errmsg[256]; - snprintf(errmsg, 256, "~throw new Error(\"Curl returned error %s.\");", code); + snprintf(errmsg, 256, "~throw new Error(\"Curl returned error %d.\");", code); eval_some_js(errmsg, cx, obj, rval); }

1 0

[commit] r6359 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip
by Freeswitch SVN 20 Nov '07

20 Nov '07

Author: mikej Date: Tue Nov 20 09:45:37 2007 New Revision: 6359 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tagarg.h Log: Tue Nov 20 06:32:08 EST 2007 Pekka Pessi <Pekka.Pessi(a)nokia.com> * su_tagarg.h: call va_copy() before calling tl_vlist() Looks like Solaris on amd64 is not happy with normal va_start()/va_end() use of va_lists. Thanks for Michael Jerris for reporting the problem. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tagarg.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tagarg.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tagarg.h Tue Nov 20 09:45:37 2007 @@ -142,8 +142,11 @@ if (ta_start__tag != NULL && \ ta_start__tag != tag_null && \ ta_start__tag != tag_next) { \ + va_list ta_start__ap; \ + va_copy(ta_start__ap, (ta).ap); \ (ta).tl[1].t_tag = tag_next; \ - (ta).tl[1].t_value = (tag_value_t)tl_vlist((ta).ap); \ + (ta).tl[1].t_value = (tag_value_t)tl_vlist(ta_start__ap); \ + va_end(ta_start__ap); \ } else { \ (ta).tl[1].t_value = 0; (ta).tl[1].t_value = (tag_value_t)0; \ } \

1 0

[commit] r6358 - freeswitch/trunk/conf/lang/en/vm
by Freeswitch SVN 20 Nov '07

20 Nov '07

Author: brian Date: Tue Nov 20 09:30:20 2007 New Revision: 6358 Modified: freeswitch/trunk/conf/lang/en/vm/tts.xml Log: she makes us be nice Modified: freeswitch/trunk/conf/lang/en/vm/tts.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/vm/tts.xml (original) +++ freeswitch/trunk/conf/lang/en/vm/tts.xml Tue Nov 20 09:30:20 2007 @@ -83,7 +83,7 @@ <macro name="voicemail_record_name"> <input pattern="^(.*)$"> <match> - <action function="speak-text" data="at the tone, record your name, press any key or stop talking to end the recording."/> + <action function="speak-text" data="at the tone, please record your name, press any key or stop talking to end the recording."/> </match> </input>

1 0

[commit] r6357 - freeswitch/trunk/src/mod/languages/mod_java
by Freeswitch SVN 20 Nov '07

20 Nov '07

Author: dacha Date: Tue Nov 20 03:12:52 2007 New Revision: 6357 Modified: freeswitch/trunk/src/mod/languages/mod_java/mod_java.c Log: Changed mod_java so it still compiles. Modified: freeswitch/trunk/src/mod/languages/mod_java/mod_java.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_java/mod_java.c (original) +++ freeswitch/trunk/src/mod/languages/mod_java/mod_java.c Tue Nov 20 03:12:52 2007 @@ -45,7 +45,7 @@ SWITCH_MODULE_DEFINITION(mod_java, mod_java_load, mod_java_shutdown, NULL); -static void launch_java(switch_core_session_t *session, char *data, JNIEnv *env) +static void launch_java(switch_core_session_t *session, const char *data, JNIEnv *env) { jclass Launcher = NULL; jmethodID launch = NULL; @@ -93,7 +93,7 @@ (*env)->DeleteLocalRef(env, Launcher); } -static void java_function(switch_core_session_t *session, char *data) +SWITCH_STANDARD_APP(java_function) { JNIEnv *env; jint res;

1 0

[commit] r6356 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 20 Nov '07

20 Nov '07

Author: mikej Date: Tue Nov 20 02:53:38 2007 New Revision: 6356 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: resolves MDXMLINT-17 added api command xml_curl (takes debug_on and debug_off as params) that enables and disables keeping the lookup files around for debug reasons. 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 Tue Nov 20 02:53:38 2007 @@ -45,6 +45,8 @@ uint32_t ignore_cacert_check; }; +static int keep_files_around = 0; + typedef struct xml_binding xml_binding_t; struct config_data { @@ -52,6 +54,34 @@ int fd; }; +#define XML_CURL_SYNTAX "[debug_on|debug_off]" +SWITCH_STANDARD_API(xml_curl_function) +{ + if (session) { + return SWITCH_STATUS_FALSE; + } + + if (switch_strlen_zero(cmd)) { + goto usage; + } + + if (!strcasecmp(cmd, "debug_on")) { + keep_files_around = 1; + } else if (!strcasecmp(cmd, "debug_off")) { + keep_files_around = 0; + } else { + goto usage; + } + + stream->write_function(stream, "OK\n"); + return SWITCH_STATUS_SUCCESS; + +usage: + stream->write_function(stream, "USAGE: %s\n", XML_CURL_SYNTAX); + return SWITCH_STATUS_SUCCESS; +} + + static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data) { register unsigned int realsize = (unsigned int) (size * nmemb); @@ -160,7 +190,12 @@ xml=NULL; } - unlink(filename); + /* Debug by leaving the file behind for review */ + if(keep_files_around) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "XML response is in %s\n", filename); + } else { + unlink(filename); + } return xml; } @@ -246,9 +281,13 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_curl_load) { + switch_api_interface_t *xml_curl_api_interface; + /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); + SWITCH_ADD_API(xml_curl_api_interface, "xml_curl", "XML Curl", xml_curl_function, XML_CURL_SYNTAX); + if (do_config() == SWITCH_STATUS_SUCCESS) { curl_global_init(CURL_GLOBAL_ALL); } else {

1 0

[commit] r6355 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 20 Nov '07

20 Nov '07

Author: mikej Date: Mon Nov 19 23:30:09 2007 New Revision: 6355 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: add Curl.fetchDocument (MODLANG-39) 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 Mon Nov 19 23:30:09 2007 @@ -2125,6 +2125,14 @@ int fd; }; +struct fetch_url_data { + JSContext *cx; + JSObject *obj; + switch_size_t buffer_size; + switch_size_t data_len; + char* buffer; +}; + static size_t hash_callback(void *ptr, size_t size, size_t nmemb, void *data) { register size_t realsize = size * nmemb; @@ -2184,17 +2192,39 @@ return realsize; } +static size_t fetch_url_callback(void *ptr, size_t size, size_t nmemb, void *data) +{ + register unsigned int realsize = (unsigned int) (size * nmemb); + struct fetch_url_data *config_data = data; + + /* Too much data. Do not increase buffer, but abort fetch instead. */ + if (config_data->data_len + realsize >= config_data->buffer_size) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Data do not fit in the allocated buffer\n"); + return 0; + } + + memcpy(config_data->buffer + config_data->data_len, ptr, realsize); + config_data->data_len += realsize; + config_data->buffer[config_data->data_len] = 0; + + return realsize; +} + static JSBool js_fetchurl_hash(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) { char *url = NULL, *name = NULL; CURL *curl_handle = NULL; struct config_data config_data; + int saveDepth = 0; + int32 disable_wait = 0; if (argc > 1) { url = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); name = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); - + if (argc > 2) { + JS_ValueToInt32(cx, argv[2], &disable_wait); + } curl_handle = curl_easy_init(); if (!strncasecmp(url, "https", 5)) { @@ -2210,7 +2240,15 @@ curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, hash_callback); curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-js/1.0"); - curl_easy_perform(curl_handle); + + if (disable_wait) { + saveDepth = JS_SuspendRequest(cx); + curl_easy_perform(curl_handle); + JS_ResumeRequest(cx, saveDepth); + } else { + curl_easy_perform(curl_handle); + } + curl_easy_cleanup(curl_handle); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n"); @@ -2227,10 +2265,15 @@ char *url = NULL, *filename = NULL; CURL *curl_handle = NULL; struct config_data config_data; + int saveDepth = 0; + int32 disable_wait = 0; if (argc > 1) { url = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); filename = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + if (argc > 2) { + JS_ValueToInt32(cx, argv[2], &disable_wait); + } curl_global_init(CURL_GLOBAL_ALL); curl_handle = curl_easy_init(); @@ -2247,7 +2290,15 @@ curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback); curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-js/1.0"); - curl_easy_perform(curl_handle); + + if (disable_wait) { + saveDepth = JS_SuspendRequest(cx); + curl_easy_perform(curl_handle); + JS_ResumeRequest(cx, saveDepth); + } else { + curl_easy_perform(curl_handle); + } + curl_easy_cleanup(curl_handle); close(config_data.fd); } else { @@ -2259,6 +2310,74 @@ return JS_TRUE; } + + +static JSBool js_fetchurl(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + char *url = NULL; + CURL *curl_handle = NULL; + struct fetch_url_data config_data; + int32 buffer_size = 65535; + CURLcode code = 0; + int saveDepth = 0; + int32 disable_wait = 0; + + if (argc >= 1) { + url = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + if (argc > 1) { + JS_ValueToInt32(cx, argv[1], &buffer_size); + if (argc > 2) { + JS_ValueToInt32(cx, argv[2], &disable_wait); + } + } + + curl_global_init(CURL_GLOBAL_ALL); + curl_handle = curl_easy_init(); + if (!strncasecmp(url, "https", 5)) { + curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); + curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); + } + + config_data.buffer_size = buffer_size; + config_data.buffer = malloc(config_data.buffer_size); + config_data.data_len = 0; + if (config_data.buffer == NULL) { + eval_some_js("~throw new Error(\"Failed to allocate data buffer.\");", cx, obj, rval); + return JS_TRUE; + } + + curl_easy_setopt(curl_handle, CURLOPT_URL, url); + curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, fetch_url_callback); + curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data); + curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-js/1.0"); + + if (disable_wait) { + saveDepth = JS_SuspendRequest(cx); + code = curl_easy_perform(curl_handle); + JS_ResumeRequest(cx, saveDepth); + } else { + code = curl_easy_perform(curl_handle); + } + + curl_easy_cleanup(curl_handle); + + if (code != CURLE_WRITE_ERROR) { + config_data.buffer[config_data.data_len] = 0; + *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, config_data.buffer)); + } else { + char errmsg[256]; + snprintf(errmsg, 256, "~throw new Error(\"Curl returned error %s.\");", code); + eval_some_js(errmsg, cx, obj, rval); + } + + free(config_data.buffer); + + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n"); + } + + return JS_TRUE; +} #endif @@ -3085,8 +3204,12 @@ {"fileDelete", js_file_unlink, 1}, {"system", js_system, 1}, #ifdef HAVE_CURL + {"fetchURL", js_fetchurl, 1}, {"fetchURLHash", js_fetchurl_hash, 1}, {"fetchURLFile", js_fetchurl_file, 1}, + {"fetchUrl", js_fetchurl, 1}, + {"fetchUrlHash", js_fetchurl_hash, 1}, + {"fetchUrlFile", js_fetchurl_file, 1}, #endif {0} };

1 0

[commit] r6354 - freeswitch/trunk
by Freeswitch SVN 20 Nov '07

20 Nov '07

Author: mikej Date: Mon Nov 19 22:58:32 2007 New Revision: 6354 Modified: freeswitch/trunk/configure.in Log: fix for FSBUILD-26 Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Nov 19 22:58:32 2007 @@ -419,7 +419,7 @@ #LIBS+=> core.log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat core.log;fi;if test "$$error" = "yes";then exit 1;fi LIBTOOL='`if test -z "$(VERBOSE)" ; then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(switch_builddir)/libtool; fi;`' TOUCH_TARGET='if test -f "$@";then touch "$@";fi;' -CONF_MODULES='\`grep -v "\#" $(switch_builddir)/modules.conf | sed -e "s|^.*/||" \`' +CONF_MODULES='\`grep -v "\#" $(switch_builddir)/modules.conf | sed -e "s|^.*/||" | sort | uniq \`' OUR_MODS='`if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods=\`for i in $$tmp_mods ; do echo $$i-all ; done \`; echo $$mods `' OUR_CLEAN_MODS='`if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods=\`for i in $$tmp_mods ; do echo $$i-clean ; done \`; echo $$mods `' OUR_INSTALL_MODS='`if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods=\`for i in $$tmp_mods ; do echo $$i-install ; done\`; echo $$mods `'

1 0