- Freeswitch-branches - FreeSWITCH Mailing Lists

[commit] r5285 - freeswitch/branches/cparker/conf
by Freeswitch SVN 07 Jun '07

07 Jun '07

Author: cparker Date: Thu Jun 7 17:14:57 2007 New Revision: 5285 Modified: freeswitch/branches/cparker/conf/mod_radius_cdr.conf.xml Log: Updated example config file to use IPs instead of hostnames Modified: freeswitch/branches/cparker/conf/mod_radius_cdr.conf.xml ============================================================================== --- freeswitch/branches/cparker/conf/mod_radius_cdr.conf.xml (original) +++ freeswitch/branches/cparker/conf/mod_radius_cdr.conf.xml Thu Jun 7 17:14:57 2007 @@ -8,9 +8,10 @@ <param name="radius_timeout" value="5"/>   - <param name="acct_server" value="localhost:1813:testing123"/> - <param name="acct_server" value="otherhost:1813:testing123"/> - <param name="acct_server" value="thirdhost:1813:testing123"/> +  + <param name="acct_server" value="127.0.0.1:1813:testing123"/> + <param name="acct_server" value="10.0.0.254:1813:testing123"/> + <param name="acct_server" value="192.168.10.10:1813:testing123"/> </settings> </configuration>

1 0

[commit] r5273 - freeswitch/branches/greenlizard/src/mod/formats/mod_shout
by Freeswitch SVN 05 Jun '07

05 Jun '07

Author: greenlizard Date: Tue Jun 5 15:44:54 2007 New Revision: 5273 Modified: freeswitch/branches/greenlizard/src/mod/formats/mod_shout/mod_shout.c Log: patch from http://jira.freeswitch.org/browse/MODFORM-1#action_10284 Modified: freeswitch/branches/greenlizard/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/branches/greenlizard/src/mod/formats/mod_shout/mod_shout.c Tue Jun 5 15:44:54 2007 @@ -271,8 +271,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Decoder Error!\n"); } dlen = 0; - //continue; - goto error; + continue; } context->mp3err = 0;

1 0

[commit] r5272 - in freeswitch/branches/greenlizard: scripts src/mod/languages/mod_python
by Freeswitch SVN 05 Jun '07

05 Jun '07

Author: greenlizard Date: Tue Jun 5 15:29:34 2007 New Revision: 5272 Modified: freeswitch/branches/greenlizard/scripts/mytest.py freeswitch/branches/greenlizard/src/mod/languages/mod_python/Makefile Log: update the mytest.py to match recent changes, checkin trunk version of Makefile Modified: freeswitch/branches/greenlizard/scripts/mytest.py ============================================================================== --- freeswitch/branches/greenlizard/scripts/mytest.py (original) +++ freeswitch/branches/greenlizard/scripts/mytest.py Tue Jun 5 15:29:34 2007 @@ -1,32 +1,44 @@ - -# WARNING: May be out of date, please see +# Please see latest version of this script at # http://wiki.freeswitch.org/wiki/Mod_python # before reporting errors import sys, time -def onDTMF(input, itype, buf, buflen): - print "input=",input - print "itype=",itype - print "buf=",buf - print "buflen",buflen - if input == "#": - return 1 - else: - return 0 + +def onDTMF(input, itype, funcargs): + console_log("1","\n\nonDTMF input: %s\n" % input) + if input == "5": + return "pause" + if input == "3": + return "seek:+60000" + if input == "1": + return "seek:-60000" + if input == "4": + return "seek:-120000" + if input == "6": + return "seek:+120000" + if input == "7": + return "seek:-360000" + if input == "9": + return "seek:+360000" + if input == "0": + return "stop" + return None # will make the streamfile audio stop + console_log("1","test from my python program\n") session.answer() -session.setDTMFCallback(onDTMF) +session.setDTMFCallback(onDTMF, "") session.set_tts_parms("cepstral", "david") -session.playFile("/root/test.gsm", "") +session.playFile("/pub/music/Bob Marley - exodus.mp3", "") session.speakText("Please enter telephone number with area code and press pound sign. ") -input = session.getDigits("", 11, "*#", 10000) -console_log("1","result from get digits is "+ input +"\n") +input = session.getDigits("", 11, "*#", "#", 10000) +console_log("1","result from get digits is %s\n" % input) phone_number = session.playAndGetDigits(5, 11, 3, 10000, "*#", "/sounds/test.gsm", "/sounds/invalid.gsm", "", "^17771112222$"); -console_log("1","result from play_and_get_digits is "+ phone_number +"\n") + +console_log("1","result from play_and_get_digits is %s\n" % phone_number) session.transfer("1000", "XML", "default") session.hangup("1") Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_python/Makefile ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_python/Makefile (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_python/Makefile Tue Jun 5 15:29:34 2007 @@ -3,8 +3,8 @@ # and define these variables to impact your build -LOCAL_CFLAGS=-I$(PREFIX)/include/python2.5/ -LOCAL_LDFLAGS=-lpython2.5 -L$(PREFIX)/lib/python2.5/config/ -lutil -lstdc++ +LOCAL_CFLAGS=-I/usr/include/python2.4/ +LOCAL_LDFLAGS=-lpython2.4 -L/usr/lib/python2.4/config/ -lutil -lstdc++ LOCAL_OBJS=freeswitch_python.o mod_python_wrap.o include ../../../../build/modmake.rules @@ -13,17 +13,20 @@ SWIGCFILE=../../../switch_swig.c SWIGIFILE=../../../switch_swig.i -local_depend: -MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install Python-2.5.1.tgz --prefix=$(PREFIX) --enable-threads CFLAGSFORSHARED="-fPIC" +#local_depend: +# MAKE=$(MAKE) PY_CFLAGS=-fPIC $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) --enable-threads reswig: -swig -python -shadow -c++ -o mod_python_wrap.cpp mod_python.i + swig -python -shadow -c++ -I../../../../src/include -o mod_python_wrap.cpp mod_python.i switch_swig_wrap.o: switch_swig_wrap.c Makefile -$(CC) -w $(CFLAGS) -c $< -o $@ + $(CC) -w $(CFLAGS) -c $< -o $@ switch_swig.o: $(SWIGCFILE) Makefile -$(CC) -w $(CFLAGS) -c $< -o $@ + $(CC) -w $(CFLAGS) -c $< -o $@ local_install: -cp -f freeswitch.py $(PREFIX)/lib/python2.5/site-packages/ + cp -f freeswitch.py /usr/lib/python2.4/site-packages/ + + +

1 0

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

05 Jun '07

