- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7007 - in freeswitch/trunk: libs/js/src src/mod/languages/mod_spidermonkey
by Freeswitch SVN 28 Dec '07

28 Dec '07

Author: anthm Date: Fri Dec 28 17:04:56 2007 New Revision: 7007 Modified: freeswitch/trunk/libs/js/src/jsexn.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix spidermonkey issue Modified: freeswitch/trunk/libs/js/src/jsexn.c ============================================================================== --- freeswitch/trunk/libs/js/src/jsexn.c (original) +++ freeswitch/trunk/libs/js/src/jsexn.c Fri Dec 28 17:04:56 2007 @@ -425,6 +425,7 @@ APPEND_CHAR_TO_STACK('('); for (i = 0; i < fp->argc; i++) { + /* Avoid toSource bloat and fallibility for object types. */ v = fp->argv[i]; if (JSVAL_IS_PRIMITIVE(v)) { 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 Dec 28 17:04:56 2007 @@ -1120,13 +1120,12 @@ jss->stack_depth++; - if (cb_state->jss_a && cb_state->jss_a->session && cb_state->jss_a->session == session) { argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_obj_a); } else if (cb_state->jss_b && cb_state->jss_b->session && cb_state->jss_b->session == session) { argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_obj_b); } else { - argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_state); + argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_state->obj); } switch (itype) {

1 0

[commit] r7006 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 28 Dec '07

28 Dec '07

Author: mikej Date: Fri Dec 28 16:14:44 2007 New Revision: 7006 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: handle error case in uuid_dump. 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 Dec 28 16:14:44 2007 @@ -2012,12 +2012,16 @@ switch_assert(channel != NULL); if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + switch_xml_t xml; switch_channel_event_set_data(channel, event); if (format && !strcasecmp(format, "xml")) { - switch_xml_t xml; if ((xml = switch_event_xmlize(event, "%s", ""))) { buf = switch_xml_toxml(xml, SWITCH_FALSE); switch_xml_free(xml); + } else { + stream->write_function(stream, "-ERR Unable to create xml!\n"); + switch_core_session_rwunlock(psession); + goto done; } } else { switch_event_serialize(event, &buf, SWITCH_TRUE);

1 0

[commit] r7005 - freeswitch/trunk/src/include
by Freeswitch SVN 28 Dec '07

28 Dec '07

Author: mikej Date: Fri Dec 28 16:04:05 2007 New Revision: 7005 Modified: freeswitch/trunk/src/include/switch.h Log: Work around bug in msvc 2005 code analysis. http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?Feedba… Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Fri Dec 28 16:04:05 2007 @@ -73,7 +73,15 @@ #include <fcntl.h> #ifdef _MSC_VER #include <Winsock2.h> +#if _MSC_VER < 1500 +/* work around bug in msvc 2005 code analysis http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?Feedba… */ +#pragma warning(push) +#pragma warning(disable:6011) #include <Ws2tcpip.h> +#pragma warning(pop) +#else +#include <Ws2tcpip.h> +#endif #else #include <strings.h> #endif

1 0

[commit] r7004 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 28 Dec '07

28 Dec '07

Author: anthm Date: Fri Dec 28 15:52:48 2007 New Revision: 7004 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: update 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 Dec 28 15:52:48 2007 @@ -764,31 +764,31 @@ /*********************************************************************************/ static JSBool dtmf_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) { - if (argc > 0) { - switch_dtmf_t *dtmf; - int32 duration = SWITCH_DEFAULT_DTMF_DURATION; - char *ename; - if (argc > 0) { - ename = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); - } else { - eval_some_js("~throw new Error(\"Invalid Args\");", cx, obj, rval); - return JS_FALSE; - } + switch_dtmf_t *dtmf; + int32 duration = SWITCH_DEFAULT_DTMF_DURATION; + char *ename; - if (argc > 1) { - JS_ValueToInt32(cx, argv[1], &duration); - if (duration <= 0) { - duration = SWITCH_DEFAULT_DTMF_DURATION; - } - } + if (argc > 0) { + ename = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + } else { + eval_some_js("~throw new Error(\"Invalid Args\");", cx, obj, rval); + return JS_FALSE; + } - if ((dtmf = malloc(sizeof(*dtmf)))) { - JS_SetPrivate(cx, obj, dtmf); - return JS_TRUE; + if (argc > 1) { + JS_ValueToInt32(cx, argv[1], &duration); + if (duration <= 0) { + duration = SWITCH_DEFAULT_DTMF_DURATION; } } + if ((dtmf = malloc(sizeof(*dtmf)))) { + JS_SetPrivate(cx, obj, dtmf); + return JS_TRUE; + } + + return JS_FALSE; }

1 0

[commit] r7003 - freeswitch/trunk/src
by Freeswitch SVN 28 Dec '07

28 Dec '07

Author: anthm Date: Fri Dec 28 15:16:39 2007 New Revision: 7003 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: remove line Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Dec 28 15:16:39 2007 @@ -745,7 +745,6 @@ if (strrchr(ringback_data, '.') || strstr(ringback_data, SWITCH_URL_SEPARATOR)) { switch_core_session_set_read_codec(session, &write_codec); - ext++; } else { ringback.asis++; write_frame.codec = read_codec;

1 0

[commit] r7002 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 28 Dec '07

28 Dec '07

Author: anthm Date: Fri Dec 28 14:47:51 2007 New Revision: 7002 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix MODAPP-59 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Dec 28 14:47:51 2007 @@ -1909,8 +1909,9 @@ switch_core_file_set_string(&fh, SWITCH_AUDIO_COL_STR_ARTIST, "FreeSWITCH mod_conference Software Conference Module"); while (switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(conference, CFLAG_RUNNING) && conference->count) { + switch_size_t len; mux_used = (uint32_t) switch_buffer_inuse(member->mux_buffer); - + if (switch_test_flag(member, MFLAG_FLUSH_BUFFER)) { if (mux_used) { switch_mutex_lock(member->audio_out_mutex); @@ -1928,18 +1929,26 @@ if ((rlen = (uint32_t) switch_buffer_read(member->mux_buffer, data, sizeof(data)))) { if (!switch_test_flag((&fh), SWITCH_FILE_PAUSE)) { - switch_size_t len = (switch_size_t) rlen / sizeof(int16_t); - if (switch_core_file_write(&fh, data, &len) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Write Failed\n"); - switch_clear_flag_locked(member, MFLAG_RUNNING); - } + len = (switch_size_t) rlen / sizeof(int16_t); } } switch_mutex_unlock(member->audio_out_mutex); } else { - switch_core_timer_next(&timer); + if (!switch_test_flag((&fh), SWITCH_FILE_PAUSE)) { + len = (switch_size_t) samples; + memset(data, 0, len); + } } - } /* Rinse ... Repeat */ + + if (!switch_test_flag((&fh), SWITCH_FILE_PAUSE)) { + if (switch_core_file_write(&fh, data, &len) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Write Failed\n"); + switch_clear_flag_locked(member, MFLAG_RUNNING); + } + } + + switch_core_timer_next(&timer); + } /* Rinse ... Repeat */ end:

1 0

[commit] r7001 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 Dec '07

28 Dec '07

Author: anthm Date: Fri Dec 28 13:54:43 2007 New Revision: 7001 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: possible fix for MODAPP-64 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Dec 28 13:54:43 2007 @@ -1719,6 +1719,7 @@ char *etmp = NULL, *exten = NULL; switch_channel_t *channel_a = NULL, *channel_b = NULL; su_home_t *home = NULL; + char *full_ref_by = NULL; tech_pvt = switch_core_session_get_private(session); channel_a = switch_core_session_get_channel(session); @@ -1737,6 +1738,13 @@ from = sip->sip_from; to = sip->sip_to; + + + if (sip->sip_referred_by) { + home = su_home_new(sizeof(*home)); + switch_assert(home != NULL); + full_ref_by = sip_header_as_string(home, (void *) sip->sip_referred_by); + } if ((refer_to = sip->sip_refer_to)) { if (profile->pflags & PFLAG_FULL_ID) { @@ -1765,9 +1773,11 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); goto done; } - - home = su_home_new(sizeof(*home)); - switch_assert(home != NULL); + + if (!home) { + home = su_home_new(sizeof(*home)); + switch_assert(home != NULL); + } if ((replaces = sip_replaces_make(home, rep)) && (bnh = nua_handle_by_replaces(nua, replaces))) { @@ -1785,7 +1795,7 @@ br_a = switch_channel_get_variable(channel_a, SWITCH_SIGNAL_BOND_VARIABLE); br_b = switch_channel_get_variable(channel_b, SWITCH_SIGNAL_BOND_VARIABLE); - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Attended Transfer [%s][%s]\n", switch_str_nil(br_a), switch_str_nil(br_b)); if (br_a && br_b) { @@ -1828,8 +1838,13 @@ } if (t_session) { + switch_channel_t *t_channel = switch_core_session_get_channel(t_session); ext = switch_channel_get_variable(hup_channel, "destination_number"); + if (!switch_strlen_zero(full_ref_by)) { + switch_channel_set_variable(t_channel, SOFIA_SIP_HEADER_PREFIX "Referred-By", full_ref_by); + } + switch_ivr_session_transfer(t_session, ext, NULL, NULL); nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), @@ -1880,6 +1895,9 @@ port); switch_channel_set_variable(channel, SOFIA_REPLACES_HEADER, rep); + if (!switch_strlen_zero(full_ref_by)) { + switch_channel_set_variable(channel, SOFIA_SIP_HEADER_PREFIX "Referred-By", full_ref_by); + } if (switch_ivr_originate(a_session, &tsession, &cause, exten, timeout, &noop_state_handler, NULL, NULL, NULL, SOF_NONE) @@ -1931,7 +1949,12 @@ switch_core_session_t *b_session; if ((b_session = switch_core_session_locate(br))) { + switch_channel_t *b_channel = switch_core_session_get_channel(b_session); switch_channel_set_variable(channel, "transfer_fallback_extension", from->a_user); + if (!switch_strlen_zero(full_ref_by)) { + switch_channel_set_variable(b_channel, SOFIA_SIP_HEADER_PREFIX "Referred-By", full_ref_by); + } + switch_ivr_session_transfer(b_session, exten, NULL, NULL); switch_core_session_rwunlock(b_session); }

1 0

[commit] r7000 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 28 Dec '07

28 Dec '07

Author: brian Date: Fri Dec 28 12:37:36 2007 New Revision: 7000 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: add this to example Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Fri Dec 28 12:37:36 2007 @@ -58,7 +58,7 @@   - +

1 0

[commit] r6999 - freeswitch/trunk/src
by Freeswitch SVN 28 Dec '07

28 Dec '07

Author: anthm Date: Fri Dec 28 10:48:50 2007 New Revision: 6999 Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_sqldb.c Log: fix FSCORE-80 Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Dec 28 10:48:50 2007 @@ -376,6 +376,20 @@ SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE | SWITCH_FPROT_UEXECUTE | SWITCH_FPROT_GREAD | SWITCH_FPROT_GEXECUTE, runtime.memory_pool); switch_safe_free(dir_path); + + + switch_dir_make_recursive(SWITCH_GLOBAL_dirs.base_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); + switch_dir_make_recursive(SWITCH_GLOBAL_dirs.mod_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); + switch_dir_make_recursive(SWITCH_GLOBAL_dirs.conf_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); + switch_dir_make_recursive(SWITCH_GLOBAL_dirs.log_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); + switch_dir_make_recursive(SWITCH_GLOBAL_dirs.db_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); + switch_dir_make_recursive(SWITCH_GLOBAL_dirs.script_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); + switch_dir_make_recursive(SWITCH_GLOBAL_dirs.htdocs_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); + switch_dir_make_recursive(SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); + switch_dir_make_recursive(SWITCH_GLOBAL_dirs.temp_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); + + + } Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Fri Dec 28 10:48:50 2007 @@ -358,6 +358,7 @@ /* Activate SQL database */ if ((sql_manager.db = switch_core_db_handle()) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB!\n"); + switch_clear_flag((&runtime), SCF_USE_SQL); } else { char create_channels_sql[] = "CREATE TABLE channels (\n"

1 0

[commit] r6998 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 28 Dec '07

28 Dec '07

Author: mikej Date: Fri Dec 28 01:36:42 2007 New Revision: 6998 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: use int32 instead of int32_t type to match macro. 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 Dec 28 01:36:42 2007 @@ -766,7 +766,7 @@ { if (argc > 0) { switch_dtmf_t *dtmf; - int32_t duration = SWITCH_DEFAULT_DTMF_DURATION; + int32 duration = SWITCH_DEFAULT_DTMF_DURATION; char *ename; if (argc > 0) {

1 0