kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge MODLANG-61 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8652 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-05-26 00:18:57 +00:00
parent 2f88e7a03c
commit d932b98aa2
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
View File

@ -2174,8 +2174,15 @@ static JSBool session_hangup(JSContext * cx, JSObject * obj, uintN argc, jsval *
CHANNEL_SANITY_CHECK(); CHANNEL_SANITY_CHECK();
if (argc > 1) { if (argc > 1) {
cause_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); if(JSVAL_IS_INT(argv[0])) {
cause = switch_channel_str2cause(cause_name); int32 i = 0;
JS_ValueToInt32(cx, argv[0], &i);
cause = i;
}
else {
cause_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
cause = switch_channel_str2cause(cause_name);
}
} }
switch_channel_hangup(channel, cause); switch_channel_hangup(channel, cause);
@ -2424,7 +2431,7 @@ static JSBool js_fetchurl(JSContext * cx, JSObject * obj, uintN argc, jsval * ar
enum session_tinyid { enum session_tinyid {
SESSION_NAME, SESSION_STATE, SESSION_NAME, SESSION_STATE,
PROFILE_DIALPLAN, PROFILE_CID_NAME, PROFILE_CID_NUM, PROFILE_IP, PROFILE_ANI, PROFILE_ANI_II, PROFILE_DEST, PROFILE_DIALPLAN, PROFILE_CID_NAME, PROFILE_CID_NUM, PROFILE_IP, PROFILE_ANI, PROFILE_ANI_II, PROFILE_DEST,
SESSION_UUID, SESSION_CAUSE SESSION_UUID, SESSION_CAUSE, SESSION_CAUSECODE
}; };
static JSFunctionSpec session_methods[] = { static JSFunctionSpec session_methods[] = {
@ -2469,6 +2476,7 @@ static JSPropertySpec session_props[] = {
{"destination", PROFILE_DEST, JSPROP_READONLY | JSPROP_PERMANENT}, {"destination", PROFILE_DEST, JSPROP_READONLY | JSPROP_PERMANENT},
{"uuid", SESSION_UUID, JSPROP_READONLY | JSPROP_PERMANENT}, {"uuid", SESSION_UUID, JSPROP_READONLY | JSPROP_PERMANENT},
{"cause", SESSION_CAUSE, JSPROP_READONLY | JSPROP_PERMANENT}, {"cause", SESSION_CAUSE, JSPROP_READONLY | JSPROP_PERMANENT},
{"causecode", SESSION_CAUSECODE, JSPROP_READONLY | JSPROP_PERMANENT},
{0} {0}
}; };
@ -2501,6 +2509,11 @@ static JSBool session_getProperty(JSContext * cx, JSObject * obj, jsval id, jsva
*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_cause2str(jss->cause))); *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_cause2str(jss->cause)));
} }
break; break;
case SESSION_CAUSECODE:
if (jss) {
*vp = INT_TO_JSVAL(jss->cause);
}
break;
default: default:
*vp = BOOLEAN_TO_JSVAL(JS_FALSE); *vp = BOOLEAN_TO_JSVAL(JS_FALSE);
} }
@ -2511,6 +2524,9 @@ static JSBool session_getProperty(JSContext * cx, JSObject * obj, jsval id, jsva
case SESSION_CAUSE: case SESSION_CAUSE:
*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_cause2str(switch_channel_get_cause(channel)))); *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_cause2str(switch_channel_get_cause(channel))));
break; break;
case SESSION_CAUSECODE:
*vp = INT_TO_JSVAL(switch_channel_get_cause(channel));
break;
case SESSION_NAME: case SESSION_NAME:
*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_get_name(channel))); *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_get_name(channel)));
break; break;