- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5455 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 24 Jun '07

24 Jun '07

Author: anthm Date: Sun Jun 24 15:47:39 2007 New Revision: 5455 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: kill mysterious race bug that magicly showed up last week 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 Sun Jun 24 15:47:39 2007 @@ -1576,6 +1576,8 @@ switch_event_t *event; caller_control_action_t *caller_action = NULL; + switch_mutex_lock(member->flag_mutex); + if (switch_core_session_dequeue_event(member->session, &event) == SWITCH_STATUS_SUCCESS) { char *from = switch_event_get_header(event, "from"); char *to = switch_event_get_header(event, "to"); @@ -1649,7 +1651,6 @@ /* handle file and TTS frames */ if (member->fnode) { - switch_mutex_lock(member->flag_mutex); /* if we are done, clean it up */ if (member->fnode->done) { conference_file_node_t *fnode; @@ -1707,7 +1708,6 @@ } } } - switch_mutex_unlock(member->flag_mutex); } else { /* send the conferecne frame to the call leg */ switch_buffer_t *use_buffer = NULL; uint32_t mux_used = (uint32_t) switch_buffer_inuse(member->mux_buffer); @@ -1770,6 +1770,7 @@ switch_core_timer_next(&timer); } } + switch_mutex_unlock(member->flag_mutex); } /* Rinse ... Repeat */ if (member->digit_stream != NULL) { @@ -3229,12 +3230,13 @@ } /* move the member from the old conference to the new one */ + switch_mutex_lock(member->flag_mutex); conference_del_member(conference, member); conference_add_member(new_conference, member); switch_mutex_unlock(new_conference->mutex); - + switch_mutex_unlock(member->flag_mutex); stream->write_function(stream, "OK Members sent to conference %s.\n", argv[2]); - + /* tell them what happened */ if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event);

1 0

[commit] r5454 - in freeswitch/trunk/src: . include mod/languages/mod_python
by Freeswitch SVN 24 Jun '07

24 Jun '07

