- Freeswitch-trunk - FreeSWITCH Mailing Lists

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

03 Aug '07

Author: mikej Date: Fri Aug 3 12:56:54 2007 New Revision: 5565 Modified: freeswitch/trunk/src/switch_event.c Log: fix for FSCORE-37 Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri Aug 3 12:56:54 2007 @@ -809,6 +809,7 @@ switch_time_exp_t tm; char date[80] = ""; switch_size_t retsize; + switch_time_t ts = switch_time_now(); assert(BLOCK != NULL); assert(RUNTIME_POOL != NULL); @@ -825,11 +826,12 @@ switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Name", "%s", switch_event_name((*event)->event_id)); switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Core-UUID", "%s", switch_core_get_uuid()); - switch_time_exp_lt(&tm, switch_time_now()); + switch_time_exp_lt(&tm, ts); switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Date-Local", "%s", date); - switch_rfc822_date(date, switch_time_now()); + switch_rfc822_date(date, ts); switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Date-GMT", "%s", date); + switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Date-timestamp", "%"SWITCH_UINT64_T_FMT, (uint64_t)ts); switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Calling-File", "%s", switch_cut_path(file)); switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Calling-Function", "%s", func); switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Calling-Line-Number", "%d", line);

1 0

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

03 Aug '07

Author: mikej Date: Fri Aug 3 12:46:21 2007 New Revision: 5564 Modified: freeswitch/trunk/src/switch_ivr.c Log: fix for FSCORE-34 Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Aug 3 12:46:21 2007 @@ -890,8 +890,17 @@ switch_channel_set_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE, NULL); - if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) - && (other_session = switch_core_session_locate(uuid))) { + + /* If HANGUP_AFTER_BRIDGE is set to 'true', SWITCH_SIGNAL_BRIDGE_VARIABLE + * will not have a value, so we need to check SWITCH_BRIDGE_VARIABLE */ + + uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE); + + if(!uuid) { + uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE); + } + + if (uuid && (other_session = switch_core_session_locate(uuid))) { switch_channel_set_variable(other_channel, SWITCH_SIGNAL_BOND_VARIABLE, NULL); switch_core_session_rwunlock(other_session); } @@ -906,6 +915,9 @@ switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL); switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL); + + /* If we are transferring the CALLER out of the bridge, we do not want to hang up on them */ + switch_channel_set_variable(channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE, "false"); switch_channel_hangup(other_channel, SWITCH_CAUSE_BLIND_TRANSFER); switch_ivr_media(uuid, SMF_NONE);

1 0

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

03 Aug '07