Author: greenlizard Date: Tue Jun 5 14:11:00 2007 New Revision: 5270 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/freeswitch_python.h freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python.i freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python_wrap.cpp freeswitch/branches/greenlizard/src/switch_cpp.cpp Log: changes described in http://pastebin.freeswitch.org/3021 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 Tue Jun 5 14:11:00 2007 @@ -20,39 +20,112 @@ struct input_callback_state *cb_state, switch_core_session_t *session); + +typedef struct input_callback_state { + void *function; // pointer to the language specific callback function + // eg, PyObject *pyfunc + void *threadState; // pointer to the language specific thread state + // eg, PyThreadState *threadState + void *extra; // currently used to store a switch_file_handle_t + char *funcargs; // extra string that will be passed to callback function +}; + + class CoreSession { - private: + protected: switch_input_args_t args; switch_input_args_t *ap; + char *uuid; + char *tts_name; + char *voice_name; + void store_file_handle(switch_file_handle_t *fh); public: CoreSession(char *uuid); CoreSession(switch_core_session_t *session); ~CoreSession(); switch_core_session_t *session; switch_channel_t *channel; + input_callback_state cb_state; int answer(); int preAnswer(); void hangup(char *cause); void setVariable(char *var, char *val); char *getVariable(char *var); + + /** \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); - void setDTMFCallback(switch_input_callback_function_t cb, void *buf, uint32_t buflen); - int speakText(char *text); + + + /** \brief set a DTMF callback function + * + * The DTMF callback function will be set and persist + * for the life of the session, and be called when a dtmf + * is pressed by user during playFile(), streamfile(), and + * certain other methods are executing. + * + * Note that language specific sessions might need to create + * their own version of this with a slightly different signature + * (as done in freeswitch_python.h) + */ + void setDTMFCallback(switch_input_callback_function_t cb, + void *buf, + uint32_t buflen); + + int speak(char *text); void set_tts_parms(char *tts_name, char *voice_name); - int getDigits(char *dtmf_buf, int len, char *terminators, char *terminator, int timeout); + + int getDigits(char *dtmf_buf, + int len, + char *terminators, + char *terminator, + int timeout); + int transfer(char *extensions, char *dialplan, char *context); - int playAndGetDigits(int min_digits, int max_digits, int max_tries, int timeout, char *terminators, - char *audio_files, char *bad_input_audio_files, char *dtmf_buf, + + /** \brief Play a file into channel and collect dtmfs + * + * See API docs in switch_ivr.h: switch_play_and_get_digits(..) + * + * NOTE: this does not call any dtmf callbacks set by + * setDTMFCallback(..) as it uses its own internal callback + * handler. + */ + int playAndGetDigits(int min_digits, + int max_digits, + int max_tries, + int timeout, + char *terminators, + char *audio_files, + char *bad_input_audio_files, + char *dtmf_buf, char *digits_regex); - int streamfile(char *file, void *cb_func, char *funcargs, int starting_sample_count); + + /** \brief Play a file that resides on disk into the channel + * + * \param file - the path to the .wav/.mp3 to be played + * \param starting_sample_count - the index of the sample to + * start playing from + * \return an int status code indicating success or failure + * + */ + int streamfile(char *file, int starting_sample_count); + + bool ready(); + void execute(char *app, char *data); - void begin_allow_threads(); - void end_allow_threads(); + virtual void begin_allow_threads(); + virtual void end_allow_threads(); + - protected: - char *uuid; - char *tts_name; - char *voice_name; }; 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 Tue Jun 5 14:11:00 2007 @@ -47,6 +47,33 @@ api_execute = _freeswitch.api_execute api_reply_delete = _freeswitch.api_reply_delete process_callback_result = _freeswitch.process_callback_result +class input_callback_state(_object): + __swig_setmethods__ = {} + __setattr__ = lambda self, name, value: _swig_setattr(self, input_callback_state, name, value) + __swig_getmethods__ = {} + __getattr__ = lambda self, name: _swig_getattr(self, input_callback_state, name) + __repr__ = _swig_repr + __swig_setmethods__["function"] = _freeswitch.input_callback_state_function_set + __swig_getmethods__["function"] = _freeswitch.input_callback_state_function_get + if _newclass:function = property(_freeswitch.input_callback_state_function_get, _freeswitch.input_callback_state_function_set) + __swig_setmethods__["threadState"] = _freeswitch.input_callback_state_threadState_set + __swig_getmethods__["threadState"] = _freeswitch.input_callback_state_threadState_get + if _newclass:threadState = property(_freeswitch.input_callback_state_threadState_get, _freeswitch.input_callback_state_threadState_set) + __swig_setmethods__["extra"] = _freeswitch.input_callback_state_extra_set + __swig_getmethods__["extra"] = _freeswitch.input_callback_state_extra_get + if _newclass:extra = property(_freeswitch.input_callback_state_extra_get, _freeswitch.input_callback_state_extra_set) + __swig_setmethods__["funcargs"] = _freeswitch.input_callback_state_funcargs_set + __swig_getmethods__["funcargs"] = _freeswitch.input_callback_state_funcargs_get + if _newclass:funcargs = property(_freeswitch.input_callback_state_funcargs_get, _freeswitch.input_callback_state_funcargs_set) + def __init__(self, *args): + this = _freeswitch.new_input_callback_state(*args) + try: self.this.append(this) + except: self.this = this + __swig_destroy__ = _freeswitch.delete_input_callback_state + __del__ = lambda self : None; +input_callback_state_swigregister = _freeswitch.input_callback_state_swigregister +input_callback_state_swigregister(input_callback_state) + class CoreSession(_object): __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, CoreSession, name, value) @@ -65,6 +92,9 @@ __swig_setmethods__["channel"] = _freeswitch.CoreSession_channel_set __swig_getmethods__["channel"] = _freeswitch.CoreSession_channel_get if _newclass:channel = property(_freeswitch.CoreSession_channel_get, _freeswitch.CoreSession_channel_set) + __swig_setmethods__["cb_state"] = _freeswitch.CoreSession_cb_state_set + __swig_getmethods__["cb_state"] = _freeswitch.CoreSession_cb_state_get + if _newclass:cb_state = property(_freeswitch.CoreSession_cb_state_get, _freeswitch.CoreSession_cb_state_set) def answer(*args): return _freeswitch.CoreSession_answer(*args) def preAnswer(*args): return _freeswitch.CoreSession_preAnswer(*args) def hangup(*args): return _freeswitch.CoreSession_hangup(*args) @@ -72,12 +102,13 @@ def getVariable(*args): return _freeswitch.CoreSession_getVariable(*args) def playFile(*args): return _freeswitch.CoreSession_playFile(*args) def setDTMFCallback(*args): return _freeswitch.CoreSession_setDTMFCallback(*args) - def speakText(*args): return _freeswitch.CoreSession_speakText(*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 ready(*args): return _freeswitch.CoreSession_ready(*args) def execute(*args): return _freeswitch.CoreSession_execute(*args) def begin_allow_threads(*args): return _freeswitch.CoreSession_begin_allow_threads(*args) def end_allow_threads(*args): return _freeswitch.CoreSession_end_allow_threads(*args) @@ -85,33 +116,6 @@ CoreSession_swigregister(CoreSession) PythonDTMFCallback = _freeswitch.PythonDTMFCallback -class input_callback_state(_object): - __swig_setmethods__ = {} - __setattr__ = lambda self, name, value: _swig_setattr(self, input_callback_state, name, value) - __swig_getmethods__ = {} - __getattr__ = lambda self, name: _swig_getattr(self, input_callback_state, name) - __repr__ = _swig_repr - __swig_setmethods__["function"] = _freeswitch.input_callback_state_function_set - __swig_getmethods__["function"] = _freeswitch.input_callback_state_function_get - if _newclass:function = property(_freeswitch.input_callback_state_function_get, _freeswitch.input_callback_state_function_set) - __swig_setmethods__["threadState"] = _freeswitch.input_callback_state_threadState_set - __swig_getmethods__["threadState"] = _freeswitch.input_callback_state_threadState_get - if _newclass:threadState = property(_freeswitch.input_callback_state_threadState_get, _freeswitch.input_callback_state_threadState_set) - __swig_setmethods__["extra"] = _freeswitch.input_callback_state_extra_set - __swig_getmethods__["extra"] = _freeswitch.input_callback_state_extra_get - if _newclass:extra = property(_freeswitch.input_callback_state_extra_get, _freeswitch.input_callback_state_extra_set) - __swig_setmethods__["funcargs"] = _freeswitch.input_callback_state_funcargs_set - __swig_getmethods__["funcargs"] = _freeswitch.input_callback_state_funcargs_get - if _newclass:funcargs = property(_freeswitch.input_callback_state_funcargs_get, _freeswitch.input_callback_state_funcargs_set) - def __init__(self, *args): - this = _freeswitch.new_input_callback_state(*args) - try: self.this.append(this) - except: self.this = this - __swig_destroy__ = _freeswitch.delete_input_callback_state - __del__ = lambda self : None; -input_callback_state_swigregister = _freeswitch.input_callback_state_swigregister -input_callback_state_swigregister(input_callback_state) - class PySession(CoreSession): __swig_setmethods__ = {} for _s in [CoreSession]: __swig_setmethods__.update(_s.__swig_setmethods__) @@ -126,7 +130,7 @@ except: self.this = this __swig_destroy__ = _freeswitch.delete_PySession __del__ = lambda self : None; - def streamfile(*args): return _freeswitch.PySession_streamfile(*args) + def setDTMFCallback(*args): return _freeswitch.PySession_setDTMFCallback(*args) def begin_allow_threads(*args): return _freeswitch.PySession_begin_allow_threads(*args) def end_allow_threads(*args): return _freeswitch.PySession_end_allow_threads(*args) PySession_swigregister = _freeswitch.PySession_swigregister 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 Tue Jun 5 14:11:00 2007 @@ -3,54 +3,52 @@ #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) -int PySession::streamfile(char *file, PyObject *pyfunc, char *funcargs, int starting_sample_count) +void PySession::setDTMFCallback(PyObject *pyfunc, char *funcargs) { - switch_status_t status; - switch_input_args_t args = { 0 }, *ap = NULL; - struct input_callback_state cb_state = { 0 }; - switch_file_handle_t fh = { 0 }; - - sanity_check(-1); - cb_state.funcargs = funcargs; - fh.samples = starting_sample_count; + sanity_check(); if (!PyCallable_Check(pyfunc)) { - dtmfCallbackFunction = NULL; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "DTMF function is not a python function."); - } - else { - dtmfCallbackFunction = pyfunc; } + else { + cb_state.funcargs = funcargs; + cb_state.function = (void *) pyfunc; - if (dtmfCallbackFunction) { - cb_state.function = dtmfCallbackFunction; - cb_state.extra = &fh; args.buf = &cb_state; args.buflen = sizeof(cb_state); // not sure what this is used for, copy mod_spidermonkey - args.input_callback = PythonDTMFCallback; // defined in mod_python.i, will use ptrs in cb_state + + // we cannot set the actual callback to a python function, because + // the callback is a function pointer with a specific signature. + // so, set it to the following c function which will act as a proxy, + // finding the python callback in the args callback args structure + args.input_callback = PythonDTMFCallback; // defined in mod_python.i ap = &args; - } - - this->begin_allow_threads(); - cb_state.threadState = threadState; // pass threadState so the dtmfhandler can pick it up - status = switch_ivr_play_file(session, &fh, file, ap); - this->end_allow_threads(); + } - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "dtmf callback was set, pyfunc: %p. cb_state: %p\n", pyfunc, &cb_state); } void PySession::begin_allow_threads(void) { - threadState = PyEval_SaveThread(); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "PySession::begin_allow_threads() called\n"); + + threadState = (void *) PyEval_SaveThread(); + cb_state.threadState = threadState; + // cb_state.extra = &fh; + args.buf = &cb_state; + ap = &args; } void PySession::end_allow_threads(void) { - PyEval_RestoreThread(threadState); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "PySession::end_allow_threads() called\n"); + PyEval_RestoreThread(((PyThreadState *)threadState)); } PySession::~PySession() { // Should we do any cleanup here? } + + Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.h ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.h (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.h Tue Jun 5 14:11:00 2007 @@ -26,26 +26,17 @@ char *api_execute(char *cmd, char *arg); void api_reply_delete(char *reply); -struct input_callback_state { - PyObject *function; - PyThreadState *threadState; - void *extra; - char *funcargs; -}; - class PySession : public CoreSession { private: - PyObject *dtmfCallbackFunction; - PyThreadState *threadState; + void *threadState; public: - PySession(char *uuid) : CoreSession(uuid) {}; - PySession(switch_core_session_t *session) : CoreSession(session) {}; - ~PySession(); - int streamfile(char *file, PyObject *pyfunc, char *funcargs, int starting_sample_count); - void begin_allow_threads(); - void end_allow_threads(); + PySession(char *uuid) : CoreSession(uuid) {} + PySession(switch_core_session_t *session) : CoreSession(session) {} + ~PySession(); + void setDTMFCallback(PyObject *pyfunc, char *funcargs); + void begin_allow_threads(); + void end_allow_threads(); - protected: }; #ifdef __cplusplus Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python.i ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python.i (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python.i Tue Jun 5 14:11:00 2007 @@ -30,6 +30,8 @@ switch_file_handle_t *fh = NULL; PyThreadState *threadState = NULL; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "PythonDTMFCallback\n"); + if (!buf) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "buf pointer is null"); return SWITCH_STATUS_FALSE; @@ -39,11 +41,14 @@ func = (PyObject *) cb_state->function; if (!func) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cb_state->function is null"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cb_state->function is null\n"); return SWITCH_STATUS_FALSE; } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "cb_state->function is NOT null\n"); + } if (!PyCallable_Check(func)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "function not callable"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "function not callable\n"); return SWITCH_STATUS_FALSE; } @@ -57,14 +62,21 @@ threadState = (PyThreadState *) cb_state->threadState; if (!threadState) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error, invalid threadstate"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error, invalid threadstate\n"); return SWITCH_STATUS_FALSE; } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "restoring threadstate: %p\n", threadState); + } PyEval_RestoreThread(threadState); // nasty stuff happens when py interp has no thread state + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "restored threadstate, calling python function: %p\n", func); + result = PyEval_CallObject(func, arglist); threadState = PyEval_SaveThread(); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "called python function\n"); Py_DECREF(arglist); // Trash arglist if (result && result != Py_None) { @@ -88,6 +100,9 @@ switch_file_handle_t *fh = NULL; fh = (switch_file_handle_t *) cb_state->extra; + if (!fh) { + return SWITCH_STATUS_FALSE; + } if (!ret) { return SWITCH_STATUS_FALSE; 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 Tue Jun 5 14:11:00 2007 @@ -2461,19 +2461,18 @@ #define SWIGTYPE_p_CoreSession swig_types[0] #define SWIGTYPE_p_PySession swig_types[1] -#define SWIGTYPE_p_PyThreadState swig_types[2] -#define SWIGTYPE_p_char swig_types[3] -#define SWIGTYPE_p_input_callback_state swig_types[4] -#define SWIGTYPE_p_switch_channel_t swig_types[5] -#define SWIGTYPE_p_switch_core_session swig_types[6] -#define SWIGTYPE_p_switch_core_session_t swig_types[7] -#define SWIGTYPE_p_switch_input_callback_function_t swig_types[8] -#define SWIGTYPE_p_switch_input_type_t swig_types[9] -#define SWIGTYPE_p_switch_status_t swig_types[10] -#define SWIGTYPE_p_uint32_t swig_types[11] -#define SWIGTYPE_p_void swig_types[12] -static swig_type_info *swig_types[14]; -static swig_module_info swig_module = {swig_types, 13, 0, 0, 0, 0}; +#define SWIGTYPE_p_char swig_types[2] +#define SWIGTYPE_p_input_callback_state swig_types[3] +#define SWIGTYPE_p_switch_channel_t swig_types[4] +#define SWIGTYPE_p_switch_core_session swig_types[5] +#define SWIGTYPE_p_switch_core_session_t swig_types[6] +#define SWIGTYPE_p_switch_input_callback_function_t swig_types[7] +#define SWIGTYPE_p_switch_input_type_t swig_types[8] +#define SWIGTYPE_p_switch_status_t swig_types[9] +#define SWIGTYPE_p_uint32_t swig_types[10] +#define SWIGTYPE_p_void swig_types[11] +static swig_type_info *swig_types[13]; +static swig_module_info swig_module = {swig_types, 12, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -2815,6 +2814,13 @@ } +SWIGINTERNINLINE PyObject* + SWIG_From_bool (bool value) +{ + return PyBool_FromLong(value ? 1 : 0); +} + + SWIGINTERN int SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) { @@ -2892,6 +2898,8 @@ switch_file_handle_t *fh = NULL; PyThreadState *threadState = NULL; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "PythonDTMFCallback\n"); + if (!buf) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "buf pointer is null"); return SWITCH_STATUS_FALSE; @@ -2901,11 +2909,14 @@ func = (PyObject *) cb_state->function; if (!func) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cb_state->function is null"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cb_state->function is null\n"); return SWITCH_STATUS_FALSE; } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "cb_state->function is NOT null\n"); + } if (!PyCallable_Check(func)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "function not callable"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "function not callable\n"); return SWITCH_STATUS_FALSE; } @@ -2919,14 +2930,21 @@ threadState = (PyThreadState *) cb_state->threadState; if (!threadState) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error, invalid threadstate"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error, invalid threadstate\n"); return SWITCH_STATUS_FALSE; } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "restoring threadstate: %p\n", threadState); + } PyEval_RestoreThread(threadState); // nasty stuff happens when py interp has no thread state + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "restored threadstate, calling python function: %p\n", func); + result = PyEval_CallObject(func, arglist); threadState = PyEval_SaveThread(); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "called python function\n"); Py_DECREF(arglist); // Trash arglist if (result && result != Py_None) { @@ -2950,6 +2968,9 @@ switch_file_handle_t *fh = NULL; fh = (switch_file_handle_t *) cb_state->extra; + if (!fh) { + return SWITCH_STATUS_FALSE; + } if (!ret) { return SWITCH_STATUS_FALSE; @@ -2984,8 +3005,6 @@ return SWITCH_STATUS_SUCCESS; } else if (!strcasecmp(ret, "stop")) { return SWITCH_STATUS_FALSE; - } else if (!strcasecmp(ret, "hangup")) { - return SWITCH_STATUS_BREAK; } else if (!strcasecmp(ret, "restart")) { unsigned int pos = 0; fh->speed = 0; @@ -3230,132 +3249,129 @@ } -SWIGINTERN PyObject *_wrap_new_CoreSession__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_input_callback_state_function_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - char *arg1 = (char *) 0 ; - CoreSession *result = 0 ; - int res1 ; - char *buf1 = 0 ; - int alloc1 = 0 ; + input_callback_state *arg1 = (input_callback_state *) 0 ; + void *arg2 = (void *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"O:new_CoreSession",&obj0)) SWIG_fail; - res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1); + if (!PyArg_ParseTuple(args,(char *)"OO:input_callback_state_function_set",&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CoreSession" "', argument " "1"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "input_callback_state_function_set" "', argument " "1"" of type '" "input_callback_state *""'"); } - arg1 = buf1; - result = (CoreSession *)new CoreSession(arg1); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CoreSession, SWIG_POINTER_NEW | 0 ); - if (alloc1 == SWIG_NEWOBJ) delete[] buf1; + arg1 = reinterpret_cast< input_callback_state * >(argp1); + res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "input_callback_state_function_set" "', argument " "2"" of type '" "void *""'"); + } + if (arg1) (arg1)->function = arg2; + + resultobj = SWIG_Py_Void(); return resultobj; fail: - if (alloc1 == SWIG_NEWOBJ) delete[] buf1; return NULL; } -SWIGINTERN PyObject *_wrap_new_CoreSession__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_input_callback_state_function_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - CoreSession *result = 0 ; + input_callback_state *arg1 = (input_callback_state *) 0 ; + void *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject * obj0 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"O:new_CoreSession",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_switch_core_session_t, 0 | 0 ); + if (!PyArg_ParseTuple(args,(char *)"O:input_callback_state_function_get",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CoreSession" "', argument " "1"" of type '" "switch_core_session_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "input_callback_state_function_get" "', argument " "1"" of type '" "input_callback_state *""'"); } - arg1 = reinterpret_cast< switch_core_session_t * >(argp1); - result = (CoreSession *)new CoreSession(arg1); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CoreSession, SWIG_POINTER_NEW | 0 ); + arg1 = reinterpret_cast< input_callback_state * >(argp1); + result = (void *) ((arg1)->function); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_new_CoreSession(PyObject *self, PyObject *args) { - int argc; - PyObject *argv[2]; - int ii; +SWIGINTERN PyObject *_wrap_input_callback_state_threadState_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + input_callback_state *arg1 = (input_callback_state *) 0 ; + void *arg2 = (void *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if (!PyTuple_Check(args)) SWIG_fail; - argc = PyObject_Length(args); - for (ii = 0; (ii < argc) && (ii < 1); ii++) { - argv[ii] = PyTuple_GET_ITEM(args,ii); - } - if (argc == 1) { - int _v; - void *vptr = 0; - int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_switch_core_session_t, 0); - _v = SWIG_CheckState(res); - if (_v) { - return _wrap_new_CoreSession__SWIG_1(self, args); - } + if (!PyArg_ParseTuple(args,(char *)"OO:input_callback_state_threadState_set",&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "input_callback_state_threadState_set" "', argument " "1"" of type '" "input_callback_state *""'"); } - if (argc == 1) { - int _v; - int res = SWIG_AsCharPtrAndSize(argv[0], 0, NULL, 0); - _v = SWIG_CheckState(res); - if (_v) { - return _wrap_new_CoreSession__SWIG_0(self, args); - } + arg1 = reinterpret_cast< input_callback_state * >(argp1); + res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "input_callback_state_threadState_set" "', argument " "2"" of type '" "void *""'"); } + if (arg1) (arg1)->threadState = arg2; + resultobj = SWIG_Py_Void(); + return resultobj; fail: - SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_CoreSession'"); return NULL; } -SWIGINTERN PyObject *_wrap_delete_CoreSession(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_input_callback_state_threadState_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - CoreSession *arg1 = (CoreSession *) 0 ; + input_callback_state *arg1 = (input_callback_state *) 0 ; + void *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject * obj0 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"O:delete_CoreSession",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, SWIG_POINTER_DISOWN | 0 ); + if (!PyArg_ParseTuple(args,(char *)"O:input_callback_state_threadState_get",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CoreSession" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "input_callback_state_threadState_get" "', argument " "1"" of type '" "input_callback_state *""'"); } - arg1 = reinterpret_cast< CoreSession * >(argp1); - delete arg1; - - resultobj = SWIG_Py_Void(); + arg1 = reinterpret_cast< input_callback_state * >(argp1); + result = (void *) ((arg1)->threadState); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_session_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_input_callback_state_extra_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - CoreSession *arg1 = (CoreSession *) 0 ; - switch_core_session_t *arg2 = (switch_core_session_t *) 0 ; + input_callback_state *arg1 = (input_callback_state *) 0 ; + void *arg2 = (void *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; + int res2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OO:CoreSession_session_set",&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); + if (!PyArg_ParseTuple(args,(char *)"OO:input_callback_state_extra_set",&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_session_set" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "input_callback_state_extra_set" "', argument " "1"" of type '" "input_callback_state *""'"); } - arg1 = reinterpret_cast< CoreSession * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_DISOWN | 0 ); + arg1 = reinterpret_cast< input_callback_state * >(argp1); + res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_session_set" "', argument " "2"" of type '" "switch_core_session_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "input_callback_state_extra_set" "', argument " "2"" of type '" "void *""'"); } - arg2 = reinterpret_cast< switch_core_session_t * >(argp2); - if (arg1) (arg1)->session = arg2; + if (arg1) (arg1)->extra = arg2; resultobj = SWIG_Py_Void(); return resultobj; @@ -3364,380 +3380,471 @@ } -SWIGINTERN PyObject *_wrap_CoreSession_session_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_input_callback_state_extra_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - CoreSession *arg1 = (CoreSession *) 0 ; - switch_core_session_t *result = 0 ; + input_callback_state *arg1 = (input_callback_state *) 0 ; + void *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject * obj0 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"O:CoreSession_session_get",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); + if (!PyArg_ParseTuple(args,(char *)"O:input_callback_state_extra_get",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_session_get" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "input_callback_state_extra_get" "', argument " "1"" of type '" "input_callback_state *""'"); } - arg1 = reinterpret_cast< CoreSession * >(argp1); - result = (switch_core_session_t *) ((arg1)->session); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_switch_core_session_t, 0 | 0 ); + arg1 = reinterpret_cast< input_callback_state * >(argp1); + result = (void *) ((arg1)->extra); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_channel_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_input_callback_state_funcargs_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - CoreSession *arg1 = (CoreSession *) 0 ; - switch_channel_t *arg2 = (switch_channel_t *) 0 ; + input_callback_state *arg1 = (input_callback_state *) 0 ; + char *arg2 = (char *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OO:CoreSession_channel_set",&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); + if (!PyArg_ParseTuple(args,(char *)"OO:input_callback_state_funcargs_set",&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_channel_set" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "input_callback_state_funcargs_set" "', argument " "1"" of type '" "input_callback_state *""'"); } - arg1 = reinterpret_cast< CoreSession * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_switch_channel_t, SWIG_POINTER_DISOWN | 0 ); + arg1 = reinterpret_cast< input_callback_state * >(argp1); + res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_channel_set" "', argument " "2"" of type '" "switch_channel_t *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "input_callback_state_funcargs_set" "', argument " "2"" of type '" "char *""'"); + } + arg2 = buf2; + if (arg1->funcargs) delete[] arg1->funcargs; + if (arg2) { + size_t size = strlen(arg2) + 1; + arg1->funcargs = reinterpret_cast< char* >(memcpy((new char[size]), arg2, sizeof(char)*(size))); + } else { + arg1->funcargs = 0; } - arg2 = reinterpret_cast< switch_channel_t * >(argp2); - if (arg1) (arg1)->channel = arg2; - resultobj = SWIG_Py_Void(); + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; return resultobj; fail: + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_channel_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_input_callback_state_funcargs_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - CoreSession *arg1 = (CoreSession *) 0 ; - switch_channel_t *result = 0 ; + input_callback_state *arg1 = (input_callback_state *) 0 ; + char *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject * obj0 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"O:CoreSession_channel_get",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); + if (!PyArg_ParseTuple(args,(char *)"O:input_callback_state_funcargs_get",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_channel_get" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "input_callback_state_funcargs_get" "', argument " "1"" of type '" "input_callback_state *""'"); } - arg1 = reinterpret_cast< CoreSession * >(argp1); - result = (switch_channel_t *) ((arg1)->channel); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_switch_channel_t, 0 | 0 ); + arg1 = reinterpret_cast< input_callback_state * >(argp1); + result = (char *) ((arg1)->funcargs); + resultobj = SWIG_FromCharPtr(result); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_answer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_new_input_callback_state(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - CoreSession *arg1 = (CoreSession *) 0 ; - int result; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; + input_callback_state *result = 0 ; - if (!PyArg_ParseTuple(args,(char *)"O:CoreSession_answer",&obj0)) 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_answer" "', argument " "1"" of type '" "CoreSession *""'"); - } - arg1 = reinterpret_cast< CoreSession * >(argp1); - result = (int)(arg1)->answer(); - resultobj = SWIG_From_int(static_cast< int >(result)); + if (!PyArg_ParseTuple(args,(char *)":new_input_callback_state")) SWIG_fail; + result = (input_callback_state *)new input_callback_state(); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_input_callback_state, SWIG_POINTER_NEW | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_preAnswer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_delete_input_callback_state(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - CoreSession *arg1 = (CoreSession *) 0 ; - int result; + input_callback_state *arg1 = (input_callback_state *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject * obj0 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"O:CoreSession_preAnswer",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); + if (!PyArg_ParseTuple(args,(char *)"O:delete_input_callback_state",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, SWIG_POINTER_DISOWN | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_preAnswer" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_input_callback_state" "', argument " "1"" of type '" "input_callback_state *""'"); } - arg1 = reinterpret_cast< CoreSession * >(argp1); - result = (int)(arg1)->preAnswer(); - resultobj = SWIG_From_int(static_cast< int >(result)); + arg1 = reinterpret_cast< input_callback_state * >(argp1); + delete arg1; + + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_hangup(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *input_callback_state_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_input_callback_state, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *_wrap_new_CoreSession__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - CoreSession *arg1 = (CoreSession *) 0 ; - char *arg2 = (char *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; + char *arg1 = (char *) 0 ; + CoreSession *result = 0 ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OO:CoreSession_hangup",&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); + if (!PyArg_ParseTuple(args,(char *)"O:new_CoreSession",&obj0)) SWIG_fail; + res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_hangup" "', 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_hangup" "', argument " "2"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CoreSession" "', argument " "1"" of type '" "char *""'"); } - arg2 = buf2; - (arg1)->hangup(arg2); - resultobj = SWIG_Py_Void(); - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + arg1 = buf1; + result = (CoreSession *)new CoreSession(arg1); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CoreSession, SWIG_POINTER_NEW | 0 ); + if (alloc1 == SWIG_NEWOBJ) delete[] buf1; return resultobj; fail: - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + if (alloc1 == SWIG_NEWOBJ) delete[] buf1; return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_setVariable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_new_CoreSession__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - CoreSession *arg1 = (CoreSession *) 0 ; - char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + CoreSession *result = 0 ; 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_setVariable",&obj0,&obj1,&obj2)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); + if (!PyArg_ParseTuple(args,(char *)"O:new_CoreSession",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_switch_core_session_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_setVariable" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CoreSession" "', argument " "1"" of type '" "switch_core_session_t *""'"); } - 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_setVariable" "', argument " "2"" of type '" "char *""'"); + arg1 = reinterpret_cast< switch_core_session_t * >(argp1); + result = (CoreSession *)new CoreSession(arg1); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CoreSession, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_CoreSession(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[2]; + int ii; + + if (!PyTuple_Check(args)) SWIG_fail; + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 1); ii++) { + argv[ii] = PyTuple_GET_ITEM(args,ii); } - arg2 = buf2; - res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_setVariable" "', argument " "3"" of type '" "char *""'"); + if (argc == 1) { + int _v; + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_switch_core_session_t, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_new_CoreSession__SWIG_1(self, args); + } } - arg3 = buf3; - (arg1)->setVariable(arg2,arg3); - resultobj = SWIG_Py_Void(); - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; - if (alloc3 == SWIG_NEWOBJ) delete[] buf3; - return resultobj; + if (argc == 1) { + int _v; + int res = SWIG_AsCharPtrAndSize(argv[0], 0, NULL, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_new_CoreSession__SWIG_0(self, args); + } + } + fail: - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; - if (alloc3 == SWIG_NEWOBJ) delete[] buf3; + SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_CoreSession'"); return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_getVariable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_delete_CoreSession(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; - char *arg2 = (char *) 0 ; - char *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OO:CoreSession_getVariable",&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); + if (!PyArg_ParseTuple(args,(char *)"O:delete_CoreSession",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, SWIG_POINTER_DISOWN | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_getVariable" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CoreSession" "', 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_getVariable" "', argument " "2"" of type '" "char *""'"); - } - arg2 = buf2; - result = (char *)(arg1)->getVariable(arg2); - resultobj = SWIG_FromCharPtr(result); - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + delete arg1; + + resultobj = SWIG_Py_Void(); return resultobj; fail: - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_playFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_session_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; - char *arg2 = (char *) 0 ; - char *arg3 = (char *) 0 ; - int result; + switch_core_session_t *arg2 = (switch_core_session_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; - int res3 ; - char *buf3 = 0 ; - int alloc3 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:CoreSession_playFile",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO:CoreSession_session_set",&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_playFile" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_session_set" "', argument " "1"" of type '" "CoreSession *""'"); } arg1 = reinterpret_cast< CoreSession * >(argp1); - res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_switch_core_session_t, SWIG_POINTER_DISOWN | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_playFile" "', argument " "2"" of type '" "char *""'"); - } - arg2 = 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 *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_session_set" "', argument " "2"" of type '" "switch_core_session_t *""'"); } - arg3 = 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; + arg2 = reinterpret_cast< switch_core_session_t * >(argp2); + if (arg1) (arg1)->session = arg2; + + resultobj = SWIG_Py_Void(); 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) { +SWIGINTERN PyObject *_wrap_CoreSession_session_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; - switch_input_callback_function_t arg2 ; - void *arg3 = (void *) 0 ; - uint32_t arg4 ; + switch_core_session_t *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 ; - int res2 = 0 ; - int res3 ; - void *argp4 ; - int res4 = 0 ; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:CoreSession_setDTMFCallback",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"O:CoreSession_session_get",&obj0)) 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_setDTMFCallback" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_session_get" "', argument " "1"" of type '" "CoreSession *""'"); } arg1 = reinterpret_cast< CoreSession * >(argp1); - { - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_switch_input_callback_function_t, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_setDTMFCallback" "', argument " "2"" of type '" "switch_input_callback_function_t""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CoreSession_setDTMFCallback" "', argument " "2"" of type '" "switch_input_callback_function_t""'"); - } else { - switch_input_callback_function_t * temp = reinterpret_cast< switch_input_callback_function_t * >(argp2); - arg2 = *temp; - if (SWIG_IsNewObj(res2)) delete temp; - } - } - res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_setDTMFCallback" "', argument " "3"" of type '" "void *""'"); - } - { - res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_uint32_t, 0 | 0); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CoreSession_setDTMFCallback" "', argument " "4"" of type '" "uint32_t""'"); - } - if (!argp4) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CoreSession_setDTMFCallback" "', argument " "4"" of type '" "uint32_t""'"); - } else { - uint32_t * temp = reinterpret_cast< uint32_t * >(argp4); - arg4 = *temp; - if (SWIG_IsNewObj(res4)) delete temp; - } - } - (arg1)->setDTMFCallback(arg2,arg3,arg4); - resultobj = SWIG_Py_Void(); + result = (switch_core_session_t *) ((arg1)->session); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_switch_core_session_t, 0 | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_speakText(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_channel_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; - char *arg2 = (char *) 0 ; - int result; + switch_channel_t *arg2 = (switch_channel_t *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OO:CoreSession_speakText",&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO:CoreSession_channel_set",&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_speakText" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_channel_set" "', argument " "1"" of type '" "CoreSession *""'"); } arg1 = reinterpret_cast< CoreSession * >(argp1); - res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_switch_channel_t, SWIG_POINTER_DISOWN | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_speakText" "', argument " "2"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_channel_set" "', argument " "2"" of type '" "switch_channel_t *""'"); } - arg2 = buf2; - result = (int)(arg1)->speakText(arg2); - resultobj = SWIG_From_int(static_cast< int >(result)); - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + arg2 = reinterpret_cast< switch_channel_t * >(argp2); + if (arg1) (arg1)->channel = arg2; + + resultobj = SWIG_Py_Void(); return resultobj; fail: - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_set_tts_parms(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_channel_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + switch_channel_t *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:CoreSession_channel_get",&obj0)) 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_channel_get" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + result = (switch_channel_t *) ((arg1)->channel); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_switch_channel_t, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CoreSession_cb_state_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + input_callback_state *arg2 = (input_callback_state *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:CoreSession_cb_state_set",&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_cb_state_set" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_input_callback_state, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_cb_state_set" "', argument " "2"" of type '" "input_callback_state *""'"); + } + arg2 = reinterpret_cast< input_callback_state * >(argp2); + if (arg1) (arg1)->cb_state = *arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CoreSession_cb_state_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + input_callback_state *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:CoreSession_cb_state_get",&obj0)) 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_cb_state_get" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + result = (input_callback_state *)& ((arg1)->cb_state); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_input_callback_state, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CoreSession_answer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:CoreSession_answer",&obj0)) 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_answer" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + result = (int)(arg1)->answer(); + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CoreSession_preAnswer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:CoreSession_preAnswer",&obj0)) 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_preAnswer" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + result = (int)(arg1)->preAnswer(); + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CoreSession_hangup(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + char *arg2 = (char *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:CoreSession_hangup",&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_hangup" "', 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_hangup" "', argument " "2"" of type '" "char *""'"); + } + arg2 = buf2; + (arg1)->hangup(arg2); + resultobj = SWIG_Py_Void(); + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return resultobj; +fail: + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CoreSession_setVariable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; char *arg2 = (char *) 0 ; @@ -3754,23 +3861,23 @@ PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:CoreSession_set_tts_parms",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:CoreSession_setVariable",&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_set_tts_parms" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_setVariable" "', 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_set_tts_parms" "', argument " "2"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_setVariable" "', argument " "2"" of type '" "char *""'"); } arg2 = buf2; res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_set_tts_parms" "', argument " "3"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_setVariable" "', argument " "3"" of type '" "char *""'"); } arg3 = buf3; - (arg1)->set_tts_parms(arg2,arg3); + (arg1)->setVariable(arg2,arg3); resultobj = SWIG_Py_Void(); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; @@ -3782,100 +3889,45 @@ } -SWIGINTERN PyObject *_wrap_CoreSession_getDigits(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_getVariable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; char *arg2 = (char *) 0 ; - int arg3 ; - char *arg4 = (char *) 0 ; - char *arg5 = (char *) 0 ; - int arg6 ; - int result; + char *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; int res2 ; - char temp2[128+1] ; - char *t2 = 0 ; - size_t n2 = 0 ; + char *buf2 = 0 ; int alloc2 = 0 ; - int val3 ; - int ecode3 = 0 ; - int res4 ; - char *buf4 = 0 ; - int alloc4 = 0 ; - int res5 ; - char temp5[8+1] ; - char *t5 = 0 ; - size_t n5 = 0 ; - int alloc5 = 0 ; - int val6 ; - int ecode6 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - PyObject * obj5 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CoreSession_getDigits",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO:CoreSession_getVariable",&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_getDigits" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_getVariable" "', argument " "1"" of type '" "CoreSession *""'"); } arg1 = reinterpret_cast< CoreSession * >(argp1); - res2 = SWIG_AsCharPtrAndSize(obj1, &t2, &n2, &alloc2); + res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_getDigits" "', argument " "2"" of type '" "char *dtmf_buf""'"); - } - if ( n2 > (size_t) 128 ) n2 = (size_t) 128; - memcpy(temp2, t2, sizeof(char)*n2); - if (alloc2 == SWIG_NEWOBJ) delete[] t2; - temp2[n2 - 1] = 0; - arg2 = (char *) temp2; - ecode3 = SWIG_AsVal_int(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CoreSession_getDigits" "', argument " "3"" of type '" "int""'"); - } - arg3 = static_cast< int >(val3); - res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CoreSession_getDigits" "', argument " "4"" of type '" "char *""'"); - } - arg4 = buf4; - res5 = SWIG_AsCharPtrAndSize(obj4, &t5, &n5, &alloc5); - if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CoreSession_getDigits" "', argument " "5"" of type '" "char *terminator""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_getVariable" "', argument " "2"" of type '" "char *""'"); } - if ( n5 > (size_t) 8 ) n5 = (size_t) 8; - memcpy(temp5, t5, sizeof(char)*n5); - if (alloc5 == SWIG_NEWOBJ) delete[] t5; - temp5[n5 - 1] = 0; - arg5 = (char *) temp5; - ecode6 = SWIG_AsVal_int(obj5, &val6); - if (!SWIG_IsOK(ecode6)) { - SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "CoreSession_getDigits" "', argument " "6"" of type '" "int""'"); - } - arg6 = static_cast< int >(val6); - result = (int)(arg1)->getDigits(arg2,arg3,arg4,arg5,arg6); - resultobj = SWIG_From_int(static_cast< int >(result)); - arg2[128] = 0; - resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_FromCharPtr(arg2)); - arg5[8] = 0; - resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_FromCharPtr(arg5)); - if (alloc4 == SWIG_NEWOBJ) delete[] buf4; + arg2 = buf2; + result = (char *)(arg1)->getVariable(arg2); + resultobj = SWIG_FromCharPtr(result); + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; return resultobj; fail: - if (alloc4 == SWIG_NEWOBJ) delete[] buf4; + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_transfer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +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 ; - char *arg4 = (char *) 0 ; int result; void *argp1 = 0 ; int res1 = 0 ; @@ -3885,236 +3937,135 @@ int res3 ; char *buf3 = 0 ; int alloc3 = 0 ; - int res4 ; - char *buf4 = 0 ; - int alloc4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:CoreSession_transfer",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + 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_transfer" "', argument " "1"" of type '" "CoreSession *""'"); + 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_transfer" "', argument " "2"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_playFile" "', argument " "2"" of type '" "char *""'"); } arg2 = buf2; res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_transfer" "', argument " "3"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_playFile" "', argument " "3"" of type '" "char *""'"); } arg3 = buf3; - res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CoreSession_transfer" "', argument " "4"" of type '" "char *""'"); - } - arg4 = buf4; - result = (int)(arg1)->transfer(arg2,arg3,arg4); + 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; - if (alloc4 == SWIG_NEWOBJ) delete[] buf4; return resultobj; fail: if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; - if (alloc4 == SWIG_NEWOBJ) delete[] buf4; return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_playAndGetDigits(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_setDTMFCallback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; - int arg2 ; - int arg3 ; - int arg4 ; - int arg5 ; - char *arg6 = (char *) 0 ; - char *arg7 = (char *) 0 ; - char *arg8 = (char *) 0 ; - char *arg9 = (char *) 0 ; - char *arg10 = (char *) 0 ; - int result; + switch_input_callback_function_t arg2 ; + void *arg3 = (void *) 0 ; + uint32_t arg4 ; void *argp1 = 0 ; int res1 = 0 ; - int val2 ; - int ecode2 = 0 ; - int val3 ; - int ecode3 = 0 ; - int val4 ; - int ecode4 = 0 ; - int val5 ; - int ecode5 = 0 ; - int res6 ; - char *buf6 = 0 ; - int alloc6 = 0 ; - int res7 ; - char *buf7 = 0 ; - int alloc7 = 0 ; - int res8 ; - char *buf8 = 0 ; - int alloc8 = 0 ; - int res9 ; - char temp9[128+1] ; - char *t9 = 0 ; - size_t n9 = 0 ; - int alloc9 = 0 ; - int res10 ; - char *buf10 = 0 ; - int alloc10 = 0 ; + void *argp2 ; + int res2 = 0 ; + int res3 ; + void *argp4 ; + int res4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - PyObject * obj5 = 0 ; - PyObject * obj6 = 0 ; - PyObject * obj7 = 0 ; - PyObject * obj8 = 0 ; - PyObject * obj9 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOO:CoreSession_playAndGetDigits",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:CoreSession_setDTMFCallback",&obj0,&obj1,&obj2,&obj3)) 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_playAndGetDigits" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_setDTMFCallback" "', argument " "1"" of type '" "CoreSession *""'"); } arg1 = reinterpret_cast< CoreSession * >(argp1); - ecode2 = SWIG_AsVal_int(obj1, &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CoreSession_playAndGetDigits" "', argument " "2"" of type '" "int""'"); - } - arg2 = static_cast< int >(val2); - ecode3 = SWIG_AsVal_int(obj2, &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CoreSession_playAndGetDigits" "', argument " "3"" of type '" "int""'"); - } - arg3 = static_cast< int >(val3); - ecode4 = SWIG_AsVal_int(obj3, &val4); - if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CoreSession_playAndGetDigits" "', argument " "4"" of type '" "int""'"); - } - arg4 = static_cast< int >(val4); - ecode5 = SWIG_AsVal_int(obj4, &val5); - if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CoreSession_playAndGetDigits" "', argument " "5"" of type '" "int""'"); - } - arg5 = static_cast< int >(val5); - res6 = SWIG_AsCharPtrAndSize(obj5, &buf6, NULL, &alloc6); - if (!SWIG_IsOK(res6)) { - SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CoreSession_playAndGetDigits" "', argument " "6"" of type '" "char *""'"); - } - arg6 = buf6; - res7 = SWIG_AsCharPtrAndSize(obj6, &buf7, NULL, &alloc7); - if (!SWIG_IsOK(res7)) { - SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CoreSession_playAndGetDigits" "', argument " "7"" of type '" "char *""'"); - } - arg7 = buf7; - res8 = SWIG_AsCharPtrAndSize(obj7, &buf8, NULL, &alloc8); - if (!SWIG_IsOK(res8)) { - SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CoreSession_playAndGetDigits" "', argument " "8"" of type '" "char *""'"); + { + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_switch_input_callback_function_t, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_setDTMFCallback" "', argument " "2"" of type '" "switch_input_callback_function_t""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CoreSession_setDTMFCallback" "', argument " "2"" of type '" "switch_input_callback_function_t""'"); + } else { + switch_input_callback_function_t * temp = reinterpret_cast< switch_input_callback_function_t * >(argp2); + arg2 = *temp; + if (SWIG_IsNewObj(res2)) delete temp; + } } - arg8 = buf8; - res9 = SWIG_AsCharPtrAndSize(obj8, &t9, &n9, &alloc9); - if (!SWIG_IsOK(res9)) { - SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CoreSession_playAndGetDigits" "', argument " "9"" of type '" "char *dtmf_buf""'"); + res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_setDTMFCallback" "', argument " "3"" of type '" "void *""'"); } - if ( n9 > (size_t) 128 ) n9 = (size_t) 128; - memcpy(temp9, t9, sizeof(char)*n9); - if (alloc9 == SWIG_NEWOBJ) delete[] t9; - temp9[n9 - 1] = 0; - arg9 = (char *) temp9; - res10 = SWIG_AsCharPtrAndSize(obj9, &buf10, NULL, &alloc10); - if (!SWIG_IsOK(res10)) { - SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "CoreSession_playAndGetDigits" "', argument " "10"" of type '" "char *""'"); + { + res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_uint32_t, 0 | 0); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CoreSession_setDTMFCallback" "', argument " "4"" of type '" "uint32_t""'"); + } + if (!argp4) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CoreSession_setDTMFCallback" "', argument " "4"" of type '" "uint32_t""'"); + } else { + uint32_t * temp = reinterpret_cast< uint32_t * >(argp4); + arg4 = *temp; + if (SWIG_IsNewObj(res4)) delete temp; + } } - arg10 = buf10; - result = (int)(arg1)->playAndGetDigits(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10); - resultobj = SWIG_From_int(static_cast< int >(result)); - arg9[128] = 0; - resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_FromCharPtr(arg9)); - if (alloc6 == SWIG_NEWOBJ) delete[] buf6; - if (alloc7 == SWIG_NEWOBJ) delete[] buf7; - if (alloc8 == SWIG_NEWOBJ) delete[] buf8; - if (alloc10 == SWIG_NEWOBJ) delete[] buf10; + (arg1)->setDTMFCallback(arg2,arg3,arg4); + resultobj = SWIG_Py_Void(); return resultobj; fail: - if (alloc6 == SWIG_NEWOBJ) delete[] buf6; - if (alloc7 == SWIG_NEWOBJ) delete[] buf7; - if (alloc8 == SWIG_NEWOBJ) delete[] buf8; - if (alloc10 == SWIG_NEWOBJ) delete[] buf10; return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_streamfile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_speak(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; char *arg2 = (char *) 0 ; - void *arg3 = (void *) 0 ; - char *arg4 = (char *) 0 ; - int arg5 ; int result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; char *buf2 = 0 ; int alloc2 = 0 ; - int res3 ; - int res4 ; - char *buf4 = 0 ; - int alloc4 = 0 ; - int val5 ; - int ecode5 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOOO:CoreSession_streamfile",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO:CoreSession_speak",&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_streamfile" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_speak" "', 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_speak" "', argument " "2"" of type '" "char *""'"); } arg2 = buf2; - res3 = SWIG_ConvertPtr(obj2,SWIG_as_voidptrptr(&arg3), 0, 0); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_streamfile" "', argument " "3"" of type '" "void *""'"); - } - res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CoreSession_streamfile" "', argument " "4"" of type '" "char *""'"); - } - arg4 = buf4; - ecode5 = SWIG_AsVal_int(obj4, &val5); - if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CoreSession_streamfile" "', argument " "5"" of type '" "int""'"); - } - arg5 = static_cast< int >(val5); - result = (int)(arg1)->streamfile(arg2,arg3,arg4,arg5); + result = (int)(arg1)->speak(arg2); resultobj = SWIG_From_int(static_cast< int >(result)); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; - if (alloc4 == SWIG_NEWOBJ) delete[] buf4; return resultobj; fail: if (alloc2 == SWIG_NEWOBJ) delete[] buf2; - if (alloc4 == SWIG_NEWOBJ) delete[] buf4; return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_execute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_set_tts_parms(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; char *arg2 = (char *) 0 ; @@ -4131,23 +4082,23 @@ PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:CoreSession_execute",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:CoreSession_set_tts_parms",&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_execute" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_set_tts_parms" "', 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_execute" "', argument " "2"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_set_tts_parms" "', argument " "2"" of type '" "char *""'"); } arg2 = buf2; res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_execute" "', argument " "3"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_set_tts_parms" "', argument " "3"" of type '" "char *""'"); } arg3 = buf3; - (arg1)->execute(arg2,arg3); + (arg1)->set_tts_parms(arg2,arg3); resultobj = SWIG_Py_Void(); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; @@ -4159,371 +4110,497 @@ } -SWIGINTERN PyObject *_wrap_CoreSession_begin_allow_threads(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_getDigits(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; + char *arg2 = (char *) 0 ; + int arg3 ; + char *arg4 = (char *) 0 ; + char *arg5 = (char *) 0 ; + int arg6 ; + int result; void *argp1 = 0 ; int res1 = 0 ; + int res2 ; + char temp2[128+1] ; + char *t2 = 0 ; + size_t n2 = 0 ; + int alloc2 = 0 ; + int val3 ; + int ecode3 = 0 ; + int res4 ; + char *buf4 = 0 ; + int alloc4 = 0 ; + int res5 ; + char temp5[8+1] ; + char *t5 = 0 ; + size_t n5 = 0 ; + int alloc5 = 0 ; + int val6 ; + int ecode6 = 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"O:CoreSession_begin_allow_threads",&obj0)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOOOO:CoreSession_getDigits",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) 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_begin_allow_threads" "', argument " "1"" of type '" "CoreSession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_getDigits" "', argument " "1"" of type '" "CoreSession *""'"); } arg1 = reinterpret_cast< CoreSession * >(argp1); - (arg1)->begin_allow_threads(); - resultobj = SWIG_Py_Void(); + res2 = SWIG_AsCharPtrAndSize(obj1, &t2, &n2, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_getDigits" "', argument " "2"" of type '" "char *dtmf_buf""'"); + } + if ( n2 > (size_t) 128 ) n2 = (size_t) 128; + memcpy(temp2, t2, sizeof(char)*n2); + if (alloc2 == SWIG_NEWOBJ) delete[] t2; + temp2[n2 - 1] = 0; + arg2 = (char *) temp2; + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CoreSession_getDigits" "', argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CoreSession_getDigits" "', argument " "4"" of type '" "char *""'"); + } + arg4 = buf4; + res5 = SWIG_AsCharPtrAndSize(obj4, &t5, &n5, &alloc5); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "CoreSession_getDigits" "', argument " "5"" of type '" "char *terminator""'"); + } + if ( n5 > (size_t) 8 ) n5 = (size_t) 8; + memcpy(temp5, t5, sizeof(char)*n5); + if (alloc5 == SWIG_NEWOBJ) delete[] t5; + temp5[n5 - 1] = 0; + arg5 = (char *) temp5; + ecode6 = SWIG_AsVal_int(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "CoreSession_getDigits" "', argument " "6"" of type '" "int""'"); + } + arg6 = static_cast< int >(val6); + result = (int)(arg1)->getDigits(arg2,arg3,arg4,arg5,arg6); + resultobj = SWIG_From_int(static_cast< int >(result)); + arg2[128] = 0; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_FromCharPtr(arg2)); + arg5[8] = 0; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_FromCharPtr(arg5)); + if (alloc4 == SWIG_NEWOBJ) delete[] buf4; return resultobj; fail: + if (alloc4 == SWIG_NEWOBJ) delete[] buf4; return NULL; } -SWIGINTERN PyObject *_wrap_CoreSession_end_allow_threads(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_transfer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:CoreSession_end_allow_threads",&obj0)) 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_end_allow_threads" "', argument " "1"" of type '" "CoreSession *""'"); - } - arg1 = reinterpret_cast< CoreSession * >(argp1); - (arg1)->end_allow_threads(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *CoreSession_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_CoreSession, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *_wrap_PythonDTMFCallback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - switch_core_session *arg1 = (switch_core_session *) 0 ; - void *arg2 = (void *) 0 ; - switch_input_type_t arg3 ; - void *arg4 = (void *) 0 ; - unsigned int arg5 ; - switch_status_t result; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + char *arg4 = (char *) 0 ; + int result; void *argp1 = 0 ; int res1 = 0 ; int res2 ; - void *argp3 ; - int res3 = 0 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; int res4 ; - unsigned int val5 ; - int ecode5 = 0 ; + char *buf4 = 0 ; + int alloc4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOOO:PythonDTMFCallback",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_switch_core_session, 0 | 0 ); + if (!PyArg_ParseTuple(args,(char *)"OOOO:CoreSession_transfer",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PythonDTMFCallback" "', argument " "1"" of type '" "switch_core_session *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_transfer" "', argument " "1"" of type '" "CoreSession *""'"); } - arg1 = reinterpret_cast< switch_core_session * >(argp1); - res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0); + arg1 = reinterpret_cast< CoreSession * >(argp1); + res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PythonDTMFCallback" "', argument " "2"" of type '" "void *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_transfer" "', argument " "2"" of type '" "char *""'"); } - { - res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_switch_input_type_t, 0 | 0); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PythonDTMFCallback" "', argument " "3"" of type '" "switch_input_type_t""'"); - } - if (!argp3) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PythonDTMFCallback" "', argument " "3"" of type '" "switch_input_type_t""'"); - } else { - switch_input_type_t * temp = reinterpret_cast< switch_input_type_t * >(argp3); - arg3 = *temp; - if (SWIG_IsNewObj(res3)) delete temp; - } + arg2 = buf2; + res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_transfer" "', argument " "3"" of type '" "char *""'"); } - res4 = SWIG_ConvertPtr(obj3,SWIG_as_voidptrptr(&arg4), 0, 0); + arg3 = buf3; + res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4); if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "PythonDTMFCallback" "', argument " "4"" of type '" "void *""'"); + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CoreSession_transfer" "', argument " "4"" of type '" "char *""'"); } - ecode5 = SWIG_AsVal_unsigned_SS_int(obj4, &val5); - if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "PythonDTMFCallback" "', argument " "5"" of type '" "unsigned int""'"); - } - arg5 = static_cast< unsigned int >(val5); - result = PythonDTMFCallback(arg1,arg2,arg3,arg4,arg5); - resultobj = SWIG_NewPointerObj((new switch_status_t(static_cast< const switch_status_t& >(result))), SWIGTYPE_p_switch_status_t, SWIG_POINTER_OWN | 0 ); + arg4 = buf4; + result = (int)(arg1)->transfer(arg2,arg3,arg4); + resultobj = SWIG_From_int(static_cast< int >(result)); + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + if (alloc3 == SWIG_NEWOBJ) delete[] buf3; + if (alloc4 == SWIG_NEWOBJ) delete[] buf4; return resultobj; fail: + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + if (alloc3 == SWIG_NEWOBJ) delete[] buf3; + if (alloc4 == SWIG_NEWOBJ) delete[] buf4; return NULL; } -SWIGINTERN PyObject *_wrap_input_callback_state_function_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_playAndGetDigits(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - input_callback_state *arg1 = (input_callback_state *) 0 ; - PyObject *arg2 = (PyObject *) 0 ; + CoreSession *arg1 = (CoreSession *) 0 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; + char *arg6 = (char *) 0 ; + char *arg7 = (char *) 0 ; + char *arg8 = (char *) 0 ; + char *arg9 = (char *) 0 ; + char *arg10 = (char *) 0 ; + int result; void *argp1 = 0 ; int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + int val3 ; + int ecode3 = 0 ; + int val4 ; + int ecode4 = 0 ; + int val5 ; + int ecode5 = 0 ; + int res6 ; + char *buf6 = 0 ; + int alloc6 = 0 ; + int res7 ; + char *buf7 = 0 ; + int alloc7 = 0 ; + int res8 ; + char *buf8 = 0 ; + int alloc8 = 0 ; + int res9 ; + char temp9[128+1] ; + char *t9 = 0 ; + size_t n9 = 0 ; + int alloc9 = 0 ; + int res10 ; + char *buf10 = 0 ; + int alloc10 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; + PyObject * obj9 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OO:input_callback_state_function_set",&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); + if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOO:CoreSession_playAndGetDigits",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "input_callback_state_function_set" "', argument " "1"" of type '" "input_callback_state *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_playAndGetDigits" "', argument " "1"" of type '" "CoreSession *""'"); } - arg1 = reinterpret_cast< input_callback_state * >(argp1); - arg2 = obj1; - if (arg1) (arg1)->function = arg2; - - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_input_callback_state_function_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - input_callback_state *arg1 = (input_callback_state *) 0 ; - PyObject *result = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:input_callback_state_function_get",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "input_callback_state_function_get" "', argument " "1"" of type '" "input_callback_state *""'"); + arg1 = reinterpret_cast< CoreSession * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CoreSession_playAndGetDigits" "', argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CoreSession_playAndGetDigits" "', argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CoreSession_playAndGetDigits" "', argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + ecode5 = SWIG_AsVal_int(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CoreSession_playAndGetDigits" "', argument " "5"" of type '" "int""'"); + } + arg5 = static_cast< int >(val5); + res6 = SWIG_AsCharPtrAndSize(obj5, &buf6, NULL, &alloc6); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "CoreSession_playAndGetDigits" "', argument " "6"" of type '" "char *""'"); } - arg1 = reinterpret_cast< input_callback_state * >(argp1); - result = (PyObject *) ((arg1)->function); - resultobj = result; - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_input_callback_state_threadState_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - input_callback_state *arg1 = (input_callback_state *) 0 ; - PyThreadState *arg2 = (PyThreadState *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"OO:input_callback_state_threadState_set",&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "input_callback_state_threadState_set" "', argument " "1"" of type '" "input_callback_state *""'"); + arg6 = buf6; + res7 = SWIG_AsCharPtrAndSize(obj6, &buf7, NULL, &alloc7); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "CoreSession_playAndGetDigits" "', argument " "7"" of type '" "char *""'"); } - arg1 = reinterpret_cast< input_callback_state * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_PyThreadState, SWIG_POINTER_DISOWN | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "input_callback_state_threadState_set" "', argument " "2"" of type '" "PyThreadState *""'"); + arg7 = buf7; + res8 = SWIG_AsCharPtrAndSize(obj7, &buf8, NULL, &alloc8); + if (!SWIG_IsOK(res8)) { + SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "CoreSession_playAndGetDigits" "', argument " "8"" of type '" "char *""'"); } - arg2 = reinterpret_cast< PyThreadState * >(argp2); - if (arg1) (arg1)->threadState = arg2; - - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_input_callback_state_threadState_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - input_callback_state *arg1 = (input_callback_state *) 0 ; - PyThreadState *result = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:input_callback_state_threadState_get",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "input_callback_state_threadState_get" "', argument " "1"" of type '" "input_callback_state *""'"); + arg8 = buf8; + res9 = SWIG_AsCharPtrAndSize(obj8, &t9, &n9, &alloc9); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "CoreSession_playAndGetDigits" "', argument " "9"" of type '" "char *dtmf_buf""'"); } - arg1 = reinterpret_cast< input_callback_state * >(argp1); - result = (PyThreadState *) ((arg1)->threadState); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PyThreadState, 0 | 0 ); + if ( n9 > (size_t) 128 ) n9 = (size_t) 128; + memcpy(temp9, t9, sizeof(char)*n9); + if (alloc9 == SWIG_NEWOBJ) delete[] t9; + temp9[n9 - 1] = 0; + arg9 = (char *) temp9; + res10 = SWIG_AsCharPtrAndSize(obj9, &buf10, NULL, &alloc10); + if (!SWIG_IsOK(res10)) { + SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "CoreSession_playAndGetDigits" "', argument " "10"" of type '" "char *""'"); + } + arg10 = buf10; + result = (int)(arg1)->playAndGetDigits(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10); + resultobj = SWIG_From_int(static_cast< int >(result)); + arg9[128] = 0; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_FromCharPtr(arg9)); + if (alloc6 == SWIG_NEWOBJ) delete[] buf6; + if (alloc7 == SWIG_NEWOBJ) delete[] buf7; + if (alloc8 == SWIG_NEWOBJ) delete[] buf8; + if (alloc10 == SWIG_NEWOBJ) delete[] buf10; return resultobj; fail: + if (alloc6 == SWIG_NEWOBJ) delete[] buf6; + if (alloc7 == SWIG_NEWOBJ) delete[] buf7; + if (alloc8 == SWIG_NEWOBJ) delete[] buf8; + if (alloc10 == SWIG_NEWOBJ) delete[] buf10; return NULL; } -SWIGINTERN PyObject *_wrap_input_callback_state_extra_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_streamfile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - input_callback_state *arg1 = (input_callback_state *) 0 ; - void *arg2 = (void *) 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 *)"OO:input_callback_state_extra_set",&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); + 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 '" "input_callback_state_extra_set" "', argument " "1"" of type '" "input_callback_state *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_streamfile" "', argument " "1"" of type '" "CoreSession *""'"); } - arg1 = reinterpret_cast< input_callback_state * >(argp1); - res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN); + arg1 = reinterpret_cast< CoreSession * >(argp1); + res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "input_callback_state_extra_set" "', argument " "2"" of type '" "void *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_streamfile" "', argument " "2"" of type '" "char *""'"); } - if (arg1) (arg1)->extra = arg2; - - resultobj = SWIG_Py_Void(); + arg2 = 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); + 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_input_callback_state_extra_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_ready(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - input_callback_state *arg1 = (input_callback_state *) 0 ; - void *result = 0 ; + CoreSession *arg1 = (CoreSession *) 0 ; + bool result; void *argp1 = 0 ; int res1 = 0 ; PyObject * obj0 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"O:input_callback_state_extra_get",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); + if (!PyArg_ParseTuple(args,(char *)"O:CoreSession_ready",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "input_callback_state_extra_get" "', argument " "1"" of type '" "input_callback_state *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_ready" "', argument " "1"" of type '" "CoreSession *""'"); } - arg1 = reinterpret_cast< input_callback_state * >(argp1); - result = (void *) ((arg1)->extra); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 | 0 ); + arg1 = reinterpret_cast< CoreSession * >(argp1); + result = (bool)(arg1)->ready(); + resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_input_callback_state_funcargs_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_execute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - input_callback_state *arg1 = (input_callback_state *) 0 ; + CoreSession *arg1 = (CoreSession *) 0 ; char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; 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 *)"OO:input_callback_state_funcargs_set",&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); + if (!PyArg_ParseTuple(args,(char *)"OOO:CoreSession_execute",&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 '" "input_callback_state_funcargs_set" "', argument " "1"" of type '" "input_callback_state *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_execute" "', argument " "1"" of type '" "CoreSession *""'"); } - arg1 = reinterpret_cast< input_callback_state * >(argp1); + arg1 = reinterpret_cast< CoreSession * >(argp1); res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "input_callback_state_funcargs_set" "', argument " "2"" of type '" "char *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_execute" "', argument " "2"" of type '" "char *""'"); } arg2 = buf2; - if (arg1->funcargs) delete[] arg1->funcargs; - if (arg2) { - size_t size = strlen(arg2) + 1; - arg1->funcargs = reinterpret_cast< char* >(memcpy((new char[size]), arg2, sizeof(char)*(size))); - } else { - arg1->funcargs = 0; + res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_execute" "', argument " "3"" of type '" "char *""'"); } + arg3 = buf3; + (arg1)->execute(arg2,arg3); resultobj = SWIG_Py_Void(); 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_input_callback_state_funcargs_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_begin_allow_threads(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - input_callback_state *arg1 = (input_callback_state *) 0 ; - char *result = 0 ; + CoreSession *arg1 = (CoreSession *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject * obj0 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"O:input_callback_state_funcargs_get",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, 0 | 0 ); + if (!PyArg_ParseTuple(args,(char *)"O:CoreSession_begin_allow_threads",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "input_callback_state_funcargs_get" "', argument " "1"" of type '" "input_callback_state *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_begin_allow_threads" "', argument " "1"" of type '" "CoreSession *""'"); } - arg1 = reinterpret_cast< input_callback_state * >(argp1); - result = (char *) ((arg1)->funcargs); - resultobj = SWIG_FromCharPtr(result); + arg1 = reinterpret_cast< CoreSession * >(argp1); + (arg1)->begin_allow_threads(); + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_new_input_callback_state(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_CoreSession_end_allow_threads(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - input_callback_state *result = 0 ; + CoreSession *arg1 = (CoreSession *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; - if (!PyArg_ParseTuple(args,(char *)":new_input_callback_state")) SWIG_fail; - result = (input_callback_state *)new input_callback_state(); - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_input_callback_state, SWIG_POINTER_NEW | 0 ); + if (!PyArg_ParseTuple(args,(char *)"O:CoreSession_end_allow_threads",&obj0)) 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_end_allow_threads" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + (arg1)->end_allow_threads(); + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_delete_input_callback_state(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *CoreSession_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_CoreSession, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *_wrap_PythonDTMFCallback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - input_callback_state *arg1 = (input_callback_state *) 0 ; + switch_core_session *arg1 = (switch_core_session *) 0 ; + void *arg2 = (void *) 0 ; + switch_input_type_t arg3 ; + void *arg4 = (void *) 0 ; + unsigned int arg5 ; + switch_status_t result; void *argp1 = 0 ; int res1 = 0 ; + int res2 ; + void *argp3 ; + int res3 = 0 ; + int res4 ; + unsigned int val5 ; + int ecode5 = 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"O:delete_input_callback_state",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_input_callback_state, SWIG_POINTER_DISOWN | 0 ); + if (!PyArg_ParseTuple(args,(char *)"OOOOO:PythonDTMFCallback",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_switch_core_session, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_input_callback_state" "', argument " "1"" of type '" "input_callback_state *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PythonDTMFCallback" "', argument " "1"" of type '" "switch_core_session *""'"); } - arg1 = reinterpret_cast< input_callback_state * >(argp1); - delete arg1; - - resultobj = SWIG_Py_Void(); + arg1 = reinterpret_cast< switch_core_session * >(argp1); + res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PythonDTMFCallback" "', argument " "2"" of type '" "void *""'"); + } + { + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_switch_input_type_t, 0 | 0); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PythonDTMFCallback" "', argument " "3"" of type '" "switch_input_type_t""'"); + } + if (!argp3) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PythonDTMFCallback" "', argument " "3"" of type '" "switch_input_type_t""'"); + } else { + switch_input_type_t * temp = reinterpret_cast< switch_input_type_t * >(argp3); + arg3 = *temp; + if (SWIG_IsNewObj(res3)) delete temp; + } + } + res4 = SWIG_ConvertPtr(obj3,SWIG_as_voidptrptr(&arg4), 0, 0); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "PythonDTMFCallback" "', argument " "4"" of type '" "void *""'"); + } + ecode5 = SWIG_AsVal_unsigned_SS_int(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "PythonDTMFCallback" "', argument " "5"" of type '" "unsigned int""'"); + } + arg5 = static_cast< unsigned int >(val5); + result = PythonDTMFCallback(arg1,arg2,arg3,arg4,arg5); + resultobj = SWIG_NewPointerObj((new switch_status_t(static_cast< const switch_status_t& >(result))), SWIGTYPE_p_switch_status_t, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *input_callback_state_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_input_callback_state, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - SWIGINTERN PyObject *_wrap_new_PySession__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; @@ -4627,60 +4704,38 @@ } -SWIGINTERN PyObject *_wrap_PySession_streamfile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_PySession_setDTMFCallback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; PySession *arg1 = (PySession *) 0 ; - char *arg2 = (char *) 0 ; - PyObject *arg3 = (PyObject *) 0 ; - char *arg4 = (char *) 0 ; - int arg5 ; - int result; + PyObject *arg2 = (PyObject *) 0 ; + char *arg3 = (char *) 0 ; void *argp1 = 0 ; int res1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; - int res4 ; - char *buf4 = 0 ; - int alloc4 = 0 ; - int val5 ; - int ecode5 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOOO:PySession_streamfile",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:PySession_setDTMFCallback",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PySession, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySession_streamfile" "', argument " "1"" of type '" "PySession *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySession_setDTMFCallback" "', argument " "1"" of type '" "PySession *""'"); } arg1 = reinterpret_cast< PySession * >(argp1); - res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PySession_streamfile" "', argument " "2"" of type '" "char *""'"); - } - arg2 = buf2; - arg3 = obj2; - res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "PySession_streamfile" "', argument " "4"" of type '" "char *""'"); + arg2 = obj1; + res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PySession_setDTMFCallback" "', argument " "3"" of type '" "char *""'"); } - arg4 = buf4; - ecode5 = SWIG_AsVal_int(obj4, &val5); - if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "PySession_streamfile" "', argument " "5"" of type '" "int""'"); - } - arg5 = static_cast< int >(val5); - result = (int)(arg1)->streamfile(arg2,arg3,arg4,arg5); - resultobj = SWIG_From_int(static_cast< int >(result)); - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; - if (alloc4 == SWIG_NEWOBJ) delete[] buf4; + arg3 = buf3; + (arg1)->setDTMFCallback(arg2,arg3); + resultobj = SWIG_Py_Void(); + if (alloc3 == SWIG_NEWOBJ) delete[] buf3; return resultobj; fail: - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; - if (alloc4 == SWIG_NEWOBJ) delete[] buf4; + if (alloc3 == SWIG_NEWOBJ) delete[] buf3; return NULL; } @@ -4740,12 +4795,25 @@ { (char *)"api_execute", _wrap_api_execute, METH_VARARGS, NULL}, { (char *)"api_reply_delete", _wrap_api_reply_delete, METH_VARARGS, NULL}, { (char *)"process_callback_result", _wrap_process_callback_result, METH_VARARGS, NULL}, + { (char *)"input_callback_state_function_set", _wrap_input_callback_state_function_set, METH_VARARGS, NULL}, + { (char *)"input_callback_state_function_get", _wrap_input_callback_state_function_get, METH_VARARGS, NULL}, + { (char *)"input_callback_state_threadState_set", _wrap_input_callback_state_threadState_set, METH_VARARGS, NULL}, + { (char *)"input_callback_state_threadState_get", _wrap_input_callback_state_threadState_get, METH_VARARGS, NULL}, + { (char *)"input_callback_state_extra_set", _wrap_input_callback_state_extra_set, METH_VARARGS, NULL}, + { (char *)"input_callback_state_extra_get", _wrap_input_callback_state_extra_get, METH_VARARGS, NULL}, + { (char *)"input_callback_state_funcargs_set", _wrap_input_callback_state_funcargs_set, METH_VARARGS, NULL}, + { (char *)"input_callback_state_funcargs_get", _wrap_input_callback_state_funcargs_get, METH_VARARGS, NULL}, + { (char *)"new_input_callback_state", _wrap_new_input_callback_state, METH_VARARGS, NULL}, + { (char *)"delete_input_callback_state", _wrap_delete_input_callback_state, METH_VARARGS, NULL}, + { (char *)"input_callback_state_swigregister", input_callback_state_swigregister, METH_VARARGS, NULL}, { (char *)"new_CoreSession", _wrap_new_CoreSession, METH_VARARGS, NULL}, { (char *)"delete_CoreSession", _wrap_delete_CoreSession, METH_VARARGS, NULL}, { (char *)"CoreSession_session_set", _wrap_CoreSession_session_set, METH_VARARGS, NULL}, { (char *)"CoreSession_session_get", _wrap_CoreSession_session_get, METH_VARARGS, NULL}, { (char *)"CoreSession_channel_set", _wrap_CoreSession_channel_set, METH_VARARGS, NULL}, { (char *)"CoreSession_channel_get", _wrap_CoreSession_channel_get, METH_VARARGS, NULL}, + { (char *)"CoreSession_cb_state_set", _wrap_CoreSession_cb_state_set, METH_VARARGS, NULL}, + { (char *)"CoreSession_cb_state_get", _wrap_CoreSession_cb_state_get, METH_VARARGS, NULL}, { (char *)"CoreSession_answer", _wrap_CoreSession_answer, METH_VARARGS, NULL}, { (char *)"CoreSession_preAnswer", _wrap_CoreSession_preAnswer, METH_VARARGS, NULL}, { (char *)"CoreSession_hangup", _wrap_CoreSession_hangup, METH_VARARGS, NULL}, @@ -4753,31 +4821,21 @@ { (char *)"CoreSession_getVariable", _wrap_CoreSession_getVariable, METH_VARARGS, NULL}, { (char *)"CoreSession_playFile", _wrap_CoreSession_playFile, METH_VARARGS, NULL}, { (char *)"CoreSession_setDTMFCallback", _wrap_CoreSession_setDTMFCallback, METH_VARARGS, NULL}, - { (char *)"CoreSession_speakText", _wrap_CoreSession_speakText, 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_ready", _wrap_CoreSession_ready, METH_VARARGS, NULL}, { (char *)"CoreSession_execute", _wrap_CoreSession_execute, METH_VARARGS, NULL}, { (char *)"CoreSession_begin_allow_threads", _wrap_CoreSession_begin_allow_threads, METH_VARARGS, NULL}, { (char *)"CoreSession_end_allow_threads", _wrap_CoreSession_end_allow_threads, METH_VARARGS, NULL}, { (char *)"CoreSession_swigregister", CoreSession_swigregister, METH_VARARGS, NULL}, { (char *)"PythonDTMFCallback", _wrap_PythonDTMFCallback, METH_VARARGS, NULL}, - { (char *)"input_callback_state_function_set", _wrap_input_callback_state_function_set, METH_VARARGS, NULL}, - { (char *)"input_callback_state_function_get", _wrap_input_callback_state_function_get, METH_VARARGS, NULL}, - { (char *)"input_callback_state_threadState_set", _wrap_input_callback_state_threadState_set, METH_VARARGS, NULL}, - { (char *)"input_callback_state_threadState_get", _wrap_input_callback_state_threadState_get, METH_VARARGS, NULL}, - { (char *)"input_callback_state_extra_set", _wrap_input_callback_state_extra_set, METH_VARARGS, NULL}, - { (char *)"input_callback_state_extra_get", _wrap_input_callback_state_extra_get, METH_VARARGS, NULL}, - { (char *)"input_callback_state_funcargs_set", _wrap_input_callback_state_funcargs_set, METH_VARARGS, NULL}, - { (char *)"input_callback_state_funcargs_get", _wrap_input_callback_state_funcargs_get, METH_VARARGS, NULL}, - { (char *)"new_input_callback_state", _wrap_new_input_callback_state, METH_VARARGS, NULL}, - { (char *)"delete_input_callback_state", _wrap_delete_input_callback_state, METH_VARARGS, NULL}, - { (char *)"input_callback_state_swigregister", input_callback_state_swigregister, METH_VARARGS, NULL}, { (char *)"new_PySession", _wrap_new_PySession, METH_VARARGS, NULL}, { (char *)"delete_PySession", _wrap_delete_PySession, METH_VARARGS, NULL}, - { (char *)"PySession_streamfile", _wrap_PySession_streamfile, METH_VARARGS, NULL}, + { (char *)"PySession_setDTMFCallback", _wrap_PySession_setDTMFCallback, METH_VARARGS, NULL}, { (char *)"PySession_begin_allow_threads", _wrap_PySession_begin_allow_threads, METH_VARARGS, NULL}, { (char *)"PySession_end_allow_threads", _wrap_PySession_end_allow_threads, METH_VARARGS, NULL}, { (char *)"PySession_swigregister", PySession_swigregister, METH_VARARGS, NULL}, @@ -4792,7 +4850,6 @@ } static swig_type_info _swigt__p_CoreSession = {"_p_CoreSession", "CoreSession *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_PySession = {"_p_PySession", "PySession *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_PyThreadState = {"_p_PyThreadState", "PyThreadState *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_input_callback_state = {"_p_input_callback_state", "input_callback_state *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_switch_channel_t = {"_p_switch_channel_t", "switch_channel_t *", 0, 0, (void*)0, 0}; @@ -4807,7 +4864,6 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_CoreSession, &_swigt__p_PySession, - &_swigt__p_PyThreadState, &_swigt__p_char, &_swigt__p_input_callback_state, &_swigt__p_switch_channel_t, @@ -4822,7 +4878,6 @@ static swig_cast_info _swigc__p_CoreSession[] = { {&_swigt__p_CoreSession, 0, 0, 0}, {&_swigt__p_PySession, _p_PySessionTo_p_CoreSession, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_PySession[] = { {&_swigt__p_PySession, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_PyThreadState[] = { {&_swigt__p_PyThreadState, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_input_callback_state[] = { {&_swigt__p_input_callback_state, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_switch_channel_t[] = { {&_swigt__p_switch_channel_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -4837,7 +4892,6 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_CoreSession, _swigc__p_PySession, - _swigc__p_PyThreadState, _swigc__p_char, _swigc__p_input_callback_state, _swigc__p_switch_channel_t, Modified: freeswitch/branches/greenlizard/src/switch_cpp.cpp ============================================================================== --- freeswitch/branches/greenlizard/src/switch_cpp.cpp (original) +++ freeswitch/branches/greenlizard/src/switch_cpp.cpp Tue Jun 5 14:11:00 2007 @@ -17,11 +17,12 @@ } } -CoreSession::CoreSession(switch_core_session_t *session) +CoreSession::CoreSession(switch_core_session_t *session_p) { init_vars(); - channel = switch_core_session_get_channel(session); - switch_core_session_read_lock(session); + channel = switch_core_session_get_channel(session_p); + switch_core_session_read_lock(session_p); + this->session = session_p; } CoreSession::~CoreSession() @@ -86,20 +87,25 @@ 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); begin_allow_threads(); - status = switch_ivr_play_file(session, NULL, file, ap); + status = switch_ivr_play_file(session, &fh, file, ap); end_allow_threads(); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } -void CoreSession::setDTMFCallback(switch_input_callback_function_t cb, void *buf, uint32_t buflen) +void CoreSession::setDTMFCallback(switch_input_callback_function_t cb, + void *buf, + uint32_t buflen) { sanity_check(); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "CoreSession::setDTMFCallback."); if (cb) { args.buf = buf; args.buflen = buflen; @@ -111,7 +117,8 @@ } } -int CoreSession::speakText(char *text) + +int CoreSession::speak(char *text) { switch_status_t status; switch_codec_t *codec; @@ -133,12 +140,22 @@ voice_name = strdup(voice_name_p); } -int CoreSession::getDigits(char *dtmf_buf, int len, char *terminators, char *terminator, int timeout) +int CoreSession::getDigits(char *dtmf_buf, + int len, + char *terminators, + char *terminator, + int timeout) { switch_status_t status; sanity_check(-1); begin_allow_threads(); - status = switch_ivr_collect_digits_count(session, dtmf_buf,(uint32_t) len,(uint32_t) len, terminators, terminator, (uint32_t) timeout); + status = switch_ivr_collect_digits_count(session, + dtmf_buf, + (uint32_t) len, + (uint32_t) len, + terminators, + terminator, + (uint32_t) timeout); end_allow_threads(); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } @@ -151,8 +168,15 @@ return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } -int CoreSession::playAndGetDigits(int min_digits, int max_digits, int max_tries, int timeout, char *terminators, - char *audio_files, char *bad_input_audio_files, char *dtmf_buf, char *digits_regex) +int CoreSession::playAndGetDigits(int min_digits, + int max_digits, + int max_tries, + int timeout, + char *terminators, + char *audio_files, + char *bad_input_audio_files, + char *dtmf_buf, + char *digits_regex) { switch_status_t status; sanity_check(-1); @@ -171,16 +195,64 @@ return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } -int CoreSession::streamfile(char *file, void *cb_func, char *funcargs, int starting_sample_count) { - return 0; +int CoreSession::streamfile(char *file, int starting_sample_count) { + + switch_status_t status; + switch_file_handle_t fh = { 0 }; + unsigned int samps; + unsigned int pos = 0; + + sanity_check(-1); + fh.samples = starting_sample_count; + store_file_handle(&fh); + + begin_allow_threads(); + status = switch_ivr_play_file(session, &fh, file, ap); + end_allow_threads(); + + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; + +} + +bool CoreSession::ready() { + + switch_channel_t *channel; + + if (!session) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "You must call the session.originate method before calling this method!\n"); + return false; + } + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + return switch_channel_ready(channel) != 0; + + } void CoreSession::begin_allow_threads() { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "CoreSession::begin_allow_threads() called and does nothing\n"); } void CoreSession::end_allow_threads() { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "CoreSession::end_allow_threads() called and does nothing\n"); } +/** \brief Store a file handle in the callback args + * + * In a few of the methods like playFile and streamfile, + * an empty switch_file_handle_t is created and passed + * to core, and stored in callback args so that the callback + * handler can retrieve it for pausing, ff, rewinding file ptr. + * + * \param fh - a switch_file_handle_t + */ +void CoreSession::store_file_handle(switch_file_handle_t *fh) { + cb_state.extra = fh; // set a file handle so callback handler can pause + args.buf = &cb_state; + ap = &args; +} /* For Emacs:

1 0

[commit] r5266 - in freeswitch/branches/greenlizard: . scripts scripts/socket/socket2me src src/include src/mod/applications/mod_dptools src/mod/applications/mod_esf src/mod/endpoints/mod_alsa src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Jun '07

05 Jun '07

Author: greenlizard Date: Tue Jun 5 12:36:58 2007 New Revision: 5266 Modified: freeswitch/branches/greenlizard/ (props changed) freeswitch/branches/greenlizard/scripts/mytest.py freeswitch/branches/greenlizard/scripts/socket/socket2me/socket2me.c freeswitch/branches/greenlizard/src/include/switch_ivr.h freeswitch/branches/greenlizard/src/include/switch_types.h freeswitch/branches/greenlizard/src/include/switch_utils.h freeswitch/branches/greenlizard/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/branches/greenlizard/src/mod/applications/mod_esf/ (props changed) freeswitch/branches/greenlizard/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/branches/greenlizard/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/sofia.c freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/branches/greenlizard/src/switch_apr.c freeswitch/branches/greenlizard/src/switch_ivr_async.c Log: merge in changes from trunk 5240 to 5265 plus one trivial change: add comments to mytest.py Modified: freeswitch/branches/greenlizard/scripts/mytest.py ============================================================================== --- freeswitch/branches/greenlizard/scripts/mytest.py (original) +++ freeswitch/branches/greenlizard/scripts/mytest.py Tue Jun 5 12:36:58 2007 @@ -1,18 +1,32 @@ -import sys -from _freeswitch import * -print "Hello World" -print sys.path -print dir() -print sys.argv +# WARNING: May be out of date, please see +# http://wiki.freeswitch.org/wiki/Mod_python +# before reporting errors -uuid = sys.argv[0] -fs_consol_log("1","test from my python program\n") -fs_consol_clean("This is fs_consol_clean\n") -fs_consol_clean("My uuid is " + uuid + "\n") +import sys, time +def onDTMF(input, itype, buf, buflen): + print "input=",input + print "itype=",itype + print "buf=",buf + print "buflen",buflen + if input == "#": + return 1 + else: + return 0 +console_log("1","test from my python program\n") +session.answer() +session.setDTMFCallback(onDTMF) +session.set_tts_parms("cepstral", "david") +session.playFile("/root/test.gsm", "") +session.speakText("Please enter telephone number with area code and press pound sign. ") +input = session.getDigits("", 11, "*#", 10000) +console_log("1","result from get digits is "+ input +"\n") +phone_number = session.playAndGetDigits(5, 11, 3, 10000, "*#", + "/sounds/test.gsm", + "/sounds/invalid.gsm", + "", + "^17771112222$"); +console_log("1","result from play_and_get_digits is "+ phone_number +"\n") +session.transfer("1000", "XML", "default") +session.hangup("1") -session = fs_core_session_locate(uuid) - -fs_channel_answer(session) - -fs_switch_ivr_session_transfer(session, "1234", "XML", "default") Modified: freeswitch/branches/greenlizard/scripts/socket/socket2me/socket2me.c ============================================================================== --- freeswitch/branches/greenlizard/scripts/socket/socket2me/socket2me.c (original) +++ freeswitch/branches/greenlizard/scripts/socket/socket2me/socket2me.c Tue Jun 5 12:36:58 2007 @@ -248,7 +248,7 @@ addr.sin_family = AF_INET; addr.sin_addr.s_addr = htonl(INADDR_ANY); - sendaddr.sin_addr.s_addr = inet_addr(remote_ip); + /*addr.sin_addr.s_addr = inet_addr(remote_ip);*/ addr.sin_port = htons(remote_port); sendaddr.sin_family = AF_INET; @@ -316,7 +316,7 @@ continue; } - if ((read_bytes = recvfrom(usock, audiobuf, sizeof(audiobuf), 0, (struct sockaddr *) &local_addr, &cliAddrLen)) < 0) { + if ((read_bytes = recvfrom(usock, audiobuf, sizeof(audiobuf), 0, (struct sockaddr *) &local_addr, cliAddrLen)) < 0) { die("recvfrom() failed"); } Modified: freeswitch/branches/greenlizard/src/include/switch_ivr.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_ivr.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_ivr.h Tue Jun 5 12:36:58 2007 @@ -25,7 +25,7 @@ * * Anthony Minessale II <anthmct(a)yahoo.com> * Neal Horman <neal at wanlink dot com> - * + * Bret McDanel <trixter AT 0xdecafbad dot com> * * switch_ivr.h -- IVR Library * @@ -208,11 +208,44 @@ */ SWITCH_DECLARE(switch_status_t) switch_ivr_stop_record_session(switch_core_session_t *session, char *file); +/*! + \brief Start looking for DTMF inband + \param session the session to start looking + \return SWITCH_STATUS_SUCCESS if all is well +*/ SWITCH_DECLARE(switch_status_t) switch_ivr_inband_dtmf_session(switch_core_session_t *session); + +/*! + \brief Stop looking for DTMF inband + \param session the session to stop looking + \return SWITCH_STATUS_SUCCESS if all is well +*/ SWITCH_DECLARE(switch_status_t) switch_ivr_stop_inband_dtmf_session(switch_core_session_t *session); + +/*! + \brief XXX DESCRIBE ME + \param session the session to act on + \return SWITCH_STATUS_SUCCESS if all is well - maybe more XXX FIXME +*/ SWITCH_DECLARE(void) switch_ivr_session_echo(switch_core_session_t *session); /*! + \brief Stop looking for FAX CNG + \param session the session to stop looking + \return SWITCH_STATUS_SUCCESS if all is well +*/ +SWITCH_DECLARE(switch_status_t) switch_ivr_stop_fax_detect_session(switch_core_session_t *session); + +/*! + \brief Start looking for FAX CNG + \param session the session to start looking + \return SWITCH_STATUS_SUCCESS if all is well +*/ +SWITCH_DECLARE(switch_status_t) switch_ivr_fax_detect_session(switch_core_session_t *session); + + + +/*! \brief play a file from the disk to the session \param session the session to play the file too \param fh file handle to use (NULL for builtin one) Modified: freeswitch/branches/greenlizard/src/include/switch_types.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_types.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_types.h Tue Jun 5 12:36:58 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Bret McDanel <trixter AT 0xdecafbad dot com> * * switch_types.h -- Data Types * @@ -832,6 +833,7 @@ SWITCH_EVENT_CODEC - Codec Change SWITCH_EVENT_BACKGROUND_JOB - Background Job SWITCH_EVENT_DETECTED_SPEECH - Detected Speech + SWITCH_EVENT_DETECTED_FAX - Detected Fax CNG Tone SWITCH_EVENT_PRIVATE_COMMAND - A private command event SWITCH_EVENT_HEARTBEAT - Machine is alive SWITCH_EVENT_TRAP - Error Trap @@ -881,6 +883,7 @@ SWITCH_EVENT_CODEC, SWITCH_EVENT_BACKGROUND_JOB, SWITCH_EVENT_DETECTED_SPEECH, + SWITCH_EVENT_DETECTED_FAX, SWITCH_EVENT_PRIVATE_COMMAND, SWITCH_EVENT_HEARTBEAT, SWITCH_EVENT_TRAP, Modified: freeswitch/branches/greenlizard/src/include/switch_utils.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_utils.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_utils.h Tue Jun 5 12:36:58 2007 @@ -175,6 +175,16 @@ */ #define switch_copy_flags(dest, src, flags) (dest)->flags &= ~(flags); (dest)->flags |= ((src)->flags & (flags)) +#define switch_set_string(_dst, _src) switch_copy_string(_dst, _src, sizeof(_dst)) + +static __inline__ void switch_clean_string(char *s) +{ char *p; + + for (p = s; p && *p; p++) { uint8_t x = (uint8_t) *p; if (x < 32 || x > 127) { *p = ' '; } + } +} + + /*! \brief Free a pointer and set it to NULL unless it already is NULL Modified: freeswitch/branches/greenlizard/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/branches/greenlizard/src/mod/applications/mod_dptools/mod_dptools.c Tue Jun 5 12:36:58 2007 @@ -27,6 +27,7 @@ * Ken Rice, Asteria Solutions Group, Inc <ken(a)asteriasgi.com> * Michael Murdock <mike at mmurdock dot org> * Neal Horman <neal at wanlink dot com> + * Bret McDanel <trixter AT 0xdecafbad dot com> * * mod_dptools.c -- Raw Audio File Streaming Application Module * @@ -649,6 +650,30 @@ } +static void dtm_session_function(switch_core_session_t *session, char *data) +{ + switch_ivr_inband_dtmf_session(session); +} + + +static void stop_dtmf_session_function(switch_core_session_t *session, char *data) +{ + switch_ivr_stop_inband_dtmf_session(session); +} + +static void fax_detect_session_function(switch_core_session_t *session, char *data) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Enabling fax detection\n"); + switch_ivr_fax_detect_session(session); +} + +static void stop_fax_detect_session_function(switch_core_session_t *session, char *data) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Disabling fax detection\n"); + switch_ivr_stop_fax_detect_session(session); +} + + static const switch_api_interface_t strepoch_api_interface = { /*.interface_name */ "strepoch", /*.desc */ "Convert a date string into epoch time", @@ -682,6 +707,46 @@ }; +static const switch_application_interface_t fax_detect_application_interface = { + /*.interface_name */ "fax_detect", + /*.application_function */ fax_detect_session_function, + /* long_desc */ "Detect fax send tone", + /* short_desc */ "Detect faxes", + /* syntax */ "", + /* flags */ SAF_NONE, + /*.next */ NULL +}; + +static const switch_application_interface_t stop_fax_detect_application_interface = { + /*.interface_name */ "stop_fax_detect", + /*.application_function */ stop_fax_detect_session_function, + /* long_desc */ "Stop detecting fax send tones", + /* short_desc */ "stop detecting faxes", + /* syntax */ "", + /* flags */ SAF_NONE, + /* next */ &fax_detect_application_interface +}; + +static const switch_application_interface_t dtmf_application_interface = { + /*.interface_name */ "start_dtmf", + /*.application_function */ dtm_session_function, + /* long_desc */ "Detect inband dtmf on the session", + /* short_desc */ "Detect dtmf", + /* syntax */ "", + /* flags */ SAF_NONE, + /* next */ &stop_fax_detect_application_interface +}; + +static const switch_application_interface_t stop_dtmf_application_interface = { + /*.interface_name */ "stop_dtmf", + /*.application_function */ stop_dtmf_session_function, + /* long_desc */ "Stop detecting inband dtmf.", + /* short_desc */ "stop inband dtmf.", + /* syntax */ "", + /* flags */ SAF_NONE, + &dtmf_application_interface +}; + static const switch_application_interface_t exe_application_interface = { /*.interface_name */ "execute_extension", /*.application_function */ exe_function, @@ -689,7 +754,7 @@ /*.short_desc */ "Execute an extension", /*.syntax */ "<extension> <dialplan> <context>", /* flags */ SAF_SUPPORT_NOMEDIA, - /*.next */ + /*.next */ &stop_dtmf_application_interface }; static const switch_application_interface_t sched_transfer_application_interface = { Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_alsa/mod_alsa.c Tue Jun 5 12:36:58 2007 @@ -152,7 +152,8 @@ static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig); static switch_status_t engage_device(unsigned int samplerate, int codec_ms); static switch_status_t load_config(void); -static switch_status_t pa_cmd(char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); +SWITCH_STANDARD_API(pa_cmd); + /* @@ -1529,7 +1530,7 @@ char *mycmd = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; pa_command_t func = NULL; - int lead = 1, devval = 0; + int lead = 1; char *wcmd = NULL, *action = NULL; char cmd_buf[1024] = ""; char *http = NULL; Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Jun 5 12:36:58 2007 @@ -439,7 +439,7 @@ } if (f_host && (profile = switch_core_hash_find(globals.profile_hash, f_host))) { - if (to && (sql = switch_mprintf("select * from jabber_subscriptions where sub_to='%q'", to))) { + if (to && (sql = switch_mprintf("select * from jabber_subscriptions where sub_to='%q' and sub_from='%q'", to, from))) { mdl_execute_sql_callback(profile, profile->mutex, sql, sin_callback, profile); switch_safe_free(sql); } @@ -1599,7 +1599,7 @@ static switch_api_interface_t debug_api_interface = { /*.interface_name */ "dl_debug", - /*.desc */ "DingaLing Presence", + /*.desc */ "DingaLing Debug", /*.function */ dl_debug, /*.syntax */ "dl_debug [true|false]", /*.next */ NULL Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/sofia.c Tue Jun 5 12:36:58 2007 @@ -581,8 +581,9 @@ switch_set_flag(gateway, REG_FLAG_CALLERID); } gateway->register_from = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, from_domain); - gateway->register_contact = switch_core_sprintf(gateway->pool, "sip:%s@%s:%d", extension, profile->sipip, profile->sip_port); - + gateway->register_contact = switch_core_sprintf(gateway->pool, "sip:%s@%s:%d", extension, + profile->extsipip ? profile->extsipip : profile->sipip, profile->sip_port); + if (!strncasecmp(proxy, "sip:", 4)) { gateway->register_proxy = switch_core_strdup(gateway->pool, proxy); gateway->register_to = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, proxy + 4); @@ -600,7 +601,6 @@ } gateway->freq -= 2; - if ((gp = sofia_reg_find_gateway(gateway->name))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring duplicate gateway '%s'\n", gateway->name); sofia_reg_release_gateway(gp); @@ -608,7 +608,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring duplicate uri '%s'\n", gateway->register_from); sofia_reg_release_gateway(gp); } else if ((gp=sofia_reg_find_gateway(gateway->register_contact))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring duplicate contact '%s'\n", gateway->register_from); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring duplicate contact '%s'\n", gateway->register_contact); sofia_reg_release_gateway(gp); } else { gateway->next = profile->gateways; Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/sofia_reg.c Tue Jun 5 12:36:58 2007 @@ -66,7 +66,7 @@ case REG_STATE_NOREG: break; case REG_STATE_REGISTER: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "registered %s\n", gateway_ptr->name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "registered %s\n", gateway_ptr->name); gateway_ptr->expires = now + gateway_ptr->freq; gateway_ptr->state = REG_STATE_REGED; break; Modified: freeswitch/branches/greenlizard/src/switch_apr.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_apr.c (original) +++ freeswitch/branches/greenlizard/src/switch_apr.c Tue Jun 5 12:36:58 2007 @@ -339,6 +339,7 @@ { va_list ap; int ret; + va_start(ap, format); ret = apr_file_printf(thefile, format, ap); va_end(ap); return ret; Modified: freeswitch/branches/greenlizard/src/switch_ivr_async.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_ivr_async.c (original) +++ freeswitch/branches/greenlizard/src/switch_ivr_async.c Tue Jun 5 12:36:58 2007 @@ -25,6 +25,7 @@ * * Anthony Minessale II <anthmct(a)yahoo.com> * Michael Jerris <mike(a)jerris.com> + * Bret McDanel <bret AT 0xdecafbad dot com> * * switch_ivr_async.c -- IVR Library (async operations) * @@ -324,6 +325,122 @@ return SWITCH_STATUS_SUCCESS; } + +typedef struct { + switch_core_session_t *session; + teletone_multi_tone_t mt; +} switch_fax_detect_t; + +static switch_bool_t fax_detect_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) +{ + switch_fax_detect_t *pvt = (switch_fax_detect_t *) user_data; + uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE]; + switch_frame_t frame = { 0 }; + // switch_channel_t *channel = switch_core_session_get_channel(pvt->session); + + // assert(channel != NULL); + frame.data = data; + frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; + + switch (type) { + case SWITCH_ABC_TYPE_INIT: + break; + case SWITCH_ABC_TYPE_CLOSE: + break; + case SWITCH_ABC_TYPE_READ: + if (switch_core_media_bug_read(bug, &frame) == SWITCH_STATUS_SUCCESS) { + if(teletone_multi_tone_detect(&pvt->mt, frame.data, frame.samples)) { + switch_event_t *event; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FAX CNG DETECTED\n"); + + if (switch_event_create(&event, SWITCH_EVENT_DETECTED_FAX) == SWITCH_STATUS_SUCCESS) { + switch_event_t *dup; + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "fax", "detected"); + + if (switch_event_dup(&dup, event) == SWITCH_STATUS_SUCCESS) { + switch_event_fire(&dup); + } + + + if (switch_core_session_queue_event(pvt->session, &event) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Event queue failed!\n"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true"); + switch_event_fire(&event); + } + } + } + } + break; + case SWITCH_ABC_TYPE_WRITE: + default: + break; + } + return SWITCH_TRUE; +} + +SWITCH_DECLARE(switch_status_t) switch_ivr_stop_fax_detect_session(switch_core_session_t *session) +{ + switch_media_bug_t *bug; + switch_channel_t *channel = switch_core_session_get_channel(session); + + assert(channel != NULL); + if ((bug = switch_channel_get_private(channel, "fax"))) { + switch_channel_set_private(channel, "fax", NULL); + switch_core_media_bug_remove(session, &bug); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; + +} + +SWITCH_DECLARE(switch_status_t) switch_ivr_fax_detect_session(switch_core_session_t *session) +{ + switch_channel_t *channel; + switch_codec_t *read_codec; + switch_media_bug_t *bug; + switch_status_t status; + switch_fax_detect_t *pvt; + teletone_tone_map_t *map; + int i; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + + read_codec = switch_core_session_get_read_codec(session); + assert(read_codec != NULL); + + if (!(pvt = switch_core_session_alloc(session, sizeof(*pvt)))) { + return SWITCH_STATUS_MEMERR; + } + + if (!(map = switch_core_session_alloc(session, sizeof(*map)))) { + return SWITCH_STATUS_MEMERR; + } + + for(i=0;i<TELETONE_MAX_TONES;i++) { + map->freqs[i] = 1100.0; + } + pvt->mt.sample_rate = read_codec->implementation->samples_per_second; + pvt->session = session; + + teletone_multi_tone_init(&pvt->mt, map); + + switch_channel_answer(channel); + + if ((status = switch_core_media_bug_add(session, fax_detect_callback, pvt, 0, SMBF_READ_STREAM, &bug)) != SWITCH_STATUS_SUCCESS) { + return status; + } + + switch_channel_set_private(channel, "fax", bug); + + return SWITCH_STATUS_SUCCESS; +} + + struct speech_thread_handle { switch_core_session_t *session; switch_asr_handle_t *ah;