Author: greenlizard Date: Sun Jun 24 13:38:17 2007 New Revision: 5454 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/mod_python.c freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp freeswitch/trunk/src/switch_cpp.cpp Log: streamFiles 2nd argument is now optional. fix segfault that was happening with originate/bridge due to no valid session in b leg. rename streamfile to streamFile. remove playFile since streamFile does the same thing Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Sun Jun 24 13:38:17 2007 @@ -142,29 +142,17 @@ /** \brief Originate a call to a destination * - * \param old_session - the session where the call is originating from - * and also the session in which _this_ session was - * created + * \param a_leg_sessoin - the session where the call is originating from + * and also the session in which _this_ session was + * created * \param dest - a string representing destination, eg, sofia/mydomain.com/foo@bar.com * \return an int status code indicating success or failure * */ - int originate(CoreSession *aleg_session, + int originate(CoreSession *a_leg_session, char *dest, int timeout=60); - /** \brief Play a file that resides on disk into the channel - * - * \param file - the path to the .wav/.mp3 to be played - * \param timer_name - ?? does not seem to be used, what is this? - * \return an int status code indicating success or failure - * - * NOTE: if a dtmf callback is installed before calling this - * function, that callback will be called upon receiving any - * dtmfs - */ - int playFile(char *file, char *timer_name); - /** \brief set a DTMF callback function * @@ -215,7 +203,7 @@ * \return an int status code indicating success or failure * */ - int streamfile(char *file, int starting_sample_count); + int streamFile(char *file, int starting_sample_count=0); /** \brief flush any pending events */ 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 Sun Jun 24 13:38:17 2007 @@ -115,14 +115,13 @@ def recordFile(*args): return _freeswitch.CoreSession_recordFile(*args) def setCallerData(*args): return _freeswitch.CoreSession_setCallerData(*args) def originate(*args): return _freeswitch.CoreSession_originate(*args) - def playFile(*args): return _freeswitch.CoreSession_playFile(*args) 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 getDigits(*args): return _freeswitch.CoreSession_getDigits(*args) def transfer(*args): return _freeswitch.CoreSession_transfer(*args) def playAndGetDigits(*args): return _freeswitch.CoreSession_playAndGetDigits(*args) - def streamfile(*args): return _freeswitch.CoreSession_streamfile(*args) + def streamFile(*args): return _freeswitch.CoreSession_streamFile(*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/freeswitch_python.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp Sun Jun 24 13:38:17 2007 @@ -175,6 +175,11 @@ bool PySession::begin_allow_threads(void) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "PySession::begin_allow_threads() called\n"); + if (!session) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No valid session\n"); + return false; + } + // swap out threadstate and store in instance variable switch_channel_t *channel = switch_core_session_get_channel(session); PyThreadState *swapin_tstate = (PyThreadState *) switch_channel_get_private(channel, "SwapInThreadState"); @@ -196,7 +201,6 @@ } else { // currently swapped out - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Threadstate already swapd-out! Skipping\n"); return false; } @@ -205,11 +209,15 @@ bool PySession::end_allow_threads(void) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "PySession::end_allow_threads() called\n"); // swap in threadstate from instance variable saved earlier + if (!session) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No valid session\n"); + return false; + } + switch_channel_t *channel = switch_core_session_get_channel(session); PyThreadState *swapin_tstate = (PyThreadState *) switch_channel_get_private(channel, "SwapInThreadState"); if (swapin_tstate == NULL) { // currently swapped in - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Threadstate double swap-in! Skipping\n"); return false; } else { 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 Sun Jun 24 13:38:17 2007 @@ -177,18 +177,19 @@ // will be null if (swapin_tstate == NULL) { // swap it out - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Threadstate mod_python.c swap-out! \n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Threadstate mod_python.c swap-out! \n"); // PyEval_ReleaseThread(cur_tstate); swapin_tstate = (void *) PyEval_SaveThread(); switch_channel_set_private(channel, "SwapInThreadState", (void *) swapin_tstate); } else { // thread state is already swapped out, so, nothing for us to do - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "according to chan priv data, already swapped out \n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "according to chan priv data, already swapped out \n"); } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Threadstate mod_python.c swap-out! \n"); + // they ran python script from cmd line, behave a bit differently (untested) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Threadstate mod_python.c swap-out! \n"); PyEval_ReleaseThread(tstate); } 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 Sun Jun 24 13:38:17 2007 @@ -3961,52 +3961,6 @@ } -SWIGINTERN PyObject *_wrap_CoreSession_playFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - CoreSession *arg1 = (CoreSession *) 0 ; - char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; - int result; - void *argp1 = 0 ; - int res1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; - int res3 ; - char *buf3 = 0 ; - int alloc3 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"OOO:CoreSession_playFile",&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_playFile" "', 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_playFile" "', argument " "2"" of type '" "char *""'"); - } - arg2 = reinterpret_cast< char * >(buf2); - res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_playFile" "', argument " "3"" of type '" "char *""'"); - } - arg3 = reinterpret_cast< char * >(buf3); - result = (int)(arg1)->playFile(arg2,arg3); - resultobj = SWIG_From_int(static_cast< int >(result)); - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; - if (alloc3 == SWIG_NEWOBJ) delete[] buf3; - return resultobj; -fail: - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; - if (alloc3 == SWIG_NEWOBJ) delete[] buf3; - return NULL; -} - - SWIGINTERN PyObject *_wrap_CoreSession_setDTMFCallback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; @@ -4405,11 +4359,11 @@ } -SWIGINTERN PyObject *_wrap_CoreSession_streamfile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_streamFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; char *arg2 = (char *) 0 ; - int arg3 ; + int arg3 = (int) 0 ; int result; void *argp1 = 0 ; int res1 = 0 ; @@ -4422,23 +4376,25 @@ PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:CoreSession_streamfile",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO|O:CoreSession_streamFile",&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_streamfile" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_streamFile" "', 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_streamfile" "', argument " "2"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_streamFile" "', 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_streamfile" "', argument " "3"" of type '" "int""'"); - } - arg3 = static_cast< int >(val3); - result = (int)(arg1)->streamfile(arg2,arg3); + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CoreSession_streamFile" "', argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + } + result = (int)(arg1)->streamFile(arg2,arg3); resultobj = SWIG_From_int(static_cast< int >(result)); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; return resultobj; @@ -5269,14 +5225,13 @@ { (char *)"CoreSession_recordFile", _wrap_CoreSession_recordFile, METH_VARARGS, NULL}, { (char *)"CoreSession_setCallerData", _wrap_CoreSession_setCallerData, METH_VARARGS, NULL}, { (char *)"CoreSession_originate", _wrap_CoreSession_originate, METH_VARARGS, NULL}, - { (char *)"CoreSession_playFile", _wrap_CoreSession_playFile, METH_VARARGS, NULL}, { (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_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}, - { (char *)"CoreSession_streamfile", _wrap_CoreSession_streamfile, METH_VARARGS, NULL}, + { (char *)"CoreSession_streamFile", _wrap_CoreSession_streamFile, 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/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Sun Jun 24 13:38:17 2007 @@ -92,6 +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); if ((application_interface = switch_loadable_module_get_application_interface(app))) { begin_allow_threads(); switch_core_session_exec(session, application_interface, data); @@ -99,25 +100,6 @@ } } -int CoreSession::playFile(char *file, char *timer_name) -{ - switch_status_t status; - switch_file_handle_t fh = { 0 }; - sanity_check(-1); - if (switch_strlen_zero(timer_name)) { - timer_name = NULL; - } - store_file_handle(&fh); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "playFile begin_allow_threads\n"); - begin_allow_threads(); - status = switch_ivr_play_file(session, &fh, file, ap); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "playFile end_allow_threads\n"); - end_allow_threads(); - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; - -} - - void CoreSession::setDTMFCallback(void *cbfunc, char *funcargs) { cb_state.funcargs = funcargs; @@ -206,6 +188,7 @@ sanity_check(-1); begin_allow_threads(); status = switch_ivr_session_transfer(session, extension, dialplan, context); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "transfer result: %d\n", status); end_allow_threads(); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } @@ -240,7 +223,7 @@ return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } -int CoreSession::streamfile(char *file, int starting_sample_count) { +int CoreSession::streamFile(char *file, int starting_sample_count) { switch_status_t status; switch_file_handle_t fh = { 0 }; @@ -282,7 +265,7 @@ } -int CoreSession::originate(CoreSession *aleg_session, +int CoreSession::originate(CoreSession *a_leg_session, char *dest, int timeout) { @@ -293,11 +276,15 @@ cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; - if (aleg_session != NULL) { - aleg_core_session = aleg_session->session; + if (a_leg_session != NULL) { + aleg_core_session = a_leg_session->session; } - begin_allow_threads(); + // this session has no valid switch_core_session_t at this point, and therefore + // no valid channel. since the threadstate is stored in the channel, and there + // is none, if we try to call begin_alllow_threads it will fail miserably. + // use the 'a leg session' to do the thread swapping stuff. + a_leg_session->begin_allow_threads(); if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); @@ -318,11 +305,11 @@ } - end_allow_threads(); + a_leg_session->end_allow_threads(); return SWITCH_STATUS_SUCCESS; failed: - end_allow_threads(); + a_leg_session->end_allow_threads(); return SWITCH_STATUS_FALSE; }