Author: anthm Date: Fri Aug 3 12:26:32 2007 New Revision: 5563 Modified: freeswitch/trunk/src/include/switch_utils.h Log: stupidly forgot to include linefeed and carraige return in ok chars for vars thus breaking bypass_media mode for who knows how long... Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Aug 3 12:26:32 2007 @@ -182,7 +182,7 @@ char *p; for (p = s; p && *p; p++) { uint8_t x = (uint8_t) *p; - if (x < 32 || x > 127) { + if ((x < 32 || x > 127) && x != '\n' && x != '\r') { *p = ' '; } }

1 0

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

03 Aug '07

Author: mikej Date: Fri Aug 3 12:13:32 2007 New Revision: 5562 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix for MODLANG-38 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 12:13:32 2007 @@ -1527,10 +1527,10 @@ CHANNEL_SANITY_CHECK(); - if (argc < 3) { - *rval = BOOLEAN_TO_JSVAL(JS_FALSE); - return JS_FALSE; - } + 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])); @@ -2311,7 +2311,7 @@ if (JS_ValueToObject(cx, argv[0], &session_obj)) { struct js_session *old_jss = NULL; - if ((old_jss = JS_GetPrivate(cx, session_obj))) { + if ((old_jss = JS_GetPrivate(cx, session_obj)) && old_jss->session) { session = old_jss->session; orig_caller_profile = switch_channel_get_caller_profile(switch_core_session_get_channel(session)); dialplan = orig_caller_profile->dialplan;

1 0

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

03 Aug '07

Author: mikej Date: Fri Aug 3 11:43:23 2007 New Revision: 5561 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Log: MODAPP-11 whoops. Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Fri Aug 3 11:43:23 2007 @@ -68,7 +68,7 @@ char *curl_xml_text; char *logdir; switch_channel_t *channel = switch_core_session_get_channel(session); - int i; + uint32_t i; if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) {

1 0

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

03 Aug '07

Author: mikej Date: Fri Aug 3 11:41:39 2007 New Revision: 5560 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Log: fix for MODAPP-11 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Fri Aug 3 11:41:39 2007 @@ -40,11 +40,22 @@ char *errLogDir; uint32_t delay; uint32_t retries; + uint32_t shutdown; } globals; SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_cdr_shutdown); SWITCH_MODULE_DEFINITION(mod_xml_cdr, mod_xml_cdr_load, NULL, NULL); +/* this function would have access to the HTML returned by the webserver, we dont need it + * and the default curl activity is to print to stdout, something not as desirable + * so we have a dummy function here + */ +static void httpCallBack() +{ + return; +} + static switch_status_t my_on_hangup(switch_core_session_t *session) { switch_xml_t cdr; @@ -57,6 +68,7 @@ char *curl_xml_text; char *logdir; switch_channel_t *channel = switch_core_session_get_channel(session); + int i; if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { @@ -110,6 +122,7 @@ curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, curl_xml_text); curl_easy_setopt(curl_handle, CURLOPT_URL, globals.url); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); + curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, httpCallBack); /* these were used for testing, optionally they may be enabled if someone desires curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 120); // tcp timeout @@ -120,7 +133,6 @@ curl_easy_perform(curl_handle); curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE,&httpRes); if(httpRes==200) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "DEBUG XXX success posting\n"); curl_easy_cleanup(curl_handle); free(curl_xml_text); free(xml_text); @@ -129,33 +141,40 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Got error [%ld] posting to web server\n",httpRes); } - /* bug? feature? we sleep even on the last failure before writing the file */ - switch_sleep(globals.delay * 1000); + /* make sure we dont sleep on the last try */ + for(i=0;i<globals.delay && (curTry != (globals.retries));i++) { + switch_sleep(1000); + if(globals.shutdown) { + /* we are shutting down so dont try to webpost any more */ + i=globals.delay; + curTry=globals.retries; + } + } + } free(curl_xml_text); curl_easy_cleanup(curl_handle); - } - /* if we are here the web post failed for some reason */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to post to web server, writing to file\n"); + /* if we are here the web post failed for some reason */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to post to web server, writing to file\n"); - if ((path = switch_mprintf("%s/%s.cdr.xml", globals.errLogDir, switch_core_session_get_uuid(session)))) { - if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { - write(fd, xml_text, (unsigned) strlen(xml_text)); - close(fd); - fd = -1; - } else { - char ebuf[512] = { 0 }; + if ((path = switch_mprintf("%s/%s.cdr.xml", globals.errLogDir, switch_core_session_get_uuid(session)))) { + if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { + write(fd, xml_text, (unsigned) strlen(xml_text)); + close(fd); + fd = -1; + } else { + char ebuf[512] = { 0 }; #ifdef WIN32 - strerror_s(ebuf, sizeof(ebuf), errno); + strerror_s(ebuf, sizeof(ebuf), errno); #else - strerror_r(errno, ebuf, sizeof(ebuf)); + strerror_r(errno, ebuf, sizeof(ebuf)); #endif - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error![%s]\n", ebuf); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error![%s]\n", ebuf); + } + free(path); } - free(path); } - free(xml_text); switch_xml_free(cdr); } else { @@ -165,11 +184,30 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t do_config(void) + +static switch_state_handler_table_t state_handlers = { + /*.on_init */ NULL, + /*.on_ring */ NULL, + /*.on_execute */ NULL, + /*.on_hangup */ my_on_hangup, + /*.on_loopback */ NULL, + /*.on_transmit */ NULL +}; + +SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load) { char *cf = "xml_cdr.conf"; switch_xml_t cfg, xml, settings, param; + + /* test global state handlers */ + switch_core_add_state_handler(&state_handlers); + + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + memset(&globals,0,sizeof(globals)); + + /* parse the config */ if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); return SWITCH_STATUS_TERM; @@ -218,31 +256,20 @@ } } + + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } -static switch_state_handler_table_t state_handlers = { - /*.on_init */ NULL, - /*.on_ring */ NULL, - /*.on_execute */ NULL, - /*.on_hangup */ my_on_hangup, - /*.on_loopback */ NULL, - /*.on_transmit */ NULL -}; -SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load) +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_cdr_shutdown) { - /* test global state handlers */ - switch_core_add_state_handler(&state_handlers); - - *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + globals.shutdown=1; + return SWITCH_STATUS_SUCCESS; +} - memset(&globals,0,sizeof(globals)); - do_config(); - /* indicate that the module should continue to be loaded */ - return SWITCH_STATUS_SUCCESS; -} /* For Emacs: * Local Variables:

1 0

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

03 Aug '07

Author: mikej Date: Fri Aug 3 01:02:45 2007 New Revision: 5559 Modified: freeswitch/trunk/Freeswitch.sln Log: remove file from solution. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Fri Aug 3 01:02:45 2007 @@ -458,7 +458,6 @@ conf\event_multicast.conf.xml = conf\event_multicast.conf.xml conf\event_socket.conf.xml = conf\event_socket.conf.xml conf\freeswitch.xml = conf\freeswitch.xml - conf\freeswitch_combined.xml = conf\freeswitch_combined.xml conf\iax.conf.xml = conf\iax.conf.xml conf\ivr.conf.xml = conf\ivr.conf.xml conf\lang_en.xml = conf\lang_en.xml

1 0

[commit] r5558 - freeswitch/trunk/libs/libteletone/src
by Freeswitch SVN 03 Aug '07

03 Aug '07

Author: mikej Date: Fri Aug 3 01:02:25 2007 New Revision: 5558 Modified: freeswitch/trunk/libs/libteletone/src/libteletone.h Log: fix for FSBUILD-12 Modified: freeswitch/trunk/libs/libteletone/src/libteletone.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone.h Fri Aug 3 01:02:25 2007 @@ -74,6 +74,9 @@ #ifdef __cplusplus extern "C" { #endif + +#include <math.h> + #define TELETONE_MAX_DTMF_DIGITS 128 #define TELETONE_MAX_TONES 6 #define TELETONE_TONE_RANGE 127

1 0

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

03 Aug '07

Author: mikej Date: Fri Aug 3 00:51:30 2007 New Revision: 5557 Removed: freeswitch/trunk/conf/freeswitch_combined.xml Log: fix for FSBUILD-10, removing freeswitch_combined.xml at least for now as it has not been kept up to date, and serves no real purpose.

1 0

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

03 Aug '07

Author: mikej Date: Fri Aug 3 00:29:57 2007 New Revision: 5556 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: fix for MODAPP-23 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 Fri Aug 3 00:29:57 2007 @@ -123,7 +123,7 @@ } switch_url_encode(data, enc_hint, sizeof(enc_hint)); - snprintf(hint_data, sizeof(hint_data), "macro_name=%s&lang=%s&data=%s", macro_name, chan_lang, enc_hint); + snprintf(hint_data, sizeof(hint_data), "macro_name=%s&lang=%s&data=%s&destination_number=%s", macro_name, chan_lang, enc_hint, switch_channel_get_variable(channel,"destination_number")); if (switch_xml_locate("phrases", NULL, NULL, NULL, &xml, &cfg, hint_data) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of phrases failed.\n");

1 0