1 0

[commit] r5264 - freeswitch/branches/greenlizard
by Freeswitch SVN 05 Jun '07

05 Jun '07

Author: greenlizard Date: Tue Jun 5 12:10:57 2007 New Revision: 5264 Modified: freeswitch/branches/greenlizard/configure.in Log: merge in changes from trunk 5202 to 5240. accidentally forgot to commit this file in previous two commits. Modified: freeswitch/branches/greenlizard/configure.in ============================================================================== --- freeswitch/branches/greenlizard/configure.in (original) +++ freeswitch/branches/greenlizard/configure.in Tue Jun 5 12:10:57 2007 @@ -139,6 +139,9 @@ *-solaris2*) APR_ADDTO(SWITCH_AM_CFLAGS, -DPATH_MAX=2048) ;; + *bsd*) + APR_ADDTO(SWITCH_AM_CFLAGS, -I/usr/local/include) + ;; esac APR_REMOVEFROM(SWITCH_AM_CXXFLAGS, -std=c99)

1 0

[commit] r5263 - in freeswitch/branches/greenlizard/libs: iax/src js/nsprpub/pr/src/io js/nsprpub/pr/src/misc js/nsprpub/pr/src/pthreads libedit libedit/src
by Freeswitch SVN 05 Jun '07

05 Jun '07