1 0

[commit] r5453 - in freeswitch/branches/greenlizard/src: include mod/languages/mod_python
by Freeswitch SVN 24 Jun '07

24 Jun '07

Author: greenlizard Date: Sun Jun 24 13:26:12 2007 New Revision: 5453 Modified: freeswitch/branches/greenlizard/src/include/switch_cpp.h freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python_wrap.cpp Log: streamFile's 2nd argument is now optional Modified: freeswitch/branches/greenlizard/src/include/switch_cpp.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_cpp.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_cpp.h Sun Jun 24 13:26:12 2007 @@ -203,7 +203,7 @@ * \return an int status code indicating success or failure * */ - int streamFile(char *file, int starting_sample_count); + int streamFile(char *file, int starting_sample_count=0); /** \brief flush any pending events */ Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python_wrap.cpp ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python_wrap.cpp (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python_wrap.cpp Sun Jun 24 13:26:12 2007 @@ -4363,7 +4363,7 @@ PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; char *arg2 = (char *) 0 ; - int arg3 ; + int arg3 = (int) 0 ; int result; void *argp1 = 0 ; int res1 = 0 ; @@ -4376,7 +4376,7 @@ PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:CoreSession_streamFile",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO|O:CoreSession_streamFile",&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_streamFile" "', argument " "1"" of type '" "CoreSession *""'"); @@ -4387,11 +4387,13 @@ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_streamFile" "', 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_streamFile" "', argument " "3"" of type '" "int""'"); - } - arg3 = static_cast< int >(val3); + if (obj2) { + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CoreSession_streamFile" "', argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + } result = (int)(arg1)->streamFile(arg2,arg3); resultobj = SWIG_From_int(static_cast< int >(result)); if (alloc2 == SWIG_NEWOBJ) delete[] buf2;

1 0

[commit] r5452 - in freeswitch/branches/greenlizard/src: . include mod/languages/mod_python
by Freeswitch SVN 24 Jun '07

24 Jun '07

Author: greenlizard Date: Sun Jun 24 13:19:32 2007 New Revision: 5452 Modified: freeswitch/branches/greenlizard/src/include/switch_cpp.h freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch.py freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.cpp freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python.c freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python_wrap.cpp freeswitch/branches/greenlizard/src/switch_cpp.cpp Log: fix segfault that was happening with originate/bridge due to no valid session in b leg. rename streamfile to streamFile. remove playFile since streamFile does the same thing Modified: freeswitch/branches/greenlizard/src/include/switch_cpp.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_cpp.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_cpp.h Sun Jun 24 13:19:32 2007 @@ -142,29 +142,17 @@ /** \brief Originate a call to a destination * - * \param old_session - the session where the call is originating from - * and also the session in which _this_ session was - * created + * \param a_leg_sessoin - the session where the call is originating from + * and also the session in which _this_ session was + * created * \param dest - a string representing destination, eg, sofia/mydomain.com/foo@bar.com * \return an int status code indicating success or failure * */ - int originate(CoreSession *aleg_session, + int originate(CoreSession *a_leg_session, char *dest, int timeout=60); - /** \brief Play a file that resides on disk into the channel - * - * \param file - the path to the .wav/.mp3 to be played - * \param timer_name - ?? does not seem to be used, what is this? - * \return an int status code indicating success or failure - * - * NOTE: if a dtmf callback is installed before calling this - * function, that callback will be called upon receiving any - * dtmfs - */ - int playFile(char *file, char *timer_name); - /** \brief set a DTMF callback function * @@ -215,7 +203,7 @@ * \return an int status code indicating success or failure * */ - int streamfile(char *file, int starting_sample_count); + int streamFile(char *file, int starting_sample_count); /** \brief flush any pending events */ Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch.py ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch.py (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch.py Sun Jun 24 13:19:32 2007 @@ -115,14 +115,13 @@ def recordFile(*args): return _freeswitch.CoreSession_recordFile(*args) def setCallerData(*args): return _freeswitch.CoreSession_setCallerData(*args) def originate(*args): return _freeswitch.CoreSession_originate(*args) - def playFile(*args): return _freeswitch.CoreSession_playFile(*args) 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 getDigits(*args): return _freeswitch.CoreSession_getDigits(*args) def transfer(*args): return _freeswitch.CoreSession_transfer(*args) def playAndGetDigits(*args): return _freeswitch.CoreSession_playAndGetDigits(*args) - def streamfile(*args): return _freeswitch.CoreSession_streamfile(*args) + def streamFile(*args): return _freeswitch.CoreSession_streamFile(*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/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.cpp ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.cpp (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.cpp Sun Jun 24 13:19:32 2007 @@ -175,6 +175,11 @@ bool PySession::begin_allow_threads(void) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "PySession::begin_allow_threads() called\n"); + if (!session) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No valid session\n"); + return false; + } + // swap out threadstate and store in instance variable switch_channel_t *channel = switch_core_session_get_channel(session); PyThreadState *swapin_tstate = (PyThreadState *) switch_channel_get_private(channel, "SwapInThreadState"); @@ -196,7 +201,6 @@ } else { // currently swapped out - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Threadstate already swapd-out! Skipping\n"); return false; } @@ -205,11 +209,15 @@ bool PySession::end_allow_threads(void) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "PySession::end_allow_threads() called\n"); // swap in threadstate from instance variable saved earlier + if (!session) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No valid session\n"); + return false; + } + switch_channel_t *channel = switch_core_session_get_channel(session); PyThreadState *swapin_tstate = (PyThreadState *) switch_channel_get_private(channel, "SwapInThreadState"); if (swapin_tstate == NULL) { // currently swapped in - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Threadstate double swap-in! Skipping\n"); return false; } else { Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python.c Sun Jun 24 13:19:32 2007 @@ -177,18 +177,19 @@ // will be null if (swapin_tstate == NULL) { // swap it out - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Threadstate mod_python.c swap-out! \n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Threadstate mod_python.c swap-out! \n"); // PyEval_ReleaseThread(cur_tstate); swapin_tstate = (void *) PyEval_SaveThread(); switch_channel_set_private(channel, "SwapInThreadState", (void *) swapin_tstate); } else { // thread state is already swapped out, so, nothing for us to do - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "according to chan priv data, already swapped out \n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "according to chan priv data, already swapped out \n"); } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Threadstate mod_python.c swap-out! \n"); + // they ran python script from cmd line, behave a bit differently (untested) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Threadstate mod_python.c swap-out! \n"); PyEval_ReleaseThread(tstate); } Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python_wrap.cpp ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python_wrap.cpp (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python_wrap.cpp Sun Jun 24 13:19:32 2007 @@ -3961,52 +3961,6 @@ } -SWIGINTERN PyObject *_wrap_CoreSession_playFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - CoreSession *arg1 = (CoreSession *) 0 ; - char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; - int result; - void *argp1 = 0 ; - int res1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; - int res3 ; - char *buf3 = 0 ; - int alloc3 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"OOO:CoreSession_playFile",&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_playFile" "', 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_playFile" "', argument " "2"" of type '" "char *""'"); - } - arg2 = reinterpret_cast< char * >(buf2); - res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_playFile" "', argument " "3"" of type '" "char *""'"); - } - arg3 = reinterpret_cast< char * >(buf3); - result = (int)(arg1)->playFile(arg2,arg3); - resultobj = SWIG_From_int(static_cast< int >(result)); - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; - if (alloc3 == SWIG_NEWOBJ) delete[] buf3; - return resultobj; -fail: - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; - if (alloc3 == SWIG_NEWOBJ) delete[] buf3; - return NULL; -} - - SWIGINTERN PyObject *_wrap_CoreSession_setDTMFCallback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; @@ -4405,7 +4359,7 @@ } -SWIGINTERN PyObject *_wrap_CoreSession_streamfile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_streamFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; char *arg2 = (char *) 0 ; @@ -4422,23 +4376,23 @@ PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:CoreSession_streamfile",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:CoreSession_streamFile",&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_streamfile" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_streamFile" "', 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_streamfile" "', argument " "2"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_streamFile" "', 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_streamfile" "', argument " "3"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CoreSession_streamFile" "', argument " "3"" of type '" "int""'"); } arg3 = static_cast< int >(val3); - result = (int)(arg1)->streamfile(arg2,arg3); + result = (int)(arg1)->streamFile(arg2,arg3); resultobj = SWIG_From_int(static_cast< int >(result)); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; return resultobj; @@ -5269,14 +5223,13 @@ { (char *)"CoreSession_recordFile", _wrap_CoreSession_recordFile, METH_VARARGS, NULL}, { (char *)"CoreSession_setCallerData", _wrap_CoreSession_setCallerData, METH_VARARGS, NULL}, { (char *)"CoreSession_originate", _wrap_CoreSession_originate, METH_VARARGS, NULL}, - { (char *)"CoreSession_playFile", _wrap_CoreSession_playFile, METH_VARARGS, NULL}, { (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_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}, - { (char *)"CoreSession_streamfile", _wrap_CoreSession_streamfile, METH_VARARGS, NULL}, + { (char *)"CoreSession_streamFile", _wrap_CoreSession_streamFile, 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/branches/greenlizard/src/switch_cpp.cpp ============================================================================== --- freeswitch/branches/greenlizard/src/switch_cpp.cpp (original) +++ freeswitch/branches/greenlizard/src/switch_cpp.cpp Sun Jun 24 13:19:32 2007 @@ -92,6 +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); if ((application_interface = switch_loadable_module_get_application_interface(app))) { begin_allow_threads(); switch_core_session_exec(session, application_interface, data); @@ -99,25 +100,6 @@ } } -int CoreSession::playFile(char *file, char *timer_name) -{ - switch_status_t status; - switch_file_handle_t fh = { 0 }; - sanity_check(-1); - if (switch_strlen_zero(timer_name)) { - timer_name = NULL; - } - store_file_handle(&fh); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "playFile begin_allow_threads\n"); - begin_allow_threads(); - status = switch_ivr_play_file(session, &fh, file, ap); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "playFile end_allow_threads\n"); - end_allow_threads(); - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; - -} - - void CoreSession::setDTMFCallback(void *cbfunc, char *funcargs) { cb_state.funcargs = funcargs; @@ -206,6 +188,7 @@ sanity_check(-1); begin_allow_threads(); status = switch_ivr_session_transfer(session, extension, dialplan, context); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "transfer result: %d\n", status); end_allow_threads(); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } @@ -241,7 +224,7 @@ } -int CoreSession::streamfile(char *file, int starting_sample_count) { +int CoreSession::streamFile(char *file, int starting_sample_count) { switch_status_t status; switch_file_handle_t fh = { 0 }; @@ -283,7 +266,7 @@ } -int CoreSession::originate(CoreSession *aleg_session, +int CoreSession::originate(CoreSession *a_leg_session, char *dest, int timeout) { @@ -294,11 +277,15 @@ cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; - if (aleg_session != NULL) { - aleg_core_session = aleg_session->session; + if (a_leg_session != NULL) { + aleg_core_session = a_leg_session->session; } - begin_allow_threads(); + // this session has no valid switch_core_session_t at this point, and therefore + // no valid channel. since the threadstate is stored in the channel, and there + // is none, if we try to call begin_alllow_threads it will fail miserably. + // use the 'a leg session' to do the thread swapping stuff. + a_leg_session->begin_allow_threads(); if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); @@ -319,11 +306,11 @@ } - end_allow_threads(); + a_leg_session->end_allow_threads(); return SWITCH_STATUS_SUCCESS; failed: - end_allow_threads(); + a_leg_session->end_allow_threads(); return SWITCH_STATUS_FALSE; }

1 0

[commit] r5451 - freeswitch/trunk/src
by Freeswitch SVN 24 Jun '07

24 Jun '07

Author: mikej Date: Sun Jun 24 00:06:05 2007 New Revision: 5451 Modified: freeswitch/trunk/src/switch_channel.c Log: protect the hash. Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sun Jun 24 00:06:05 2007 @@ -772,6 +772,8 @@ const void *var; char state_num[25]; + switch_mutex_lock(channel->profile_mutex); + if ((caller_profile = switch_channel_get_caller_profile(channel))) { originator_caller_profile = caller_profile->originator_caller_profile; originatee_caller_profile = caller_profile->originatee_caller_profile; @@ -818,7 +820,7 @@ } } - + switch_mutex_unlock(channel->profile_mutex); }

