- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8930 - in freeswitch/trunk/src: . include mod/applications/mod_dptools mod/applications/mod_fifo mod/applications/mod_voicemail mod/languages/mod_java mod/languages/mod_java/src/org/freeswitch/swig mod/languages/mod_lua mod/languages/mod_perl mod/languages/mod_python mod/languages/mod_spidermonkey
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: anthm Date: Tue Jul 8 13:27:02 2008 New Revision: 8930 Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_cpp.cpp freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_menu.c freeswitch/trunk/src/switch_ivr_originate.c Log: add args to sleep Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Tue Jul 8 13:27:02 2008 @@ -276,6 +276,7 @@ * */ SWITCH_DECLARE(int) streamFile(char *file, int starting_sample_count = 0); + SWITCH_DECLARE(int) sleep(char *file, int ms); /** \brief flush any pending events */ Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Tue Jul 8 13:27:02 2008 @@ -107,9 +107,10 @@ \brief Wait for time to pass for a specified number of milliseconds \param session the session to wait for. \param ms the number of milliseconds + \param args arguements to pass for callbacks etc \return SWITCH_STATUS_SUCCESS if the channel is still up */ -SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session, uint32_t ms); +SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session, uint32_t ms, switch_input_args_t *args); SWITCH_DECLARE(switch_status_t) switch_ivr_park(switch_core_session_t *session, switch_input_args_t *args); Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Jul 8 13:27:02 2008 @@ -586,16 +586,6 @@ } } -SWITCH_STANDARD_APP(sleep_function) -{ - if (switch_strlen_zero(data)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No timeout specified.\n"); - } else { - uint32_t ms = atoi(data); - switch_ivr_sleep(session, ms); - } -} - SWITCH_STANDARD_APP(delay_function) { uint32_t len = 0; @@ -1323,6 +1313,26 @@ return SWITCH_STATUS_SUCCESS; } + +SWITCH_STANDARD_APP(sleep_function) +{ + if (switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No timeout specified.\n"); + } else { + uint32_t ms = atoi(data); + char buf[10]; + switch_input_args_t args = { 0 }; + + args.input_callback = on_dtmf; + args.buf = buf; + args.buflen = sizeof(buf); + + switch_ivr_sleep(session, ms, &args); + } +} + + + SWITCH_STANDARD_APP(clear_speech_cache_function) { switch_ivr_clear_speech_cache(session); Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Tue Jul 8 13:27:02 2008 @@ -855,7 +855,7 @@ if (announce) { switch_ivr_play_file(session, NULL, announce, NULL); } else { - switch_ivr_sleep(session, 500); + switch_ivr_sleep(session, 500, NULL); } Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Tue Jul 8 13:27:02 2008 @@ -1314,7 +1314,7 @@ status = switch_ivr_phrase_macro(session, VM_HELLO_MACRO, NULL, NULL, &args); while (switch_channel_ready(channel)) { - switch_ivr_sleep(session, 100); + switch_ivr_sleep(session, 100, NULL); switch (vm_check_state) { case VM_CHECK_START: Modified: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java (original) +++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java Tue Jul 8 13:27:02 2008 @@ -209,6 +209,10 @@ return freeswitchJNI.CoreSession_streamFile__SWIG_1(swigCPtr, this, file); } + public int sleep(String file, int ms) { + return freeswitchJNI.CoreSession_sleep(swigCPtr, this, file, ms); + } + public int flushEvents() { return freeswitchJNI.CoreSession_flushEvents(swigCPtr, this); } Modified: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java (original) +++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java Tue Jul 8 13:27:02 2008 @@ -120,6 +120,7 @@ public final static native String CoreSession_playAndGetDigits(long jarg1, CoreSession jarg1_, int jarg2, int jarg3, int jarg4, int jarg5, String jarg6, String jarg7, String jarg8, String jarg9); public final static native int CoreSession_streamFile__SWIG_0(long jarg1, CoreSession jarg1_, String jarg2, int jarg3); public final static native int CoreSession_streamFile__SWIG_1(long jarg1, CoreSession jarg1_, String jarg2); + public final static native int CoreSession_sleep(long jarg1, CoreSession jarg1_, String jarg2, int jarg3); public final static native int CoreSession_flushEvents(long jarg1, CoreSession jarg1_); public final static native int CoreSession_flushDigits(long jarg1, CoreSession jarg1_); public final static native int CoreSession_setAutoHangup(long jarg1, CoreSession jarg1_, boolean jarg2); Modified: freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp Tue Jul 8 13:27:02 2008 @@ -2376,6 +2376,30 @@ } +SWIGEXPORT jint JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1sleep(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jint jarg3) { + jint jresult = 0 ; + CoreSession *arg1 = (CoreSession *) 0 ; + char *arg2 = (char *) 0 ; + int arg3 ; + int result; + + (void)jenv; + (void)jcls; + (void)jarg1_; + arg1 = *(CoreSession **)&jarg1; + arg2 = 0; + if (jarg2) { + arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); + if (!arg2) return 0; + } + arg3 = (int)jarg3; + result = (int)(arg1)->sleep(arg2,arg3); + jresult = (jint)result; + if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); + return jresult; +} + + SWIGEXPORT jint JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1flushEvents(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jint jresult = 0 ; CoreSession *arg1 = (CoreSession *) 0 ; Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp Tue Jul 8 13:27:02 2008 @@ -5476,6 +5476,37 @@ } +static int _wrap_CoreSession_sleep(lua_State* L) { + int SWIG_arg = -1; + CoreSession *arg1 = (CoreSession *) 0 ; + char *arg2 = (char *) 0 ; + int arg3 ; + int result; + + SWIG_check_num_args("sleep",3,3) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("sleep",1,"CoreSession *"); + if(!lua_isstring(L,2)) SWIG_fail_arg("sleep",2,"char *"); + if(!lua_isnumber(L,3)) SWIG_fail_arg("sleep",3,"int"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_CoreSession,0))){ + SWIG_fail_ptr("CoreSession_sleep",1,SWIGTYPE_p_CoreSession); + } + + arg2 = (char *)lua_tostring(L, 2); + arg3 = (int)lua_tonumber(L, 3); + result = (int)(arg1)->sleep(arg2,arg3); + SWIG_arg=0; + lua_pushnumber(L, (lua_Number) result); SWIG_arg++; + return SWIG_arg; + + if(0) SWIG_fail; + +fail: + lua_error(L); + return SWIG_arg; +} + + static int _wrap_CoreSession_flushEvents(lua_State* L) { int SWIG_arg = -1; CoreSession *arg1 = (CoreSession *) 0 ; @@ -6081,6 +6112,7 @@ {"read", _wrap_CoreSession_read}, {"playAndGetDigits", _wrap_CoreSession_playAndGetDigits}, {"streamFile", _wrap_CoreSession_streamFile}, + {"sleep", _wrap_CoreSession_sleep}, {"flushEvents", _wrap_CoreSession_flushEvents}, {"flushDigits", _wrap_CoreSession_flushDigits}, {"setAutoHangup", _wrap_CoreSession_setAutoHangup}, Modified: freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm Tue Jul 8 13:27:02 2008 @@ -372,6 +372,7 @@ *read = *freeswitchc::CoreSession_read; *playAndGetDigits = *freeswitchc::CoreSession_playAndGetDigits; *streamFile = *freeswitchc::CoreSession_streamFile; +*sleep = *freeswitchc::CoreSession_sleep; *flushEvents = *freeswitchc::CoreSession_flushEvents; *flushDigits = *freeswitchc::CoreSession_flushDigits; *setAutoHangup = *freeswitchc::CoreSession_setAutoHangup; Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp Tue Jul 8 13:27:02 2008 @@ -7312,6 +7312,55 @@ } +XS(_wrap_CoreSession_sleep) { + { + CoreSession *arg1 = (CoreSession *) 0 ; + char *arg2 = (char *) 0 ; + int arg3 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int val3 ; + int ecode3 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 3) || (items > 3)) { + SWIG_croak("Usage: CoreSession_sleep(self,file,ms);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_sleep" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_sleep" "', argument " "2"" of type '" "char *""'"); + } + arg2 = reinterpret_cast< char * >(buf2); + ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CoreSession_sleep" "', argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + result = (int)(arg1)->sleep(arg2,arg3); + ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ; + + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + + XSRETURN(argvi); + fail: + + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + + SWIG_croak_null(); + } +} + + XS(_wrap_CoreSession_flushEvents) { { CoreSession *arg1 = (CoreSession *) 0 ; @@ -9331,6 +9380,7 @@ {"freeswitchc::CoreSession_read", _wrap_CoreSession_read}, {"freeswitchc::CoreSession_playAndGetDigits", _wrap_CoreSession_playAndGetDigits}, {"freeswitchc::CoreSession_streamFile", _wrap_CoreSession_streamFile}, +{"freeswitchc::CoreSession_sleep", _wrap_CoreSession_sleep}, {"freeswitchc::CoreSession_flushEvents", _wrap_CoreSession_flushEvents}, {"freeswitchc::CoreSession_flushDigits", _wrap_CoreSession_flushDigits}, {"freeswitchc::CoreSession_setAutoHangup", _wrap_CoreSession_setAutoHangup}, 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 Tue Jul 8 13:27:02 2008 @@ -247,6 +247,7 @@ def read(*args): return _freeswitch.CoreSession_read(*args) def playAndGetDigits(*args): return _freeswitch.CoreSession_playAndGetDigits(*args) def streamFile(*args): return _freeswitch.CoreSession_streamFile(*args) + def sleep(*args): return _freeswitch.CoreSession_sleep(*args) def flushEvents(*args): return _freeswitch.CoreSession_flushEvents(*args) def flushDigits(*args): return _freeswitch.CoreSession_flushDigits(*args) def setAutoHangup(*args): return _freeswitch.CoreSession_setAutoHangup(*args) 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 Tue Jul 8 13:27:02 2008 @@ -7354,6 +7354,49 @@ } +SWIGINTERN PyObject *_wrap_CoreSession_sleep(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + char *arg2 = (char *) 0 ; + int arg3 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int val3 ; + int ecode3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OOO:CoreSession_sleep",&obj0,&obj1,&obj2)) 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_sleep" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_sleep" "', argument " "2"" of type '" "char *""'"); + } + arg2 = reinterpret_cast< char * >(buf2); + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CoreSession_sleep" "', argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + result = (int)(arg1)->sleep(arg2,arg3); + resultobj = SWIG_From_int(static_cast< int >(result)); + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return resultobj; +fail: + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return NULL; +} + + SWIGINTERN PyObject *_wrap_CoreSession_flushEvents(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; @@ -8540,6 +8583,7 @@ { (char *)"CoreSession_read", _wrap_CoreSession_read, METH_VARARGS, NULL}, { (char *)"CoreSession_playAndGetDigits", _wrap_CoreSession_playAndGetDigits, METH_VARARGS, NULL}, { (char *)"CoreSession_streamFile", _wrap_CoreSession_streamFile, METH_VARARGS, NULL}, + { (char *)"CoreSession_sleep", _wrap_CoreSession_sleep, METH_VARARGS, NULL}, { (char *)"CoreSession_flushEvents", _wrap_CoreSession_flushEvents, METH_VARARGS, NULL}, { (char *)"CoreSession_flushDigits", _wrap_CoreSession_flushDigits, METH_VARARGS, NULL}, { (char *)"CoreSession_setAutoHangup", _wrap_CoreSession_setAutoHangup, METH_VARARGS, NULL}, 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 Tue Jul 8 13:27:02 2008 @@ -1689,6 +1689,64 @@ return JS_TRUE; } + + +static JSBool session_sleep(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + struct js_session *jss = JS_GetPrivate(cx, obj); + switch_channel_t *channel; + void *bp = NULL; + int len = 0; + switch_input_callback_function_t dtmf_func = NULL; + struct input_callback_state cb_state = { 0 }; + JSFunction *function; + switch_input_args_t args = { 0 }; + int32 ms; + + METHOD_SANITY_CHECK(); + channel = switch_core_session_get_channel(jss->session); + CHANNEL_SANITY_CHECK(); + CHANNEL_MEDIA_SANITY_CHECK(); + + if (argc > 0) { + JS_ValueToInt32(cx, argv[0], &ms); + if (ms <= 0) { + return JS_FALSE; + } + } + + if (argc > 1) { + if ((function = JS_ValueToFunction(cx, argv[1]))) { + memset(&cb_state, 0, sizeof(cb_state)); + cb_state.function = function; + + if (argc > 2) { + cb_state.arg = argv[2]; + } + + cb_state.session_state = jss; + cb_state.cx = cx; + cb_state.obj = obj; + dtmf_func = js_stream_input_callback; + bp = &cb_state; + len = sizeof(cb_state); + } + } + + cb_state.ret = BOOLEAN_TO_JSVAL(JS_FALSE); + cb_state.saveDepth = JS_SuspendRequest(cx); + args.input_callback = dtmf_func; + args.buf = bp; + args.buflen = len; + check_hangup_hook(jss); + switch_ivr_sleep(jss->session, ms, &args); + check_hangup_hook(jss); + JS_ResumeRequest(cx, cb_state.saveDepth); + *rval = cb_state.ret; + + return JS_TRUE; +} + static JSBool session_set_variable(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) { struct js_session *jss = JS_GetPrivate(cx, obj); @@ -2488,6 +2546,7 @@ {"sendEvent", session_send_event, 0}, {"hangup", session_hangup, 0}, {"execute", session_execute, 0}, + {"sleep", session_sleep, 1}, {0} }; Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Tue Jul 8 13:27:02 2008 @@ -804,6 +804,21 @@ } +SWITCH_DECLARE(int) CoreSession::sleep(char *file, int ms) { + + switch_status_t status; + + this_check(-1); + sanity_check(-1); + + begin_allow_threads(); + status = switch_ivr_sleep(session, ms, ap); + end_allow_threads(); + + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; + +} + SWITCH_DECLARE(bool) CoreSession::ready() { this_check(false); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Jul 8 13:27:02 2008 @@ -38,7 +38,7 @@ #include <switch_ivr.h> #include "stfu.h" -SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session, uint32_t ms) +SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session, uint32_t ms, switch_input_args_t *args) { switch_channel_t *channel = switch_core_session_get_channel(session); switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -59,6 +59,41 @@ if (now > done || left <= 0) { break; } + + if (args && (args->input_callback || args->buf || args->buflen)) { + switch_dtmf_t dtmf; + + /* + dtmf handler function you can hook up to be executed when a digit is dialed during playback + if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. + */ + if (switch_channel_has_dtmf(channel)) { + if (!args->input_callback && !args->buf) { + status = SWITCH_STATUS_BREAK; + break; + } + switch_channel_dequeue_dtmf(channel, &dtmf); + if (args->input_callback) { + status = args->input_callback(session, (void *) &dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen); + } else { + switch_copy_string((char *) args->buf, (void *) &dtmf, args->buflen); + status = SWITCH_STATUS_BREAK; + } + } + + if (args->input_callback) { + switch_event_t *event = NULL; + + if (switch_core_session_dequeue_event(session, &event) == SWITCH_STATUS_SUCCESS) { + status = args->input_callback(session, event, SWITCH_INPUT_TYPE_EVENT, args->buf, args->buflen); + switch_event_destroy(&event); + } + } + + if (status != SWITCH_STATUS_SUCCESS) { + break; + } + } if (switch_channel_test_flag(channel, CF_PROXY_MODE)) { switch_yield(1000); Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Tue Jul 8 13:27:02 2008 @@ -501,7 +501,7 @@ } errs++; if (status == SWITCH_STATUS_SUCCESS) { - status = switch_ivr_sleep(session, 1000); + status = switch_ivr_sleep(session, 1000, NULL); } /* breaks are ok too */ if (SWITCH_STATUS_IS_BREAK(status)) { Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Jul 8 13:27:02 2008 @@ -40,7 +40,7 @@ if (!switch_channel_test_flag(channel, CF_PROXY_MODE)) { while (switch_channel_get_state(channel) == CS_CONSUME_MEDIA && !switch_channel_test_flag(channel, CF_TAGGED)) { - switch_ivr_sleep(session, 10); + switch_ivr_sleep(session, 10, NULL); } }

1 0

[commit] r8929 - in freeswitch/trunk: conf/autoload_configs src/mod/applications/mod_conference
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: brian Date: Tue Jul 8 12:26:10 2008 New Revision: 8929 Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: underscores not dashes Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Tue Jul 8 12:26:10 2008 @@ -97,7 +97,7 @@    </profile> 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 Tue Jul 8 12:26:10 2008 @@ -4274,7 +4274,7 @@ goto done; } - switch_channel_set_variable(channel, "conference-name", conference->name); + switch_channel_set_variable(channel, "conference_name", conference->name); /* Set the minimum number of members (once you go above it you cannot go below it) */ conference->min = 2; @@ -4306,7 +4306,7 @@ conference->pin = switch_core_strdup(conference->pool, dpin); } - switch_channel_set_variable(channel, "conference-name", conference->name); + switch_channel_set_variable(channel, "conference_name", conference->name); /* Set the minimum number of members (once you go above it you cannot go below it) */ conference->min = 1; @@ -4317,7 +4317,7 @@ /* Start the conference thread for this conference */ launch_conference_thread(conference); } else { /* setup user variable */ - switch_channel_set_variable(channel, "conference-name", conference->name); + switch_channel_set_variable(channel, "conference_name", conference->name); } /* acquire a read lock on the thread so it can't leave without us */