Author: greenlizard Date: Tue Jun 5 12:03:00 2007 New Revision: 5263 Modified: freeswitch/branches/greenlizard/libs/iax/src/iax.c freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prfdcach.c freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prlog.c freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/misc/prinit.c freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/pthreads/ptthread.c freeswitch/branches/greenlizard/libs/libedit/Makefile.am freeswitch/branches/greenlizard/libs/libedit/src/el.c freeswitch/branches/greenlizard/libs/libedit/src/sig.c freeswitch/branches/greenlizard/libs/libedit/src/sig.h freeswitch/branches/greenlizard/libs/libedit/src/term.c freeswitch/branches/greenlizard/libs/libedit/src/unvis.c freeswitch/branches/greenlizard/libs/libedit/src/vi.c freeswitch/branches/greenlizard/libs/libedit/src/vis.c Log: merge in changes from trunk 5202 to 5240. accidentally forgot to commit the libs directory on last commit. Modified: freeswitch/branches/greenlizard/libs/iax/src/iax.c ============================================================================== --- freeswitch/branches/greenlizard/libs/iax/src/iax.c (original) +++ freeswitch/branches/greenlizard/libs/iax/src/iax.c Tue Jun 5 12:03:00 2007 @@ -140,7 +140,7 @@ /* Max timeouts */ static int maxretries = 10; -/* configurable jitterbuffer options */ +/* configurable jitterbuffer options */ static long jb_target_extra = -1; static int do_shutdown = 0; @@ -948,11 +948,11 @@ return do_shutdown++; } -void iax_set_jb_target_extra( long value ) -{ - /* store in jb_target_extra, a static global */ - jb_target_extra = value ; -} +void iax_set_jb_target_extra( long value ) +{ + /* store in jb_target_extra, a static global */ + jb_target_extra = value ; +} int iax_init(char *ip, int preferredportno) { @@ -979,33 +979,33 @@ return -1; } - if (preferredportno == 0) preferredportno = IAX_DEFAULT_PORTNO; - if (preferredportno < 0) preferredportno = 0; - - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = 0; - sin.sin_port = htons((short)preferredportno); - if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) - { -#if defined(WIN32) || defined(_WIN32_WCE) - if (WSAGetLastError() == WSAEADDRINUSE) -#else - if (errno == EADDRINUSE) -#endif - { - /*the port is already in use, so bind to a free port chosen by the IP stack*/ - DEBU(G "Unable to bind to preferred port - port is in use. Trying to bind to a free one"); - sin.sin_port = htons((short)0); - if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) - { - IAXERROR "Unable to bind UDP socket\n"); - return -1; - } - } else - { - IAXERROR "Unable to bind UDP socket\n"); - return -1; - } + if (preferredportno == 0) preferredportno = IAX_DEFAULT_PORTNO; + if (preferredportno < 0) preferredportno = 0; + + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = 0; + sin.sin_port = htons((short)preferredportno); + if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) + { +#if defined(WIN32) || defined(_WIN32_WCE) + if (WSAGetLastError() == WSAEADDRINUSE) +#else + if (errno == EADDRINUSE) +#endif + { + /*the port is already in use, so bind to a free port chosen by the IP stack*/ + DEBU(G "Unable to bind to preferred port - port is in use. Trying to bind to a free one"); + sin.sin_port = htons((short)0); + if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) + { + IAXERROR "Unable to bind UDP socket\n"); + return -1; + } + } else + { + IAXERROR "Unable to bind UDP socket\n"); + return -1; + } } sinlen = sizeof(sin); if (getsockname(netfd, (struct sockaddr *) &sin, &sinlen) < 0) { @@ -1587,12 +1587,12 @@ iax_send_pong(event->session, event->ts); iax_event_free(event); break; - case IAX_EVENT_POKE: - event->etype = IAX_EVENT_PONG; - iax_send_pong(event->session, event->ts); - iax_destroy(event->session); - iax_event_free(event); - break; + case IAX_EVENT_POKE: + event->etype = IAX_EVENT_PONG; + iax_send_pong(event->session, event->ts); + iax_destroy(event->session); + iax_event_free(event); + break; default: return event; } @@ -2702,9 +2702,9 @@ e->ts = ts; e = schedule_delivery(e, ts, updatehistory); break; - case IAX_COMMAND_POKE: - e->etype = IAX_EVENT_POKE; - e->ts = ts; + case IAX_COMMAND_POKE: + e->etype = IAX_EVENT_POKE; + e->ts = ts; break; case IAX_COMMAND_PING: /* PINGS and PONGS don't get scheduled; */ Modified: freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prfdcach.c ============================================================================== --- freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prfdcach.c (original) +++ freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prfdcach.c Tue Jun 5 12:03:00 2007 @@ -259,8 +259,8 @@ ** be overridden at runtime using environment variables ** or a super-wiz-bang API. */ - //const char *low = PR_GetEnv("NSPR_FD_CACHE_SIZE_LOW"); - //const char *high = PR_GetEnv("NSPR_FD_CACHE_SIZE_HIGH"); + /* const char *low = PR_GetEnv("NSPR_FD_CACHE_SIZE_LOW"); */ + /* const char *high = PR_GetEnv("NSPR_FD_CACHE_SIZE_HIGH"); */ /* ** _low is allowed to be zero, _high is not. @@ -274,8 +274,8 @@ _pr_fd_cache.limit_high = 0; #endif /* defined(DEBUG) */ - //if (NULL != low) _pr_fd_cache.limit_low = atoi(low); - //if (NULL != high) _pr_fd_cache.limit_high = atoi(high); + /*if (NULL != low) _pr_fd_cache.limit_low = atoi(low);*/ + /*if (NULL != high) _pr_fd_cache.limit_high = atoi(high);*/ if (_pr_fd_cache.limit_high < _pr_fd_cache.limit_low) _pr_fd_cache.limit_high = _pr_fd_cache.limit_low; Modified: freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prlog.c ============================================================================== --- freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prlog.c (original) +++ freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/io/prlog.c Tue Jun 5 12:03:00 2007 @@ -208,7 +208,7 @@ _pr_logLock = PR_NewLock(); -// ev = PR_GetEnv("NSPR_LOG_MODULES"); + /* ev = PR_GetEnv("NSPR_LOG_MODULES"); */ if (ev && ev[0]) { char module[64]; /* Security-Critical: If you change this * size, you must also change the sscanf @@ -255,7 +255,7 @@ } PR_SetLogBuffering(isSync ? bufSize : 0); - //ev = PR_GetEnv("NSPR_LOG_FILE"); + /* ev = PR_GetEnv("NSPR_LOG_FILE"); */ if (ev && ev[0]) { if (!PR_SetLogFile(ev)) { #ifdef XP_PC @@ -318,7 +318,7 @@ { char *ev = NULL; - //ev = PR_GetEnv("NSPR_LOG_MODULES"); + /* ev = PR_GetEnv("NSPR_LOG_MODULES"); */ if (ev && ev[0]) { char module[64]; /* Security-Critical: If you change this * size, you must also change the sscanf Modified: freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/misc/prinit.c ============================================================================== --- freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/misc/prinit.c (original) +++ freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/misc/prinit.c Tue Jun 5 12:03:00 2007 @@ -202,7 +202,6 @@ _PR_InitSegs(); _PR_InitStacks(); _PR_InitTPD(); - //_PR_InitEnv(); _PR_InitLayerCache(); _PR_InitClock(); @@ -234,22 +233,10 @@ _PR_InitMem(); #endif - //_PR_InitCMon(); _PR_InitIO(); - //_PR_InitNet(); _PR_InitLog(); - //_PR_InitLinker(); _PR_InitCallOnce(); - //_PR_InitDtoa(); _PR_InitMW(); - //_PR_InitRWLocks(); - - //nspr_InitializePRErrorTable(); - -#if !defined(_PR_INET6) || defined(_PR_INET6_PROBE) - //_pr_init_ipv6(); -#endif - _PR_MD_FINAL_INIT(); } @@ -420,9 +407,7 @@ #endif _PR_CleanupMW(); - //_PR_CleanupDtoa(); _PR_CleanupCallOnce(); - //_PR_ShutdownLinker(); /* Release the primordial thread's private data, etc. */ _PR_CleanupThread(me); @@ -452,7 +437,6 @@ * Ideally, for each _PR_InitXXX(), there should be a corresponding * _PR_XXXCleanup() that we can call here. */ - //_PR_CleanupNet(); _PR_CleanupIO(); #ifdef WINNT _PR_CleanupCPUs(); @@ -461,7 +445,6 @@ PR_DestroyLock(_pr_sleeplock); _pr_sleeplock = NULL; _PR_CleanupLayerCache(); - //_PR_CleanupEnv(); _PR_CleanupStacks(); _PR_CleanupBeforeExit(); _pr_initialized = PR_FALSE; Modified: freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/pthreads/ptthread.c ============================================================================== --- freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/pthreads/ptthread.c (original) +++ freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/pthreads/ptthread.c Tue Jun 5 12:03:00 2007 @@ -938,9 +938,7 @@ PR_Unlock(pt_book.ml); _PR_CleanupMW(); - //_PR_CleanupDtoa(); _PR_CleanupCallOnce(); - //_PR_ShutdownLinker(); _PR_LogCleanup(); _PR_CleanupNet(); /* Close all the fd's before calling _PR_CleanupIO */ @@ -963,7 +961,6 @@ PR_DestroyLock(_pr_sleeplock); _pr_sleeplock = NULL; _PR_CleanupLayerCache(); - //_PR_CleanupEnv(); #ifdef _PR_ZONE_ALLOCATOR _PR_DestroyZones(); #endif Modified: freeswitch/branches/greenlizard/libs/libedit/Makefile.am ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/Makefile.am (original) +++ freeswitch/branches/greenlizard/libs/libedit/Makefile.am Tue Jun 5 12:03:00 2007 @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = src examples doc +SUBDIRS = src ## GENERATED BY SCRIPT - DO NOT EDIT BELOW Modified: freeswitch/branches/greenlizard/libs/libedit/src/el.c ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/src/el.c (original) +++ freeswitch/branches/greenlizard/libs/libedit/src/el.c Tue Jun 5 12:03:00 2007 @@ -522,7 +522,9 @@ sigset_t oset, nset; (void) sigemptyset(&nset); +#ifdef SIGWINCH (void) sigaddset(&nset, SIGWINCH); +#endif (void) sigprocmask(SIG_BLOCK, &nset, &oset); /* get the correct window size */ Modified: freeswitch/branches/greenlizard/libs/libedit/src/sig.c ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/src/sig.c (original) +++ freeswitch/branches/greenlizard/libs/libedit/src/sig.c Tue Jun 5 12:03:00 2007 @@ -83,9 +83,11 @@ term__flush(); break; +#ifdef SIGWINCH case SIGWINCH: el_resize(sel); break; +#endif default: tty_cookedmode(sel); Modified: freeswitch/branches/greenlizard/libs/libedit/src/sig.h ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/src/sig.h (original) +++ freeswitch/branches/greenlizard/libs/libedit/src/sig.h Tue Jun 5 12:03:00 2007 @@ -48,6 +48,7 @@ * Define here all the signals we are going to handle * The _DO macro is used to iterate in the source code */ +#ifdef SIGWINCH #define ALLSIGS \ _DO(SIGINT) \ _DO(SIGTSTP) \ @@ -57,6 +58,16 @@ _DO(SIGTERM) \ _DO(SIGCONT) \ _DO(SIGWINCH) +#else +#define ALLSIGS \ + _DO(SIGINT) \ + _DO(SIGTSTP) \ + _DO(SIGSTOP) \ + _DO(SIGQUIT) \ + _DO(SIGHUP) \ + _DO(SIGTERM) \ + _DO(SIGCONT) +#endif typedef void (*el_signalhandler_t)(int); typedef el_signalhandler_t *el_signal_t; Modified: freeswitch/branches/greenlizard/libs/libedit/src/term.c ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/src/term.c (original) +++ freeswitch/branches/greenlizard/libs/libedit/src/term.c Tue Jun 5 12:03:00 2007 @@ -905,7 +905,9 @@ int lins, cols; (void) sigemptyset(&nset); +#ifdef SIGWINCH (void) sigaddset(&nset, SIGWINCH); +#endif (void) sigprocmask(SIG_BLOCK, &nset, &oset); area = buf; Modified: freeswitch/branches/greenlizard/libs/libedit/src/unvis.c ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/src/unvis.c (original) +++ freeswitch/branches/greenlizard/libs/libedit/src/unvis.c Tue Jun 5 12:03:00 2007 @@ -63,7 +63,7 @@ #define S_HEX1 7 /* hex digit */ #define S_HEX2 8 /* hex digit 2 */ -#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') +#define isoctal(c) (((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '7') #define xtod(c) (isdigit(c) ? (c - '0') : ((tolower(c) - 'a') + 10)) /* Modified: freeswitch/branches/greenlizard/libs/libedit/src/vi.c ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/src/vi.c (original) +++ freeswitch/branches/greenlizard/libs/libedit/src/vi.c Tue Jun 5 12:03:00 2007 @@ -915,14 +915,14 @@ * NB: posix implies that we should enter insert mode, however * this is against historical precedent... */ -#ifdef __weak_reference +#if defined(__weak_reference) && !defined(__FreeBSD__) extern char *get_alias_text(const char *) __weak_reference(get_alias_text); #endif protected el_action_t /*ARGSUSED*/ vi_alias(EditLine *el, int c) { -#ifdef __weak_reference +#if defined(__weak_reference) && !defined(__FreeBSD__) char alias_name[3]; char *alias_text; Modified: freeswitch/branches/greenlizard/libs/libedit/src/vis.c ============================================================================== --- freeswitch/branches/greenlizard/libs/libedit/src/vis.c (original) +++ freeswitch/branches/greenlizard/libs/libedit/src/vis.c Tue Jun 5 12:03:00 2007 @@ -106,7 +106,7 @@ #undef BELL #define BELL '\a' -#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') +#define isoctal(c) (((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '7') #define iswhite(c) (c == ' ' || c == '\t' || c == '\n') #define issafe(c) (c == '\b' || c == BELL || c == '\r') #define xtoa(c) "0123456789abcdef"[c] @@ -208,8 +208,8 @@ } \ if (isextra || ((c & 0177) == ' ') || (flag & VIS_OCTAL)) { \ *dst++ = '\\'; \ - *dst++ = (u_char)(((u_int32_t)(u_char)c >> 6) & 03) + '0'; \ - *dst++ = (u_char)(((u_int32_t)(u_char)c >> 3) & 07) + '0'; \ + *dst++ = (unsigned char)(((u_int32_t)(unsigned char)c >> 6) & 03) + '0'; \ + *dst++ = (unsigned char)(((u_int32_t)(unsigned char)c >> 3) & 07) + '0'; \ *dst++ = (c & 07) + '0'; \ } else { \ if ((flag & VIS_NOSLASH) == 0) *dst++ = '\\'; \

1 0

[commit] r5259 - freeswitch/branches/anthonyl/log2file-branch/conf
by Freeswitch SVN 05 Jun '07

05 Jun '07

Author: anthonyl Date: Mon Jun 4 23:05:14 2007 New Revision: 5259 Modified: freeswitch/branches/anthonyl/log2file-branch/conf/log2file.conf.xml Log: adding contents to log2file.conf.xml Modified: freeswitch/branches/anthonyl/log2file-branch/conf/log2file.conf.xml ============================================================================== --- freeswitch/branches/anthonyl/log2file-branch/conf/log2file.conf.xml (original) +++ freeswitch/branches/anthonyl/log2file-branch/conf/log2file.conf.xml Mon Jun 4 23:05:14 2007 @@ -0,0 +1,14 @@ +<configuration name="log2file.conf" description="File Logging"> + <settings> +  + <param name="logfile" value="/var/log/freeswitch.log"/> +  + <param name="rollover" value="12000"/> +  + <param name="level" value="debug,info,warning-alert"/> +  +  + <param name="format" value="${time} ${type} ${file} ${func} ${message}"/> +</settings> +</configuration> +

1 0

[commit] r5258 - freeswitch/branches/anthonyl/log2file-branch/conf
by Freeswitch SVN 05 Jun '07

05 Jun '07

Author: anthonyl Date: Mon Jun 4 20:05:16 2007 New Revision: 5258 Added: freeswitch/branches/anthonyl/log2file-branch/conf/log2file.conf.xml Log: adding a sample log2file.conf.xml Added: freeswitch/branches/anthonyl/log2file-branch/conf/log2file.conf.xml ==============================================================================

1 0

[commit] r5252 - in freeswitch/branches/anthonyl/log2file-branch/src: include mod/loggers/mod_log2file
by Freeswitch SVN 03 Jun '07

03 Jun '07

Author: anthonyl Date: Sun Jun 3 04:39:06 2007 New Revision: 5252 Modified: freeswitch/branches/anthonyl/log2file-branch/src/include/switch_apr.h freeswitch/branches/anthonyl/log2file-branch/src/mod/loggers/mod_log2file/mod_log2file.c Log: a fun update, the logging works which is nice ;) i had to add a def for switch_fopen_seek.. in the apr file_io.h code it just defines apr_seek as seek_set so i use that for now.. umm, i still need to work on some of the memory pool things as well as on adding some features.. but that's not to much work ;-p Modified: freeswitch/branches/anthonyl/log2file-branch/src/include/switch_apr.h ============================================================================== --- freeswitch/branches/anthonyl/log2file-branch/src/include/switch_apr.h (original) +++ freeswitch/branches/anthonyl/log2file-branch/src/include/switch_apr.h Sun Jun 3 04:39:06 2007 @@ -641,7 +641,7 @@ #define SWITCH_FOPEN_SENDFILE_ENABLED 0x01000 /**< Advisory flag that this file should support apr_socket_sendfile operation */ #define SWITCH_FOPEN_LARGEFILE 0x04000 /**< Platform dependent flag to enable large file support */ /** @} */ - +#define SWITCH_FOPEN_SET SEEK_SET /**< Set the position of the file for seeking */ /** * Open the specified file. * @param newf The opened file descriptor. Modified: freeswitch/branches/anthonyl/log2file-branch/src/mod/loggers/mod_log2file/mod_log2file.c ============================================================================== --- freeswitch/branches/anthonyl/log2file-branch/src/mod/loggers/mod_log2file/mod_log2file.c (original) +++ freeswitch/branches/anthonyl/log2file-branch/src/mod/loggers/mod_log2file/mod_log2file.c Sun Jun 3 04:39:06 2007 @@ -45,16 +45,13 @@ static switch_status_t mod_log2file_check(void); static switch_memory_pool_t *module_pool = NULL; -static switch_hash_t *log_hash = NULL; -static switch_hash_t *name_hash = NULL; -static int8_t all_level = -1; static struct { unsigned int log_fd; unsigned int log_size; /* keep the log size in check for rotation */ unsigned int roll_size; /* the size that we want to rotate the file at */ - unsigned char *logfile; - unsigned char *format; + char *logfile; + char *format; switch_file_t *log_afd; } globals; @@ -131,7 +128,7 @@ { char *q; - while (q = strsep(&p, ",")) { + while ((q = strsep(&p, ","))) { if (!strncasecmp(q, "emerg", strlen(q))) { levels[SWITCH_LOG_EMERG].on = 1; } else if (!strncasecmp(q, "alert", strlen(q))) { @@ -163,37 +160,45 @@ } static switch_status_t mod_log2file_openlogfile(void) { - int fd; + unsigned int flags = 0; switch_file_t *afd; switch_status_t stat; + switch_memory_pool_t *pool; - stat = switch_file_open(&afd, globals.logfile, - APR_CREATE| APR_READ | APR_WRITE | APR_APPEND, NULL, NULL); - + + flags |= SWITCH_FOPEN_CREATE; + flags |= SWITCH_FOPEN_READ; + flags |= SWITCH_FOPEN_WRITE; + flags |= SWITCH_FOPEN_APPEND; + + switch_core_new_memory_pool(&pool); + stat = switch_file_open(&afd, globals.logfile,flags,SWITCH_FPROT_UREAD|SWITCH_FPROT_UWRITE, pool); if (stat != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_FALSE; } globals.log_afd = afd; mod_log2file_check(); + return SWITCH_STATUS_SUCCESS; } /* rotate the log file */ static switch_status_t mod_log2file_rotate(void) { - unsigned int i = 0; - unsigned char *p = NULL; - unsigned char *q = NULL; + unsigned int i = 0; + unsigned int flags = 0; + char *p = NULL; + char *q = NULL; switch_status_t stat = 0; switch_size_t nbytes = 1024; switch_file_t *l_afd = NULL; + switch_memory_pool_t *pool = NULL; globals.log_size = 0; - stat = switch_file_seek(globals.log_afd, APR_SET, 0); - + switch_core_new_memory_pool(&pool); + stat = switch_file_seek(globals.log_afd, SWITCH_FOPEN_SET, 0); if (stat != SWITCH_STATUS_SUCCESS) return SWITCH_STATUS_FALSE; - p = malloc(strlen(globals.logfile)+WARM_FUZZY_OFFSET); if (!p) { return SWITCH_STATUS_FALSE; @@ -205,22 +210,28 @@ } memset(p, '\0', strlen(globals.logfile)+WARM_FUZZY_OFFSET); for (i=1;i<MAX_ROT; i++) { - sprintf(p, "%s.%i", globals.logfile, i); - stat = switch_file_open(l_afd, p, APR_READ, NULL, NULL); + sprintf((char *)p, "%s.%i", globals.logfile, i); + + stat = switch_file_open(&l_afd, p, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD, pool); + if (stat == SWITCH_STATUS_SUCCESS) { switch_file_close(l_afd); continue; } - stat = switch_file_open(l_afd, p, APR_READ | APR_WRITE | APR_CREATE , NULL, NULL); + flags |= SWITCH_FOPEN_READ; + flags |= SWITCH_FOPEN_WRITE; + flags |= SWITCH_FOPEN_CREATE; + + stat = switch_file_open(&l_afd, p, flags , SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE ,pool); if (stat == SWITCH_STATUS_SUCCESS) break; } - while ((stat = switch_file_read(&globals.log_afd, q, &nbytes)) == SWITCH_STATUS_SUCCESS) { + while ((stat = switch_file_read(globals.log_afd, q, &nbytes)) == SWITCH_STATUS_SUCCESS) { switch_file_write(l_afd, q, &nbytes); memset(q, '\0', 1024); nbytes = 1024; } - stat = switch_file_seek(&globals.log_afd, APR_SET, 0); + stat = switch_file_seek(globals.log_afd, SWITCH_FOPEN_SET, 0); free(p); free(q); return SWITCH_STATUS_SUCCESS; @@ -229,26 +240,23 @@ /* check the size of the file for rotation */ static switch_status_t mod_log2file_check(void) { - switch_status_t stat; switch_size_t fsize; - fsize = switch_file_get_size(&globals.log_afd); - - if (stat != SWITCH_STATUS_SUCCESS) - return SWITCH_STATUS_FALSE; + fsize = switch_file_get_size(globals.log_afd); + printf("Checking LogFile\n"); if (fsize >= globals.roll_size) { return mod_log2file_rotate(); } - + printf("File Size %i\n",fsize); return SWITCH_STATUS_SUCCESS; } /* write to the actual logfile */ static switch_status_t mod_log2file_write(char *fmt, ...) { - unsigned int len; char *log_data; switch_status_t stat; + switch_size_t len; va_list args; va_start(args, fmt); printf("Mod Log To File Write\n"); @@ -257,12 +265,14 @@ #else len = vasprintf(&log_data, fmt, args); #endif + printf("log data %s\n", log_data); if (len <= 0) return SWITCH_STATUS_FALSE; - stat = switch_file_write(&globals.log_afd, log_data, len); - if (stat != SWITCH_STATUS_SUCCESS) - return SWITCH_STATUS_FALSE; + stat = switch_file_write(globals.log_afd, log_data, &len); + //if (stat != SWITCH_STATUS_SUCCESS) + //return SWITCH_STATUS_FALSE; globals.log_size += len; + printf("Done Writing To File"); /* we may want to hold back on this for preformance reasons */ mod_log2file_check(); return SWITCH_STATUS_SUCCESS; @@ -270,8 +280,7 @@ static switch_status_t mod_log2file_logger(const switch_log_node_t *node, switch_log_level_t level) { - uint8_t *lookup = NULL; - char line_no[sizeof(int)*8+1]; + char line_no[sizeof(int)*8+1]; char date[80] = ""; switch_time_exp_t time; switch_size_t retsize; @@ -326,6 +335,8 @@ char *cf = "log2file.conf"; switch_xml_t cfg, xml, settings, param; + printf("Running load_config\n"); + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); } else { @@ -366,7 +377,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); return SWITCH_STATUS_TERM; } - + + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT,"Loading ModLog2File\n"); *interface = &log2file_module_interface; if ((status=load_config()) != SWITCH_STATUS_SUCCESS) {

1 0