1 0

[commit] r5450 - freeswitch/trunk/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 24 Jun '07

24 Jun '07

Author: mikej Date: Sat Jun 23 23:42:11 2007 New Revision: 5450 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp Log: those who lock, should also unlock... Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp Sat Jun 23 23:42:11 2007 @@ -341,6 +341,7 @@ tempstring_second = (char *) val; chanvars_supp[tempstring_first] = tempstring_second; } + switch_channel_variable_last(channel); } else {

1 0

[commit] r5449 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 24 Jun '07

24 Jun '07

Author: mikej Date: Sat Jun 23 23:17:21 2007 New Revision: 5449 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix hold on ua's that send sendonly in the m instead of the a line and unhold without a sendrecv. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sat Jun 23 23:17:21 2007 @@ -1055,6 +1055,7 @@ sdp_attribute_t *a; int first = 0, last = 0; int ptime = 0, dptime = 0; + int sendonly = 0; int greedy = 0, x = 0, skip = 0, mine = 0; switch_channel_t *channel = NULL; char *val; @@ -1080,33 +1081,44 @@ } } + if (((m = sdp->sdp_media)) && m->m_mode == sdp_sendonly) { + sendonly = 1; + } + for (a = sdp->sdp_attributes; a; a = a->a_next) { if (switch_strlen_zero(a->a_name)) { continue; } if (!strcasecmp(a->a_name, "sendonly")) { - if (!switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { - char *stream; - switch_set_flag_locked(tech_pvt, TFLAG_SIP_HOLD); - if (!(stream = switch_channel_get_variable(tech_pvt->channel, SWITCH_HOLD_MUSIC_VARIABLE))) { - stream = tech_pvt->profile->hold_music; - } - if (stream) { - switch_ivr_broadcast(switch_core_session_get_uuid(tech_pvt->session), stream, SMF_ECHO_BLEG | SMF_LOOP); - } - } - } else if (!strcasecmp(a->a_name, "sendrecv")) { - if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { - switch_channel_clear_flag_partner(tech_pvt->channel, CF_BROADCAST); - switch_channel_set_flag_partner(tech_pvt->channel, CF_BREAK); - switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); - } + sendonly = 1; + } else if (!strcasecmp(a->a_name, "sendrecv")) { + sendonly = 0; } else if (!strcasecmp(a->a_name, "ptime")) { dptime = atoi(a->a_value); } } + if (sendonly) { + if (!switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { + char *stream; + switch_set_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + if (!(stream = switch_channel_get_variable(tech_pvt->channel, SWITCH_HOLD_MUSIC_VARIABLE))) { + stream = tech_pvt->profile->hold_music; + } + if (stream) { + switch_ivr_broadcast(switch_core_session_get_uuid(tech_pvt->session), stream, SMF_ECHO_BLEG | SMF_LOOP); + } + } + } else { + if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { + switch_channel_clear_flag_partner(tech_pvt->channel, CF_BROADCAST); + switch_channel_set_flag_partner(tech_pvt->channel, CF_BREAK); + switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + } + } + + for (m = sdp->sdp_media; m; m = m->m_next) { sdp_connection_t *connection;

1 0

[commit] r5448 - in freeswitch/trunk/src: . include mod/applications/mod_dptools mod/event_handlers/mod_event_socket
by Freeswitch SVN 23 Jun '07

23 Jun '07

Author: anthm Date: Sat Jun 23 01:41:07 2007 New Revision: 5448 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_event.c Log: Add events around all application execution: fire SWITCH_EVEHT_CHANNEL_EXECUTE <execute app> fire SWITCH_EVEHT_CHANNEL_EXECUTE_COMPLETE This can be used in async socket connections to tell when a queued application has finished executing. Add the "event" application to the dialplan: <action application="event" data="header1=val1,header2=val2"/> Events fired from this applcation will always have the type SWITCH_EVENT_CHANNEL_APPLICATION. You can add up to 25 headers of your own to the event via the application arguements. Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Sat Jun 23 01:41:07 2007 @@ -823,12 +823,14 @@ SWITCH_EVENT_CHANNEL_ANSWER - A channel has been answered SWITCH_EVENT_CHANNEL_HANGUP - A channel has been hungup SWITCH_EVENT_CHANNEL_EXECUTE - A channel has executed a module's application + SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE - A channel has finshed executing a module's application SWITCH_EVENT_CHANNEL_BRIDGE - A channel has bridged to another channel SWITCH_EVENT_CHANNEL_UNBRIDGE - A channel has unbridged from another channel SWITCH_EVENT_CHANNEL_PROGRESS - A channel has been parked SWITCH_EVENT_CHANNEL_OUTGOING - A channel has been unparked SWITCH_EVENT_CHANNEL_PARK - A channel has been parked SWITCH_EVENT_CHANNEL_UNPARK - A channel has been unparked + SWITCH_EVENT_CHANNEL_APPLICATION- A channel has called and event from an application SWITCH_EVENT_API - An API call has been executed SWITCH_EVENT_LOG - A LOG event has been triggered SWITCH_EVENT_INBOUND_CHAN - A new inbound channel has been created @@ -872,12 +874,14 @@ SWITCH_EVENT_CHANNEL_ANSWER, SWITCH_EVENT_CHANNEL_HANGUP, SWITCH_EVENT_CHANNEL_EXECUTE, + SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE, SWITCH_EVENT_CHANNEL_BRIDGE, SWITCH_EVENT_CHANNEL_UNBRIDGE, SWITCH_EVENT_CHANNEL_PROGRESS, SWITCH_EVENT_CHANNEL_OUTGOING, SWITCH_EVENT_CHANNEL_PARK, SWITCH_EVENT_CHANNEL_UNPARK, + SWITCH_EVENT_CHANNEL_APPLICATION, SWITCH_EVENT_API, SWITCH_EVENT_LOG, SWITCH_EVENT_INBOUND_CHAN, 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 Sat Jun 23 01:41:07 2007 @@ -443,6 +443,53 @@ } + + +SWITCH_STANDARD_APP(event_function) +{ + switch_channel_t *channel; + switch_event_t *event; + char *argv[25]; + int argc = 0; + char *lbuf; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_APPLICATION) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(channel, event); + if (data && (lbuf = switch_core_session_strdup(session, data)) + && (argc = switch_separate_string(lbuf, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) { + int x = 0; + + for (x = 0; x < argc; x++) { + char *p, *this = argv[x]; + p = this; + while(*p == ' ') *p++ = '\0'; + this = p; + + if (this) { + char *var = this, *val = NULL; + if ((val = strchr(var, '='))) { + p = val - 1; + *val++ = '\0'; + while(*p == ' ') *p-- = '\0'; + p = val; + while(*p == ' ') *p++ = '\0'; + val = p; + switch_event_add_header(event, SWITCH_STACK_BOTTOM, var, "%s", val); + } + } + + } + } + + switch_event_fire(&event); + } + +} + + SWITCH_STANDARD_APP(privacy_function) { switch_channel_t *channel; @@ -1082,6 +1129,7 @@ SWITCH_ADD_APP(app_interface, "hangup", "Hangup the call", "Hangup the call for a channel.", hangup_function, "[<cause>]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "log", "Logs a channel varaible", LOG_LONG_DESC, log_function, "<varname>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "info", "Display Call Info", "Display Call Info", info_function, "", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "event", "Fire an event", "Fire an event", event_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "export", "Export a channel varaible across a bridge", EXPORT_LONG_DESC, export_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "set", "Set a channel varaible", SET_LONG_DESC, set_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "unset", "Unset a channel varaible", UNSET_LONG_DESC, unset_function, "<varname>", SAF_SUPPORT_NOMEDIA); Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Sat Jun 23 01:41:07 2007 @@ -642,12 +642,14 @@ listener->event_list[SWITCH_EVENT_CHANNEL_ANSWER] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_HANGUP] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_EXECUTE] = 1; + listener->event_list[SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_BRIDGE] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_UNBRIDGE] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_PROGRESS] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_OUTGOING] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_PARK] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_UNPARK] = 1; + listener->event_list[SWITCH_EVENT_CHANNEL_APPLICATION] = 1; listener->event_list[SWITCH_EVENT_TALK] = 1; listener->event_list[SWITCH_EVENT_DTMF] = 1; listener->event_list[SWITCH_EVENT_NOTALK] = 1; Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Sat Jun 23 01:41:07 2007 @@ -912,7 +912,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_exec(switch_core_session_t *session, const switch_application_interface_t *application_interface, char *arg) { switch_app_log_t *log, *lp; - + switch_event_t *event; + log = switch_core_session_alloc(session, sizeof(*log)); assert(log != NULL); @@ -928,7 +929,21 @@ session->app_log = log; } + if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(session->channel, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Application", "%s", application_interface->interface_name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Application-Data", "%s", arg); + switch_event_fire(&event); + } + application_interface->application_function(session, arg); + + if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(session->channel, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Application", "%s", application_interface->interface_name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Application-Data", "%s", arg); + switch_event_fire(&event); + } return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Sat Jun 23 01:41:07 2007 @@ -108,7 +108,6 @@ static void switch_core_standard_on_execute(switch_core_session_t *session) { switch_caller_extension_t *extension; - switch_event_t *event; const switch_application_interface_t *application_interface; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard EXECUTE\n"); @@ -149,15 +148,6 @@ expanded); } - if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE) == SWITCH_STATUS_SUCCESS) { - switch_channel_event_set_data(session->channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Application", "%s", extension->current_application->application_name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Application-Data-Orig", "%s", extension->current_application->application_data); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Application-Data", "%s", expanded); - switch_event_fire(&event); - } - - if (switch_channel_get_variable(session->channel, "presence_id")) { char *arg = switch_mprintf("%s(%s)", extension->current_application->application_name, expanded); if (arg) { Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Sat Jun 23 01:41:07 2007 @@ -103,12 +103,14 @@ "CHANNEL_ANSWER", "CHANNEL_HANGUP", "CHANNEL_EXECUTE", + "CHANNEL_EXECUTE_COMPLETE", "CHANNEL_BRIDGE", "CHANNEL_UNBRIDGE", "CHANNEL_PROGRESS", "CHANNEL_OUTGOING", "CHANNEL_PARK", "CHANNEL_UNPARK", + "CHANNEL_APPLICATION", "API", "LOG", "INBOUND_CHAN",

1 0

[commit] r5447 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 23 Jun '07

23 Jun '07

Author: anthm Date: Fri Jun 22 23:51:57 2007 New Revision: 5447 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: avoiding racing cpu (part 3) Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Jun 22 23:51:57 2007 @@ -859,7 +859,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SETUP RTP %s:%d -> %s:%d\n", tech_pvt->profile->ip, tech_pvt->local_port, tech_pvt->remote_ip, tech_pvt->remote_port); - flags = SWITCH_RTP_FLAG_GOOGLEHACK | SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_RAW_WRITE | SWITCH_RTP_FLAG_AUTO_CNG; + flags = SWITCH_RTP_FLAG_DATAWAIT | SWITCH_RTP_FLAG_GOOGLEHACK | SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_RAW_WRITE | SWITCH_RTP_FLAG_AUTO_CNG; if (switch_test_flag(tech_pvt->profile, TFLAG_TIMER)) { flags |= SWITCH_RTP_FLAG_USE_TIMER;

1 0

[commit] r5446 - in freeswitch/trunk: scripts/socket src
by Freeswitch SVN 23 Jun '07

23 Jun '07

Author: anthm Date: Fri Jun 22 23:26:12 2007 New Revision: 5446 Modified: freeswitch/trunk/scripts/socket/sock.pl freeswitch/trunk/src/switch_rtp.c Log: avoiding racing cpu (part 2) Modified: freeswitch/trunk/scripts/socket/sock.pl ============================================================================== --- freeswitch/trunk/scripts/socket/sock.pl (original) +++ freeswitch/trunk/scripts/socket/sock.pl Fri Jun 22 23:26:12 2007 @@ -21,12 +21,12 @@ $o = $fs->call_command("answer"); #to turn on events when in async mode -#$o = $fs->raw_command("myevents"); +$o = $fs->raw_command("myevents"); $o = $fs->call_command("playback", "/ram/swimp.raw"); $o = $fs->call_command("hangup"); #comment exit in async mode -exit; +#exit; while(my $r = $fs->readhash(undef)) { if ($r->{socketerror}) { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jun 22 23:26:12 2007 @@ -964,12 +964,7 @@ if (status == SWITCH_STATUS_BREAK || bytes == 0) { if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DATAWAIT)) { - if (rtp_session->ms_per_packet) { - switch_yield((rtp_session->ms_per_packet / 1000) * 750); - } else { - switch_yield(1000); - } - continue; + goto do_continue; } return 0; } @@ -1005,12 +1000,7 @@ if (bytes && rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) { - if (rtp_session->ms_per_packet) { - switch_yield((rtp_session->ms_per_packet / 1000) * 750); - } else { - switch_yield(1000); - } - continue; + goto do_continue; } @@ -1059,11 +1049,19 @@ } } - continue; + goto do_continue; } break; + + do_continue: + + if (rtp_session->ms_per_packet) { + switch_yield((rtp_session->ms_per_packet / 1000) * 750); + } else { + switch_yield(1000); + } } *payload_type = (switch_payload_t) rtp_session->recv_msg.header.pt;

1 0