August 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5639 - freeswitch/trunk/src
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: anthm Date: Mon Aug 20 17:25:06 2007 New Revision: 5639 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: tweak Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Mon Aug 20 17:25:06 2007 @@ -1047,6 +1047,7 @@ assert(module != NULL); switch_loadable_module_unprocess(module); + switch_core_hash_delete_locked(loadable_modules.module_hash, module->key, loadable_modules.mutex); if (module->switch_module_shutdown) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping: %s\n", module->module_interface->module_name); @@ -1067,7 +1068,7 @@ } - switch_core_hash_delete_locked(loadable_modules.module_hash, module->key, loadable_modules.mutex); + }

1 0

[commit] r5638 - freeswitch/trunk/src
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: greenlizard Date: Mon Aug 20 16:02:14 2007 New Revision: 5638 Modified: freeswitch/trunk/src/switch_cpp.cpp Log: did not have a return value and was breaking on windows build Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Mon Aug 20 16:02:14 2007 @@ -165,6 +165,7 @@ begin_allow_threads(); switch_ivr_collect_digits_callback(session, ap, timeout); end_allow_threads(); + return SWITCH_STATUS_SUCCESS; } int CoreSession::getDigits(char *dtmf_buf,

1 0

[commit] r5636 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: achaloyan Date: Mon Aug 20 15:25:59 2007 New Revision: 5636 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: set the highest (disable) mrcp log priority by default; log priority can be changed from mod_openmrcp.conf.xml->settings->log_level=7 [0-7] Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Mon Aug 20 15:25:59 2007 @@ -761,6 +761,7 @@ return SWITCH_STATUS_TERM; } + mrcp_logger.priority = MRCP_PRIO_EMERGENCY; if ((settings = switch_xml_child(cfg, "settings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) { const char *var = switch_xml_attr_soft(param, "name"); @@ -770,6 +771,8 @@ asr_profile_name = val; } else if (!strcasecmp(var, "tts_default_profile")) { tts_profile_name = val; + } else if (!strcasecmp(var, "log_level")) { + mrcp_logger.priority = atoi(val); } } }

1 0

[commit] r5635 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: achaloyan Date: Mon Aug 20 15:09:19 2007 New Revision: 5635 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: add FLAG_TERMINATING to trigger normal and unexpected (abnormal) session termination Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Mon Aug 20 15:09:19 2007 @@ -99,7 +99,8 @@ FLAG_BARGE = (1 << 1), FLAG_READY = (1 << 2), FLAG_SPEAK_COMPLETE = (1 << 3), - FLAG_FEED_STARTED = (1 << 4) + FLAG_FEED_STARTED = (1 << 4), + FLAG_TERMINATING = (1 << 5) } mrcp_flag_t; typedef struct { @@ -173,7 +174,13 @@ if(!openmrcp_session) { return MRCP_STATUS_FAILURE; } - openmrcp_session_destroy(openmrcp_session); + + if (switch_test_flag(openmrcp_session, FLAG_TERMINATING)) { + openmrcp_session_destroy(openmrcp_session); + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "abnormal session terminate\n"); + } return MRCP_STATUS_SUCCESS; } @@ -436,6 +443,7 @@ // terminate client session switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Going to TERMINATE SESSION\n"); + switch_set_flag_locked(asr_session, FLAG_TERMINATING); mrcp_client_context_session_terminate(context, asr_session->client_session); switch_set_flag(ah, SWITCH_ASR_FLAG_CLOSED); @@ -605,6 +613,7 @@ /* terminate tts session */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "terminate tts_session\n"); + switch_set_flag_locked(tts_session, FLAG_TERMINATING); mrcp_client_context_session_terminate(context,tts_session->client_session); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r5633 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: achaloyan Date: Mon Aug 20 14:10:00 2007 New Revision: 5633 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: asr result in mrcp message body must be checked to exist before use Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Mon Aug 20 14:10:00 2007 @@ -487,15 +487,21 @@ </result> */ - char *marker = "?>"; // FIXME -- lame and brittle way of doing this. use regex or better. - char *position = strstr(asr_session->mrcp_message_last_rcvd->body, marker); - if (!position) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bad result received from mrcp server: %s", asr_session->mrcp_message_last_rcvd->body); - ret = SWITCH_STATUS_FALSE; + if(asr_session->mrcp_message_last_rcvd && asr_session->mrcp_message_last_rcvd->body) { + char *marker = "?>"; // FIXME -- lame and brittle way of doing this. use regex or better. + char *position = strstr(asr_session->mrcp_message_last_rcvd->body, marker); + if (!position) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bad result received from mrcp server: %s", asr_session->mrcp_message_last_rcvd->body); + ret = SWITCH_STATUS_FALSE; + } + else { + position += strlen(marker); + *xmlstr = strdup(position); + } } else { - position += strlen(marker); - *xmlstr = strdup(position); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No result received from mrcp server: %s"); + ret = SWITCH_STATUS_FALSE; } // since we are returning our result here, future calls to check_results

1 0

[commit] r5632 - freeswitch/trunk/src/mod/timers/mod_softtimer
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: anthm Date: Mon Aug 20 14:06:08 2007 New Revision: 5632 Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Log: remove inline from timer to avoid unhappyness Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Mon Aug 20 14:06:08 2007 @@ -74,7 +74,7 @@ #define IDLE_SPEED 100 -static inline switch_status_t timer_init(switch_timer_t *timer) +static switch_status_t timer_init(switch_timer_t *timer) { timer_private_t *private_info; int sanity = 0; @@ -112,7 +112,7 @@ -static inline switch_status_t timer_step(switch_timer_t *timer) +static switch_status_t timer_step(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; uint64_t samples; @@ -136,7 +136,7 @@ } -static inline switch_status_t timer_next(switch_timer_t *timer) +static switch_status_t timer_next(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; @@ -154,7 +154,7 @@ return SWITCH_STATUS_FALSE; } -static inline switch_status_t timer_check(switch_timer_t *timer) +static switch_status_t timer_check(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -182,7 +182,7 @@ } -static inline switch_status_t timer_destroy(switch_timer_t *timer) +static switch_status_t timer_destroy(switch_timer_t *timer) { timer_private_t *private_info = timer->private_info; switch_mutex_lock(globals.mutex);

1 0

[commit] r5626 - freeswitch/trunk/src/mod/languages/mod_python
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: greenlizard Date: Mon Aug 20 12:43:42 2007 New Revision: 5626 Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp Log: fix a bug introduced in last mod_python commit on greenlizard branch where dtmfs will segfault the switch due to an incorrect Py_XDECREF. Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp Mon Aug 20 12:43:42 2007 @@ -109,7 +109,7 @@ PyObject *func, *arglist; PyObject *pyresult; - PyObject* headerdict; + PyObject *headerdict; char *resultStr; char *funcargs; @@ -159,6 +159,10 @@ headerdict = PyDict_New(); for (hp = event->headers; hp; hp = hp->next) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding event header to result"); + + // TODO: create PyObject pointers for name and value + // and explicitly decref them. all ref counting stuff is + // a mess and needs to be tested and looked at closer. PyDict_SetItem(headerdict, Py_BuildValue("s", hp->name), Py_BuildValue("s", hp->value)); @@ -172,7 +176,9 @@ "headers", headerdict); - //arglist = Py_BuildValue("(sis)", event->body, itype, funcargs); + Py_XDECREF(headerdict); + + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown input type: %d\n", itype); @@ -189,10 +195,9 @@ did_swap_in = end_allow_threads(); pyresult = PyEval_CallObject(func, arglist); - + Py_XDECREF(arglist); // Trash arglist - Py_XDECREF(headerdict); if (pyresult && pyresult != Py_None) { resultStr = (char *) PyString_AsString(pyresult); @@ -200,7 +205,7 @@ return cbresult; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Python callback\n returned None"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Python callback\n returned None"); PyErr_Print(); PyErr_Clear(); }

