- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

[commit] r6997 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 27 Dec '07

27 Dec '07

Author: brian Date: Thu Dec 27 17:26:18 2007 New Revision: 6997 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: woops didn't mean to commit this Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Dec 27 17:26:18 2007 @@ -113,10 +113,10 @@ <anti-action application="set" data="transfer_ringback=${us-ring}"/> <anti-action application="set" data="call_timeout=30"/> <anti-action application="set" data="hangup_after_bridge=true"/> - <anti-action application="set" data="left_hanging_extension=5900"/> <anti-action application="set" data="continue_on_fail=NORMAL_TEMPORARY_FAILURE,BUSY,USER_BUSY,NO_ANSWER,TIMEOUT,NO_ROUTE_DESTINATION"/> <anti-action application="db" data="insert/call_return/${dialed_ext}/${caller_id_number}"/> <anti-action application="db" data="insert/last_dial_ext/${dialed_ext}/${uuid}"/> +  <anti-action application="bridge" data="user/${dialed_ext}@$${domain}"/> <anti-action application="answer"/> <anti-action application="sleep" data="1000"/> @@ -184,7 +184,7 @@ <extension name="enum"> <condition field="destination_number" expression="^(.*)$"> - <action application="reject" data="484 Address Incomplete"/> + <action application="transfer" data="$1 enum"/> </condition> </extension>

1 0

[commit] r6996 - freeswitch/trunk/src
by Freeswitch SVN 27 Dec '07

27 Dec '07

Author: anthm Date: Thu Dec 27 17:24:30 2007 New Revision: 6996 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: adj Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Thu Dec 27 17:24:30 2007 @@ -236,7 +236,8 @@ { switch_channel_t *channel = NULL; switch_ivr_bridge_data_t *bd; - + switch_channel_state_t state; + channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); @@ -252,9 +253,11 @@ } switch_channel_clear_state_handler(channel, &audio_bridge_peer_state_handlers); - if (!switch_channel_test_flag(channel, CF_TRANSFER) && switch_channel_get_state(channel) == CS_LOOPBACK) { + state = switch_channel_get_state(channel); + + if (!switch_channel_test_flag(channel, CF_TRANSFER) && state != CS_PARK && state != CS_RING) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - } + } return SWITCH_STATUS_FALSE; } @@ -328,6 +331,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CUSTOM TRANSMIT\n", switch_channel_get_name(channel)); switch_channel_clear_state_handler(channel, NULL); + switch_channel_clear_flag(channel, CF_TRANSFER); if (!switch_channel_test_flag(channel, CF_ORIGINATOR)) { return SWITCH_STATUS_SUCCESS; @@ -553,7 +557,8 @@ switch_channel_t *caller_channel, *peer_channel; int stream_id = 0; switch_status_t status = SWITCH_STATUS_SUCCESS; - + switch_channel_state_t state; + switch_assert(session != NULL); switch_assert(peer_session != NULL); @@ -565,6 +570,9 @@ peer_channel = switch_core_session_get_channel(peer_session); switch_assert(peer_channel != NULL); + switch_channel_clear_flag(caller_channel, CF_TRANSFER); + switch_channel_clear_flag(peer_channel, CF_TRANSFER); + a_leg = switch_core_session_alloc(session, sizeof(*a_leg)); b_leg = switch_core_session_alloc(peer_session, sizeof(*b_leg)); @@ -660,6 +668,7 @@ if (!switch_channel_test_flag(peer_channel, CF_TRANSFER) && switch_channel_get_state(peer_channel) == CS_LOOPBACK) { switch_channel_set_state(peer_channel, CS_RESET); } + while (switch_channel_get_state(peer_channel) == CS_LOOPBACK) { switch_yield(1000); } @@ -682,10 +691,12 @@ done: + state = switch_channel_get_state(caller_channel); + if (!switch_channel_test_flag(caller_channel, CF_TRANSFER)) { - if (switch_channel_test_flag(peer_channel, CF_ANSWERED) && - switch_channel_get_state(caller_channel) < CS_HANGUP && - switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { + if ((state != CS_EXECUTE && state != CS_PARK && state != CS_RING) || + (switch_channel_test_flag(peer_channel, CF_ANSWERED) && state < CS_HANGUP && + switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE)))) { switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel)); } }

1 0

[commit] r6995 - in freeswitch/trunk: scripts/js_modules src/mod/languages/mod_spidermonkey
by Freeswitch SVN 27 Dec '07

27 Dec '07