1 0

[commit] r8928 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: anthm Date: Tue Jul 8 11:25:52 2008 New Revision: 8928 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update 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 Tue Jul 8 11:25:52 2008 @@ -518,7 +518,7 @@ tportlog = 1; } - supported = switch_core_sprintf(profile->pool, "%s%sprecondition, path, Replaces", + supported = switch_core_sprintf(profile->pool, "%s%sprecondition, path, replaces", use_100rel ? "100rel, " : "", use_timer ? "timer, " : "" );

1 0

[commit] r8927 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: brian Date: Tue Jul 8 10:28:43 2008 New Revision: 8927 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add replaces to supported, SIP rocks so much nothing ever complained about it but let's add it anyway 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 Tue Jul 8 10:28:43 2008 @@ -518,7 +518,7 @@ tportlog = 1; } - supported = switch_core_sprintf(profile->pool, "%s%sprecondition, path", + supported = switch_core_sprintf(profile->pool, "%s%sprecondition, path, Replaces", use_100rel ? "100rel, " : "", use_timer ? "timer, " : "" );

1 0

[commit] r8926 - in freeswitch/trunk/debian: . default monit
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: ctrix Date: Tue Jul 8 05:49:53 2008 New Revision: 8926 Added: freeswitch/trunk/debian/freeswitch-lang-es.install freeswitch/trunk/debian/freeswitch-lang-nl.install freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-16000.install freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-32000.install freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-8000.install freeswitch/trunk/debian/freeswitch-sounds-music-8000.install freeswitch/trunk/debian/freeswitch.default Removed: freeswitch/trunk/debian/default/ Modified: freeswitch/trunk/debian/changelog freeswitch/trunk/debian/control freeswitch/trunk/debian/freeswitch.init freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/debian/monit/freeswitch.monitrc freeswitch/trunk/debian/rules Log: Debian build scripts updates. * Updated revision number * Fixed init problem reported by Jay Binks (FSSCRIPTS-1) * Added a patch to the debian build system add more features (thanks to Hadley Rich) (FSBUILD-45) - Added en-us-callie sounds and music on hold packages - Added recommends and suggests - Added mod_say_es and mod_say_nl - Updated descriptions - Added mod_cdr_csv * Fixed typos and some errors in the previus patch. * Modified monit script. Now it should work. * The debian build system now bootstrap automagically if it's necessary and all scripts are in place. Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Tue Jul 8 05:49:53 2008 @@ -1,3 +1,19 @@ +freeswitch (1.0.1~trunk) unstable; urgency=low + + * Updated revision number + * Fixed init problem reported by Jay Binks (FSSCRIPTS-1) + * Added a patch to the debian build system add more features (thanks to Hadley Rich) (FSBUILD-45) + - Added en-us-callie sounds and music on hold packages + - Added recommends and suggests + - Added mod_say_es and mod_say_nl + - Updated descriptions + - Added mod_cdr_csv + * Fixed typos and some errors in the previus patch. + * Modified monit script. Now it should work. + * The debian build system now bootstrap automagically if it's necessary and all scripts are in place. + + -- Massimo Cetra <devel(a)navynet.it> Sun, 6 Jul 2008 16:30:00 +0100 + freeswitch (1.0.0-1) unstable; urgency=low * Enhanced sofia sip nat handling Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Tue Jul 8 05:49:53 2008 @@ -2,14 +2,15 @@ Maintainer: Michal Bielicki <michal.bielicki(a)voiceworks.pl> Section: net Priority: extra -Build-Depends: debhelper (>= 5), automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb4.4-dev, libgnutls-dev -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 5), fakeroot, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev +Standards-Version: 3.7.3 Package: freeswitch Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, unixodbc, libasound2, libcurl3, openssl, libncurses5 -Suggests: monit -Description: A telephony platform that really kicks some ass... +Recommends: freeswitch-lang-en +Suggests: freeswitch-spidermonkey, freeswitch-lua, freeswitch-perl, freeswitch-sounds-music-8000, monit +Description: The FreeSWITCH open source telephony platform FreeSWITCH is an open source telephony platform designed to facilitate the creation of voice and chat driven products scaling from a soft-phone up to a soft-switch. It can be used as a simple switching engine, a media gateway @@ -19,22 +20,22 @@ Package: freeswitch-dev Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch -Description: Development Package for the FreeSwitch open source telephony platform +Description: Development Package for the FreeSWITCH open source telephony platform Package: freeswitch-spidermonkey Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch -Description: A Javascript engine for freeswitch +Description: A Javascript engine for FreeSWITCH Package: freeswitch-perl Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch -Description: A perl engine for freeswitch +Description: A perl engine for FreeSWITCH Package: freeswitch-lua Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch -Description: A lua engine for freeswitch +Description: A lua engine for FreeSWITCH Package: freeswitch-codec-passthru-g7231 Architecture: any @@ -54,8 +55,30 @@ Package: freeswitch-lang-en Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Recommends: freeswitch-sounds-en-us-callie-8000 +Suggests: freeswitch-sounds-en-us-callie-16000, freeswitch-sounds-en-us-callie-32000 Description: English language files for the FreeSWITCH open source telephony platform +Package: freeswitch-sounds-en-us-callie-8000 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: English language files for the FreeSWITCH open source telephony platform + +Package: freeswitch-sounds-en-us-callie-16000 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: English language files for the FreeSWITCH open source telephony platform (16000) + +Package: freeswitch-sounds-en-us-callie-32000 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: English language files for the FreeSWITCH open source telephony platform (32000) + +Package: freeswitch-sounds-music-8000 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: Music on hold files for the FreeSWITCH open source telephony platform + Package: freeswitch-lang-de Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch @@ -70,3 +93,13 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: Italian language files for the FreeSWITCH open source telephony platform + +Package: freeswitch-lang-es +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: Spanish language files for the FreeSWITCH open source telephony platform + +Package: freeswitch-lang-nl +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: Dutch language files for the FreeSWITCH open source telephony platform Added: freeswitch/trunk/debian/freeswitch-lang-es.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-es.install Tue Jul 8 05:49:53 2008 @@ -0,0 +1 @@ +opt/freeswitch/mod/mod_say_es.so* Added: freeswitch/trunk/debian/freeswitch-lang-nl.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-nl.install Tue Jul 8 05:49:53 2008 @@ -0,0 +1 @@ +opt/freeswitch/mod/mod_say_nl.so* Added: freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-16000.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-16000.install Tue Jul 8 05:49:53 2008 @@ -0,0 +1,2 @@ +opt/freeswitch/sounds/en/us/callie/*/16000/* + Added: freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-32000.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-32000.install Tue Jul 8 05:49:53 2008 @@ -0,0 +1,2 @@ +opt/freeswitch/sounds/en/us/callie/*/32000/* + Added: freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-8000.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-8000.install Tue Jul 8 05:49:53 2008 @@ -0,0 +1,2 @@ +opt/freeswitch/sounds/en/us/callie/*/8000/* + Added: freeswitch/trunk/debian/freeswitch-sounds-music-8000.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-sounds-music-8000.install Tue Jul 8 05:49:53 2008 @@ -0,0 +1,2 @@ +opt/freeswitch/sounds/music/8000/* + Added: freeswitch/trunk/debian/freeswitch.default ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch.default Tue Jul 8 05:49:53 2008 @@ -0,0 +1,11 @@ +# Startup settings for FreeSWITCH + +# Enable initd (let init handle start and stop of freeswitch). +# Set to "true" (lowercase) to enable. + +FREESWITCH_ENABLED="false" + +# The parameters Freeswitch should be started with + +FREESWITCH_PARAMS="-nc" + Modified: freeswitch/trunk/debian/freeswitch.init ============================================================================== --- freeswitch/trunk/debian/freeswitch.init (original) +++ freeswitch/trunk/debian/freeswitch.init Tue Jul 8 05:49:53 2008 @@ -19,26 +19,20 @@ DESC="FreeSwitch Voice Switching System" NAME=freeswitch DAEMON=/opt/freeswitch/bin/$NAME -DAEMON_ARGS="-nc" USER=freeswitch PIDFILE=/opt/freeswitch/log/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME # Check if we are being executed by init -. /etc/default/$NAME CALLEDSCRIPT=`basename $0` -echo $CALLEDSCRIPT -case "$CALLEDSCRIPT" in - freeswitch) - ;; - *) - if [ "$USE_INIT" != "TRUE" ]; then - echo "FreeSwitch disabled" ; - exit 0 ; - fi - ;; -esac + +if [ -r /etc/default/$NAME ]; then . /etc/default/$NAME; fi + +if [ "$FREESWITCH_ENABLED" != "true" ]; then + echo "$DESC not enabled yet. Edit /etc/default/$NAME first." + exit 0 ; +fi # Exit if the package is not installed # [ -x "$DAEMON" ] || exit 0 @@ -65,7 +59,7 @@ start-stop-daemon -c $USER --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ || return 1 start-stop-daemon -c $USER --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ + $FREESWITCH_PARAMS \ || return 2 # Add code here, if necessary, that waits for the process to be ready # to handle requests from services started subsequently which depend Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Tue Jul 8 05:49:53 2008 @@ -3,6 +3,7 @@ opt/freeswitch/bin/scripts/* opt/freeswitch/lib/libfreeswitch*.so* opt/freeswitch/mod/mod_shout* +opt/freeswitch/mod/mod_cdr_csv.so* opt/freeswitch/mod/mod_console.so* opt/freeswitch/mod/mod_expr.so* opt/freeswitch/mod/mod_rss.so* Modified: freeswitch/trunk/debian/monit/freeswitch.monitrc ============================================================================== --- freeswitch/trunk/debian/monit/freeswitch.monitrc (original) +++ freeswitch/trunk/debian/monit/freeswitch.monitrc Tue Jul 8 05:49:53 2008 @@ -2,7 +2,10 @@ group voice start program = "/etc/init.d/freeswitch start" stop program = "/etc/init.d/freeswitch stop" - if failed port 5060 type UDP then restart +# Checks sip port on localhost, not wlways suitable +# if failed port 5060 type UDP then restart +# Checks mod_event_socket on localhost. Maybe more suitable + if failed port 8021 type TCP then restart if 5 restarts within 5 cycles then timeout depends on freeswitch_bin depends on freeswitch_rc @@ -10,9 +13,9 @@ check file freeswitch_bin with path /opt/freeswitch/bin/freeswitch group voice if failed checksum then unmonitor - if failed permission 755 then unmonitor + if failed permission 750 then unmonitor if failed uid freeswitch then unmonitor - if failed gid daemon then unmonitor +# if failed gid daemon then unmonitor check file freeswitch_rc with path /etc/init.d/freeswitch group voice Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Tue Jul 8 05:49:53 2008 @@ -16,13 +16,13 @@ export DIRECTORIES_MODULES= export DOTNET_MODULES= export ENDPOINTS_MODULES=endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_woomera ../../libs/openzap/mod_openzap -export EVENT_HANDLERS_MODULES=event_handlers/mod_event_multicast event_handlers/mod_event_socket +export EVENT_HANDLERS_MODULES=event_handlers/mod_event_multicast event_handlers/mod_event_socket event_handlers/mod_cdr_csv export FORMATS_MODULES=formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream formats/mod_shout export LANGUAGES_MODULES=languages/mod_perl languages/mod_lua export LOGGERS_MODULES=loggers/mod_console loggers/mod_logfile loggers/mod_syslog -export SAY_MODULES=say/mod_say_de say/mod_say_en say/mod_say_fr say/mod_say_it +export SAY_MODULES=say/mod_say_en say/mod_say_it say/mod_say_de say/mod_say_fr say/mod_say_es say/mod_say_nl export TIMERS_MODULES= -export DISABLED_MODULES=applications/mod_soundtouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf say/mod_say_es say/mod_say_nl +export DISABLED_MODULES=applications/mod_soundtouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf export XML_INT_MODULES=xml_int/mod_xml_rpc xml_int/mod_xml_curl xml_int/mod_xml_cdr export MYMODULES=$(PASSTHRU_CODEC_MODULES) $(SPIDERMONKEY_MODULES) $(APPLICATIONS_MODULES) $(ASR_TTS_MODULES) $(CODECS_MODULES) $(DIALPLANS_MODULES) $(DIRECTORIES_MODULES) $(DOTNET_MODULES) $(ENDPOINTS_MODULES) $(EVENT_HANDLERS_MODULES) $(FORMATS_MODULES) $(LANGUAGES_MODULES) $(LOGGERS_MODULES) $(SAY_MODULES) $(TIMERS_MODULES) $(XML_INT_MODULES) export MODULES=$(MYMODULES) @@ -49,14 +49,21 @@ config.status: configure dh_testdir - rm modules.conf + rm -f modules.conf touch modules.conf echo $(MODULES) for i in $(MODULES); do echo $$i >> modules.conf; done ./configure --prefix=/opt/freeswitch --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES} -configure: bootstrap.sh - AUTOCONF=${AUTOCONF} ./bootstrap.sh +configure: + if test ! -f Makefile.in ; then \ + if test -f ./bootstrap.sh ; then \ + AUTOCONF=${AUTOCONF} ./bootstrap.sh ; \ + else \ + echo "No Makefile.in and no known way to bootstrap." ; \ + exit 1; \ + fi; \ + fi; build: build-stamp build-stamp: config.status @@ -89,7 +96,7 @@ dh_clean -k dh_installdirs -A --sourcedir=debian/tmp - $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install uhd-sounds-install moh-install # Build architecture-independent files here. @@ -116,8 +123,7 @@ # dh_installinfo # dh_undocumented # dh_installman - cp debian/monit/freeswitch.monitrc debian/freeswitch/etc/monit/freswitch.monitrc - cp debian/default/freeswitch debian/freeswitch/etc/default + cp debian/monit/freeswitch.monitrc debian/freeswitch/etc/monit/freeswitch.monitrc dh_install --sourcedir=debian/tmp dh_strip dh_compress

1 0

[commit] r8925 - freeswitch/trunk/debian
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Tue Jul 8 03:33:35 2008 New Revision: 8925 Modified: freeswitch/trunk/debian/freeswitch.init Log: typo (FSSCRIPTS-1) Modified: freeswitch/trunk/debian/freeswitch.init ============================================================================== --- freeswitch/trunk/debian/freeswitch.init (original) +++ freeswitch/trunk/debian/freeswitch.init Tue Jul 8 03:33:35 2008 @@ -33,7 +33,7 @@ freeswitch) ;; *) - if [ "USE_INIT" != "TRUE" ]; then + if [ "$USE_INIT" != "TRUE" ]; then echo "FreeSwitch disabled" ; exit 0 ; fi

1 0

[commit] r8924 - in freeswitch/trunk: scripts/scenario src/mod/asr_tts/mod_pocketsphinx src/mod/languages/mod_python
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Tue Jul 8 02:59:02 2008 New Revision: 8924 Modified: freeswitch/trunk/scripts/scenario/phones.cfg freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Log: fix seg src/mod/languages/mod_python Modified: freeswitch/trunk/scripts/scenario/phones.cfg ============================================================================== --- freeswitch/trunk/scripts/scenario/phones.cfg (original) +++ freeswitch/trunk/scripts/scenario/phones.cfg Tue Jul 8 02:59:02 2008 @@ -1,4 +1,4 @@ -Snom_300,10.0.1.241,1000 +Snom_300,10.0.1.17,1000 Snom_320,10.0.1.242,1002 Snom_360,10.0.1.243,1006 Snom_370,10.0.1.244,1007 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Tue Jul 8 02:59:02 2008 @@ -32,7 +32,6 @@ #include <switch.h> #include <pocketsphinx.h> -#define MODELDIR "/usr/local/share/pocketsphinx/model" SWITCH_MODULE_LOAD_FUNCTION(mod_pocketsphinx_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_pocketsphinx_shutdown); 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 Tue Jul 8 02:59:02 2008 @@ -1,6 +1,6 @@ #include "freeswitch_python.h" -#define sanity_check(x) do { if (!session) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return x;}} while(0) +#define py_sanity_check(x) do { if (!session) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return x;}} while(0) #define py_init_vars() do { caller_profile.source = "mod_python"; swapstate = S_SWAPPED_IN; } while(0) PySession::PySession():CoreSession() @@ -21,7 +21,7 @@ void PySession::setDTMFCallback(PyObject * pyfunc, char *funcargs) { - sanity_check(); + py_sanity_check(); if (!PyCallable_Check(pyfunc)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "DTMF function is not a python function.\n"); @@ -51,10 +51,12 @@ void PySession::check_hangup_hook() { +#if 0 PyObject *func; PyObject *result; char *resultStr; bool did_swap_in = false; +#endif switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "check_hangup_hook has been DISABLED, please do not use hangup hooks in python code until further notice!\n"); Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Tue Jul 8 02:59:02 2008 @@ -249,40 +249,11 @@ return SWITCH_STATUS_SUCCESS; } -static switch_application_interface_t python_application_interface = { - /*.interface_name */ "python", - /*.application_function */ python_function, - NULL, NULL, NULL, - /* flags */ SAF_NONE, - /* should we support no media mode here? If so, we need to detect the mode, and either disable the media functions or indicate media if/when we need */ - /*.next */ NULL -}; - -static switch_api_interface_t python_run_interface = { - /*.interface_name */ "python", - /*.desc */ "run a python script", - /*.function */ launch_python, - /*.syntax */ "python </path/to/script>", - /*.next */ NULL -}; - -static switch_loadable_module_interface_t python_module_interface = { - /*.module_name */ modname, - /*.endpoint_interface */ NULL, - /*.timer_interface */ NULL, - /*.dialplan_interface */ NULL, - /*.codec_interface */ NULL, - /*.application_interface */ &python_application_interface, - /*.api_interface */ &python_run_interface, - /*.file_interface */ NULL, - /*.speech_interface */ NULL, - /*.directory_interface */ NULL -}; - SWITCH_MODULE_LOAD_FUNCTION(mod_python_load) { - /* connect my internal structure to the blank pointer passed to me */ - *module_interface = &python_module_interface; + switch_api_interface_t *api_interface; + switch_application_interface_t *app_interface; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Python Framework Loading...\n"); if (!Py_IsInitialized()) { @@ -305,6 +276,13 @@ PyEval_ReleaseLock(); } + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + SWITCH_ADD_API(api_interface, "python", "run a python script", launch_python, "python </path/to/script>"); + SWITCH_ADD_APP(app_interface, "python", "Launch python ivr", "Run a python ivr on a channel", python_function, "<script> [additional_vars [...]]", + SAF_SUPPORT_NOMEDIA); + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r8923 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Tue Jul 8 00:54:33 2008 New Revision: 8923 Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml Log: dox Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Tue Jul 8 00:54:33 2008 @@ -94,6 +94,11 @@   <param name="comfort-noise" value="true"/> +  +  +  </profile> <profile name="wideband">

1 0

[commit] r8922 - freeswitch/trunk/libs/sofia-sip
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Tue Jul 8 00:37:05 2008 New Revision: 8922 Modified: freeswitch/trunk/libs/sofia-sip/RELEASE freeswitch/trunk/libs/sofia-sip/configure.ac Log: Thu Jun 5 11:48:10 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * configure.ac, RELEASE: 1.12.9 Modified: freeswitch/trunk/libs/sofia-sip/RELEASE ============================================================================== --- freeswitch/trunk/libs/sofia-sip/RELEASE (original) +++ freeswitch/trunk/libs/sofia-sip/RELEASE Tue Jul 8 00:37:05 2008 @@ -1,6 +1,6 @@ -====================================== -Release notes for Sofia-SIP 1.12.9pre1 -====================================== +================================== +Release notes for Sofia-SIP 1.12.9 +================================== Changes since last release -------------------------- @@ -104,3 +104,5 @@ - Fixed sf.net bug #1930055: nat detection did not un-REGISTER natted contact if fist response to REGISTER was 200 OK. - Fixed crashes in soa if m= lines were removed from user sdp. +- Fixed problem detecting CANCEL with To-tag copied from a provisional + response Modified: freeswitch/trunk/libs/sofia-sip/configure.ac ============================================================================== --- freeswitch/trunk/libs/sofia-sip/configure.ac (original) +++ freeswitch/trunk/libs/sofia-sip/configure.ac Tue Jul 8 00:37:05 2008 @@ -11,7 +11,7 @@ dnl --------------------------- dnl update both the version for AC_INIT and the LIBSOFIA_SIP_UA_MAJOR_MINOR -AC_INIT([sofia-sip], [1.12.8pre1.12.9.1]) +AC_INIT([sofia-sip], [1.12.9]) AC_CONFIG_SRCDIR([libsofia-sip-ua/sip/sofia-sip/sip.h]) AC_SUBST(VER_LIBSOFIA_SIP_UA_MAJOR_MINOR, [1.12]) dnl Includedir specific to this sofia version

1 0

[commit] r8921 - freeswitch/trunk/libs/sofia-sip/win32
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Tue Jul 8 00:36:41 2008 New Revision: 8921 Modified: freeswitch/trunk/libs/sofia-sip/win32/README.txt Log: Thu Jun 5 11:46:04 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * win32/README.txt: updated download link for IPv6 Technology Preview. Modified: freeswitch/trunk/libs/sofia-sip/win32/README.txt ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/README.txt (original) +++ freeswitch/trunk/libs/sofia-sip/win32/README.txt Tue Jul 8 00:36:41 2008 @@ -9,6 +9,7 @@ shared and static libraries for libsofia-sip-ua, and a few test programs. The test programs can be run with the script check.cmd. + Preparing the build tree ------------------------ @@ -23,29 +24,35 @@ - plus many sites, a web search for "win32 awk" will provide you many more links -Notes pthread support ---------------------- + +Notes for pthread support +------------------------- There is a pthread implementation for Visual C on Win32 included. Source code and documentation for the pthread library can also be downloaded from http://sources.redhat.com/pthreads-win32/. + MS-VC6 specific notes --------------------- The MSVC6 workspace file is "SofiaSIP.dsw". -With Visual Studio 6, and Windows 2000 or older Platform SDK, you -need to have so called "IPv6 Technology Preview for Windows 2000" -installed, in order to compile Sofia-SIP. This is required even -if IPv6 support is disabled (the socket APIs of older Platfrom SDKs -are insufficient). +With Visual Studio 6, and Windows 2000 or older Platform SDK, you need to +have the header files from the so called "IPv6 Technology Preview for +Windows 2000" installed, in order to compile Sofia-SIP. This is required +even if IPv6 support is disabled (the socket APIs of older Platfrom SDKs are +insufficient). -You can download the preview SDK from: -http://msdn.microsoft.com/downloads/sdks/platform/tpipv6.asp +You can download the preview SDK from Microsoft Download Center: + +http://www.microsoft.com/downloads/ + +Search for "IPv6 Technology Preview for Windows 2000". With newer Platform SDKs, the IPv6 Preview SDK is not needed. + MSVC2005 specific notes ------------------------

1 0