1 0

[commit] r5625 - freeswitch/trunk/src
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: anthm Date: Mon Aug 20 12:35:22 2007 New Revision: 5625 Modified: freeswitch/trunk/src/switch_xml.c Log: fix FSCORE-45 Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Mon Aug 20 12:35:22 2007 @@ -951,8 +951,8 @@ char *arg, *e; char *bp = expand_vars(buf, ebuf, sizeof(ebuf), &cur); - /* we ignore <include> or </include> for the sake of validators */ - if (strstr(buf, "<include>") || strstr(buf, "</include>")) { + /* we ignore <include> or </include> for the sake of validators as well as <?xml version="1.0"?> type stuff */ + if (strstr(buf, "<include>") || strstr(buf, "</include>") || strstr(buf, "<?")) { continue; }

1 0

[commit] r5624 - in freeswitch/trunk/src: . include mod/languages/mod_python
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: greenlizard Date: Mon Aug 20 12:33:28 2007 New Revision: 5624 Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.h freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp freeswitch/trunk/src/switch_cpp.cpp Log: 1. add collectInput method. 2. modify the dtmf callback handlers to better deal with event inputs, as opposed to dtmf inputs. currently returns a dictionary where one key contains the body, and another contains the headers as a subdictionary. Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Mon Aug 20 12:33:28 2007 @@ -158,7 +158,7 @@ * * The DTMF callback function will be set and persist * for the life of the session, and be called when a dtmf - * is pressed by user during playFile(), streamfile(), and + * is pressed by user during streamfile(), collectDigits(), and * certain other methods are executing. * */ @@ -168,6 +168,19 @@ int speak(char *text); void set_tts_parms(char *tts_name, char *voice_name); + /** + * For timeout milliseconds, call the dtmf function set previously + * by setDTMFCallback whenever a dtmf or event is received + */ + int collectDigits(int timeout); + + /** + * Collect up to maxdigits digits worth of digits + * and store them in dtmf_buf. In the case of mod_python, the + * dtmf_buf parameter is configured to act as a _return_ value, + * (see mod_python.i). This does NOT call any callbacks upon + * receiving dtmf digits. For that, use collectDigits. + */ int getDigits(char *dtmf_buf, int buflen, int maxdigits, Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py Mon Aug 20 12:33:28 2007 @@ -118,6 +118,7 @@ def setDTMFCallback(*args): return _freeswitch.CoreSession_setDTMFCallback(*args) def speak(*args): return _freeswitch.CoreSession_speak(*args) def set_tts_parms(*args): return _freeswitch.CoreSession_set_tts_parms(*args) + def collectDigits(*args): return _freeswitch.CoreSession_collectDigits(*args) def getDigits(*args): return _freeswitch.CoreSession_getDigits(*args) def transfer(*args): return _freeswitch.CoreSession_transfer(*args) def playAndGetDigits(*args): return _freeswitch.CoreSession_playAndGetDigits(*args) Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp Mon Aug 20 12:33:28 2007 @@ -105,10 +105,12 @@ } switch_status_t PySession::run_dtmf_callback(void *input, - switch_input_type_t itype) { + switch_input_type_t itype) { PyObject *func, *arglist; PyObject *pyresult; + PyObject* headerdict; + char *resultStr; char *funcargs; switch_file_handle_t *fh = NULL; @@ -137,7 +139,47 @@ funcargs = (char *) cb_state.funcargs; - arglist = Py_BuildValue("(sis)", input, itype, funcargs); + if (itype == SWITCH_INPUT_TYPE_DTMF) { + + arglist = Py_BuildValue("(sis)", input, itype, funcargs); + } + else if (itype == SWITCH_INPUT_TYPE_EVENT) { + // DUNNO if this is correct in the case we have an event + // will be of type switch_event_t *event; + // http://www.freeswitch.org/docs/structswitch__event.html + switch_event_t *event = (switch_event_t *) input; + arglist = Py_BuildValue("({s:s}is)", + "body", event->body, + itype, + funcargs); + + // build a dictionary with all the headers + + switch_event_header_t *hp; + headerdict = PyDict_New(); + for (hp = event->headers; hp; hp = hp->next) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding event header to result"); + PyDict_SetItem(headerdict, + Py_BuildValue("s", hp->name), + Py_BuildValue("s", hp->value)); + + } + + // add it to the main event dictionary (first arg in list) + // under key 'headers' + PyObject *dict = PyTuple_GetItem(arglist, 0); + PyDict_SetItemString(dict, + "headers", + headerdict); + + //arglist = Py_BuildValue("(sis)", event->body, itype, funcargs); + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown input type: %d\n", itype); + return SWITCH_STATUS_FALSE; + } + + if (!arglist) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error building arglist"); return SWITCH_STATUS_FALSE; @@ -150,13 +192,15 @@ Py_XDECREF(arglist); // Trash arglist + Py_XDECREF(headerdict); + if (pyresult && pyresult != Py_None) { resultStr = (char *) PyString_AsString(pyresult); switch_status_t cbresult = process_callback_result(resultStr, &cb_state, session); return cbresult; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error calling python callback\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Python callback\n returned None"); PyErr_Print(); PyErr_Clear(); } Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.h (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.h Mon Aug 20 12:33:28 2007 @@ -40,8 +40,19 @@ bool begin_allow_threads(); bool end_allow_threads(); + /** + * Run DTMF callback + * + * A static method in CoreSession is the first thing called + * upon receving a dtmf/event callback from fs engine, and then + * it gets the PySession instance and calls this method with + * dtmf/event object. + * + * @param input - a dtmf char buffer, or an event 'object' (not sure..) + * @param itype - a SWITCH_INPUT_TYPE_DTMF or a SWITCH_INPUT_TYPE_EVENT + */ switch_status_t run_dtmf_callback(void *input, - switch_input_type_t itype); + switch_input_type_t itype); }; Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Mon Aug 20 12:33:28 2007 @@ -4080,6 +4080,37 @@ } +SWIGINTERN PyObject *_wrap_CoreSession_collectDigits(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + int arg2 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:CoreSession_collectDigits",&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_collectDigits" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CoreSession_collectDigits" "', argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + result = (int)(arg1)->collectDigits(arg2); + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_CoreSession_getDigits(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; @@ -5228,6 +5259,7 @@ { (char *)"CoreSession_setDTMFCallback", _wrap_CoreSession_setDTMFCallback, METH_VARARGS, NULL}, { (char *)"CoreSession_speak", _wrap_CoreSession_speak, METH_VARARGS, NULL}, { (char *)"CoreSession_set_tts_parms", _wrap_CoreSession_set_tts_parms, METH_VARARGS, NULL}, + { (char *)"CoreSession_collectDigits", _wrap_CoreSession_collectDigits, METH_VARARGS, NULL}, { (char *)"CoreSession_getDigits", _wrap_CoreSession_getDigits, METH_VARARGS, NULL}, { (char *)"CoreSession_transfer", _wrap_CoreSession_transfer, METH_VARARGS, NULL}, { (char *)"CoreSession_playAndGetDigits", _wrap_CoreSession_playAndGetDigits, METH_VARARGS, NULL}, Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Mon Aug 20 12:33:28 2007 @@ -92,7 +92,7 @@ const switch_application_interface_t *application_interface; sanity_check_noreturn; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CoreSession::execute. data:%s\n", data); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CoreSession::execute. app: %s data:%s\n", app, data); if ((application_interface = switch_loadable_module_get_application_interface(app))) { begin_allow_threads(); switch_core_session_exec(session, application_interface, data); @@ -158,6 +158,15 @@ voice_name = strdup(voice_name_p); } + + +int CoreSession::collectDigits(int timeout) { + sanity_check(-1); + begin_allow_threads(); + switch_ivr_collect_digits_callback(session, ap, timeout); + end_allow_threads(); +} + int CoreSession::getDigits(char *dtmf_buf, int buflen, int maxdigits, @@ -214,7 +223,8 @@ terminators, audio_files, bad_input_audio_files, - dtmf_buf, 128, + dtmf_buf, + 128, digits_regex); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "playAndGetDigits dtmf_buf: %s\n", dtmf_buf); @@ -521,7 +531,7 @@ CoreSession *coresession = NULL; switch_status_t result; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dtmf_callback called\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "dtmf_callback called\n"); fflush(stdout); channel = switch_core_session_get_channel(session_cb);

1 0

[commit] r5623 - in freeswitch/trunk/src: . mod/languages/mod_spidermonkey
by Freeswitch SVN 20 Aug '07

20 Aug '07

Author: anthm Date: Mon Aug 20 12:04:02 2007 New Revision: 5623 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_ivr_bridge.c Log: fix MODLANG-41 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 Aug 20 12:04:02 2007 @@ -2752,24 +2752,31 @@ struct input_callback_state cb_state = { 0 }; JSFunction *function; + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + if (argc > 1) { if (JS_ValueToObject(cx, argv[0], &session_obj_a)) { if (!(jss_a = JS_GetPrivate(cx, session_obj_a))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Find Session [1]\n"); - return JS_FALSE; + eval_some_js("~throw new Error(\"Cannot find session A\");", cx, obj, rval); + return JS_TRUE; } } if (JS_ValueToObject(cx, argv[1], &session_obj_b)) { if (!(jss_b = JS_GetPrivate(cx, session_obj_b))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Find Session [1]\n"); - return JS_FALSE; + eval_some_js("~throw new Error(\"Cannot find session B\");", cx, obj, rval); + return JS_TRUE; } } } - if (!(jss_a && jss_b)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failure! %s %s\n", jss_a ? "y" : "n", jss_b ? "y" : "n"); - return JS_FALSE; + if (!(jss_a && jss_a->session)) { + eval_some_js("~throw new Error(\"session A is not ready!\");", cx, obj, rval); + return JS_TRUE; + } + + if (!(jss_b && jss_b->session)) { + eval_some_js("~throw new Error(\"session B is not ready!\");", cx, obj, rval); + return JS_TRUE; } @@ -2796,6 +2803,7 @@ switch_ivr_multi_threaded_bridge(jss_a->session, jss_b->session, dtmf_func, bp, bp); JS_ResumeRequest(cx, cb_state.saveDepth); + *rval = BOOLEAN_TO_JSVAL(JS_TRUE); return JS_TRUE; } Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon Aug 20 12:04:02 2007 @@ -551,6 +551,9 @@ int stream_id = 0; switch_status_t status = SWITCH_STATUS_SUCCESS; + assert(session != NULL); + assert(peer_session != NULL); + caller_channel = switch_core_session_get_channel(session); assert(caller_channel != NULL);

1 0