Author: anthm Date: Thu Dec 27 15:45:26 2007 New Revision: 6995 Modified: freeswitch/trunk/scripts/js_modules/SpeechTools.jm freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: change callback prototype on js (will break all callback scripts) Modified: freeswitch/trunk/scripts/js_modules/SpeechTools.jm ============================================================================== --- freeswitch/trunk/scripts/js_modules/SpeechTools.jm (original) +++ freeswitch/trunk/scripts/js_modules/SpeechTools.jm Thu Dec 27 15:45:26 2007 @@ -147,7 +147,7 @@ } /* Callback function for streaming,TTS or bridged calls */ - this.onInput = function(type, inputEvent, _this) { + this.onInput = function(s, type, inputEvent, _this) { if (type == "event") { var speech_type = inputEvent.getHeader("Speech-Type"); var rv = new Array(); 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 Thu Dec 27 15:45:26 2007 @@ -760,6 +760,111 @@ }; +/* Dtmf Object */ +/*********************************************************************************/ +static JSBool dtmf_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + if (argc > 0) { + switch_dtmf_t *dtmf; + int32_t 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; + } + + 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; +} + +static void dtmf_destroy(JSContext * cx, JSObject * obj) +{ + switch_dtmf_t *dtmf = JS_GetPrivate(cx, obj); + + if (dtmf) { + switch_safe_free(dtmf); + JS_SetPrivate(cx, obj, NULL); + } +} + +enum dtmf_tinyid { + DTMF_DIGIT, DTMF_DURATION +}; + +static JSFunctionSpec dtmf_methods[] = { + {0} +}; + + +static JSPropertySpec dtmf_props[] = { + {"digit", DTMF_DIGIT, JSPROP_READONLY | JSPROP_PERMANENT}, + {"duration", DTMF_DURATION, JSPROP_READONLY | JSPROP_PERMANENT}, + {0} +}; + + +static JSBool dtmf_getProperty(JSContext * cx, JSObject * obj, jsval id, jsval * vp) +{ + JSBool res = JS_TRUE; + switch_dtmf_t *dtmf = JS_GetPrivate(cx, obj); + char *name; + int param = 0; + + if (!dtmf) { + *vp = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; + } + + + name = JS_GetStringBytes(JS_ValueToString(cx, id)); + /* numbers are our props anything else is a method */ + if (name[0] >= 48 && name[0] <= 57) { + param = atoi(name); + } else { + return JS_TRUE; + } + + switch (param) { + case DTMF_DIGIT: + { + char tmp[2] = { dtmf->digit, '\0' }; + *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, tmp)); + } + break; + + case DTMF_DURATION: + { + *vp = INT_TO_JSVAL((int)dtmf->duration); + } + break; + } + + return res; +} + +JSClass dtmf_class = { + "DTMF", JSCLASS_HAS_PRIVATE, + JS_PropertyStub, JS_PropertyStub, dtmf_getProperty, DEFAULT_SET_PROPERTY, + JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, dtmf_destroy, NULL, NULL, NULL, + dtmf_construct +}; + + static void js_error(JSContext * cx, const char *message, JSErrorReport * report) { const char *filename = __FILE__; @@ -977,11 +1082,29 @@ return Event; } + +JSObject *new_js_dtmf(switch_dtmf_t *dtmf, char *name, JSContext * cx, JSObject * obj) +{ + JSObject *DTMF = NULL; + switch_dtmf_t *ddtmf; + + if ((ddtmf = malloc(sizeof(*ddtmf)))) { + *ddtmf = *dtmf; + if ((DTMF = JS_DefineObject(cx, obj, name, &dtmf_class, NULL, 0))) { + JS_SetPrivate(cx, DTMF, ddtmf); + JS_DefineProperties(cx, DTMF, dtmf_props); + JS_DefineFunctions(cx, DTMF, dtmf_methods); + } else { + abort(); + } + } + return DTMF; +} + #define MAX_STACK_DEPTH 2 static switch_status_t js_common_callback(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen) { - char dtmf[2] = ""; switch_event_t *event = NULL; struct input_callback_state *cb_state = buf; struct js_session *jss = cb_state->session_state; @@ -997,6 +1120,15 @@ 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); + } + switch (itype) { case SWITCH_INPUT_TYPE_EVENT: if ((event = (switch_event_t *) input)) { @@ -1012,11 +1144,14 @@ break; case SWITCH_INPUT_TYPE_DTMF: { - switch_dtmf_t *_dtmf = (switch_dtmf_t *) input; - dtmf[0] = _dtmf->digit; - dtmf[1] = '\0'; - argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(cb_state->cx, "dtmf")); - argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(cb_state->cx, dtmf)); + switch_dtmf_t *dtmf = (switch_dtmf_t *) input; + + if (dtmf) { + if ((Event = new_js_dtmf(dtmf, "_XX_DTMF_XX_", cb_state->cx, cb_state->obj))) { + argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(cb_state->cx, "dtmf")); + argv[argc++] = OBJECT_TO_JSVAL(Event); + } + } } break; } @@ -1025,11 +1160,7 @@ argv[argc++] = cb_state->arg; } - 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); - } + if (jss->stack_depth > MAX_STACK_DEPTH) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Maximum recursive callback limit %d reached.\n", MAX_STACK_DEPTH); @@ -3247,6 +3378,8 @@ JS_InitClass(cx, javascript_object, NULL, &event_class, event_construct, 3, event_props, event_methods, event_props, event_methods); + JS_InitClass(cx, javascript_object, NULL, &dtmf_class, dtmf_construct, 3, dtmf_props, dtmf_methods, dtmf_props, dtmf_methods); + JS_InitClass(cx, javascript_object, NULL, &pcre_class, pcre_construct, 3, pcre_props, pcre_methods, pcre_props, pcre_methods); return 1;

1 0