Freeswitch-branches

Download

freeswitch-branches@lists.freeswitch.org

1655 discussions

[commit] r5199 - in freeswitch/branches/greenlizard: libs/iksemel/src libs/libteletone/src libs/sofia-sip/libsofia-sip-ua/su src src/include src/mod/endpoints/mod_woomera src/mod/formats/mod_shout src/mod/languages/mod_python
by Freeswitch SVN 17 May '07

17 May '07

Author: greenlizard Date: Thu May 17 12:45:24 2007 New Revision: 5199 Modified: freeswitch/branches/greenlizard/libs/iksemel/src/ikstack.c freeswitch/branches/greenlizard/libs/libteletone/src/libteletone.h freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_detect.c freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_detect.h freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_generate.c freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_generate.h freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c freeswitch/branches/greenlizard/src/include/switch_cpp.h freeswitch/branches/greenlizard/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/branches/greenlizard/src/mod/formats/mod_shout/layer3.c freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch.py freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.cpp freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python.i freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python_wrap.cpp freeswitch/branches/greenlizard/src/switch_core_io.c freeswitch/branches/greenlizard/src/switch_core_session.c freeswitch/branches/greenlizard/src/switch_ivr.c freeswitch/branches/greenlizard/src/switch_ivr_bridge.c freeswitch/branches/greenlizard/src/switch_rtp.c Log: Sync up changes from trunk version 5186 to 5198, plus other changes related to getting streamfile working Modified: freeswitch/branches/greenlizard/libs/iksemel/src/ikstack.c ============================================================================== --- freeswitch/branches/greenlizard/libs/iksemel/src/ikstack.c (original) +++ freeswitch/branches/greenlizard/libs/iksemel/src/ikstack.c Thu May 17 12:45:24 2007 @@ -196,6 +196,7 @@ if (!s) { return; } + *sp = NULL; c = s->meta->next; while (c) { tmp = c->next; @@ -209,5 +210,5 @@ c = tmp; } iks_free (s); - *sp = NULL; + } Modified: freeswitch/branches/greenlizard/libs/libteletone/src/libteletone.h ============================================================================== --- freeswitch/branches/greenlizard/libs/libteletone/src/libteletone.h (original) +++ freeswitch/branches/greenlizard/libs/libteletone/src/libteletone.h Thu May 17 12:45:24 2007 @@ -28,6 +28,45 @@ * * libteletone.h -- Tone Generator/Detector * + * + * + * Exception: + * The author hereby grants the use of this source code under the + * following license if and only if the source code is distributed + * as part of the openzap library. Any use or distribution of this + * source code outside the scope of the openzap library will nullify the + * following license and reinact the MPL 1.1 as stated above. + * + * Copyright (c) 2007, Anthony Minessale II + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef LIBTELETONE_H #define LIBTELETONE_H Modified: freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_detect.c ============================================================================== --- freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_detect.c (original) +++ freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_detect.c Thu May 17 12:45:24 2007 @@ -49,7 +49,47 @@ * public domain for the benefit of all mankind - even the slimy * ones who might try to proprietize my work and use it to my * detriment. + * + * + * Exception: + * The author hereby grants the use of this source code under the + * following license if and only if the source code is distributed + * as part of the openzap library. Any use or distribution of this + * source code outside the scope of the openzap library will nullify the + * following license and reinact the MPL 1.1 as stated above. + * + * Copyright (c) 2007, Anthony Minessale II + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #include <math.h> #ifndef _MSC_VER #include <stdint.h> Modified: freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_detect.h ============================================================================== --- freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_detect.h (original) +++ freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_detect.h Thu May 17 12:45:24 2007 @@ -49,7 +49,47 @@ * public domain for the benefit of all mankind - even the slimy * ones who might try to proprietize my work and use it to my * detriment. + * + * + * Exception: + * The author hereby grants the use of this source code under the + * following license if and only if the source code is distributed + * as part of the openzap library. Any use or distribution of this + * source code outside the scope of the openzap library will nullify the + * following license and reinact the MPL 1.1 as stated above. + * + * Copyright (c) 2007, Anthony Minessale II + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #ifndef LIBTELETONE_DETECT_H #define LIBTELETONE_DETECT_H Modified: freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_generate.c ============================================================================== --- freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_generate.c (original) +++ freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_generate.c Thu May 17 12:45:24 2007 @@ -28,7 +28,47 @@ * * libteletone.c -- Tone Generator * + * + * + * Exception: + * The author hereby grants the use of this source code under the + * following license if and only if the source code is distributed + * as part of the openzap library. Any use or distribution of this + * source code outside the scope of the openzap library will nullify the + * following license and reinact the MPL 1.1 as stated above. + * + * Copyright (c) 2007, Anthony Minessale II + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #include <libteletone.h> #define SMAX 32767 #define SMIN -32768 Modified: freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_generate.h ============================================================================== --- freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_generate.h (original) +++ freeswitch/branches/greenlizard/libs/libteletone/src/libteletone_generate.h Thu May 17 12:45:24 2007 @@ -28,6 +28,45 @@ * * libteletone.h -- Tone Generator * + * + * + * Exception: + * The author hereby grants the use of this source code under the + * following license if and only if the source code is distributed + * as part of the openzap library. Any use or distribution of this + * source code outside the scope of the openzap library will nullify the + * following license and reinact the MPL 1.1 as stated above. + * + * Copyright (c) 2007, Anthony Minessale II + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef LIBTELETONE_GENERATE_H #define LIBTELETONE_GENERATE_H Modified: freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Thu May 17 12:45:24 2007 @@ -929,7 +929,7 @@ return 0; } - +#define safe_free(it) if (it) { free(it); it = NULL; } /** Internal deinitialization */ static void _su_home_deinit(su_home_t *home) @@ -965,16 +965,17 @@ } else if (su_is_preloaded(b, b->sub_nodes[i].sua_data)) continue; - free(b->sub_nodes[i].sua_data); + safe_free(b->sub_nodes[i].sua_data); + } } if (b->sub_preload && !b->sub_preauto) - free(b->sub_preload); + safe_free(b->sub_preload); if (b->sub_stats) - free(b->sub_stats); + safe_free(b->sub_stats); if (!b->sub_auto) - free(b); + safe_free(b); home->suh_blocks = NULL; 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 Thu May 17 12:45:24 2007 @@ -16,6 +16,9 @@ void console_clean_log(char *msg); char *api_execute(char *cmd, char *arg); void api_reply_delete(char *reply); +switch_status_t process_callback_result(char *raw_result, + struct input_callback_state *cb_state, + switch_core_session_t *session); class CoreSession { private: Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_woomera/mod_woomera.c Thu May 17 12:45:24 2007 @@ -334,7 +334,9 @@ { const char p = 0; switch_size_t len = sizeof(p); - switch_socket_sendto(tech_pvt->udp_socket, tech_pvt->udpwrite, 0, &p, &len); + if (tech_pvt->udp_socket && tech_pvt->udpwrite) { + switch_socket_sendto(tech_pvt->udp_socket, tech_pvt->udpwrite, 0, &p, &len); + } } break; } Modified: freeswitch/branches/greenlizard/src/mod/formats/mod_shout/layer3.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/formats/mod_shout/layer3.c (original) +++ freeswitch/branches/greenlizard/src/mod/formats/mod_shout/layer3.c Thu May 17 12:45:24 2007 @@ -826,9 +826,23 @@ int x, y; if (!mc) { + unsigned sanity; mc = *m++; - v = gr_info->pow2gain[((*scf++) + (*pretab++)) << shift]; - cb = *m++; + if ((unsigned)*scf < 100 && (unsigned)*pretab < 100) { + sanity = (((*scf++) + (*pretab++)) << shift); + + //v = gr_info->pow2gain[((*scf++) + (*pretab++)) << shift]; + if (sanity < 100) { + v = gr_info->pow2gain[sanity]; + cb = *m++; + } else { + return 1; + } + + } else { + return 1; + } + } { register short *val = h->table; 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 Thu May 17 12:45:24 2007 @@ -46,6 +46,7 @@ console_clean_log = _freeswitch.console_clean_log api_execute = _freeswitch.api_execute api_reply_delete = _freeswitch.api_reply_delete +process_callback_result = _freeswitch.process_callback_result class CoreSession(_object): __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, CoreSession, name, value) 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 Thu May 17 12:45:24 2007 @@ -27,8 +27,12 @@ sanity_check(-1); if (PyArg_ParseTuple(funcargs, "s", &s)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "funcargs: %s.", s); cb_state.funcargs = s; } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "could not get funcargs"); + } if (!PyCallable_Check(pyfunc)) { dtmfCallbackFunction = NULL; 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 Thu May 17 12:45:24 2007 @@ -14,75 +14,145 @@ %{ -// status = args->input_callback(session, dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen); switch_status_t PythonDTMFCallback(switch_core_session_t *session, void *input, switch_input_type_t itype, - void *buf, // Python function defined in script + void *buf, unsigned int buflen) { PyObject *func, *arglist; PyObject *result; + char *resultStr; + char *funcargs; struct input_callback_state *cb_state; - switch_status_t dres = SWITCH_STATUS_FALSE; + switch_file_handle_t *fh = NULL; PyThreadState *threadState = NULL; - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "PythonDTMFCallback CALLED"); if (!buf) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "buf pointer is null"); - return dres; + return SWITCH_STATUS_FALSE; } - // TODO: a struct will be passed, of which one of the members will be - // the actual callback function - cb_state = (input_callback_state *) buf; + cb_state = (input_callback_state *) buf; - func = (PyObject *) cb_state->function; // Get Python function + func = (PyObject *) cb_state->function; if (!func) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cb_state->function is null"); - return dres; + return SWITCH_STATUS_FALSE; } if (!PyCallable_Check(func)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "function not callable"); - return dres; + return SWITCH_STATUS_FALSE; } - arglist = Py_BuildValue("(si)", input, itype); // Build argument list + funcargs = (char *) cb_state->funcargs; + + arglist = Py_BuildValue("(sis)", input, itype, funcargs); if (!arglist) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error building arglist"); - return dres; + return SWITCH_STATUS_FALSE; } threadState = (PyThreadState *) cb_state->threadState; if (!threadState) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error, invalid threadstate"); - return dres; + return SWITCH_STATUS_FALSE; } - // TODO: the python should return string values just like the javascript - // user defined function. then in this function, we act on those values - // by pausing the fh (shit, where is the fh?), fast forwarding, etc. - // then figure out a freeswitch status to return and return it. + PyEval_RestoreThread(threadState); // nasty stuff happens when py interp has no thread state + result = PyEval_CallObject(func, arglist); + threadState = PyEval_SaveThread(); - + Py_DECREF(arglist); // Trash arglist + if (result) { + resultStr = (char *) PyString_AsString(result); + } + Py_XDECREF(result); - PyEval_RestoreThread(threadState); + return process_callback_result(resultStr, cb_state, session); - result = PyEval_CallObject(func, arglist); // Call Python +} - threadState = PyEval_SaveThread(); + +switch_status_t process_callback_result(char *ret, + struct input_callback_state *cb_state, + switch_core_session_t *session) +{ + + switch_file_handle_t *fh = NULL; + fh = (switch_file_handle_t *) cb_state->extra; + + if (!strncasecmp(ret, "speed", 4)) { + char *p; + + if ((p = strchr(ret, ':'))) { + p++; + if (*p == '+' || *p == '-') { + int step; + if (!(step = atoi(p))) { + step = 1; + } + fh->speed += step; + } else { + int speed = atoi(p); + fh->speed = speed; + } + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; + + } else if (!strcasecmp(ret, "pause")) { + if (switch_test_flag(fh, SWITCH_FILE_PAUSE)) { + switch_clear_flag(fh, SWITCH_FILE_PAUSE); + } else { + switch_set_flag(fh, SWITCH_FILE_PAUSE); + } + return SWITCH_STATUS_SUCCESS; + } else if (!strcasecmp(ret, "restart")) { + unsigned int pos = 0; + fh->speed = 0; + switch_core_file_seek(fh, &pos, 0, SEEK_SET); + return SWITCH_STATUS_SUCCESS; + } else if (!strncasecmp(ret, "seek", 4)) { + switch_codec_t *codec; + unsigned int samps = 0; + unsigned int pos = 0; + char *p; + codec = switch_core_session_get_read_codec(session); + + if ((p = strchr(ret, ':'))) { + p++; + if (*p == '+' || *p == '-') { + int step; + if (!(step = atoi(p))) { + step = 1000; + } + if (step > 0) { + samps = step * (codec->implementation->samples_per_second / 1000); + switch_core_file_seek(fh, &pos, samps, SEEK_CUR); + } else { + samps = step * (codec->implementation->samples_per_second / 1000); + switch_core_file_seek(fh, &pos, fh->pos - samps, SEEK_SET); + } + } else { + samps = atoi(p) * (codec->implementation->samples_per_second / 1000); + switch_core_file_seek(fh, &pos, samps, SEEK_SET); + } + } + + return SWITCH_STATUS_SUCCESS; + } + + if (!strcmp(ret, "true") || !strcmp(ret, "undefined")) { + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; - Py_DECREF(arglist); // Trash arglist - if (result) { // If no errors, return double - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "PythonDTMFCallback 5"); - dres = (switch_status_t) PyInt_AsLong(result); - } - Py_XDECREF(result); - return dres; } 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 Thu May 17 12:45:24 2007 @@ -2876,75 +2876,145 @@ -// status = args->input_callback(session, dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen); switch_status_t PythonDTMFCallback(switch_core_session_t *session, void *input, switch_input_type_t itype, - void *buf, // Python function defined in script + void *buf, unsigned int buflen) { PyObject *func, *arglist; PyObject *result; + char *resultStr; + char *funcargs; struct input_callback_state *cb_state; - switch_status_t dres = SWITCH_STATUS_FALSE; + switch_file_handle_t *fh = NULL; PyThreadState *threadState = NULL; - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "PythonDTMFCallback CALLED"); if (!buf) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "buf pointer is null"); - return dres; + return SWITCH_STATUS_FALSE; } - // TODO: a struct will be passed, of which one of the members will be - // the actual callback function - cb_state = (input_callback_state *) buf; + cb_state = (input_callback_state *) buf; - func = (PyObject *) cb_state->function; // Get Python function + func = (PyObject *) cb_state->function; if (!func) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cb_state->function is null"); - return dres; + return SWITCH_STATUS_FALSE; } if (!PyCallable_Check(func)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "function not callable"); - return dres; + return SWITCH_STATUS_FALSE; } - arglist = Py_BuildValue("(si)", input, itype); // Build argument list + funcargs = (char *) cb_state->funcargs; + + arglist = Py_BuildValue("(sis)", input, itype, funcargs); if (!arglist) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error building arglist"); - return dres; + return SWITCH_STATUS_FALSE; } threadState = (PyThreadState *) cb_state->threadState; if (!threadState) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error, invalid threadstate"); - return dres; + return SWITCH_STATUS_FALSE; } - // TODO: the python should return string values just like the javascript - // user defined function. then in this function, we act on those values - // by pausing the fh (shit, where is the fh?), fast forwarding, etc. - // then figure out a freeswitch status to return and return it. + PyEval_RestoreThread(threadState); // nasty stuff happens when py interp has no thread state + result = PyEval_CallObject(func, arglist); + threadState = PyEval_SaveThread(); - + Py_DECREF(arglist); // Trash arglist + if (result) { + resultStr = (char *) PyString_AsString(result); + } + Py_XDECREF(result); - PyEval_RestoreThread(threadState); + return process_callback_result(resultStr, cb_state, session); - result = PyEval_CallObject(func, arglist); // Call Python +} - threadState = PyEval_SaveThread(); + +switch_status_t process_callback_result(char *ret, + struct input_callback_state *cb_state, + switch_core_session_t *session) +{ + + switch_file_handle_t *fh = NULL; + fh = (switch_file_handle_t *) cb_state->extra; + + if (!strncasecmp(ret, "speed", 4)) { + char *p; + + if ((p = strchr(ret, ':'))) { + p++; + if (*p == '+' || *p == '-') { + int step; + if (!(step = atoi(p))) { + step = 1; + } + fh->speed += step; + } else { + int speed = atoi(p); + fh->speed = speed; + } + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; + + } else if (!strcasecmp(ret, "pause")) { + if (switch_test_flag(fh, SWITCH_FILE_PAUSE)) { + switch_clear_flag(fh, SWITCH_FILE_PAUSE); + } else { + switch_set_flag(fh, SWITCH_FILE_PAUSE); + } + return SWITCH_STATUS_SUCCESS; + } else if (!strcasecmp(ret, "restart")) { + unsigned int pos = 0; + fh->speed = 0; + switch_core_file_seek(fh, &pos, 0, SEEK_SET); + return SWITCH_STATUS_SUCCESS; + } else if (!strncasecmp(ret, "seek", 4)) { + switch_codec_t *codec; + unsigned int samps = 0; + unsigned int pos = 0; + char *p; + codec = switch_core_session_get_read_codec(session); + + if ((p = strchr(ret, ':'))) { + p++; + if (*p == '+' || *p == '-') { + int step; + if (!(step = atoi(p))) { + step = 1000; + } + if (step > 0) { + samps = step * (codec->implementation->samples_per_second / 1000); + switch_core_file_seek(fh, &pos, samps, SEEK_CUR); + } else { + samps = step * (codec->implementation->samples_per_second / 1000); + switch_core_file_seek(fh, &pos, fh->pos - samps, SEEK_SET); + } + } else { + samps = atoi(p) * (codec->implementation->samples_per_second / 1000); + switch_core_file_seek(fh, &pos, samps, SEEK_SET); + } + } + + return SWITCH_STATUS_SUCCESS; + } + + if (!strcmp(ret, "true") || !strcmp(ret, "undefined")) { + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; - Py_DECREF(arglist); // Trash arglist - if (result) { // If no errors, return double - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "PythonDTMFCallback 5"); - dres = (switch_status_t) PyInt_AsLong(result); - } - Py_XDECREF(result); - return dres; } @@ -3104,6 +3174,49 @@ } +SWIGINTERN PyObject *_wrap_process_callback_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + input_callback_state *arg2 = (input_callback_state *) 0 ; + switch_core_session_t *arg3 = (switch_core_session_t *) 0 ; + switch_status_t result; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OOO:process_callback_result",&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "process_callback_result" "', argument " "1"" of type '" "char *""'"); + } + arg1 = buf1; + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_input_callback_state, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "process_callback_result" "', argument " "2"" of type '" "input_callback_state *""'"); + } + arg2 = reinterpret_cast< input_callback_state * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_switch_core_session_t, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "process_callback_result" "', argument " "3"" of type '" "switch_core_session_t *""'"); + } + arg3 = reinterpret_cast< switch_core_session_t * >(argp3); + result = process_callback_result(arg1,arg2,arg3); + resultobj = SWIG_NewPointerObj((new switch_status_t(static_cast< const switch_status_t& >(result))), SWIGTYPE_p_switch_status_t, SWIG_POINTER_OWN | 0 ); + if (alloc1 == SWIG_NEWOBJ) delete[] buf1; + return resultobj; +fail: + if (alloc1 == SWIG_NEWOBJ) delete[] buf1; + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_CoreSession__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; @@ -4566,6 +4679,7 @@ { (char *)"console_clean_log", _wrap_console_clean_log, METH_VARARGS, NULL}, { (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 *)"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}, Modified: freeswitch/branches/greenlizard/src/switch_core_io.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_io.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_io.c Thu May 17 12:45:24 2007 @@ -730,7 +730,7 @@ switch_io_event_hook_kill_channel_t *ptr; switch_status_t status = SWITCH_STATUS_FALSE; - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_INFO, "Kill %s [%s]\n", switch_channel_get_name(session->channel), + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_DEBUG, "Kill %s [%s]\n", switch_channel_get_name(session->channel), SIG_NAMES[sig]); if (session->endpoint_interface->io_routines->kill_channel) { Modified: freeswitch/branches/greenlizard/src/switch_core_session.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_session.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_session.c Thu May 17 12:45:24 2007 @@ -626,7 +626,7 @@ { switch_status_t status = SWITCH_STATUS_SUCCESS; switch_io_event_hook_state_change_t *ptr; - + /* If trylock fails the signal is already awake so we needn't bother */ if (switch_mutex_trylock(session->mutex) == SWITCH_STATUS_SUCCESS) { switch_thread_cond_signal(session->cond); @@ -644,6 +644,7 @@ } } } + switch_core_session_kill_channel(session, SWITCH_SIG_BREAK); } SWITCH_DECLARE(unsigned int) switch_core_session_running(switch_core_session_t *session) Modified: freeswitch/branches/greenlizard/src/switch_ivr.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_ivr.c (original) +++ freeswitch/branches/greenlizard/src/switch_ivr.c Thu May 17 12:45:24 2007 @@ -749,7 +749,6 @@ if (switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { status = SWITCH_STATUS_SUCCESS; - switch_channel_clear_flag(channel, CF_BYPASS_MEDIA); switch_core_session_receive_message(session, &msg); if ((flags & SMF_REBRIDGE) @@ -765,7 +764,7 @@ switch_channel_clear_state_handler(channel, NULL); } } - + switch_core_session_rwunlock(session); if (other_channel) { @@ -803,22 +802,21 @@ } if ((flags & SMF_FORCE) || !switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { - switch_ivr_parse_all_events(session); - + //switch_ivr_parse_all_events(session); + switch_core_session_receive_message(session, &msg); + if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(other_uuid))) { other_channel = switch_core_session_get_channel(other_session); assert(other_channel != NULL); - - switch_ivr_parse_all_events(other_session); + //switch_ivr_parse_all_events(other_session); switch_core_session_receive_message(other_session, &msg); switch_channel_clear_state_handler(other_channel, NULL); } - switch_channel_set_flag(channel, CF_BYPASS_MEDIA); - switch_core_session_receive_message(session, &msg); + if (other_channel) { switch_channel_clear_state_handler(channel, NULL); Modified: freeswitch/branches/greenlizard/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_ivr_bridge.c (original) +++ freeswitch/branches/greenlizard/src/switch_ivr_bridge.c Thu May 17 12:45:24 2007 @@ -98,7 +98,7 @@ break; } - if (loop_count > 10 && switch_core_session_private_event_count(session_a)) { + if (loop_count > 50 && switch_core_session_private_event_count(session_a)) { switch_channel_set_flag(chan_b, CF_SUSPEND); msg.string_arg = data->b_uuid; msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE; @@ -491,7 +491,7 @@ switch_channel_set_state_flag(caller_channel, CF_TRANSFER); switch_channel_set_state_flag(peer_channel, CF_TRANSFER); - + switch_channel_set_state(caller_channel, CS_HIBERNATE); switch_channel_set_state(peer_channel, CS_HIBERNATE); Modified: freeswitch/branches/greenlizard/src/switch_rtp.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_rtp.c (original) +++ freeswitch/branches/greenlizard/src/switch_rtp.c Thu May 17 12:45:24 2007 @@ -129,6 +129,8 @@ switch_sockaddr_t *remote_addr; rtp_msg_t recv_msg; srtp_ctx_t *recv_ctx; + uint32_t autoadj_window; + uint32_t autoadj_tally; uint16_t seq; uint16_t rseq; @@ -430,12 +432,13 @@ rtp_session->pool = pool; - rtp_session->flags = flags; rtp_session->te = 101; switch_mutex_init(&rtp_session->flag_mutex, SWITCH_MUTEX_NESTED, rtp_session->pool); switch_mutex_init(&rtp_session->dtmf_data.dtmf_mutex, SWITCH_MUTEX_NESTED, rtp_session->pool); switch_buffer_create_dynamic(&rtp_session->dtmf_data.dtmf_buffer, 128, 128, 0); + switch_rtp_set_flag(rtp_session, flags); + /* for from address on recvfrom calls */ switch_sockaddr_info_get(&rtp_session->from_addr, NULL, SWITCH_UNSPEC, 0, 0, rtp_session->pool); @@ -705,7 +708,10 @@ { switch_set_flag_locked(rtp_session, flags); - + if (flags & SWITCH_RTP_FLAG_AUTOADJ) { + rtp_session->autoadj_window = 20; + rtp_session->autoadj_tally = 0; + } } SWITCH_DECLARE(uint8_t) switch_rtp_test_flag(switch_rtp_t *rtp_session, switch_rtp_flag_t flags) @@ -960,30 +966,35 @@ } - - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { - + if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { char *tx_host; char *old_host; char bufa[30], bufb[30]; tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->from_addr); old_host = switch_get_addr(bufb, sizeof(bufb), rtp_session->remote_addr); - - if ((switch_sockaddr_get_port(rtp_session->from_addr) != rtp_session->remote_port) - || strcmp(tx_host, old_host)) { + if ((switch_sockaddr_get_port(rtp_session->from_addr) != rtp_session->remote_port) || strcmp(tx_host, old_host)) { const char *err; uint32_t old = rtp_session->remote_port; if (!switch_strlen_zero(tx_host) && switch_sockaddr_get_port(rtp_session->from_addr) > 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, - "Auto Changing port from %s:%u to %s:%u\n", old_host, old, tx_host, - switch_sockaddr_get_port(rtp_session->from_addr)); - switch_rtp_set_remote_address(rtp_session, tx_host, switch_sockaddr_get_port(rtp_session->from_addr), &err); + if (++rtp_session->autoadj_tally >= 10) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "Auto Changing port from %s:%u to %s:%u\n", old_host, old, tx_host, + switch_sockaddr_get_port(rtp_session->from_addr)); + switch_rtp_set_remote_address(rtp_session, tx_host, switch_sockaddr_get_port(rtp_session->from_addr), &err); + } } } - switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); } + if (rtp_session->autoadj_window) { + if (--rtp_session->autoadj_window == 0) { + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); + } + } + + + if (bytes && rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) { continue; }

1 0

[commit] r5195 - in freeswitch/branches/greenlizard/src: . include mod/languages/mod_python
by Freeswitch SVN 16 May '07

16 May '07

Author: greenlizard Date: Wed May 16 18:49:51 2007 New Revision: 5195 Modified: freeswitch/branches/greenlizard/src/include/switch_cpp.h freeswitch/branches/greenlizard/src/mod/languages/mod_python/Makefile 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.c 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: seventy percent finished with new version of streamfile for python modelled after mod_spidermonkey 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 Wed May 16 18:49:51 2007 @@ -1,9 +1,17 @@ #ifndef SWITCH_CPP_H #define SWITCH_CPP_H -SWITCH_BEGIN_EXTERN_C + +#ifdef __cplusplus +extern "C" { +#endif +#ifdef DOH +} +#endif + #include <switch.h> + void console_log(char *level_str, char *msg); void console_clean_log(char *msg); char *api_execute(char *cmd, char *arg); @@ -11,9 +19,6 @@ class CoreSession { private: - char *uuid; - char *tts_name; - char *voice_name; switch_input_args_t args; switch_input_args_t *ap; public: @@ -33,14 +38,24 @@ void set_tts_parms(char *tts_name, char *voice_name); 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, char *digits_regex); + 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); void execute(char *app, char *data); + void begin_allow_threads(); + void end_allow_threads(); + protected: + char *uuid; + char *tts_name; + char *voice_name; }; -SWITCH_END_EXTERN_C +#ifdef __cplusplus +} +#endif + #endif /* For Emacs: * Local Variables: 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 Wed May 16 18:49:51 2007 @@ -3,8 +3,9 @@ # 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$(PREFIX)/include/python2.4/ -I/usr/include/python2.4/ +LOCAL_LDFLAGS=-lpython2.4 -L$(PREFIX)/lib/python2.4/config/ -lutil -lstdc++ + LOCAL_OBJS=freeswitch_python.o mod_python_wrap.o include ../../../../build/modmake.rules @@ -17,7 +18,7 @@ MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install Python-2.5.1.tgz --prefix=$(PREFIX) --enable-threads CFLAGSFORSHARED="-fPIC" 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 $@ @@ -26,5 +27,5 @@ $(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/ 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 Wed May 16 18:49:51 2007 @@ -1,25 +1,37 @@ -# This file was created automatically by SWIG. +# This file was created automatically by SWIG 1.3.29. # Don't modify this file, modify the SWIG interface instead. # This file is compatible with both classic and new-style classes. import _freeswitch - -def _swig_setattr(self,class_type,name,value): +import new +new_instancemethod = new.instancemethod +def _swig_setattr_nondynamic(self,class_type,name,value,static=1): + if (name == "thisown"): return self.this.own(value) if (name == "this"): - if isinstance(value, class_type): - self.__dict__[name] = value.this - if hasattr(value,"thisown"): self.__dict__["thisown"] = value.thisown - del value.thisown + if type(value).__name__ == 'PySwigObject': + self.__dict__[name] = value return method = class_type.__swig_setmethods__.get(name,None) if method: return method(self,value) - self.__dict__[name] = value + if (not static) or hasattr(self,name): + self.__dict__[name] = value + else: + raise AttributeError("You cannot add attributes to %s" % self) + +def _swig_setattr(self,class_type,name,value): + return _swig_setattr_nondynamic(self,class_type,name,value,0) def _swig_getattr(self,class_type,name): + if (name == "thisown"): return self.this.own() method = class_type.__swig_getmethods__.get(name,None) if method: return method(self) raise AttributeError,name +def _swig_repr(self): + try: strthis = "proxy of " + self.this.__repr__() + except: strthis = "" + return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,) + import types try: _object = types.ObjectType @@ -30,52 +42,94 @@ del types - -PythonDTMFCallback = _freeswitch.PythonDTMFCallback - console_log = _freeswitch.console_log - console_clean_log = _freeswitch.console_clean_log - api_execute = _freeswitch.api_execute - api_reply_delete = _freeswitch.api_reply_delete -class SessionContainer(_object): +class CoreSession(_object): + __swig_setmethods__ = {} + __setattr__ = lambda self, name, value: _swig_setattr(self, CoreSession, name, value) + __swig_getmethods__ = {} + __getattr__ = lambda self, name: _swig_getattr(self, CoreSession, name) + __repr__ = _swig_repr + def __init__(self, *args): + this = _freeswitch.new_CoreSession(*args) + try: self.this.append(this) + except: self.this = this + __swig_destroy__ = _freeswitch.delete_CoreSession + __del__ = lambda self : None; + __swig_setmethods__["session"] = _freeswitch.CoreSession_session_set + __swig_getmethods__["session"] = _freeswitch.CoreSession_session_get + if _newclass:session = property(_freeswitch.CoreSession_session_get, _freeswitch.CoreSession_session_set) + __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) + def answer(*args): return _freeswitch.CoreSession_answer(*args) + def preAnswer(*args): return _freeswitch.CoreSession_preAnswer(*args) + def hangup(*args): return _freeswitch.CoreSession_hangup(*args) + def setVariable(*args): return _freeswitch.CoreSession_setVariable(*args) + 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 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 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) +CoreSession_swigregister = _freeswitch.CoreSession_swigregister +CoreSession_swigregister(CoreSession) + +PythonDTMFCallback = _freeswitch.PythonDTMFCallback +class input_callback_state(_object): __swig_setmethods__ = {} - __setattr__ = lambda self, name, value: _swig_setattr(self, SessionContainer, name, value) + __setattr__ = lambda self, name, value: _swig_setattr(self, input_callback_state, name, value) __swig_getmethods__ = {} - __getattr__ = lambda self, name: _swig_getattr(self, SessionContainer, name) - def __repr__(self): - return "<C SessionContainer instance at %s>" % (self.this,) - def __init__(self, *args): - _swig_setattr(self, SessionContainer, 'this', _freeswitch.new_SessionContainer(*args)) - _swig_setattr(self, SessionContainer, 'thisown', 1) - def __del__(self, destroy=_freeswitch.delete_SessionContainer): - try: - if self.thisown: destroy(self) - except: pass - __swig_setmethods__["uuid"] = _freeswitch.SessionContainer_uuid_set - __swig_getmethods__["uuid"] = _freeswitch.SessionContainer_uuid_get - if _newclass:uuid = property(_freeswitch.SessionContainer_uuid_get, _freeswitch.SessionContainer_uuid_set) - def answer(*args): return _freeswitch.SessionContainer_answer(*args) - def pre_answer(*args): return _freeswitch.SessionContainer_pre_answer(*args) - def hangup(*args): return _freeswitch.SessionContainer_hangup(*args) - def set_variable(*args): return _freeswitch.SessionContainer_set_variable(*args) - def get_variable(*args): return _freeswitch.SessionContainer_get_variable(*args) - def play_file(*args): return _freeswitch.SessionContainer_play_file(*args) - def set_dtmf_callback(*args): return _freeswitch.SessionContainer_set_dtmf_callback(*args) - def speak_text(*args): return _freeswitch.SessionContainer_speak_text(*args) - def set_tts_parms(*args): return _freeswitch.SessionContainer_set_tts_parms(*args) - def get_digits(*args): return _freeswitch.SessionContainer_get_digits(*args) - def transfer(*args): return _freeswitch.SessionContainer_transfer(*args) - def play_and_get_digits(*args): return _freeswitch.SessionContainer_play_and_get_digits(*args) - def execute(*args): return _freeswitch.SessionContainer_execute(*args) - -class SessionContainerPtr(SessionContainer): - def __init__(self, this): - _swig_setattr(self, SessionContainer, 'this', this) - if not hasattr(self,"thisown"): _swig_setattr(self, SessionContainer, 'thisown', 0) - _swig_setattr(self, SessionContainer,self.__class__,SessionContainer) -_freeswitch.SessionContainer_swigregister(SessionContainerPtr) + __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__) + __setattr__ = lambda self, name, value: _swig_setattr(self, PySession, name, value) + __swig_getmethods__ = {} + for _s in [CoreSession]: __swig_getmethods__.update(_s.__swig_getmethods__) + __getattr__ = lambda self, name: _swig_getattr(self, PySession, name) + __repr__ = _swig_repr + def __init__(self, *args): + this = _freeswitch.new_PySession(*args) + try: self.this.append(this) + except: self.this = this + __swig_destroy__ = _freeswitch.delete_PySession + __del__ = lambda self : None; + def streamfile(*args): return _freeswitch.PySession_streamfile(*args) + def set_dtmf_callback(*args): return _freeswitch.PySession_set_dtmf_callback(*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 +PySession_swigregister(PySession) + 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 Wed May 16 18:49:51 2007 @@ -2,97 +2,34 @@ #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) -SessionContainer::SessionContainer(char *nuuid) -{ - uuid = nuuid; - dtmfCallbackFunction = NULL; - tts_name = NULL; - voice_name = NULL; - - if (session = switch_core_session_locate(uuid)) { - channel = switch_core_session_get_channel(session); - } -} - -SessionContainer::~SessionContainer() -{ - - if (session) { - switch_core_session_rwunlock(session); - } -} - -int SessionContainer::answer() -{ - switch_status_t status; - - sanity_check(-1); - status = switch_channel_answer(channel); - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; -} - -int SessionContainer::pre_answer() -{ - switch_status_t status; - sanity_check(-1); - switch_channel_pre_answer(channel); - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; -} - -void SessionContainer::hangup(char *cause) -{ - sanity_check(); - switch_channel_hangup(channel, switch_channel_str2cause(cause)); -} - -void SessionContainer::set_variable(char *var, char *val) +void PySession::set_dtmf_callback(PyObject *pyfunc) { sanity_check(); - switch_channel_set_variable(channel, var, val); -} - -char *SessionContainer::get_variable(char *var) -{ - sanity_check(NULL); - return switch_channel_get_variable(channel, var); + if (!PyCallable_Check(pyfunc)) { + dtmfCallbackFunction = NULL; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF function is not a python function."); + } + else { + dtmfCallbackFunction = pyfunc; + } } -void SessionContainer::execute(char *app, char *data) +int PySession::streamfile(char *file, PyObject *pyfunc, PyObject *funcargs, int starting_sample_count) { - const switch_application_interface_t *application_interface; - sanity_check(); - - if ((application_interface = switch_loadable_module_get_application_interface(app))) { - switch_core_session_exec(session, application_interface, data); - } -} + // TODO: callback_args is currently ignored + // NOTE: funcargs is expected to contain a string -int SessionContainer::play_file(char *file, char *timer_name) -{ switch_status_t status; switch_input_args_t args = { 0 }, *ap = NULL; - sanity_check(-1); - - if (switch_strlen_zero(timer_name)) { - timer_name = NULL; + struct input_callback_state cb_state = { 0 }; + switch_file_handle_t fh = { 0 }; + char *s; + + sanity_check(-1); + if (PyArg_ParseTuple(funcargs, "s", &s)) { + cb_state.funcargs = s; } - if (dtmfCallbackFunction) { - args.buf = dtmfCallbackFunction; - args.input_callback = PythonDTMFCallback; - ap = &args; - } - - Py_BEGIN_ALLOW_THREADS - status = switch_ivr_play_file(session, NULL, file, ap); - Py_END_ALLOW_THREADS - - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; -} - -void SessionContainer::set_dtmf_callback(PyObject *pyfunc) -{ - sanity_check(); if (!PyCallable_Check(pyfunc)) { dtmfCallbackFunction = NULL; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF function is not a python function."); @@ -100,74 +37,45 @@ else { dtmfCallbackFunction = pyfunc; } -} - -int SessionContainer::speak_text(char *text) -{ - switch_status_t status; - switch_codec_t *codec; - switch_input_args_t args = { 0 }, *ap = NULL; - sanity_check(-1); + fh.samples = starting_sample_count; - codec = switch_core_session_get_read_codec(session); if (dtmfCallbackFunction) { - args.buf = dtmfCallbackFunction; - args.input_callback = PythonDTMFCallback; - ap = &args; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting DTMF callback\n"); + 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 stuff in cb_state + ap = &args; + } + else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "NOT Setting DTMF callback\n"); } - Py_BEGIN_ALLOW_THREADS - status = switch_ivr_speak_text(session, tts_name, voice_name, codec->implementation->samples_per_second, text, ap); - Py_END_ALLOW_THREADS - - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; -} - -void SessionContainer::set_tts_parms(char *tts_name_p, char *voice_name_p) -{ - sanity_check(); - tts_name = tts_name_p; - voice_name = voice_name_p; -} - -int SessionContainer::get_digits(char *dtmf_buf, int len, char *terminators, char *terminator, int timeout) -{ - switch_status_t status; - sanity_check(-1); - Py_BEGIN_ALLOW_THREADS - status = switch_ivr_collect_digits_count(session, dtmf_buf,(uint32_t) len,(uint32_t) len, terminators, terminator, (uint32_t) timeout); - Py_END_ALLOW_THREADS + 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; -} -int SessionContainer::transfer(char *extension, char *dialplan, char *context) -{ - switch_status_t status; - sanity_check(-1); - - Py_BEGIN_ALLOW_THREADS - status = switch_ivr_session_transfer(session, extension, dialplan, context); - Py_END_ALLOW_THREADS - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } -int SessionContainer::play_and_get_digits(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); - Py_BEGIN_ALLOW_THREADS - status = switch_play_and_get_digits( session, (uint32_t) min_digits,(uint32_t) max_digits, - (uint32_t) max_tries, (uint32_t) timeout, - terminators, audio_files, bad_input_audio_files, dtmf_buf, 128, digits_regex); - Py_END_ALLOW_THREADS +void PySession::begin_allow_threads(void) { + threadState = PyEval_SaveThread(); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Py_BEGIN_ALLOW_THREADS\n"); +} - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; +void PySession::end_allow_threads(void) { + PyEval_RestoreThread(threadState); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Py_END_ALLOW_THREADS\n"); } +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 Wed May 16 18:49:51 2007 @@ -10,40 +10,42 @@ } #endif -#include <switch.h> +#include <switch_cpp.h> + + + +// declaration for function that is defined in mod_python.i +extern switch_status_t PythonDTMFCallback(switch_core_session *session, + void *input, + switch_input_type_t itype, + void *buf, + unsigned int buflen); -extern switch_status_t PythonDTMFCallback(switch_core_session * session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen); void console_log(char *level_str, char *msg); void console_clean_log(char *msg); char *api_execute(char *cmd, char *arg); void api_reply_delete(char *reply); -class SessionContainer { +struct input_callback_state { + PyObject *function; + PyThreadState *threadState; + void *extra; + char *funcargs; +}; + +class PySession : public CoreSession { private: - switch_core_session_t *session; - switch_channel_t *channel; PyObject *dtmfCallbackFunction; - char *tts_name; - char *voice_name; + PyThreadState *threadState; public: - SessionContainer(char *uuid); - ~SessionContainer(); - char *uuid; - - int answer(); - int pre_answer(); - void hangup(char *cause); - void set_variable(char *var, char *val); - char *get_variable(char *var); - int play_file(char *file, char *timer_name); - void set_dtmf_callback(PyObject * pyfunc); - int speak_text(char *text); - void set_tts_parms(char *tts_name, char *voice_name); - int get_digits(char *dtmf_buf, int len, char *terminators, char *terminator, int timeout); - int transfer(char *extensions, char *dialplan, char *context); - int play_and_get_digits(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); - void execute(char *app, char *data); + PySession(char *uuid) : CoreSession(uuid) {}; + PySession(switch_core_session_t *session) : CoreSession(session) {}; + ~PySession(); + int streamfile(char *file, PyObject *pyfunc, PyObject *funcargs, int starting_sample_count); + void set_dtmf_callback(PyObject *pyfunc); + void begin_allow_threads(); + void end_allow_threads(); + protected: }; Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python.c Wed May 16 18:49:51 2007 @@ -44,7 +44,7 @@ #include <switch.h> -static PyThreadState *mainThreadState = NULL; +PyThreadState *mainThreadState = NULL; void init_freeswitch(void); static switch_api_interface_t python_run_interface; @@ -111,7 +111,7 @@ PyRun_SimpleString("from freeswitch import *"); if (uuid) { char code[128]; - snprintf(code, sizeof(code), "session = SessionContainer(\"%s\");", uuid); + snprintf(code, sizeof(code), "session = PySession(\"%s\");", uuid); PyRun_SimpleString(code); } PySys_SetArgv(argc - lead, &argv[lead]); 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 Wed May 16 18:49:51 2007 @@ -5,28 +5,80 @@ %cstring_bounded_mutable(char *terminator, 8); %{ +#include "switch_cpp.h" #include "freeswitch_python.h" %} +%include switch_cpp.h %include freeswitch_python.h %{ +// status = args->input_callback(session, dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen); + + switch_status_t PythonDTMFCallback(switch_core_session_t *session, void *input, switch_input_type_t itype, - void *buf, + void *buf, // Python function defined in script unsigned int buflen) { PyObject *func, *arglist; PyObject *result; + struct input_callback_state *cb_state; switch_status_t dres = SWITCH_STATUS_FALSE; + PyThreadState *threadState = NULL; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "PythonDTMFCallback CALLED"); + + if (!buf) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "buf pointer is null"); + return dres; + } - func = (PyObject *) buf; // Get Python function + // TODO: a struct will be passed, of which one of the members will be + // the actual callback function + cb_state = (input_callback_state *) buf; + + func = (PyObject *) cb_state->function; // Get Python function + if (!func) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cb_state->function is null"); + return dres; + } + if (!PyCallable_Check(func)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "function not callable"); + return dres; + } + arglist = Py_BuildValue("(si)", input, itype); // Build argument list + if (!arglist) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error building arglist"); + return dres; + } + + threadState = (PyThreadState *) cb_state->threadState; + if (!threadState) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error, invalid threadstate"); + return dres; + } + + // TODO: the python should return string values just like the javascript + // user defined function. then in this function, we act on those values + // by pausing the fh (shit, where is the fh?), fast forwarding, etc. + // then figure out a freeswitch status to return and return it. + + + + PyEval_RestoreThread(threadState); + result = PyEval_CallObject(func, arglist); // Call Python + + threadState = PyEval_SaveThread(); + + Py_DECREF(arglist); // Trash arglist if (result) { // If no errors, return double + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "PythonDTMFCallback 5"); dres = (switch_status_t) PyInt_AsLong(result); } Py_XDECREF(result); 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 Wed May 16 18:49:51 2007 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.21 + * Version 1.3.29 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_PYTHON_DIRECTOR_NO_VTABLE #ifdef __cplusplus template<class T> class SwigValueWrapper { @@ -23,77 +24,290 @@ T *operator&() { return tt; } private: SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs); -}; +}; #endif +/* ----------------------------------------------------------------------------- + * This section contains generic SWIG labels for method/variable + * declarations/attributes, and other compiler dependent labels. + * ----------------------------------------------------------------------------- */ -#include "Python.h" +/* template workaround for compilers that cannot correctly implement the C++ standard */ +#ifndef SWIGTEMPLATEDISAMBIGUATOR +# if defined(__SUNPRO_CC) +# if (__SUNPRO_CC <= 0x560) +# define SWIGTEMPLATEDISAMBIGUATOR template +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif +#endif -/*************************************************************** -*- c -*- - * python/precommon.swg - * - * Rename all exported symbols from common.swg, to avoid symbol - * clashes if multiple interpreters are included - * - ************************************************************************/ +/* inline attribute */ +#ifndef SWIGINLINE +# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__)) +# define SWIGINLINE inline +# else +# define SWIGINLINE +# endif +#endif -#define SWIG_TypeRegister SWIG_Python_TypeRegister -#define SWIG_TypeCheck SWIG_Python_TypeCheck -#define SWIG_TypeCast SWIG_Python_TypeCast -#define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast -#define SWIG_TypeName SWIG_Python_TypeName -#define SWIG_TypeQuery SWIG_Python_TypeQuery -#define SWIG_TypeClientData SWIG_Python_TypeClientData -#define SWIG_PackData SWIG_Python_PackData -#define SWIG_UnpackData SWIG_Python_UnpackData +/* attribute recognised by some compilers to avoid 'unused' warnings */ +#ifndef SWIGUNUSED +# if defined(__GNUC__) +# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +# elif defined(__ICC) +# define SWIGUNUSED __attribute__ ((__unused__)) +# else +# define SWIGUNUSED +# endif +#endif +#ifndef SWIGUNUSEDPARM +# ifdef __cplusplus +# define SWIGUNUSEDPARM(p) +# else +# define SWIGUNUSEDPARM(p) p SWIGUNUSED +# endif +#endif -/*********************************************************************** - * common.swg - * - * This file contains generic SWIG runtime support for pointer - * type checking as well as a few commonly used macros to control - * external linkage. - * - * Author : David Beazley (beazley(a)cs.uchicago.edu) - * - * Copyright (c) 1999-2000, The University of Chicago - * - * This file may be freely redistributed without license or fee provided - * this copyright message remains intact. - ************************************************************************/ +/* internal SWIG method */ +#ifndef SWIGINTERN +# define SWIGINTERN static SWIGUNUSED +#endif -#include <string.h> +/* internal inline SWIG method */ +#ifndef SWIGINTERNINLINE +# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE +#endif -#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -# if defined(_MSC_VER) || defined(__GNUC__) -# if defined(STATIC_LINKED) -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) extern a -# else -# define SWIGEXPORT(a) __declspec(dllexport) a -# define SWIGIMPORT(a) extern a -# endif -# else -# if defined(__BORLANDC__) -# define SWIGEXPORT(a) a _export -# define SWIGIMPORT(a) a _export -# else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a -# endif +/* exporting methods */ +#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# ifndef GCC_HASCLASSVISIBILITY +# define GCC_HASCLASSVISIBILITY # endif -#else -# define SWIGEXPORT(a) a -# define SWIGIMPORT(a) a #endif -#ifdef SWIG_GLOBAL -# define SWIGRUNTIME(a) SWIGEXPORT(a) +#ifndef SWIGEXPORT +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# if defined(STATIC_LINKED) +# define SWIGEXPORT +# else +# define SWIGEXPORT __declspec(dllexport) +# endif +# else +# if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY) +# define SWIGEXPORT __attribute__ ((visibility("default"))) +# else +# define SWIGEXPORT +# endif +# endif +#endif + +/* calling conventions for Windows */ +#ifndef SWIGSTDCALL +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# define SWIGSTDCALL __stdcall +# else +# define SWIGSTDCALL +# endif +#endif + +/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ +#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) +# define _CRT_SECURE_NO_DEPRECATE +#endif + + +/* Python.h has to appear first */ +#include <Python.h> + +/* ----------------------------------------------------------------------------- + * swigrun.swg + * + * This file contains generic CAPI SWIG runtime support for pointer + * type checking. + * ----------------------------------------------------------------------------- */ + +/* This should only be incremented when either the layout of swig_type_info changes, + or for whatever reason, the runtime changes incompatibly */ +#define SWIG_RUNTIME_VERSION "2" + +/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */ +#ifdef SWIG_TYPE_TABLE +# define SWIG_QUOTE_STRING(x) #x +# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x) +# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE) #else -# define SWIGRUNTIME(a) static a +# define SWIG_TYPE_TABLE_NAME #endif +/* + You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for + creating a static or dynamic library from the swig runtime code. + In 99.9% of the cases, swig just needs to declare them as 'static'. + + But only do this if is strictly necessary, ie, if you have problems + with your compiler or so. +*/ + +#ifndef SWIGRUNTIME +# define SWIGRUNTIME SWIGINTERN +#endif + +#ifndef SWIGRUNTIMEINLINE +# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE +#endif + +/* Generic buffer size */ +#ifndef SWIG_BUFFER_SIZE +# define SWIG_BUFFER_SIZE 1024 +#endif + +/* Flags for pointer conversions */ +#define SWIG_POINTER_DISOWN 0x1 + +/* Flags for new pointer objects */ +#define SWIG_POINTER_OWN 0x1 + + +/* + Flags/methods for returning states. + + The swig conversion methods, as ConvertPtr, return and integer + that tells if the conversion was successful or not. And if not, + an error code can be returned (see swigerrors.swg for the codes). + + Use the following macros/flags to set or process the returning + states. + + In old swig versions, you usually write code as: + + if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) { + // success code + } else { + //fail code + } + + Now you can be more explicit as: + + int res = SWIG_ConvertPtr(obj,vptr,ty.flags); + if (SWIG_IsOK(res)) { + // success code + } else { + // fail code + } + + that seems to be the same, but now you can also do + + Type *ptr; + int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags); + if (SWIG_IsOK(res)) { + // success code + if (SWIG_IsNewObj(res) { + ... + delete *ptr; + } else { + ... + } + } else { + // fail code + } + + I.e., now SWIG_ConvertPtr can return new objects and you can + identify the case and take care of the deallocation. Of course that + requires also to SWIG_ConvertPtr to return new result values, as + + int SWIG_ConvertPtr(obj, ptr,...) { + if (<obj is ok>) { + if (<need new object>) { + *ptr = <ptr to new allocated object>; + return SWIG_NEWOBJ; + } else { + *ptr = <ptr to old object>; + return SWIG_OLDOBJ; + } + } else { + return SWIG_BADOBJ; + } + } + + Of course, returning the plain '0(success)/-1(fail)' still works, but you can be + more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the + swig errors code. + + Finally, if the SWIG_CASTRANK_MODE is enabled, the result code + allows to return the 'cast rank', for example, if you have this + + int food(double) + int fooi(int); + + and you call + + food(1) // cast rank '1' (1 -> 1.0) + fooi(1) // cast rank '0' + + just use the SWIG_AddCast()/SWIG_CheckState() + + + */ +#define SWIG_OK (0) +#define SWIG_ERROR (-1) +#define SWIG_IsOK(r) (r >= 0) +#define SWIG_ArgError(r) ((r != SWIG_ERROR) ? r : SWIG_TypeError) + +/* The CastRankLimit says how many bits are used for the cast rank */ +#define SWIG_CASTRANKLIMIT (1 << 8) +/* The NewMask denotes the object was created (using new/malloc) */ +#define SWIG_NEWOBJMASK (SWIG_CASTRANKLIMIT << 1) +/* The TmpMask is for in/out typemaps that use temporal objects */ +#define SWIG_TMPOBJMASK (SWIG_NEWOBJMASK << 1) +/* Simple returning values */ +#define SWIG_BADOBJ (SWIG_ERROR) +#define SWIG_OLDOBJ (SWIG_OK) +#define SWIG_NEWOBJ (SWIG_OK | SWIG_NEWOBJMASK) +#define SWIG_TMPOBJ (SWIG_OK | SWIG_TMPOBJMASK) +/* Check, add and del mask methods */ +#define SWIG_AddNewMask(r) (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r) +#define SWIG_DelNewMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r) +#define SWIG_IsNewObj(r) (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK)) +#define SWIG_AddTmpMask(r) (SWIG_IsOK(r) ? (r | SWIG_TMPOBJMASK) : r) +#define SWIG_DelTmpMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r) +#define SWIG_IsTmpObj(r) (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK)) + + +/* Cast-Rank Mode */ +#if defined(SWIG_CASTRANK_MODE) +# ifndef SWIG_TypeRank +# define SWIG_TypeRank unsigned long +# endif +# ifndef SWIG_MAXCASTRANK /* Default cast allowed */ +# define SWIG_MAXCASTRANK (2) +# endif +# define SWIG_CASTRANKMASK ((SWIG_CASTRANKLIMIT) -1) +# define SWIG_CastRank(r) (r & SWIG_CASTRANKMASK) +SWIGINTERNINLINE int SWIG_AddCast(int r) { + return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r; +} +SWIGINTERNINLINE int SWIG_CheckState(int r) { + return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; +} +#else /* no cast-rank mode */ +# define SWIG_AddCast +# define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0) +#endif + + + + +#include <string.h> + #ifdef __cplusplus extern "C" { #endif @@ -101,106 +315,141 @@ typedef void *(*swig_converter_func)(void *); typedef struct swig_type_info *(*swig_dycast_func)(void **); +/* Structure to store inforomation on one type */ typedef struct swig_type_info { - const char *name; - swig_converter_func converter; - const char *str; - void *clientdata; - swig_dycast_func dcast; - struct swig_type_info *next; - struct swig_type_info *prev; + const char *name; /* mangled name of this type */ + const char *str; /* human readable name of this type */ + swig_dycast_func dcast; /* dynamic cast function down a hierarchy */ + struct swig_cast_info *cast; /* linked list of types that can cast into this type */ + void *clientdata; /* language specific type data */ + int owndata; /* flag if the structure owns the clientdata */ } swig_type_info; -#ifdef SWIG_NOINCLUDE - -SWIGIMPORT(swig_type_info *) SWIG_TypeRegister(swig_type_info *); -SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *); -SWIGIMPORT(void *) SWIG_TypeCast(swig_type_info *, void *); -SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **); -SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *); -SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *); -SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); -SWIGIMPORT(char *) SWIG_PackData(char *, void *, int); -SWIGIMPORT(char *) SWIG_UnpackData(char *, void *, int); - -#else +/* Structure to store a type and conversion function used for casting */ +typedef struct swig_cast_info { + swig_type_info *type; /* pointer to type that is equivalent to this type */ + swig_converter_func converter; /* function to cast the void pointers */ + struct swig_cast_info *next; /* pointer to next cast in linked list */ + struct swig_cast_info *prev; /* pointer to the previous cast */ +} swig_cast_info; + +/* Structure used to store module information + * Each module generates one structure like this, and the runtime collects + * all of these structures and stores them in a circularly linked list.*/ +typedef struct swig_module_info { + swig_type_info **types; /* Array of pointers to swig_type_info structures that are in this module */ + size_t size; /* Number of types in this module */ + struct swig_module_info *next; /* Pointer to next element in circularly linked list */ + swig_type_info **type_initial; /* Array of initially generated type structures */ + swig_cast_info **cast_initial; /* Array of initially generated casting structures */ + void *clientdata; /* Language specific module data */ +} swig_module_info; + +/* + Compare two type names skipping the space characters, therefore + "char*" == "char *" and "Class<int>" == "Class<int >", etc. + + Return 0 when the two name types are equivalent, as in + strncmp, but skipping ' '. +*/ +SWIGRUNTIME int +SWIG_TypeNameComp(const char *f1, const char *l1, + const char *f2, const char *l2) { + for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) { + while ((*f1 == ' ') && (f1 != l1)) ++f1; + while ((*f2 == ' ') && (f2 != l2)) ++f2; + if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1; + } + return (l1 - f1) - (l2 - f2); +} -static swig_type_info *swig_type_list = 0; - -/* Register a type mapping with the type-checking */ -SWIGRUNTIME(swig_type_info *) -SWIG_TypeRegister(swig_type_info *ti) { - swig_type_info *tc, *head, *ret, *next; - /* Check to see if this type has already been registered */ - tc = swig_type_list; - while (tc) { - if (strcmp(tc->name, ti->name) == 0) { - /* Already exists in the table. Just add additional types to the list */ - if (tc->clientdata) ti->clientdata = tc->clientdata; - head = tc; - next = tc->next; - goto l1; - } - tc = tc->prev; - } - head = ti; - next = 0; - - /* Place in list */ - ti->prev = swig_type_list; - swig_type_list = ti; - - /* Build linked lists */ - l1: - ret = head; - tc = ti + 1; - /* Patch up the rest of the links */ - while (tc->name) { - head->next = tc; - tc->prev = head; - head = tc; - tc++; - } - if (next) next->prev = head; - head->next = next; - return ret; -} - -/* Check the typename */ -SWIGRUNTIME(swig_type_info *) -SWIG_TypeCheck(char *c, swig_type_info *ty) { - swig_type_info *s; - if (!ty) return 0; /* Void pointer */ - s = ty->next; /* First element always just a name */ - do { - if (strcmp(s->name,c) == 0) { - if (s == ty->next) return s; - /* Move s to the top of the linked list */ - s->prev->next = s->next; - if (s->next) { - s->next->prev = s->prev; - } - /* Insert s as second element in the list */ - s->next = ty->next; - if (ty->next) ty->next->prev = s; - ty->next = s; - s->prev = ty; - return s; +/* + Check type equivalence in a name list like <name1>|<name2>|... + Return 0 if not equal, 1 if equal +*/ +SWIGRUNTIME int +SWIG_TypeEquiv(const char *nb, const char *tb) { + int equiv = 0; + const char* te = tb + strlen(tb); + const char* ne = nb; + while (!equiv && *ne) { + for (nb = ne; *ne; ++ne) { + if (*ne == '|') break; } - s = s->next; - } while (s && (s != ty->next)); - return 0; + equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; + if (*ne) ++ne; + } + return equiv; } -/* Cast a pointer up an inheritance hierarchy */ -SWIGRUNTIME(void *) -SWIG_TypeCast(swig_type_info *ty, void *ptr) { - if ((!ty) || (!ty->converter)) return ptr; - return (*ty->converter)(ptr); +/* + Check type equivalence in a name list like <name1>|<name2>|... + Return 0 if equal, -1 if nb < tb, 1 if nb > tb +*/ +SWIGRUNTIME int +SWIG_TypeCompare(const char *nb, const char *tb) { + int equiv = 0; + const char* te = tb + strlen(tb); + const char* ne = nb; + while (!equiv && *ne) { + for (nb = ne; *ne; ++ne) { + if (*ne == '|') break; + } + equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; + if (*ne) ++ne; + } + return equiv; } -/* Dynamic pointer casting. Down an inheritance hierarchy */ -SWIGRUNTIME(swig_type_info *) + +/* think of this as a c++ template<> or a scheme macro */ +#define SWIG_TypeCheck_Template(comparison, ty) \ + if (ty) { \ + swig_cast_info *iter = ty->cast; \ + while (iter) { \ + if (comparison) { \ + if (iter == ty->cast) return iter; \ + /* Move iter to the top of the linked list */ \ + iter->prev->next = iter->next; \ + if (iter->next) \ + iter->next->prev = iter->prev; \ + iter->next = ty->cast; \ + iter->prev = 0; \ + if (ty->cast) ty->cast->prev = iter; \ + ty->cast = iter; \ + return iter; \ + } \ + iter = iter->next; \ + } \ + } \ + return 0 + +/* + Check the typename +*/ +SWIGRUNTIME swig_cast_info * +SWIG_TypeCheck(const char *c, swig_type_info *ty) { + SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty); +} + +/* Same as previous function, except strcmp is replaced with a pointer comparison */ +SWIGRUNTIME swig_cast_info * +SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) { + SWIG_TypeCheck_Template(iter->type == from, into); +} + +/* + Cast a pointer up an inheritance hierarchy +*/ +SWIGRUNTIMEINLINE void * +SWIG_TypeCast(swig_cast_info *ty, void *ptr) { + return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr); +} + +/* + Dynamic pointer casting. Down an inheritance hierarchy +*/ +SWIGRUNTIME swig_type_info * SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) { swig_type_info *lastty = ty; if (!ty || !ty->dcast) return ty; @@ -211,558 +460,2487 @@ return lastty; } -/* Return the name associated with this type */ -SWIGRUNTIME(const char *) +/* + Return the name associated with this type +*/ +SWIGRUNTIMEINLINE const char * SWIG_TypeName(const swig_type_info *ty) { return ty->name; } -/* Search for a swig_type_info structure */ -SWIGRUNTIME(swig_type_info *) -SWIG_TypeQuery(const char *name) { - swig_type_info *ty = swig_type_list; - while (ty) { - if (ty->str && (strcmp(name,ty->str) == 0)) return ty; - if (ty->name && (strcmp(name,ty->name) == 0)) return ty; - ty = ty->prev; +/* + Return the pretty name associated with this type, + that is an unmangled type name in a form presentable to the user. +*/ +SWIGRUNTIME const char * +SWIG_TypePrettyName(const swig_type_info *type) { + /* The "str" field contains the equivalent pretty names of the + type, separated by vertical-bar characters. We choose + to print the last name, as it is often (?) the most + specific. */ + if (!type) return NULL; + if (type->str != NULL) { + const char *last_name = type->str; + const char *s; + for (s = type->str; *s; s++) + if (*s == '|') last_name = s+1; + return last_name; } - return 0; + else + return type->name; } -/* Set the clientdata field for a type */ -SWIGRUNTIME(void) +/* + Set the clientdata field for a type +*/ +SWIGRUNTIME void SWIG_TypeClientData(swig_type_info *ti, void *clientdata) { - swig_type_info *tc, *equiv; - if (ti->clientdata == clientdata) return; + swig_cast_info *cast = ti->cast; + /* if (ti->clientdata == clientdata) return; */ ti->clientdata = clientdata; - equiv = ti->next; - while (equiv) { - if (!equiv->converter) { - tc = swig_type_list; - while (tc) { - if ((strcmp(tc->name, equiv->name) == 0)) - SWIG_TypeClientData(tc,clientdata); - tc = tc->prev; - } - } - equiv = equiv->next; + + while (cast) { + if (!cast->converter) { + swig_type_info *tc = cast->type; + if (!tc->clientdata) { + SWIG_TypeClientData(tc, clientdata); + } + } + cast = cast->next; + } +} +SWIGRUNTIME void +SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) { + SWIG_TypeClientData(ti, clientdata); + ti->owndata = 1; +} + +/* + Search for a swig_type_info structure only by mangled name + Search is a O(log #types) + + We start searching at module start, and finish searching when start == end. + Note: if start == end at the beginning of the function, we go all the way around + the circular list. +*/ +SWIGRUNTIME swig_type_info * +SWIG_MangledTypeQueryModule(swig_module_info *start, + swig_module_info *end, + const char *name) { + swig_module_info *iter = start; + do { + if (iter->size) { + register size_t l = 0; + register size_t r = iter->size - 1; + do { + /* since l+r >= 0, we can (>> 1) instead (/ 2) */ + register size_t i = (l + r) >> 1; + const char *iname = iter->types[i]->name; + if (iname) { + register int compare = strcmp(name, iname); + if (compare == 0) { + return iter->types[i]; + } else if (compare < 0) { + if (i) { + r = i - 1; + } else { + break; + } + } else if (compare > 0) { + l = i + 1; + } + } else { + break; /* should never happen */ + } + } while (l <= r); + } + iter = iter->next; + } while (iter != end); + return 0; +} + +/* + Search for a swig_type_info structure for either a mangled name or a human readable name. + It first searches the mangled names of the types, which is a O(log #types) + If a type is not found it then searches the human readable names, which is O(#types). + + We start searching at module start, and finish searching when start == end. + Note: if start == end at the beginning of the function, we go all the way around + the circular list. +*/ +SWIGRUNTIME swig_type_info * +SWIG_TypeQueryModule(swig_module_info *start, + swig_module_info *end, + const char *name) { + /* STEP 1: Search the name field using binary search */ + swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name); + if (ret) { + return ret; + } else { + /* STEP 2: If the type hasn't been found, do a complete search + of the str field (the human readable name) */ + swig_module_info *iter = start; + do { + register size_t i = 0; + for (; i < iter->size; ++i) { + if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name))) + return iter->types[i]; + } + iter = iter->next; + } while (iter != end); } + + /* neither found a match */ + return 0; } -/* Pack binary data into a string */ -SWIGRUNTIME(char *) -SWIG_PackData(char *c, void *ptr, int sz) { - static char hex[17] = "0123456789abcdef"; - int i; - unsigned char *u = (unsigned char *) ptr; - register unsigned char uu; - for (i = 0; i < sz; i++,u++) { - uu = *u; +/* + Pack binary data into a string +*/ +SWIGRUNTIME char * +SWIG_PackData(char *c, void *ptr, size_t sz) { + static const char hex[17] = "0123456789abcdef"; + register const unsigned char *u = (unsigned char *) ptr; + register const unsigned char *eu = u + sz; + for (; u != eu; ++u) { + register unsigned char uu = *u; *(c++) = hex[(uu & 0xf0) >> 4]; *(c++) = hex[uu & 0xf]; } return c; } -/* Unpack binary data from a string */ -SWIGRUNTIME(char *) -SWIG_UnpackData(char *c, void *ptr, int sz) { - register unsigned char uu = 0; - register int d; - unsigned char *u = (unsigned char *) ptr; - int i; - for (i = 0; i < sz; i++, u++) { - d = *(c++); +/* + Unpack binary data from a string +*/ +SWIGRUNTIME const char * +SWIG_UnpackData(const char *c, void *ptr, size_t sz) { + register unsigned char *u = (unsigned char *) ptr; + register const unsigned char *eu = u + sz; + for (; u != eu; ++u) { + register char d = *(c++); + register unsigned char uu; if ((d >= '0') && (d <= '9')) uu = ((d - '0') << 4); else if ((d >= 'a') && (d <= 'f')) uu = ((d - ('a'-10)) << 4); + else + return (char *) 0; d = *(c++); if ((d >= '0') && (d <= '9')) uu |= (d - '0'); else if ((d >= 'a') && (d <= 'f')) uu |= (d - ('a'-10)); + else + return (char *) 0; *u = uu; } return c; } -#endif +/* + Pack 'void *' into a string buffer. +*/ +SWIGRUNTIME char * +SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) { + char *r = buff; + if ((2*sizeof(void *) + 2) > bsz) return 0; + *(r++) = '_'; + r = SWIG_PackData(r,&ptr,sizeof(void *)); + if (strlen(name) + 1 > (bsz - (r - buff))) return 0; + strcpy(r,name); + return buff; +} -#ifdef __cplusplus +SWIGRUNTIME const char * +SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) { + if (*c != '_') { + if (strcmp(c,"NULL") == 0) { + *ptr = (void *) 0; + return name; + } else { + return 0; + } + } + return SWIG_UnpackData(++c,ptr,sizeof(void *)); } -#endif -/*********************************************************************** - * python.swg - * - * This file contains the runtime support for Python modules - * and includes code for managing global variables and pointer - * type checking. - * - * Author : David Beazley (beazley(a)cs.uchicago.edu) - ************************************************************************/ +SWIGRUNTIME char * +SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) { + char *r = buff; + size_t lname = (name ? strlen(name) : 0); + if ((2*sz + 2 + lname) > bsz) return 0; + *(r++) = '_'; + r = SWIG_PackData(r,ptr,sz); + if (lname) { + strncpy(r,name,lname+1); + } else { + *r = 0; + } + return buff; +} -#include "Python.h" +SWIGRUNTIME const char * +SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { + if (*c != '_') { + if (strcmp(c,"NULL") == 0) { + memset(ptr,0,sz); + return name; + } else { + return 0; + } + } + return SWIG_UnpackData(++c,ptr,sz); +} #ifdef __cplusplus -extern "C" { +} #endif -#define SWIG_PY_INT 1 -#define SWIG_PY_FLOAT 2 -#define SWIG_PY_STRING 3 -#define SWIG_PY_POINTER 4 -#define SWIG_PY_BINARY 5 - -/* Flags for pointer conversion */ - -#define SWIG_POINTER_EXCEPTION 0x1 -#define SWIG_POINTER_DISOWN 0x2 - -/* Exception handling in wrappers */ -#define SWIG_fail goto fail - -/* Constant information structure */ -typedef struct swig_const_info { - int type; - char *name; - long lvalue; - double dvalue; - void *pvalue; - swig_type_info **ptype; -} swig_const_info; - -/* Common SWIG API */ -#define SWIG_ConvertPtr(obj, pp, type, flags) \ - SWIG_Python_ConvertPtr(obj, pp, type, flags) -#define SWIG_NewPointerObj(p, type, flags) \ - SWIG_Python_NewPointerObj(p, type, flags) -#define SWIG_MustGetPtr(p, type, argnum, flags) \ - SWIG_Python_MustGetPtr(p, type, argnum, flags) - -/* Python-specific SWIG API */ -#define SWIG_newvarlink() \ - SWIG_Python_newvarlink() -#define SWIG_addvarlink(p, name, get_attr, set_attr) \ - SWIG_Python_addvarlink(p, name, get_attr, set_attr) -#define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \ - SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) -#define SWIG_NewPackedObj(ptr, sz, type) \ - SWIG_Python_NewPackedObj(ptr, sz, type) -#define SWIG_InstallConstants(d, constants) \ - SWIG_Python_InstallConstants(d, constants) - -#ifdef SWIG_NOINCLUDE - -SWIGIMPORT(int) SWIG_Python_ConvertPtr(PyObject *, void **, swig_type_info *, int); -SWIGIMPORT(PyObject *) SWIG_Python_NewPointerObj(void *, swig_type_info *,int own); -SWIGIMPORT(void *) SWIG_Python_MustGetPtr(PyObject *, swig_type_info *, int, int); -SWIGIMPORT(PyObject *) SWIG_Python_newvarlink(void); -SWIGIMPORT(void) SWIG_Python_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); -SWIGIMPORT(int) SWIG_Python_ConvertPacked(PyObject *, void *, int sz, swig_type_info *, int); -SWIGIMPORT(PyObject *) SWIG_Python_NewPackedObj(void *, int sz, swig_type_info *); -SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]); - -#else +/* Errors in SWIG */ +#define SWIG_UnknownError -1 +#define SWIG_IOError -2 +#define SWIG_RuntimeError -3 +#define SWIG_IndexError -4 +#define SWIG_TypeError -5 +#define SWIG_DivisionByZero -6 +#define SWIG_OverflowError -7 +#define SWIG_SyntaxError -8 +#define SWIG_ValueError -9 +#define SWIG_SystemError -10 +#define SWIG_AttributeError -11 +#define SWIG_MemoryError -12 +#define SWIG_NullReferenceError -13 -/* ----------------------------------------------------------------------------- - * global variable support code. - * ----------------------------------------------------------------------------- */ -typedef struct swig_globalvar { - char *name; /* Name of global variable */ - PyObject *(*get_attr)(void); /* Return the current value */ - int (*set_attr)(PyObject *); /* Set the value */ - struct swig_globalvar *next; -} swig_globalvar; -typedef struct swig_varlinkobject { - PyObject_HEAD - swig_globalvar *vars; -} swig_varlinkobject; +/* Python.h has to appear first */ +#include <Python.h> + +/* Add PyOS_snprintf for old Pythons */ +#if PY_VERSION_HEX < 0x02020000 +# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM) +# define PyOS_snprintf _snprintf +# else +# define PyOS_snprintf snprintf +# endif +#endif -static PyObject * -swig_varlink_repr(swig_varlinkobject *v) { - v = v; - return PyString_FromString("<Global variables>"); -} +/* A crude PyString_FromFormat implementation for old Pythons */ +#if PY_VERSION_HEX < 0x02020000 -static int -swig_varlink_print(swig_varlinkobject *v, FILE *fp, int flags) { - swig_globalvar *var; - flags = flags; - fprintf(fp,"Global variables { "); - for (var = v->vars; var; var=var->next) { - fprintf(fp,"%s", var->name); - if (var->next) fprintf(fp,", "); - } - fprintf(fp," }\n"); - return 0; -} +#ifndef SWIG_PYBUFFER_SIZE +# define SWIG_PYBUFFER_SIZE 1024 +#endif static PyObject * -swig_varlink_getattr(swig_varlinkobject *v, char *n) { - swig_globalvar *var = v->vars; - while (var) { - if (strcmp(var->name,n) == 0) { - return (*var->get_attr)(); - } - var = var->next; - } - PyErr_SetString(PyExc_NameError,"Unknown C global variable"); - return NULL; +PyString_FromFormat(const char *fmt, ...) { + va_list ap; + char buf[SWIG_PYBUFFER_SIZE * 2]; + int res; + va_start(ap, fmt); + res = vsnprintf(buf, sizeof(buf), fmt, ap); + va_end(ap); + return (res < 0 || res >= (int)sizeof(buf)) ? 0 : PyString_FromString(buf); } +#endif -static int -swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) { - swig_globalvar *var = v->vars; - while (var) { - if (strcmp(var->name,n) == 0) { - return (*var->set_attr)(p); - } - var = var->next; - } - PyErr_SetString(PyExc_NameError,"Unknown C global variable"); - return 1; -} - -statichere PyTypeObject varlinktype = { - PyObject_HEAD_INIT(0) - 0, - (char *)"swigvarlink", /* Type name */ - sizeof(swig_varlinkobject), /* Basic size */ - 0, /* Itemsize */ - 0, /* Deallocator */ - (printfunc) swig_varlink_print, /* Print */ - (getattrfunc) swig_varlink_getattr, /* get attr */ - (setattrfunc) swig_varlink_setattr, /* Set attr */ - 0, /* tp_compare */ - (reprfunc) swig_varlink_repr, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_mapping*/ - 0, /* tp_hash */ -}; +/* Add PyObject_Del for old Pythons */ +#if PY_VERSION_HEX < 0x01060000 +# define PyObject_Del(op) PyMem_DEL((op)) +#endif +#ifndef PyObject_DEL +# define PyObject_DEL PyObject_Del +#endif -/* Create a variable linking object for use later */ -SWIGRUNTIME(PyObject *) -SWIG_Python_newvarlink(void) { - swig_varlinkobject *result = 0; - result = PyMem_NEW(swig_varlinkobject,1); - varlinktype.ob_type = &PyType_Type; /* Patch varlinktype into a PyType */ - result->ob_type = &varlinktype; - result->vars = 0; - result->ob_refcnt = 0; - Py_XINCREF((PyObject *) result); - return ((PyObject*) result); -} - -SWIGRUNTIME(void) -SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) { - swig_varlinkobject *v; - swig_globalvar *gv; - v= (swig_varlinkobject *) p; - gv = (swig_globalvar *) malloc(sizeof(swig_globalvar)); - gv->name = (char *) malloc(strlen(name)+1); - strcpy(gv->name,name); - gv->get_attr = get_attr; - gv->set_attr = set_attr; - gv->next = v->vars; - v->vars = gv; -} +/* A crude PyExc_StopIteration exception for old Pythons */ +#if PY_VERSION_HEX < 0x02020000 +# ifndef PyExc_StopIteration +# define PyExc_StopIteration PyExc_RuntimeError +# endif +# ifndef PyObject_GenericGetAttr +# define PyObject_GenericGetAttr 0 +# endif +#endif +/* Py_NotImplemented is defined in 2.1 and up. */ +#if PY_VERSION_HEX < 0x02010000 +# ifndef Py_NotImplemented +# define Py_NotImplemented PyExc_RuntimeError +# endif +#endif -/* Convert a pointer value */ -SWIGRUNTIME(int) -SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) { - swig_type_info *tc; - char *c = 0; - static PyObject *SWIG_this = 0; - int newref = 0; - PyObject *pyobj = 0; - if (!obj) return 0; - if (obj == Py_None) { - *ptr = 0; - return 0; - } -#ifdef SWIG_COBJECT_TYPES - if (!(PyCObject_Check(obj))) { - if (!SWIG_this) - SWIG_this = PyString_FromString("this"); - pyobj = obj; - obj = PyObject_GetAttr(obj,SWIG_this); - newref = 1; - if (!obj) goto type_error; - if (!PyCObject_Check(obj)) { - Py_DECREF(obj); - goto type_error; - } - } - *ptr = PyCObject_AsVoidPtr(obj); - c = (char *) PyCObject_GetDesc(obj); - if (newref) Py_DECREF(obj); - goto cobject; -#else - if (!(PyString_Check(obj))) { - if (!SWIG_this) - SWIG_this = PyString_FromString("this"); - pyobj = obj; - obj = PyObject_GetAttr(obj,SWIG_this); - newref = 1; - if (!obj) goto type_error; - if (!PyString_Check(obj)) { - Py_DECREF(obj); - goto type_error; - } - } - c = PyString_AsString(obj); - /* Pointer values must start with leading underscore */ - if (*c != '_') { - *ptr = (void *) 0; - if (strcmp(c,"NULL") == 0) { - if (newref) { Py_DECREF(obj); } - return 0; - } else { - if (newref) { Py_DECREF(obj); } - goto type_error; - } - } - c++; - c = SWIG_UnpackData(c,ptr,sizeof(void *)); - if (newref) { Py_DECREF(obj); } +/* A crude PyString_AsStringAndSize implementation for old Pythons */ +#if PY_VERSION_HEX < 0x02010000 +# ifndef PyString_AsStringAndSize +# define PyString_AsStringAndSize(obj, s, len) {*s = PyString_AsString(obj); *len = *s ? strlen(*s) : 0;} +# endif #endif -#ifdef SWIG_COBJECT_TYPES -cobject: +/* PySequence_Size for old Pythons */ +#if PY_VERSION_HEX < 0x02000000 +# ifndef PySequence_Size +# define PySequence_Size PySequence_Length +# endif #endif - if (ty) { - tc = SWIG_TypeCheck(c,ty); - if (!tc) goto type_error; - *ptr = SWIG_TypeCast(tc,(void*) *ptr); - } - - if ((pyobj) && (flags & SWIG_POINTER_DISOWN)) { - PyObject *zero = PyInt_FromLong(0); - PyObject_SetAttrString(pyobj,(char*)"thisown",zero); - Py_DECREF(zero); - } - return 0; - -type_error: - if (flags & SWIG_POINTER_EXCEPTION) { - if (ty && c) { - char *temp = (char *) malloc(64+strlen(ty->name)+strlen(c)); - sprintf(temp,"Type error. Got %s, expected %s", c, ty->name); - PyErr_SetString(PyExc_TypeError, temp); - free((char *) temp); - } else { - PyErr_SetString(PyExc_TypeError,"Expected a pointer"); - } - } - return -1; -} -/* Convert a pointer value, signal an exception on a type mismatch */ -SWIGRUNTIME(void *) -SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) { - void *result; - SWIG_Python_ConvertPtr(obj, &result, ty, flags | SWIG_POINTER_EXCEPTION); +/* PyBool_FromLong for old Pythons */ +#if PY_VERSION_HEX < 0x02030000 +static +PyObject *PyBool_FromLong(long ok) +{ + PyObject *result = ok ? Py_True : Py_False; + Py_INCREF(result); return result; } +#endif -/* Convert a packed value value */ -SWIGRUNTIME(int) -SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, int sz, swig_type_info *ty, int flags) { - swig_type_info *tc; - char *c = 0; - - if ((!obj) || (!PyString_Check(obj))) goto type_error; - c = PyString_AsString(obj); - /* Pointer values must start with leading underscore */ - if (*c != '_') goto type_error; - c++; - c = SWIG_UnpackData(c,ptr,sz); - if (ty) { - tc = SWIG_TypeCheck(c,ty); - if (!tc) goto type_error; - } - return 0; -type_error: +/* ----------------------------------------------------------------------------- + * error manipulation + * ----------------------------------------------------------------------------- */ - if (flags) { - if (ty && c) { - char *temp = (char *) malloc(64+strlen(ty->name)+strlen(c)); - sprintf(temp,"Type error. Got %s, expected %s", c, ty->name); - PyErr_SetString(PyExc_TypeError, temp); - free((char *) temp); - } else { - PyErr_SetString(PyExc_TypeError,"Expected a pointer"); - } +SWIGRUNTIME PyObject* +SWIG_Python_ErrorType(int code) { + PyObject* type = 0; + switch(code) { + case SWIG_MemoryError: + type = PyExc_MemoryError; + break; + case SWIG_IOError: + type = PyExc_IOError; + break; + case SWIG_RuntimeError: + type = PyExc_RuntimeError; + break; + case SWIG_IndexError: + type = PyExc_IndexError; + break; + case SWIG_TypeError: + type = PyExc_TypeError; + break; + case SWIG_DivisionByZero: + type = PyExc_ZeroDivisionError; + break; + case SWIG_OverflowError: + type = PyExc_OverflowError; + break; + case SWIG_SyntaxError: + type = PyExc_SyntaxError; + break; + case SWIG_ValueError: + type = PyExc_ValueError; + break; + case SWIG_SystemError: + type = PyExc_SystemError; + break; + case SWIG_AttributeError: + type = PyExc_AttributeError; + break; + default: + type = PyExc_RuntimeError; } - return -1; + return type; } -/* Create a new pointer object */ -SWIGRUNTIME(PyObject *) -SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int own) { - PyObject *robj; - if (!ptr) { - Py_INCREF(Py_None); - return Py_None; - } -#ifdef SWIG_COBJECT_TYPES - robj = PyCObject_FromVoidPtrAndDesc((void *) ptr, (char *) type->name, NULL); -#else - { - char result[1024]; - char *r = result; - *(r++) = '_'; - r = SWIG_PackData(r,&ptr,sizeof(void *)); - strcpy(r,type->name); - robj = PyString_FromString(result); - } -#endif - if (!robj || (robj == Py_None)) return robj; - if (type->clientdata) { - PyObject *inst; - PyObject *args = Py_BuildValue((char*)"(O)", robj); - Py_DECREF(robj); - inst = PyObject_CallObject((PyObject *) type->clientdata, args); - Py_DECREF(args); - if (inst) { - if (own) { - PyObject *n = PyInt_FromLong(1); - PyObject_SetAttrString(inst,(char*)"thisown",n); - Py_DECREF(n); - } - robj = inst; - } + +SWIGRUNTIME void +SWIG_Python_AddErrorMsg(const char* mesg) +{ + PyObject *type = 0; + PyObject *value = 0; + PyObject *traceback = 0; + + if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback); + if (value) { + PyObject *old_str = PyObject_Str(value); + PyErr_Clear(); + Py_XINCREF(type); + PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg); + Py_DECREF(old_str); + Py_DECREF(value); + } else { + PyErr_Format(PyExc_RuntimeError, mesg); } - return robj; } -SWIGRUNTIME(PyObject *) -SWIG_Python_NewPackedObj(void *ptr, int sz, swig_type_info *type) { - char result[1024]; - char *r = result; - if ((2*sz + 1 + strlen(type->name)) > 1000) return 0; - *(r++) = '_'; - r = SWIG_PackData(r,ptr,sz); - strcpy(r,type->name); - return PyString_FromString(result); -} -/* Install Constants */ -SWIGRUNTIME(void) -SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) { - int i; - PyObject *obj; - for (i = 0; constants[i].type; i++) { - switch(constants[i].type) { - case SWIG_PY_INT: - obj = PyInt_FromLong(constants[i].lvalue); - break; - case SWIG_PY_FLOAT: - obj = PyFloat_FromDouble(constants[i].dvalue); - break; - case SWIG_PY_STRING: - obj = PyString_FromString((char *) constants[i].pvalue); - break; - case SWIG_PY_POINTER: - obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0); - break; - case SWIG_PY_BINARY: - obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype)); - break; - default: - obj = 0; - break; - } - if (obj) { - PyDict_SetItemString(d,constants[i].name,obj); - Py_DECREF(obj); - } - } -} +#if defined(SWIG_PYTHON_NO_THREADS) +# if defined(SWIG_PYTHON_THREADS) +# undef SWIG_PYTHON_THREADS +# endif +#endif +#if defined(SWIG_PYTHON_THREADS) /* Threading support is enabled */ +# if !defined(SWIG_PYTHON_USE_GIL) && !defined(SWIG_PYTHON_NO_USE_GIL) +# if (PY_VERSION_HEX >= 0x02030000) /* For 2.3 or later, use the PyGILState calls */ +# define SWIG_PYTHON_USE_GIL +# endif +# endif +# if defined(SWIG_PYTHON_USE_GIL) /* Use PyGILState threads calls */ +# ifndef SWIG_PYTHON_INITIALIZE_THREADS +# define SWIG_PYTHON_INITIALIZE_THREADS PyEval_InitThreads() +# endif +# ifdef __cplusplus /* C++ code */ + class SWIG_Python_Thread_Block { + bool status; + PyGILState_STATE state; + public: + void end() { if (status) { PyGILState_Release(state); status = false;} } + SWIG_Python_Thread_Block() : status(true), state(PyGILState_Ensure()) {} + ~SWIG_Python_Thread_Block() { end(); } + }; + class SWIG_Python_Thread_Allow { + bool status; + PyThreadState *save; + public: + void end() { if (status) { PyEval_RestoreThread(save); status = false; }} + SWIG_Python_Thread_Allow() : status(true), save(PyEval_SaveThread()) {} + ~SWIG_Python_Thread_Allow() { end(); } + }; +# define SWIG_PYTHON_THREAD_BEGIN_BLOCK SWIG_Python_Thread_Block _swig_thread_block +# define SWIG_PYTHON_THREAD_END_BLOCK _swig_thread_block.end() +# define SWIG_PYTHON_THREAD_BEGIN_ALLOW SWIG_Python_Thread_Allow _swig_thread_allow +# define SWIG_PYTHON_THREAD_END_ALLOW _swig_thread_allow.end() +# else /* C code */ +# define SWIG_PYTHON_THREAD_BEGIN_BLOCK PyGILState_STATE _swig_thread_block = PyGILState_Ensure() +# define SWIG_PYTHON_THREAD_END_BLOCK PyGILState_Release(_swig_thread_block) +# define SWIG_PYTHON_THREAD_BEGIN_ALLOW PyThreadState *_swig_thread_allow = PyEval_SaveThread() +# define SWIG_PYTHON_THREAD_END_ALLOW PyEval_RestoreThread(_swig_thread_allow) +# endif +# else /* Old thread way, not implemented, user must provide it */ +# if !defined(SWIG_PYTHON_INITIALIZE_THREADS) +# define SWIG_PYTHON_INITIALIZE_THREADS +# endif +# if !defined(SWIG_PYTHON_THREAD_BEGIN_BLOCK) +# define SWIG_PYTHON_THREAD_BEGIN_BLOCK +# endif +# if !defined(SWIG_PYTHON_THREAD_END_BLOCK) +# define SWIG_PYTHON_THREAD_END_BLOCK +# endif +# if !defined(SWIG_PYTHON_THREAD_BEGIN_ALLOW) +# define SWIG_PYTHON_THREAD_BEGIN_ALLOW +# endif +# if !defined(SWIG_PYTHON_THREAD_END_ALLOW) +# define SWIG_PYTHON_THREAD_END_ALLOW +# endif +# endif +#else /* No thread support */ +# define SWIG_PYTHON_INITIALIZE_THREADS +# define SWIG_PYTHON_THREAD_BEGIN_BLOCK +# define SWIG_PYTHON_THREAD_END_BLOCK +# define SWIG_PYTHON_THREAD_BEGIN_ALLOW +# define SWIG_PYTHON_THREAD_END_ALLOW +#endif + +/* ----------------------------------------------------------------------------- + * Python API portion that goes into the runtime + * ----------------------------------------------------------------------------- */ + +#ifdef __cplusplus +extern "C" { +#if 0 +} /* cc-mode */ +#endif #endif -/* Contract support */ +/* ----------------------------------------------------------------------------- + * Constant declarations + * ----------------------------------------------------------------------------- */ + +/* Constant Types */ +#define SWIG_PY_POINTER 4 +#define SWIG_PY_BINARY 5 -#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else +/* Constant information structure */ +typedef struct swig_const_info { + int type; + char *name; + long lvalue; + double dvalue; + void *pvalue; + swig_type_info **ptype; +} swig_const_info; #ifdef __cplusplus +#if 0 +{ /* cc-mode */ +#endif } #endif -/* -------- TYPES TABLE (BEGIN) -------- */ +/* ----------------------------------------------------------------------------- + * See the LICENSE file for information on copyright, usage and redistribution + * of SWIG, and the README file for authors - http://www.swig.org/release.html. + * + * pyrun.swg + * + * This file contains the runtime support for Python modules + * and includes code for managing global variables and pointer + * type checking. + * + * ----------------------------------------------------------------------------- */ -#define SWIGTYPE_p_switch_status_t swig_types[0] -#define SWIGTYPE_p_switch_input_type_t swig_types[1] -#define SWIGTYPE_p_switch_core_session swig_types[2] -#define SWIGTYPE_p_SessionContainer swig_types[3] -static swig_type_info *swig_types[5]; +/* Common SWIG API */ -/* -------- TYPES TABLE (END) -------- */ +/* for raw pointers */ +#define SWIG_Python_ConvertPtr(obj, pptr, type, flags) SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, 0) +#define SWIG_ConvertPtr(obj, pptr, type, flags) SWIG_Python_ConvertPtr(obj, pptr, type, flags) +#define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own) SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, own) +#define SWIG_NewPointerObj(ptr, type, flags) SWIG_Python_NewPointerObj(ptr, type, flags) +#define SWIG_CheckImplicit(ty) SWIG_Python_CheckImplicit(ty) +#define SWIG_AcquirePtr(ptr, src) SWIG_Python_AcquirePtr(ptr, src) +#define swig_owntype int +/* for raw packed data */ +#define SWIG_ConvertPacked(obj, ptr, sz, ty) SWIG_Python_ConvertPacked(obj, ptr, sz, ty) +#define SWIG_NewPackedObj(ptr, sz, type) SWIG_Python_NewPackedObj(ptr, sz, type) -/*----------------------------------------------- - @(target):= _freeswitch.so - ------------------------------------------------*/ -#define SWIG_init init_freeswitch +/* for class or struct pointers */ +#define SWIG_ConvertInstance(obj, pptr, type, flags) SWIG_ConvertPtr(obj, pptr, type, flags) +#define SWIG_NewInstanceObj(ptr, type, flags) SWIG_NewPointerObj(ptr, type, flags) -#define SWIG_name "_freeswitch" +/* for C or C++ function pointers */ +#define SWIG_ConvertFunctionPtr(obj, pptr, type) SWIG_Python_ConvertFunctionPtr(obj, pptr, type) +#define SWIG_NewFunctionPtrObj(ptr, type) SWIG_Python_NewPointerObj(ptr, type, 0) -#include "freeswitch_python.h" +/* for C++ member pointers, ie, member methods */ +#define SWIG_ConvertMember(obj, ptr, sz, ty) SWIG_Python_ConvertPacked(obj, ptr, sz, ty) +#define SWIG_NewMemberObj(ptr, sz, type) SWIG_Python_NewPackedObj(ptr, sz, type) -extern switch_status_t PythonDTMFCallback(switch_core_session *,void *,switch_input_type_t,void *,unsigned int); -static PyObject* t_output_helper(PyObject* target, PyObject* o) { - PyObject* o2; - PyObject* o3; - - if (!target) { - target = o; - } else if (target == Py_None) { - Py_DECREF(Py_None); - target = o; - } else { - if (!PyTuple_Check(target)) { - o2 = target; - target = PyTuple_New(1); - PyTuple_SetItem(target, 0, o2); - } - o3 = PyTuple_New(1); - PyTuple_SetItem(o3, 0, o); +/* Runtime API */ - o2 = target; - target = PySequence_Concat(o2, o3); - Py_DECREF(o2); - Py_DECREF(o3); - } - return target; -} +#define SWIG_GetModule(clientdata) SWIG_Python_GetModule() +#define SWIG_SetModule(clientdata, pointer) SWIG_Python_SetModule(pointer) +#define SWIG_NewClientData(obj) PySwigClientData_New(obj) +#define SWIG_SetErrorObj SWIG_Python_SetErrorObj +#define SWIG_SetErrorMsg SWIG_Python_SetErrorMsg +#define SWIG_ErrorType(code) SWIG_Python_ErrorType(code) +#define SWIG_Error(code, msg) SWIG_Python_SetErrorMsg(SWIG_ErrorType(code), msg) +#define SWIG_fail goto fail -switch_status_t PythonDTMFCallback(switch_core_session_t *session, - void *input, - switch_input_type_t itype, - void *buf, - unsigned int buflen) +/* Runtime API implementation */ + +/* Error manipulation */ + +SWIGINTERN void +SWIG_Python_SetErrorObj(PyObject *errtype, PyObject *obj) { + SWIG_PYTHON_THREAD_BEGIN_BLOCK; + PyErr_SetObject(errtype, obj); + Py_DECREF(obj); + SWIG_PYTHON_THREAD_END_BLOCK; +} + +SWIGINTERN void +SWIG_Python_SetErrorMsg(PyObject *errtype, const char *msg) { + SWIG_PYTHON_THREAD_BEGIN_BLOCK; + PyErr_SetString(errtype, (char *) msg); + SWIG_PYTHON_THREAD_END_BLOCK; +} + +#define SWIG_Python_Raise(obj, type, desc) SWIG_Python_SetErrorObj(SWIG_Python_ExceptionType(desc), obj) + +/* Set a constant value */ + +SWIGINTERN void +SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) { + PyDict_SetItemString(d, (char*) name, obj); + Py_DECREF(obj); +} + +/* Append a value to the result obj */ + +SWIGINTERN PyObject* +SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) { +#if !defined(SWIG_PYTHON_OUTPUT_TUPLE) + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyList_Check(result)) { + PyObject *o2 = result; + result = PyList_New(1); + PyList_SetItem(result, 0, o2); + } + PyList_Append(result,obj); + Py_DECREF(obj); + } + return result; +#else + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SET_ITEM(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; +#endif +} + +/* Unpack the argument tuple */ + +SWIGINTERN int +SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyObject **objs) +{ + if (!args) { + if (!min && !max) { + return 1; + } else { + PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", + name, (min == max ? "" : "at least "), min); + return 0; + } + } + if (!PyTuple_Check(args)) { + PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple"); + return 0; + } else { + register int l = PyTuple_GET_SIZE(args); + if (l < min) { + PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", + name, (min == max ? "" : "at least "), min, l); + return 0; + } else if (l > max) { + PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", + name, (min == max ? "" : "at most "), max, l); + return 0; + } else { + register int i; + for (i = 0; i < l; ++i) { + objs[i] = PyTuple_GET_ITEM(args, i); + } + for (; l < max; ++l) { + objs[l] = 0; + } + return i + 1; + } + } +} + +/* A functor is a function object with one single object argument */ +#if PY_VERSION_HEX >= 0x02020000 +#define SWIG_Python_CallFunctor(functor, obj) PyObject_CallFunctionObjArgs(functor, obj, NULL); +#else +#define SWIG_Python_CallFunctor(functor, obj) PyObject_CallFunction(functor, "O", obj); +#endif + +/* + Helper for static pointer initialization for both C and C++ code, for example + static PyObject *SWIG_STATIC_POINTER(MyVar) = NewSomething(...); +*/ +#ifdef __cplusplus +#define SWIG_STATIC_POINTER(var) var +#else +#define SWIG_STATIC_POINTER(var) var = 0; if (!var) var +#endif + +/* ----------------------------------------------------------------------------- + * Pointer declarations + * ----------------------------------------------------------------------------- */ + +/* Flags for new pointer objects */ +#define SWIG_POINTER_NOSHADOW (SWIG_POINTER_OWN << 1) +#define SWIG_POINTER_NEW (SWIG_POINTER_NOSHADOW | SWIG_POINTER_OWN) + +#define SWIG_POINTER_IMPLICIT_CONV (SWIG_POINTER_DISOWN << 1) + +#ifdef __cplusplus +extern "C" { +#if 0 +} /* cc-mode */ +#endif +#endif + +/* How to access Py_None */ +#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +# ifndef SWIG_PYTHON_NO_BUILD_NONE +# ifndef SWIG_PYTHON_BUILD_NONE +# define SWIG_PYTHON_BUILD_NONE +# endif +# endif +#endif + +#ifdef SWIG_PYTHON_BUILD_NONE +# ifdef Py_None +# undef Py_None +# define Py_None SWIG_Py_None() +# endif +SWIGRUNTIMEINLINE PyObject * +_SWIG_Py_None(void) +{ + PyObject *none = Py_BuildValue(""); + Py_DECREF(none); + return none; +} +SWIGRUNTIME PyObject * +SWIG_Py_None(void) +{ + static PyObject *SWIG_STATIC_POINTER(none) = _SWIG_Py_None(); + return none; +} +#endif + +/* The python void return value */ + +SWIGRUNTIMEINLINE PyObject * +SWIG_Py_Void(void) +{ + PyObject *none = Py_None; + Py_INCREF(none); + return none; +} + +/* PySwigClientData */ + +typedef struct { + PyObject *klass; + PyObject *newraw; + PyObject *newargs; + PyObject *destroy; + int delargs; + int implicitconv; +} PySwigClientData; + +SWIGRUNTIMEINLINE int +SWIG_Python_CheckImplicit(swig_type_info *ty) +{ + PySwigClientData *data = (PySwigClientData *)ty->clientdata; + return data ? data->implicitconv : 0; +} + +SWIGRUNTIMEINLINE PyObject * +SWIG_Python_ExceptionType(swig_type_info *desc) { + PySwigClientData *data = desc ? (PySwigClientData *) desc->clientdata : 0; + PyObject *klass = data ? data->klass : 0; + return (klass ? klass : PyExc_RuntimeError); +} + + +SWIGRUNTIME PySwigClientData * +PySwigClientData_New(PyObject* obj) +{ + if (!obj) { + return 0; + } else { + PySwigClientData *data = (PySwigClientData *)malloc(sizeof(PySwigClientData)); + /* the klass element */ + data->klass = obj; + Py_INCREF(data->klass); + /* the newraw method and newargs arguments used to create a new raw instance */ + if (PyClass_Check(obj)) { + data->newraw = 0; + data->newargs = obj; + Py_INCREF(obj); + } else { +#if (PY_VERSION_HEX < 0x02020000) + data->newraw = 0; +#else + data->newraw = PyObject_GetAttrString(data->klass, (char *)"__new__"); +#endif + if (data->newraw) { + Py_INCREF(data->newraw); + data->newargs = PyTuple_New(1); + PyTuple_SetItem(data->newargs, 0, obj); + } else { + data->newargs = obj; + } + Py_INCREF(data->newargs); + } + /* the destroy method, aka as the C++ delete method */ + data->destroy = PyObject_GetAttrString(data->klass, (char *)"__swig_destroy__"); + if (PyErr_Occurred()) { + PyErr_Clear(); + data->destroy = 0; + } + if (data->destroy) { + int flags; + Py_INCREF(data->destroy); + flags = PyCFunction_GET_FLAGS(data->destroy); +#ifdef METH_O + data->delargs = !(flags & (METH_O)); +#else + data->delargs = 0; +#endif + } else { + data->delargs = 0; + } + data->implicitconv = 0; + return data; + } +} + +SWIGRUNTIME void +PySwigClientData_Del(PySwigClientData* data) +{ + Py_XDECREF(data->newraw); + Py_XDECREF(data->newargs); + Py_XDECREF(data->destroy); +} + +/* =============== PySwigObject =====================*/ + +typedef struct { + PyObject_HEAD + void *ptr; + swig_type_info *ty; + int own; + PyObject *next; +} PySwigObject; + +SWIGRUNTIME PyObject * +PySwigObject_long(PySwigObject *v) +{ + return PyLong_FromVoidPtr(v->ptr); +} + +SWIGRUNTIME PyObject * +PySwigObject_format(const char* fmt, PySwigObject *v) +{ + PyObject *res = NULL; + PyObject *args = PyTuple_New(1); + if (args) { + if (PyTuple_SetItem(args, 0, PySwigObject_long(v)) == 0) { + PyObject *ofmt = PyString_FromString(fmt); + if (ofmt) { + res = PyString_Format(ofmt,args); + Py_DECREF(ofmt); + } + Py_DECREF(args); + } + } + return res; +} + +SWIGRUNTIME PyObject * +PySwigObject_oct(PySwigObject *v) +{ + return PySwigObject_format("%o",v); +} + +SWIGRUNTIME PyObject * +PySwigObject_hex(PySwigObject *v) +{ + return PySwigObject_format("%x",v); +} + +SWIGRUNTIME PyObject * +#ifdef METH_NOARGS +PySwigObject_repr(PySwigObject *v) +#else +PySwigObject_repr(PySwigObject *v, PyObject *args) +#endif +{ + const char *name = SWIG_TypePrettyName(v->ty); + PyObject *hex = PySwigObject_hex(v); + PyObject *repr = PyString_FromFormat("<Swig Object of type '%s' at 0x%s>", name, PyString_AsString(hex)); + Py_DECREF(hex); + if (v->next) { +#ifdef METH_NOARGS + PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next); +#else + PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next, args); +#endif + PyString_ConcatAndDel(&repr,nrep); + } + return repr; +} + +SWIGRUNTIME int +PySwigObject_print(PySwigObject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) +{ +#ifdef METH_NOARGS + PyObject *repr = PySwigObject_repr(v); +#else + PyObject *repr = PySwigObject_repr(v, NULL); +#endif + if (repr) { + fputs(PyString_AsString(repr), fp); + Py_DECREF(repr); + return 0; + } else { + return 1; + } +} + +SWIGRUNTIME PyObject * +PySwigObject_str(PySwigObject *v) +{ + char result[SWIG_BUFFER_SIZE]; + return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ? + PyString_FromString(result) : 0; +} + +SWIGRUNTIME int +PySwigObject_compare(PySwigObject *v, PySwigObject *w) +{ + void *i = v->ptr; + void *j = w->ptr; + return (i < j) ? -1 : ((i > j) ? 1 : 0); +} + +SWIGRUNTIME PyTypeObject* _PySwigObject_type(void); + +SWIGRUNTIME PyTypeObject* +PySwigObject_type(void) { + static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigObject_type(); + return type; +} + +SWIGRUNTIMEINLINE int +PySwigObject_Check(PyObject *op) { + return ((op)->ob_type == PySwigObject_type()) + || (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0); +} + +SWIGRUNTIME PyObject * +PySwigObject_New(void *ptr, swig_type_info *ty, int own); + +SWIGRUNTIME void +PySwigObject_dealloc(PyObject *v) +{ + PySwigObject *sobj = (PySwigObject *) v; + PyObject *next = sobj->next; + if (sobj->own) { + swig_type_info *ty = sobj->ty; + PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0; + PyObject *destroy = data ? data->destroy : 0; + if (destroy) { + /* destroy is always a VARARGS method */ + PyObject *res; + if (data->delargs) { + /* we need to create a temporal object to carry the destroy operation */ + PyObject *tmp = PySwigObject_New(sobj->ptr, ty, 0); + res = SWIG_Python_CallFunctor(destroy, tmp); + Py_DECREF(tmp); + } else { + PyCFunction meth = PyCFunction_GET_FUNCTION(destroy); + PyObject *mself = PyCFunction_GET_SELF(destroy); + res = ((*meth)(mself, v)); + } + Py_XDECREF(res); + } else { + const char *name = SWIG_TypePrettyName(ty); +#if !defined(SWIG_PYTHON_SILENT_MEMLEAK) + printf("swig/python detected a memory leak of type '%s', no destructor found.\n", name); +#endif + } + } + Py_XDECREF(next); + PyObject_DEL(v); +} + +SWIGRUNTIME PyObject* +PySwigObject_append(PyObject* v, PyObject* next) +{ + PySwigObject *sobj = (PySwigObject *) v; +#ifndef METH_O + PyObject *tmp = 0; + if (!PyArg_ParseTuple(next,(char *)"O:append", &tmp)) return NULL; + next = tmp; +#endif + if (!PySwigObject_Check(next)) { + return NULL; + } + sobj->next = next; + Py_INCREF(next); + return SWIG_Py_Void(); +} + +SWIGRUNTIME PyObject* +#ifdef METH_NOARGS +PySwigObject_next(PyObject* v) +#else +PySwigObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) +#endif +{ + PySwigObject *sobj = (PySwigObject *) v; + if (sobj->next) { + Py_INCREF(sobj->next); + return sobj->next; + } else { + return SWIG_Py_Void(); + } +} + +SWIGINTERN PyObject* +#ifdef METH_NOARGS +PySwigObject_disown(PyObject *v) +#else +PySwigObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) +#endif +{ + PySwigObject *sobj = (PySwigObject *)v; + sobj->own = 0; + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject* +#ifdef METH_NOARGS +PySwigObject_acquire(PyObject *v) +#else +PySwigObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args)) +#endif +{ + PySwigObject *sobj = (PySwigObject *)v; + sobj->own = SWIG_POINTER_OWN; + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject* +PySwigObject_own(PyObject *v, PyObject *args) +{ + PyObject *val = 0; +#if (PY_VERSION_HEX < 0x02020000) + if (!PyArg_ParseTuple(args,(char *)"|O:own",&val)) +#else + if (!PyArg_UnpackTuple(args, (char *)"own", 0, 1, &val)) +#endif + { + return NULL; + } + else + { + PySwigObject *sobj = (PySwigObject *)v; + PyObject *obj = PyBool_FromLong(sobj->own); + if (val) { +#ifdef METH_NOARGS + if (PyObject_IsTrue(val)) { + PySwigObject_acquire(v); + } else { + PySwigObject_disown(v); + } +#else + if (PyObject_IsTrue(val)) { + PySwigObject_acquire(v,args); + } else { + PySwigObject_disown(v,args); + } +#endif + } + return obj; + } +} + +#ifdef METH_O +static PyMethodDef +swigobject_methods[] = { + {(char *)"disown", (PyCFunction)PySwigObject_disown, METH_NOARGS, (char *)"releases ownership of the pointer"}, + {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_NOARGS, (char *)"aquires ownership of the pointer"}, + {(char *)"own", (PyCFunction)PySwigObject_own, METH_VARARGS, (char *)"returns/sets ownership of the pointer"}, + {(char *)"append", (PyCFunction)PySwigObject_append, METH_O, (char *)"appends another 'this' object"}, + {(char *)"next", (PyCFunction)PySwigObject_next, METH_NOARGS, (char *)"returns the next 'this' object"}, + {(char *)"__repr__",(PyCFunction)PySwigObject_repr, METH_NOARGS, (char *)"returns object representation"}, + {0, 0, 0, 0} +}; +#else +static PyMethodDef +swigobject_methods[] = { + {(char *)"disown", (PyCFunction)PySwigObject_disown, METH_VARARGS, (char *)"releases ownership of the pointer"}, + {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_VARARGS, (char *)"aquires ownership of the pointer"}, + {(char *)"own", (PyCFunction)PySwigObject_own, METH_VARARGS, (char *)"returns/sets ownership of the pointer"}, + {(char *)"append", (PyCFunction)PySwigObject_append, METH_VARARGS, (char *)"appends another 'this' object"}, + {(char *)"next", (PyCFunction)PySwigObject_next, METH_VARARGS, (char *)"returns the next 'this' object"}, + {(char *)"__repr__",(PyCFunction)PySwigObject_repr, METH_VARARGS, (char *)"returns object representation"}, + {0, 0, 0, 0} +}; +#endif + +#if PY_VERSION_HEX < 0x02020000 +SWIGINTERN PyObject * +PySwigObject_getattr(PySwigObject *sobj,char *name) +{ + return Py_FindMethod(swigobject_methods, (PyObject *)sobj, name); +} +#endif + +SWIGRUNTIME PyTypeObject* +_PySwigObject_type(void) { + static char swigobject_doc[] = "Swig object carries a C/C++ instance pointer"; + + static PyNumberMethods PySwigObject_as_number = { + (binaryfunc)0, /*nb_add*/ + (binaryfunc)0, /*nb_subtract*/ + (binaryfunc)0, /*nb_multiply*/ + (binaryfunc)0, /*nb_divide*/ + (binaryfunc)0, /*nb_remainder*/ + (binaryfunc)0, /*nb_divmod*/ + (ternaryfunc)0,/*nb_power*/ + (unaryfunc)0, /*nb_negative*/ + (unaryfunc)0, /*nb_positive*/ + (unaryfunc)0, /*nb_absolute*/ + (inquiry)0, /*nb_nonzero*/ + 0, /*nb_invert*/ + 0, /*nb_lshift*/ + 0, /*nb_rshift*/ + 0, /*nb_and*/ + 0, /*nb_xor*/ + 0, /*nb_or*/ + (coercion)0, /*nb_coerce*/ + (unaryfunc)PySwigObject_long, /*nb_int*/ + (unaryfunc)PySwigObject_long, /*nb_long*/ + (unaryfunc)0, /*nb_float*/ + (unaryfunc)PySwigObject_oct, /*nb_oct*/ + (unaryfunc)PySwigObject_hex, /*nb_hex*/ +#if PY_VERSION_HEX >= 0x02020000 + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ +#elif PY_VERSION_HEX >= 0x02000000 + 0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */ +#endif + }; + + static PyTypeObject pyswigobject_type; + static int type_init = 0; + if (!type_init) { + const PyTypeObject tmp + = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + (char *)"PySwigObject", /* tp_name */ + sizeof(PySwigObject), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor)PySwigObject_dealloc, /* tp_dealloc */ + (printfunc)PySwigObject_print, /* tp_print */ +#if PY_VERSION_HEX < 0x02020000 + (getattrfunc)PySwigObject_getattr, /* tp_getattr */ +#else + (getattrfunc)0, /* tp_getattr */ +#endif + (setattrfunc)0, /* tp_setattr */ + (cmpfunc)PySwigObject_compare, /* tp_compare */ + (reprfunc)PySwigObject_repr, /* tp_repr */ + &PySwigObject_as_number, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + (hashfunc)0, /* tp_hash */ + (ternaryfunc)0, /* tp_call */ + (reprfunc)PySwigObject_str, /* tp_str */ + PyObject_GenericGetAttr, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT, /* tp_flags */ + swigobject_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ +#if PY_VERSION_HEX >= 0x02020000 + 0, /* tp_iter */ + 0, /* tp_iternext */ + swigobject_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ + 0, /* tp_free */ + 0, /* tp_is_gc */ + 0, /* tp_bases */ + 0, /* tp_mro */ + 0, /* tp_cache */ + 0, /* tp_subclasses */ + 0, /* tp_weaklist */ +#endif +#if PY_VERSION_HEX >= 0x02030000 + 0, /* tp_del */ +#endif +#ifdef COUNT_ALLOCS + 0,0,0,0 /* tp_alloc -> tp_next */ +#endif + }; + pyswigobject_type = tmp; + pyswigobject_type.ob_type = &PyType_Type; + type_init = 1; + } + return &pyswigobject_type; +} + +SWIGRUNTIME PyObject * +PySwigObject_New(void *ptr, swig_type_info *ty, int own) +{ + PySwigObject *sobj = PyObject_NEW(PySwigObject, PySwigObject_type()); + if (sobj) { + sobj->ptr = ptr; + sobj->ty = ty; + sobj->own = own; + sobj->next = 0; + } + return (PyObject *)sobj; +} + +/* ----------------------------------------------------------------------------- + * Implements a simple Swig Packed type, and use it instead of string + * ----------------------------------------------------------------------------- */ + +typedef struct { + PyObject_HEAD + void *pack; + swig_type_info *ty; + size_t size; +} PySwigPacked; + +SWIGRUNTIME int +PySwigPacked_print(PySwigPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags)) +{ + char result[SWIG_BUFFER_SIZE]; + fputs("<Swig Packed ", fp); + if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) { + fputs("at ", fp); + fputs(result, fp); + } + fputs(v->ty->name,fp); + fputs(">", fp); + return 0; +} + +SWIGRUNTIME PyObject * +PySwigPacked_repr(PySwigPacked *v) +{ + char result[SWIG_BUFFER_SIZE]; + if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) { + return PyString_FromFormat("<Swig Packed at %s%s>", result, v->ty->name); + } else { + return PyString_FromFormat("<Swig Packed %s>", v->ty->name); + } +} + +SWIGRUNTIME PyObject * +PySwigPacked_str(PySwigPacked *v) +{ + char result[SWIG_BUFFER_SIZE]; + if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))){ + return PyString_FromFormat("%s%s", result, v->ty->name); + } else { + return PyString_FromString(v->ty->name); + } +} + +SWIGRUNTIME int +PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w) +{ + size_t i = v->size; + size_t j = w->size; + int s = (i < j) ? -1 : ((i > j) ? 1 : 0); + return s ? s : strncmp((char *)v->pack, (char *)w->pack, 2*v->size); +} + +SWIGRUNTIME PyTypeObject* _PySwigPacked_type(void); + +SWIGRUNTIME PyTypeObject* +PySwigPacked_type(void) { + static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigPacked_type(); + return type; +} + +SWIGRUNTIMEINLINE int +PySwigPacked_Check(PyObject *op) { + return ((op)->ob_type == _PySwigPacked_type()) + || (strcmp((op)->ob_type->tp_name,"PySwigPacked") == 0); +} + +SWIGRUNTIME void +PySwigPacked_dealloc(PyObject *v) +{ + if (PySwigPacked_Check(v)) { + PySwigPacked *sobj = (PySwigPacked *) v; + free(sobj->pack); + } + PyObject_DEL(v); +} + +SWIGRUNTIME PyTypeObject* +_PySwigPacked_type(void) { + static char swigpacked_doc[] = "Swig object carries a C/C++ instance pointer"; + static PyTypeObject pyswigpacked_type; + static int type_init = 0; + if (!type_init) { + const PyTypeObject tmp + = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + (char *)"PySwigPacked", /* tp_name */ + sizeof(PySwigPacked), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor)PySwigPacked_dealloc, /* tp_dealloc */ + (printfunc)PySwigPacked_print, /* tp_print */ + (getattrfunc)0, /* tp_getattr */ + (setattrfunc)0, /* tp_setattr */ + (cmpfunc)PySwigPacked_compare, /* tp_compare */ + (reprfunc)PySwigPacked_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + (hashfunc)0, /* tp_hash */ + (ternaryfunc)0, /* tp_call */ + (reprfunc)PySwigPacked_str, /* tp_str */ + PyObject_GenericGetAttr, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT, /* tp_flags */ + swigpacked_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ +#if PY_VERSION_HEX >= 0x02020000 + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ + 0, /* tp_free */ + 0, /* tp_is_gc */ + 0, /* tp_bases */ + 0, /* tp_mro */ + 0, /* tp_cache */ + 0, /* tp_subclasses */ + 0, /* tp_weaklist */ +#endif +#if PY_VERSION_HEX >= 0x02030000 + 0, /* tp_del */ +#endif +#ifdef COUNT_ALLOCS + 0,0,0,0 /* tp_alloc -> tp_next */ +#endif + }; + pyswigpacked_type = tmp; + pyswigpacked_type.ob_type = &PyType_Type; + type_init = 1; + } + return &pyswigpacked_type; +} + +SWIGRUNTIME PyObject * +PySwigPacked_New(void *ptr, size_t size, swig_type_info *ty) +{ + PySwigPacked *sobj = PyObject_NEW(PySwigPacked, PySwigPacked_type()); + if (sobj) { + void *pack = malloc(size); + if (pack) { + memcpy(pack, ptr, size); + sobj->pack = pack; + sobj->ty = ty; + sobj->size = size; + } else { + PyObject_DEL((PyObject *) sobj); + sobj = 0; + } + } + return (PyObject *) sobj; +} + +SWIGRUNTIME swig_type_info * +PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size) +{ + if (PySwigPacked_Check(obj)) { + PySwigPacked *sobj = (PySwigPacked *)obj; + if (sobj->size != size) return 0; + memcpy(ptr, sobj->pack, size); + return sobj->ty; + } else { + return 0; + } +} + +/* ----------------------------------------------------------------------------- + * pointers/data manipulation + * ----------------------------------------------------------------------------- */ + +SWIGRUNTIMEINLINE PyObject * +_SWIG_This(void) +{ + return PyString_FromString("this"); +} + +SWIGRUNTIME PyObject * +SWIG_This(void) +{ + static PyObject *SWIG_STATIC_POINTER(swig_this) = _SWIG_This(); + return swig_this; +} + +/* #define SWIG_PYTHON_SLOW_GETSET_THIS */ + +SWIGRUNTIME PySwigObject * +SWIG_Python_GetSwigThis(PyObject *pyobj) +{ + if (PySwigObject_Check(pyobj)) { + return (PySwigObject *) pyobj; + } else { + PyObject *obj = 0; +#if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000)) + if (PyInstance_Check(pyobj)) { + obj = _PyInstance_Lookup(pyobj, SWIG_This()); + } else { + PyObject **dictptr = _PyObject_GetDictPtr(pyobj); + if (dictptr != NULL) { + PyObject *dict = *dictptr; + obj = dict ? PyDict_GetItem(dict, SWIG_This()) : 0; + } else { +#ifdef PyWeakref_CheckProxy + if (PyWeakref_CheckProxy(pyobj)) { + PyObject *wobj = PyWeakref_GET_OBJECT(pyobj); + return wobj ? SWIG_Python_GetSwigThis(wobj) : 0; + } +#endif + obj = PyObject_GetAttr(pyobj,SWIG_This()); + if (obj) { + Py_DECREF(obj); + } else { + if (PyErr_Occurred()) PyErr_Clear(); + return 0; + } + } + } +#else + obj = PyObject_GetAttr(pyobj,SWIG_This()); + if (obj) { + Py_DECREF(obj); + } else { + if (PyErr_Occurred()) PyErr_Clear(); + return 0; + } +#endif + if (obj && !PySwigObject_Check(obj)) { + /* a PyObject is called 'this', try to get the 'real this' + PySwigObject from it */ + return SWIG_Python_GetSwigThis(obj); + } + return (PySwigObject *)obj; + } +} + +/* Acquire a pointer value */ + +SWIGRUNTIME int +SWIG_Python_AcquirePtr(PyObject *obj, int own) { + if (own) { + PySwigObject *sobj = SWIG_Python_GetSwigThis(obj); + if (sobj) { + int oldown = sobj->own; + sobj->own = own; + return oldown; + } + } + return 0; +} + +/* Convert a pointer value */ + +SWIGRUNTIME int +SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) { + if (!obj) return SWIG_ERROR; + if (obj == Py_None) { + if (ptr) *ptr = 0; + return SWIG_OK; + } else { + PySwigObject *sobj = SWIG_Python_GetSwigThis(obj); + while (sobj) { + void *vptr = sobj->ptr; + if (ty) { + swig_type_info *to = sobj->ty; + if (to == ty) { + /* no type cast needed */ + if (ptr) *ptr = vptr; + break; + } else { + swig_cast_info *tc = SWIG_TypeCheck(to->name,ty); + if (!tc) { + sobj = (PySwigObject *)sobj->next; + } else { + if (ptr) *ptr = SWIG_TypeCast(tc,vptr); + break; + } + } + } else { + if (ptr) *ptr = vptr; + break; + } + } + if (sobj) { + if (own) *own = sobj->own; + if (flags & SWIG_POINTER_DISOWN) { + sobj->own = 0; + } + return SWIG_OK; + } else { + int res = SWIG_ERROR; + if (flags & SWIG_POINTER_IMPLICIT_CONV) { + PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0; + if (data && !data->implicitconv) { + PyObject *klass = data->klass; + if (klass) { + PyObject *impconv; + data->implicitconv = 1; /* avoid recursion and call 'explicit' constructors*/ + impconv = SWIG_Python_CallFunctor(klass, obj); + data->implicitconv = 0; + if (PyErr_Occurred()) { + PyErr_Clear(); + impconv = 0; + } + if (impconv) { + PySwigObject *iobj = SWIG_Python_GetSwigThis(impconv); + if (iobj) { + void *vptr; + res = SWIG_Python_ConvertPtrAndOwn((PyObject*)iobj, &vptr, ty, 0, 0); + if (SWIG_IsOK(res)) { + if (ptr) { + *ptr = vptr; + /* transfer the ownership to 'ptr' */ + iobj->own = 0; + res = SWIG_AddCast(res); + res = SWIG_AddNewMask(res); + } else { + res = SWIG_AddCast(res); + } + } + } + Py_DECREF(impconv); + } + } + } + } + return res; + } + } +} + +/* Convert a function ptr value */ + +SWIGRUNTIME int +SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) { + if (!PyCFunction_Check(obj)) { + return SWIG_ConvertPtr(obj, ptr, ty, 0); + } else { + void *vptr = 0; + + /* here we get the method pointer for callbacks */ + char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0; + if (desc) { + desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0; + if (!desc) return SWIG_ERROR; + } + if (ty) { + swig_cast_info *tc = SWIG_TypeCheck(desc,ty); + if (!tc) return SWIG_ERROR; + *ptr = SWIG_TypeCast(tc,vptr); + } else { + *ptr = vptr; + } + return SWIG_OK; + } +} + +/* Convert a packed value value */ + +SWIGRUNTIME int +SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty) { + swig_type_info *to = PySwigPacked_UnpackData(obj, ptr, sz); + if (!to) return SWIG_ERROR; + if (ty) { + if (to != ty) { + /* check type cast? */ + swig_cast_info *tc = SWIG_TypeCheck(to->name,ty); + if (!tc) return SWIG_ERROR; + } + } + return SWIG_OK; +} + +/* ----------------------------------------------------------------------------- + * Create a new pointer object + * ----------------------------------------------------------------------------- */ + +/* + Create a new instance object, whitout calling __init__, and set the + 'this' attribute. +*/ + +SWIGRUNTIME PyObject* +SWIG_Python_NewShadowInstance(PySwigClientData *data, PyObject *swig_this) +{ +#if (PY_VERSION_HEX >= 0x02020000) + PyObject *inst = 0; + PyObject *newraw = data->newraw; + if (newraw) { + inst = PyObject_Call(newraw, data->newargs, NULL); + if (inst) { +#if !defined(SWIG_PYTHON_SLOW_GETSET_THIS) + PyObject **dictptr = _PyObject_GetDictPtr(inst); + if (dictptr != NULL) { + PyObject *dict = *dictptr; + if (dict == NULL) { + dict = PyDict_New(); + *dictptr = dict; + PyDict_SetItem(dict, SWIG_This(), swig_this); + } + } +#else + PyObject *key = SWIG_This(); + PyObject_SetAttr(inst, key, swig_this); +#endif + } + } else { + PyObject *dict = PyDict_New(); + PyDict_SetItem(dict, SWIG_This(), swig_this); + inst = PyInstance_NewRaw(data->newargs, dict); + Py_DECREF(dict); + } + return inst; +#else +#if (PY_VERSION_HEX >= 0x02010000) + PyObject *inst; + PyObject *dict = PyDict_New(); + PyDict_SetItem(dict, SWIG_This(), swig_this); + inst = PyInstance_NewRaw(data->newargs, dict); + Py_DECREF(dict); + return (PyObject *) inst; +#else + PyInstanceObject *inst = PyObject_NEW(PyInstanceObject, &PyInstance_Type); + if (inst == NULL) { + return NULL; + } + inst->in_class = (PyClassObject *)data->newargs; + Py_INCREF(inst->in_class); + inst->in_dict = PyDict_New(); + if (inst->in_dict == NULL) { + Py_DECREF(inst); + return NULL; + } +#ifdef Py_TPFLAGS_HAVE_WEAKREFS + inst->in_weakreflist = NULL; +#endif +#ifdef Py_TPFLAGS_GC + PyObject_GC_Init(inst); +#endif + PyDict_SetItem(inst->in_dict, SWIG_This(), swig_this); + return (PyObject *) inst; +#endif +#endif +} + +SWIGRUNTIME void +SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this) +{ + PyObject *dict; +#if (PY_VERSION_HEX >= 0x02020000) && !defined(SWIG_PYTHON_SLOW_GETSET_THIS) + PyObject **dictptr = _PyObject_GetDictPtr(inst); + if (dictptr != NULL) { + dict = *dictptr; + if (dict == NULL) { + dict = PyDict_New(); + *dictptr = dict; + } + PyDict_SetItem(dict, SWIG_This(), swig_this); + return; + } +#endif + dict = PyObject_GetAttrString(inst, "__dict__"); + PyDict_SetItem(dict, SWIG_This(), swig_this); + Py_DECREF(dict); +} + + +SWIGINTERN PyObject * +SWIG_Python_InitShadowInstance(PyObject *args) { + PyObject *obj[2]; + if (!SWIG_Python_UnpackTuple(args,(char*)"swiginit", 2, 2, obj)) { + return NULL; + } else { + PySwigObject *sthis = SWIG_Python_GetSwigThis(obj[0]); + if (sthis) { + PySwigObject_append((PyObject*) sthis, obj[1]); + } else { + SWIG_Python_SetSwigThis(obj[0], obj[1]); + } + return SWIG_Py_Void(); + } +} + +/* Create a new pointer object */ + +SWIGRUNTIME PyObject * +SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) { + if (!ptr) { + return SWIG_Py_Void(); + } else { + int own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0; + PyObject *robj = PySwigObject_New(ptr, type, own); + PySwigClientData *clientdata = type ? (PySwigClientData *)(type->clientdata) : 0; + if (clientdata && !(flags & SWIG_POINTER_NOSHADOW)) { + PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj); + if (inst) { + Py_DECREF(robj); + robj = inst; + } + } + return robj; + } +} + +/* Create a new packed object */ + +SWIGRUNTIMEINLINE PyObject * +SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) { + return ptr ? PySwigPacked_New((void *) ptr, sz, type) : SWIG_Py_Void(); +} + +/* -----------------------------------------------------------------------------* + * Get type list + * -----------------------------------------------------------------------------*/ + +#ifdef SWIG_LINK_RUNTIME +void *SWIG_ReturnGlobalTypeList(void *); +#endif + +SWIGRUNTIME swig_module_info * +SWIG_Python_GetModule(void) { + static void *type_pointer = (void *)0; + /* first check if module already created */ + if (!type_pointer) { +#ifdef SWIG_LINK_RUNTIME + type_pointer = SWIG_ReturnGlobalTypeList((void *)0); +#else + type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, + (char*)"type_pointer" SWIG_TYPE_TABLE_NAME); + if (PyErr_Occurred()) { + PyErr_Clear(); + type_pointer = (void *)0; + } +#endif + } + return (swig_module_info *) type_pointer; +} + +#if PY_MAJOR_VERSION < 2 +/* PyModule_AddObject function was introduced in Python 2.0. The following function + is copied out of Python/modsupport.c in python version 2.3.4 */ +SWIGINTERN int +PyModule_AddObject(PyObject *m, char *name, PyObject *o) +{ + PyObject *dict; + if (!PyModule_Check(m)) { + PyErr_SetString(PyExc_TypeError, + "PyModule_AddObject() needs module as first arg"); + return SWIG_ERROR; + } + if (!o) { + PyErr_SetString(PyExc_TypeError, + "PyModule_AddObject() needs non-NULL value"); + return SWIG_ERROR; + } + + dict = PyModule_GetDict(m); + if (dict == NULL) { + /* Internal error -- modules must have a dict! */ + PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__", + PyModule_GetName(m)); + return SWIG_ERROR; + } + if (PyDict_SetItemString(dict, name, o)) + return SWIG_ERROR; + Py_DECREF(o); + return SWIG_OK; +} +#endif + +SWIGRUNTIME void +SWIG_Python_DestroyModule(void *vptr) +{ + swig_module_info *swig_module = (swig_module_info *) vptr; + swig_type_info **types = swig_module->types; + size_t i; + for (i =0; i < swig_module->size; ++i) { + swig_type_info *ty = types[i]; + if (ty->owndata) { + PySwigClientData *data = (PySwigClientData *) ty->clientdata; + if (data) PySwigClientData_Del(data); + } + } + Py_DECREF(SWIG_This()); +} + +SWIGRUNTIME void +SWIG_Python_SetModule(swig_module_info *swig_module) { + static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */ + + PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, + swig_empty_runtime_method_table); + PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule); + if (pointer && module) { + PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer); + } else { + Py_XDECREF(pointer); + } +} + +/* The python cached type query */ +SWIGRUNTIME PyObject * +SWIG_Python_TypeCache() { + static PyObject *SWIG_STATIC_POINTER(cache) = PyDict_New(); + return cache; +} + +SWIGRUNTIME swig_type_info * +SWIG_Python_TypeQuery(const char *type) +{ + PyObject *cache = SWIG_Python_TypeCache(); + PyObject *key = PyString_FromString(type); + PyObject *obj = PyDict_GetItem(cache, key); + swig_type_info *descriptor; + if (obj) { + descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj); + } else { + swig_module_info *swig_module = SWIG_Python_GetModule(); + descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type); + if (descriptor) { + obj = PyCObject_FromVoidPtr(descriptor, NULL); + PyDict_SetItem(cache, key, obj); + Py_DECREF(obj); + } + } + Py_DECREF(key); + return descriptor; +} + +/* + For backward compatibility only +*/ +#define SWIG_POINTER_EXCEPTION 0 +#define SWIG_arg_fail(arg) SWIG_Python_ArgFail(arg) +#define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) + +SWIGRUNTIME int +SWIG_Python_AddErrMesg(const char* mesg, int infront) +{ + if (PyErr_Occurred()) { + PyObject *type = 0; + PyObject *value = 0; + PyObject *traceback = 0; + PyErr_Fetch(&type, &value, &traceback); + if (value) { + PyObject *old_str = PyObject_Str(value); + Py_XINCREF(type); + PyErr_Clear(); + if (infront) { + PyErr_Format(type, "%s %s", mesg, PyString_AsString(old_str)); + } else { + PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg); + } + Py_DECREF(old_str); + } + return 1; + } else { + return 0; + } +} + +SWIGRUNTIME int +SWIG_Python_ArgFail(int argnum) +{ + if (PyErr_Occurred()) { + /* add information about failing argument */ + char mesg[256]; + PyOS_snprintf(mesg, sizeof(mesg), "argument number %d:", argnum); + return SWIG_Python_AddErrMesg(mesg, 1); + } else { + return 0; + } +} + +SWIGRUNTIMEINLINE const char * +PySwigObject_GetDesc(PyObject *self) +{ + PySwigObject *v = (PySwigObject *)self; + swig_type_info *ty = v ? v->ty : 0; + return ty ? ty->str : (char*)""; +} + +SWIGRUNTIME void +SWIG_Python_TypeError(const char *type, PyObject *obj) +{ + if (type) { +#if defined(SWIG_COBJECT_TYPES) + if (obj && PySwigObject_Check(obj)) { + const char *otype = (const char *) PySwigObject_GetDesc(obj); + if (otype) { + PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'PySwigObject(%s)' is received", + type, otype); + return; + } + } else +#endif + { + const char *otype = (obj ? obj->ob_type->tp_name : 0); + if (otype) { + PyObject *str = PyObject_Str(obj); + const char *cstr = str ? PyString_AsString(str) : 0; + if (cstr) { + PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received", + type, otype, cstr); + } else { + PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received", + type, otype); + } + Py_XDECREF(str); + return; + } + } + PyErr_Format(PyExc_TypeError, "a '%s' is expected", type); + } else { + PyErr_Format(PyExc_TypeError, "unexpected type is received"); + } +} + + +/* Convert a pointer value, signal an exception on a type mismatch */ +SWIGRUNTIME void * +SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) { + void *result; + if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) { + PyErr_Clear(); + if (flags & SWIG_POINTER_EXCEPTION) { + SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj); + SWIG_Python_ArgFail(argnum); + } + } + return result; +} + + +#ifdef __cplusplus +#if 0 +{ /* cc-mode */ +#endif +} +#endif + + + +#define SWIG_exception_fail(code, msg) do { SWIG_Error(code, msg); SWIG_fail; } while(0) + +#define SWIG_contract_assert(expr, msg) if (!(expr)) { SWIG_Error(SWIG_RuntimeError, msg); SWIG_fail; } else + + + +/* -------- TYPES TABLE (BEGIN) -------- */ + +#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 SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) +#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) + +/* -------- TYPES TABLE (END) -------- */ + +#if (PY_VERSION_HEX <= 0x02000000) +# if !defined(SWIG_PYTHON_CLASSIC) +# error "This python version requires to use swig with the '-classic' option" +# endif +#endif + +/*----------------------------------------------- + @(target):= _freeswitch.so + ------------------------------------------------*/ +#define SWIG_init init_freeswitch + +#define SWIG_name "_freeswitch" + +#define SWIGVERSION 0x010329 + + +#define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) +#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),reinterpret_cast< void** >(a)) + + +#include <stdexcept> + + +namespace swig { + class PyObject_ptr { + protected: + PyObject *_obj; + + public: + PyObject_ptr() :_obj(0) + { + } + + PyObject_ptr(const PyObject_ptr& item) : _obj(item._obj) + { + Py_XINCREF(_obj); + } + + PyObject_ptr(PyObject *obj, bool initial_ref = true) :_obj(obj) + { + if (initial_ref) Py_XINCREF(_obj); + } + + PyObject_ptr & operator=(const PyObject_ptr& item) + { + Py_XINCREF(item._obj); + Py_XDECREF(_obj); + _obj = item._obj; + return *this; + } + + ~PyObject_ptr() + { + Py_XDECREF(_obj); + } + + operator PyObject *() const + { + return _obj; + } + + PyObject *operator->() const + { + return _obj; + } + }; +} + + +namespace swig { + struct PyObject_var : PyObject_ptr { + PyObject_var(PyObject* obj = 0) : PyObject_ptr(obj, false) { } + + PyObject_var & operator = (PyObject* obj) + { + Py_XDECREF(_obj); + _obj = obj; + return *this; + } + }; +} + + +#include "switch_cpp.h" +#include "freeswitch_python.h" + + +SWIGINTERN swig_type_info* +SWIG_pchar_descriptor() +{ + static int init = 0; + static swig_type_info* info = 0; + if (!init) { + info = SWIG_TypeQuery("_p_char"); + init = 1; + } + return info; +} + + +SWIGINTERN int +SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) +{ + if (PyString_Check(obj)) { + char *cstr; int len; + PyString_AsStringAndSize(obj, &cstr, &len); + if (cptr) { + if (alloc) { + /* + In python the user should not be able to modify the inner + string representation. To warranty that, if you define + SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string + buffer is always returned. + + The default behavior is just to return the pointer value, + so, be careful. + */ +#if defined(SWIG_PYTHON_SAFE_CSTRINGS) + if (*alloc != SWIG_OLDOBJ) +#else + if (*alloc == SWIG_NEWOBJ) +#endif + { + *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); + *alloc = SWIG_NEWOBJ; + } + else { + *cptr = cstr; + *alloc = SWIG_OLDOBJ; + } + } else { + *cptr = PyString_AsString(obj); + } + } + if (psize) *psize = len + 1; + return SWIG_OK; + } else { + swig_type_info* pchar_descriptor = SWIG_pchar_descriptor(); + if (pchar_descriptor) { + void* vptr = 0; + if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) { + if (cptr) *cptr = (char *) vptr; + if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0; + if (alloc) *alloc = SWIG_OLDOBJ; + return SWIG_OK; + } + } + } + return SWIG_TypeError; +} + + + + + +SWIGINTERNINLINE PyObject * +SWIG_FromCharPtrAndSize(const char* carray, size_t size) +{ + if (carray) { + if (size > INT_MAX) { + swig_type_info* pchar_descriptor = SWIG_pchar_descriptor(); + return pchar_descriptor ? + SWIG_NewPointerObj(const_cast< char * >(carray), pchar_descriptor, 0) : SWIG_Py_Void(); + } else { + return PyString_FromStringAndSize(carray, static_cast< int >(size)); + } + } else { + return SWIG_Py_Void(); + } +} + + +SWIGINTERNINLINE PyObject * +SWIG_FromCharPtr(const char *cptr) +{ + return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0)); +} + + + #define SWIG_From_long PyInt_FromLong + + +SWIGINTERNINLINE PyObject * +SWIG_From_int (int value) +{ + return SWIG_From_long (value); +} + + +#include <limits.h> +#ifndef LLONG_MIN +# define LLONG_MIN LONG_LONG_MIN +#endif +#ifndef LLONG_MAX +# define LLONG_MAX LONG_LONG_MAX +#endif +#ifndef ULLONG_MAX +# define ULLONG_MAX ULONG_LONG_MAX +#endif + + +SWIGINTERN int +SWIG_AsVal_double (PyObject *obj, double *val) +{ + int res = SWIG_TypeError; + if (PyFloat_Check(obj)) { + if (val) *val = PyFloat_AsDouble(obj); + return SWIG_OK; + } else if (PyInt_Check(obj)) { + if (val) *val = PyInt_AsLong(obj); + return SWIG_OK; + } else if (PyLong_Check(obj)) { + double v = PyLong_AsDouble(obj); + if (!PyErr_Occurred()) { + if (val) *val = v; + return SWIG_OK; + } else { + PyErr_Clear(); + } + } +#ifdef SWIG_PYTHON_CAST_MODE + { + int dispatch = 0; + double d = PyFloat_AsDouble(obj); + if (!PyErr_Occurred()) { + if (val) *val = d; + return SWIG_AddCast(SWIG_OK); + } else { + PyErr_Clear(); + } + if (!dispatch) { + long v = PyLong_AsLong(obj); + if (!PyErr_Occurred()) { + if (val) *val = v; + return SWIG_AddCast(SWIG_AddCast(SWIG_OK)); + } else { + PyErr_Clear(); + } + } + } +#endif + return res; +} + + +#include <float.h> + + +#include <math.h> + + +SWIGINTERNINLINE int +SWIG_CanCastAsInteger(double *d, double min, double max) { + double x = *d; + if ((min <= x && x <= max)) { + double fx = floor(x); + double cx = ceil(x); + double rd = ((x - fx) < 0.5) ? fx : cx; /* simple rint */ + if ((errno == EDOM) || (errno == ERANGE)) { + errno = 0; + } else { + double summ, reps, diff; + if (rd < x) { + diff = x - rd; + } else if (rd > x) { + diff = rd - x; + } else { + return 1; + } + summ = rd + x; + reps = diff/summ; + if (reps < 8*DBL_EPSILON) { + *d = rd; + return 1; + } + } + } + return 0; +} + + +SWIGINTERN int +SWIG_AsVal_long (PyObject *obj, long* val) +{ + if (PyInt_Check(obj)) { + if (val) *val = PyInt_AsLong(obj); + return SWIG_OK; + } else if (PyLong_Check(obj)) { + long v = PyLong_AsLong(obj); + if (!PyErr_Occurred()) { + if (val) *val = v; + return SWIG_OK; + } else { + PyErr_Clear(); + } + } +#ifdef SWIG_PYTHON_CAST_MODE + { + int dispatch = 0; + long v = PyInt_AsLong(obj); + if (!PyErr_Occurred()) { + if (val) *val = v; + return SWIG_AddCast(SWIG_OK); + } else { + PyErr_Clear(); + } + if (!dispatch) { + double d; + int res = SWIG_AddCast(SWIG_AsVal_double (obj,&d)); + if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, LONG_MIN, LONG_MAX)) { + if (val) *val = (long)(d); + return res; + } + } + } +#endif + return SWIG_TypeError; +} + + +SWIGINTERN int +SWIG_AsVal_int (PyObject * obj, int *val) +{ + long v; + int res = SWIG_AsVal_long (obj, &v); + if (SWIG_IsOK(res)) { + if ((v < INT_MIN || v > INT_MAX)) { + return SWIG_OverflowError; + } else { + if (val) *val = static_cast< int >(v); + } + } + return res; +} + + +SWIGINTERN int +SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) +{ + if (PyInt_Check(obj)) { + long v = PyInt_AsLong(obj); + if (v >= 0) { + if (val) *val = v; + return SWIG_OK; + } else { + return SWIG_OverflowError; + } + } else if (PyLong_Check(obj)) { + unsigned long v = PyLong_AsUnsignedLong(obj); + if (!PyErr_Occurred()) { + if (val) *val = v; + return SWIG_OK; + } else { + PyErr_Clear(); + } + } +#ifdef SWIG_PYTHON_CAST_MODE + { + int dispatch = 0; + unsigned long v = PyLong_AsUnsignedLong(obj); + if (!PyErr_Occurred()) { + if (val) *val = v; + return SWIG_AddCast(SWIG_OK); + } else { + PyErr_Clear(); + } + if (!dispatch) { + double d; + int res = SWIG_AddCast(SWIG_AsVal_double (obj,&d)); + if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, ULONG_MAX)) { + if (val) *val = (unsigned long)(d); + return res; + } + } + } +#endif + return SWIG_TypeError; +} + + +SWIGINTERN int +SWIG_AsVal_unsigned_SS_int (PyObject * obj, unsigned int *val) +{ + unsigned long v; + int res = SWIG_AsVal_unsigned_SS_long (obj, &v); + if (SWIG_IsOK(res)) { + if ((v > UINT_MAX)) { + return SWIG_OverflowError; + } else { + if (val) *val = static_cast< unsigned int >(v); + } + } + return res; +} + + + +// status = args->input_callback(session, dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen); + + +switch_status_t PythonDTMFCallback(switch_core_session_t *session, + void *input, + switch_input_type_t itype, + void *buf, // Python function defined in script + unsigned int buflen) { PyObject *func, *arglist; PyObject *result; + struct input_callback_state *cb_state; switch_status_t dres = SWITCH_STATUS_FALSE; + PyThreadState *threadState = NULL; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "PythonDTMFCallback CALLED"); + + if (!buf) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "buf pointer is null"); + return dres; + } - func = (PyObject *) buf; // Get Python function + // TODO: a struct will be passed, of which one of the members will be + // the actual callback function + cb_state = (input_callback_state *) buf; + + func = (PyObject *) cb_state->function; // Get Python function + if (!func) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cb_state->function is null"); + return dres; + } + if (!PyCallable_Check(func)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "function not callable"); + return dres; + } + arglist = Py_BuildValue("(si)", input, itype); // Build argument list + if (!arglist) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error building arglist"); + return dres; + } + + threadState = (PyThreadState *) cb_state->threadState; + if (!threadState) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error, invalid threadstate"); + return dres; + } + + // TODO: the python should return string values just like the javascript + // user defined function. then in this function, we act on those values + // by pausing the fh (shit, where is the fh?), fast forwarding, etc. + // then figure out a freeswitch status to return and return it. + + + + PyEval_RestoreThread(threadState); + result = PyEval_CallObject(func, arglist); // Call Python + + threadState = PyEval_SaveThread(); + + Py_DECREF(arglist); // Trash arglist if (result) { // If no errors, return double + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "PythonDTMFCallback 5"); dres = (switch_status_t) PyInt_AsLong(result); } Py_XDECREF(result); @@ -802,544 +2980,2202 @@ -#ifdef __cplusplus -extern "C" { -#endif -static PyObject *_wrap_PythonDTMFCallback(PyObject *self, PyObject *args) { - PyObject *resultobj; - 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; - switch_input_type_t *argp3 ; - 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)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj2,(void **) &argp3, SWIGTYPE_p_switch_input_type_t,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; - arg3 = *argp3; - if ((SWIG_ConvertPtr(obj3,(void **) &arg4, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg5 = (unsigned int) PyInt_AsLong(obj4); - if (PyErr_Occurred()) SWIG_fail; - result = PythonDTMFCallback(arg1,arg2,arg3,arg4,arg5); - - { - switch_status_t * resultptr; - resultptr = new switch_status_t((switch_status_t &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_switch_status_t, 1); - } - return resultobj; - fail: - return NULL; +#ifdef __cplusplus +extern "C" { +#endif +SWIGINTERN PyObject *_wrap_console_log(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:console_log",&obj0,&obj1)) SWIG_fail; + res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "console_log" "', argument " "1"" of type '" "char *""'"); + } + arg1 = buf1; + res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "console_log" "', argument " "2"" of type '" "char *""'"); + } + arg2 = buf2; + console_log(arg1,arg2); + resultobj = SWIG_Py_Void(); + if (alloc1 == SWIG_NEWOBJ) delete[] buf1; + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return resultobj; +fail: + if (alloc1 == SWIG_NEWOBJ) delete[] buf1; + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return NULL; +} + + +SWIGINTERN PyObject *_wrap_console_clean_log(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:console_clean_log",&obj0)) SWIG_fail; + res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "console_clean_log" "', argument " "1"" of type '" "char *""'"); + } + arg1 = buf1; + console_clean_log(arg1); + resultobj = SWIG_Py_Void(); + if (alloc1 == SWIG_NEWOBJ) delete[] buf1; + return resultobj; +fail: + if (alloc1 == SWIG_NEWOBJ) delete[] buf1; + return NULL; +} + + +SWIGINTERN PyObject *_wrap_api_execute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + char *arg2 = (char *) 0 ; + char *result = 0 ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:api_execute",&obj0,&obj1)) SWIG_fail; + res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "api_execute" "', argument " "1"" of type '" "char *""'"); + } + arg1 = buf1; + res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "api_execute" "', argument " "2"" of type '" "char *""'"); + } + arg2 = buf2; + result = (char *)api_execute(arg1,arg2); + resultobj = SWIG_FromCharPtr(result); + if (alloc1 == SWIG_NEWOBJ) delete[] buf1; + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return resultobj; +fail: + if (alloc1 == SWIG_NEWOBJ) delete[] buf1; + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return NULL; +} + + +SWIGINTERN PyObject *_wrap_api_reply_delete(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:api_reply_delete",&obj0)) SWIG_fail; + res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "api_reply_delete" "', argument " "1"" of type '" "char *""'"); + } + arg1 = buf1; + api_reply_delete(arg1); + resultobj = SWIG_Py_Void(); + if (alloc1 == SWIG_NEWOBJ) delete[] buf1; + return resultobj; +fail: + if (alloc1 == SWIG_NEWOBJ) delete[] buf1; + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_CoreSession__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + char *arg1 = (char *) 0 ; + CoreSession *result = 0 ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + PyObject * obj0 = 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 '" "new_CoreSession" "', argument " "1"" of type '" "char *""'"); + } + 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 (alloc1 == SWIG_NEWOBJ) delete[] buf1; + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_CoreSession__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + CoreSession *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 (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CoreSession" "', argument " "1"" of type '" "switch_core_session_t *""'"); + } + 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); + } + 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 (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: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_CoreSession'"); + return NULL; +} + + +SWIGINTERN PyObject *_wrap_delete_CoreSession(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: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 '" "delete_CoreSession" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + delete arg1; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CoreSession_session_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + switch_core_session_t *arg2 = (switch_core_session_t *) 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_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_session_set" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + 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_session_set" "', argument " "2"" of type '" "switch_core_session_t *""'"); + } + arg2 = reinterpret_cast< switch_core_session_t * >(argp2); + if (arg1) (arg1)->session = arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CoreSession_session_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + switch_core_session_t *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 (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_session_get" "', argument " "1"" of type '" "CoreSession *""'"); + } + 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 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CoreSession_channel_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + switch_channel_t *arg2 = (switch_channel_t *) 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_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_channel_set" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + 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_channel_set" "', argument " "2"" of type '" "switch_channel_t *""'"); + } + arg2 = reinterpret_cast< switch_channel_t * >(argp2); + if (arg1) (arg1)->channel = arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +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_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 ; + 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 *)"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_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_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_setVariable" "', argument " "3"" of type '" "char *""'"); + } + arg3 = buf3; + (arg1)->setVariable(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_CoreSession_getVariable(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 (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_getVariable" "', 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; + return resultobj; +fail: + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CoreSession_playFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + int res3 ; + char *buf3 = 0 ; + int alloc3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OOO:CoreSession_playFile",&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_playFile" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_playFile" "', argument " "2"" of type '" "char *""'"); + } + arg2 = buf2; + res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_playFile" "', argument " "3"" of type '" "char *""'"); + } + arg3 = buf3; + result = (int)(arg1)->playFile(arg2,arg3); + resultobj = SWIG_From_int(static_cast< int >(result)); + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + if (alloc3 == SWIG_NEWOBJ) delete[] buf3; + return resultobj; +fail: + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + if (alloc3 == SWIG_NEWOBJ) delete[] buf3; + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CoreSession_setDTMFCallback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + switch_input_callback_function_t arg2 ; + void *arg3 = (void *) 0 ; + uint32_t arg4 ; + 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; + 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 *""'"); + } + 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(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CoreSession_speakText(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + CoreSession *arg1 = (CoreSession *) 0 ; + char *arg2 = (char *) 0 ; + int result; + 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_speakText",&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 *""'"); + } + 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_speakText" "', argument " "2"" of type '" "char *""'"); + } + arg2 = buf2; + result = (int)(arg1)->speakText(arg2); + resultobj = SWIG_From_int(static_cast< int >(result)); + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return resultobj; +fail: + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return NULL; +} + + +SWIGINTERN PyObject *_wrap_CoreSession_set_tts_parms(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 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 *)"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_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_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_set_tts_parms" "', argument " "3"" of type '" "char *""'"); + } + arg3 = buf3; + (arg1)->set_tts_parms(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_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 *)"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_getDigits" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + 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_transfer(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 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; + 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; + 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 *""'"); + } + 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 *""'"); + } + 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 *""'"); + } + 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); + 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) { + 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; + 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 *)"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 '" "CoreSession_playAndGetDigits" "', 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 *""'"); + } + 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""'"); + } + 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_CoreSession_execute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 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 *)"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 '" "CoreSession_execute" "', 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 *""'"); + } + 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 *""'"); + } + 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; } -static PyObject *_wrap_console_log(PyObject *self, PyObject *args) { - PyObject *resultobj; - char *arg1 ; - char *arg2 ; - - if(!PyArg_ParseTuple(args,(char *)"ss:console_log",&arg1,&arg2)) goto fail; - console_log(arg1,arg2); - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_CoreSession_begin_allow_threads(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_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 '" "CoreSession_begin_allow_threads" "', argument " "1"" of type '" "CoreSession *""'"); + } + arg1 = reinterpret_cast< CoreSession * >(argp1); + (arg1)->begin_allow_threads(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; } -static PyObject *_wrap_console_clean_log(PyObject *self, PyObject *args) { - PyObject *resultobj; - char *arg1 ; - - if(!PyArg_ParseTuple(args,(char *)"s:console_clean_log",&arg1)) goto fail; - console_clean_log(arg1); - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_CoreSession_end_allow_threads(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; } -static PyObject *_wrap_api_execute(PyObject *self, PyObject *args) { - PyObject *resultobj; - char *arg1 ; - char *arg2 ; - char *result; - - if(!PyArg_ParseTuple(args,(char *)"ss:api_execute",&arg1,&arg2)) goto fail; - result = (char *)api_execute(arg1,arg2); - - resultobj = result ? PyString_FromString(result) : Py_BuildValue((char*)""); - 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; + 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 *)"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 '" "PythonDTMFCallback" "', argument " "1"" of type '" "switch_core_session *""'"); + } + 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; } -static PyObject *_wrap_api_reply_delete(PyObject *self, PyObject *args) { - PyObject *resultobj; - char *arg1 ; - - if(!PyArg_ParseTuple(args,(char *)"s:api_reply_delete",&arg1)) goto fail; - api_reply_delete(arg1); - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_input_callback_state_function_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + input_callback_state *arg1 = (input_callback_state *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 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 (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "input_callback_state_function_set" "', argument " "1"" of type '" "input_callback_state *""'"); + } + arg1 = reinterpret_cast< input_callback_state * >(argp1); + arg2 = obj1; + if (arg1) (arg1)->function = arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; } -static PyObject *_wrap_new_SessionContainer(PyObject *self, PyObject *args) { - PyObject *resultobj; - char *arg1 ; - SessionContainer *result; - - if(!PyArg_ParseTuple(args,(char *)"s:new_SessionContainer",&arg1)) goto fail; - result = (SessionContainer *)new SessionContainer(arg1); - - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_SessionContainer, 1); - 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< input_callback_state * >(argp1); + result = (PyObject *) ((arg1)->function); + resultobj = result; + return resultobj; +fail: + return NULL; } -static PyObject *_wrap_delete_SessionContainer(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"O:delete_SessionContainer",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - delete arg1; - - Py_INCREF(Py_None); resultobj = Py_None; - 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 *""'"); + } + 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 *""'"); + } + arg2 = reinterpret_cast< PyThreadState * >(argp2); + if (arg1) (arg1)->threadState = arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; } -static PyObject *_wrap_SessionContainer_uuid_set(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 ; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"Os:SessionContainer_uuid_set",&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - if (arg1->uuid) delete [] arg1->uuid; - if (arg2) { - arg1->uuid = (char *) (new char[strlen(arg2)+1]); - strcpy((char *) arg1->uuid,arg2); - } else { - arg1->uuid = 0; - } - } - Py_INCREF(Py_None); resultobj = Py_None; - 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 *""'"); + } + arg1 = reinterpret_cast< input_callback_state * >(argp1); + result = (PyThreadState *) ((arg1)->threadState); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PyThreadState, 0 | 0 ); + return resultobj; +fail: + return NULL; } -static PyObject *_wrap_SessionContainer_uuid_get(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - char *result; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"O:SessionContainer_uuid_get",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (char *) ((arg1)->uuid); - - resultobj = result ? PyString_FromString(result) : Py_BuildValue((char*)""); - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_input_callback_state_extra_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 (!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 '" "input_callback_state_extra_set" "', argument " "1"" of type '" "input_callback_state *""'"); + } + 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_extra_set" "', argument " "2"" of type '" "void *""'"); + } + if (arg1) (arg1)->extra = arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; } -static PyObject *_wrap_SessionContainer_answer(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - int result; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"O:SessionContainer_answer",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (int)(arg1)->answer(); - - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_input_callback_state_extra_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 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: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 '" "input_callback_state_extra_get" "', argument " "1"" of type '" "input_callback_state *""'"); + } + 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; } -static PyObject *_wrap_SessionContainer_pre_answer(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - int result; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"O:SessionContainer_pre_answer",&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (int)(arg1)->pre_answer(); - - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_input_callback_state_funcargs_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + input_callback_state *arg1 = (input_callback_state *) 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: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 '" "input_callback_state_funcargs_set" "', argument " "1"" of type '" "input_callback_state *""'"); + } + 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 '" "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; + } + resultobj = SWIG_Py_Void(); + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return resultobj; +fail: + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return NULL; } -static PyObject *_wrap_SessionContainer_hangup(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 ; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"Os:SessionContainer_hangup",&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - (arg1)->hangup(arg2); - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_input_callback_state_funcargs_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 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: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 '" "input_callback_state_funcargs_get" "', argument " "1"" of type '" "input_callback_state *""'"); + } + arg1 = reinterpret_cast< input_callback_state * >(argp1); + result = (char *) ((arg1)->funcargs); + resultobj = SWIG_FromCharPtr(result); + return resultobj; +fail: + return NULL; } -static PyObject *_wrap_SessionContainer_set_variable(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 ; - char *arg3 ; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"Oss:SessionContainer_set_variable",&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - (arg1)->set_variable(arg2,arg3); - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_new_input_callback_state(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + input_callback_state *result = 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 ); + return resultobj; +fail: + return NULL; } -static PyObject *_wrap_SessionContainer_get_variable(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 ; - char *result; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"Os:SessionContainer_get_variable",&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (char *)(arg1)->get_variable(arg2); - - resultobj = result ? PyString_FromString(result) : Py_BuildValue((char*)""); - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_delete_input_callback_state(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + input_callback_state *arg1 = (input_callback_state *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 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 '" "delete_input_callback_state" "', argument " "1"" of type '" "input_callback_state *""'"); + } + arg1 = reinterpret_cast< input_callback_state * >(argp1); + delete arg1; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; } -static PyObject *_wrap_SessionContainer_play_file(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 ; - char *arg3 ; - int result; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"Oss:SessionContainer_play_file",&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (int)(arg1)->play_file(arg2,arg3); - - resultobj = PyInt_FromLong((long)result); - 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 ; + PySession *result = 0 ; + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:new_PySession",&obj0)) SWIG_fail; + res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PySession" "', argument " "1"" of type '" "char *""'"); + } + arg1 = buf1; + result = (PySession *)new PySession(arg1); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PySession, SWIG_POINTER_NEW | 0 ); + if (alloc1 == SWIG_NEWOBJ) delete[] buf1; + return resultobj; +fail: + if (alloc1 == SWIG_NEWOBJ) delete[] buf1; + return NULL; } -static PyObject *_wrap_SessionContainer_set_dtmf_callback(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - PyObject *arg2 = (PyObject *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO:SessionContainer_set_dtmf_callback",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = obj1; - (arg1)->set_dtmf_callback(arg2); - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_new_PySession__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + PySession *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:new_PySession",&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 '" "new_PySession" "', argument " "1"" of type '" "switch_core_session_t *""'"); + } + arg1 = reinterpret_cast< switch_core_session_t * >(argp1); + result = (PySession *)new PySession(arg1); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PySession, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; } -static PyObject *_wrap_SessionContainer_speak_text(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 ; - int result; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"Os:SessionContainer_speak_text",&obj0,&arg2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (int)(arg1)->speak_text(arg2); - - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_new_PySession(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); + } + 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_PySession__SWIG_1(self, args); + } + } + if (argc == 1) { + int _v; + int res = SWIG_AsCharPtrAndSize(argv[0], 0, NULL, 0); + _v = SWIG_CheckState(res); + if (_v) { + return _wrap_new_PySession__SWIG_0(self, args); + } + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_PySession'"); + return NULL; } -static PyObject *_wrap_SessionContainer_set_tts_parms(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 ; - char *arg3 ; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"Oss:SessionContainer_set_tts_parms",&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - (arg1)->set_tts_parms(arg2,arg3); - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_delete_PySession(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + PySession *arg1 = (PySession *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:delete_PySession",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PySession, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PySession" "', argument " "1"" of type '" "PySession *""'"); + } + arg1 = reinterpret_cast< PySession * >(argp1); + delete arg1; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; } -static PyObject *_wrap_SessionContainer_get_digits(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 ; - int arg3 ; - char *arg4 ; - char *arg5 ; - int arg6 ; - int result; - char temp2[128+1] ; - char temp5[8+1] ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj4 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OOisOi:SessionContainer_get_digits",&obj0,&obj1,&arg3,&arg4,&obj4,&arg6)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - char *t = PyString_AsString(obj1); - if (PyErr_Occurred()) SWIG_fail; - strncpy(temp2,t,128); - arg2 = (char *) temp2; - } - { - char *t = PyString_AsString(obj4); - if (PyErr_Occurred()) SWIG_fail; - strncpy(temp5,t,8); - arg5 = (char *) temp5; - } - result = (int)(arg1)->get_digits(arg2,arg3,arg4,arg5,arg6); - - resultobj = PyInt_FromLong((long)result); - { - PyObject *o; - arg2[128] = 0; - o = PyString_FromString(arg2); - resultobj = t_output_helper(resultobj,o); - } - { - PyObject *o; - arg5[8] = 0; - o = PyString_FromString(arg5); - resultobj = t_output_helper(resultobj,o); - } - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_PySession_streamfile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + PySession *arg1 = (PySession *) 0 ; + char *arg2 = (char *) 0 ; + PyObject *arg3 = (PyObject *) 0 ; + PyObject *arg4 = (PyObject *) 0 ; + int arg5 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + int res2 ; + char *buf2 = 0 ; + int alloc2 = 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:PySession_streamfile",&obj0,&obj1,&obj2,&obj3,&obj4)) 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 *""'"); + } + 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; + arg4 = obj3; + 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; + return resultobj; +fail: + if (alloc2 == SWIG_NEWOBJ) delete[] buf2; + return NULL; } -static PyObject *_wrap_SessionContainer_transfer(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 ; - char *arg3 ; - char *arg4 ; - int result; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"Osss:SessionContainer_transfer",&obj0,&arg2,&arg3,&arg4)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - result = (int)(arg1)->transfer(arg2,arg3,arg4); - - resultobj = PyInt_FromLong((long)result); - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_PySession_set_dtmf_callback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + PySession *arg1 = (PySession *) 0 ; + PyObject *arg2 = (PyObject *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"OO:PySession_set_dtmf_callback",&obj0,&obj1)) 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_set_dtmf_callback" "', argument " "1"" of type '" "PySession *""'"); + } + arg1 = reinterpret_cast< PySession * >(argp1); + arg2 = obj1; + (arg1)->set_dtmf_callback(arg2); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; } -static PyObject *_wrap_SessionContainer_play_and_get_digits(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - int arg2 ; - int arg3 ; - int arg4 ; - int arg5 ; - char *arg6 ; - char *arg7 ; - char *arg8 ; - char *arg9 ; - char *arg10 ; - int result; - char temp9[128+1] ; - PyObject * obj0 = 0 ; - PyObject * obj8 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OiiiisssOs:SessionContainer_play_and_get_digits",&obj0,&arg2,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&obj8,&arg10)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - char *t = PyString_AsString(obj8); - if (PyErr_Occurred()) SWIG_fail; - strncpy(temp9,t,128); - arg9 = (char *) temp9; - } - result = (int)(arg1)->play_and_get_digits(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10); - - resultobj = PyInt_FromLong((long)result); - { - PyObject *o; - arg9[128] = 0; - o = PyString_FromString(arg9); - resultobj = t_output_helper(resultobj,o); - } - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_PySession_begin_allow_threads(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + PySession *arg1 = (PySession *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:PySession_begin_allow_threads",&obj0)) 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_begin_allow_threads" "', argument " "1"" of type '" "PySession *""'"); + } + arg1 = reinterpret_cast< PySession * >(argp1); + (arg1)->begin_allow_threads(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; } -static PyObject *_wrap_SessionContainer_execute(PyObject *self, PyObject *args) { - PyObject *resultobj; - SessionContainer *arg1 = (SessionContainer *) 0 ; - char *arg2 ; - char *arg3 ; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"Oss:SessionContainer_execute",&obj0,&arg2,&arg3)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - (arg1)->execute(arg2,arg3); - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; +SWIGINTERN PyObject *_wrap_PySession_end_allow_threads(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + PySession *arg1 = (PySession *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:PySession_end_allow_threads",&obj0)) 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_end_allow_threads" "', argument " "1"" of type '" "PySession *""'"); + } + arg1 = reinterpret_cast< PySession * >(argp1); + (arg1)->end_allow_threads(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; } -static PyObject * SessionContainer_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_SessionContainer, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); +SWIGINTERN PyObject *PySession_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_PySession, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); } + static PyMethodDef SwigMethods[] = { - { (char *)"PythonDTMFCallback", _wrap_PythonDTMFCallback, METH_VARARGS }, - { (char *)"console_log", _wrap_console_log, METH_VARARGS }, - { (char *)"console_clean_log", _wrap_console_clean_log, METH_VARARGS }, - { (char *)"api_execute", _wrap_api_execute, METH_VARARGS }, - { (char *)"api_reply_delete", _wrap_api_reply_delete, METH_VARARGS }, - { (char *)"new_SessionContainer", _wrap_new_SessionContainer, METH_VARARGS }, - { (char *)"delete_SessionContainer", _wrap_delete_SessionContainer, METH_VARARGS }, - { (char *)"SessionContainer_uuid_set", _wrap_SessionContainer_uuid_set, METH_VARARGS }, - { (char *)"SessionContainer_uuid_get", _wrap_SessionContainer_uuid_get, METH_VARARGS }, - { (char *)"SessionContainer_answer", _wrap_SessionContainer_answer, METH_VARARGS }, - { (char *)"SessionContainer_pre_answer", _wrap_SessionContainer_pre_answer, METH_VARARGS }, - { (char *)"SessionContainer_hangup", _wrap_SessionContainer_hangup, METH_VARARGS }, - { (char *)"SessionContainer_set_variable", _wrap_SessionContainer_set_variable, METH_VARARGS }, - { (char *)"SessionContainer_get_variable", _wrap_SessionContainer_get_variable, METH_VARARGS }, - { (char *)"SessionContainer_play_file", _wrap_SessionContainer_play_file, METH_VARARGS }, - { (char *)"SessionContainer_set_dtmf_callback", _wrap_SessionContainer_set_dtmf_callback, METH_VARARGS }, - { (char *)"SessionContainer_speak_text", _wrap_SessionContainer_speak_text, METH_VARARGS }, - { (char *)"SessionContainer_set_tts_parms", _wrap_SessionContainer_set_tts_parms, METH_VARARGS }, - { (char *)"SessionContainer_get_digits", _wrap_SessionContainer_get_digits, METH_VARARGS }, - { (char *)"SessionContainer_transfer", _wrap_SessionContainer_transfer, METH_VARARGS }, - { (char *)"SessionContainer_play_and_get_digits", _wrap_SessionContainer_play_and_get_digits, METH_VARARGS }, - { (char *)"SessionContainer_execute", _wrap_SessionContainer_execute, METH_VARARGS }, - { (char *)"SessionContainer_swigregister", SessionContainer_swigregister, METH_VARARGS }, - { NULL, NULL } + { (char *)"console_log", _wrap_console_log, METH_VARARGS, NULL}, + { (char *)"console_clean_log", _wrap_console_clean_log, METH_VARARGS, NULL}, + { (char *)"api_execute", _wrap_api_execute, METH_VARARGS, NULL}, + { (char *)"api_reply_delete", _wrap_api_reply_delete, 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_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}, + { (char *)"CoreSession_setVariable", _wrap_CoreSession_setVariable, METH_VARARGS, NULL}, + { (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_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_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_set_dtmf_callback", _wrap_PySession_set_dtmf_callback, 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}, + { NULL, NULL, 0, NULL } }; /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ -static swig_type_info _swigt__p_switch_status_t[] = {{"_p_switch_status_t", 0, "switch_status_t *", 0},{"_p_switch_status_t"},{0}}; -static swig_type_info _swigt__p_switch_input_type_t[] = {{"_p_switch_input_type_t", 0, "switch_input_type_t *", 0},{"_p_switch_input_type_t"},{0}}; -static swig_type_info _swigt__p_switch_core_session[] = {{"_p_switch_core_session", 0, "switch_core_session *", 0},{"_p_switch_core_session"},{0}}; -static swig_type_info _swigt__p_SessionContainer[] = {{"_p_SessionContainer", 0, "SessionContainer *", 0},{"_p_SessionContainer"},{0}}; - -static swig_type_info *swig_types_initial[] = { -_swigt__p_switch_status_t, -_swigt__p_switch_input_type_t, -_swigt__p_switch_core_session, -_swigt__p_SessionContainer, -0 +static void *_p_PySessionTo_p_CoreSession(void *x) { + return (void *)((CoreSession *) ((PySession *) x)); +} +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}; +static swig_type_info _swigt__p_switch_core_session = {"_p_switch_core_session", "switch_core_session *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_switch_core_session_t = {"_p_switch_core_session_t", "switch_core_session_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_switch_input_callback_function_t = {"_p_switch_input_callback_function_t", "switch_input_callback_function_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_switch_input_type_t = {"_p_switch_input_type_t", "switch_input_type_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_switch_status_t = {"_p_switch_status_t", "switch_status_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_uint32_t = {"_p_uint32_t", "uint32_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_void = {"_p_void", "void *", 0, 0, (void*)0, 0}; + +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, + &_swigt__p_switch_core_session, + &_swigt__p_switch_core_session_t, + &_swigt__p_switch_input_callback_function_t, + &_swigt__p_switch_input_type_t, + &_swigt__p_switch_status_t, + &_swigt__p_uint32_t, + &_swigt__p_void, +}; + +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}}; +static swig_cast_info _swigc__p_switch_core_session[] = { {&_swigt__p_switch_core_session, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_switch_core_session_t[] = { {&_swigt__p_switch_core_session_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_switch_input_callback_function_t[] = { {&_swigt__p_switch_input_callback_function_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_switch_input_type_t[] = { {&_swigt__p_switch_input_type_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_switch_status_t[] = { {&_swigt__p_switch_status_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_uint32_t[] = { {&_swigt__p_uint32_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_void[] = { {&_swigt__p_void, 0, 0, 0},{0, 0, 0, 0}}; + +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, + _swigc__p_switch_core_session, + _swigc__p_switch_core_session_t, + _swigc__p_switch_input_callback_function_t, + _swigc__p_switch_input_type_t, + _swigc__p_switch_status_t, + _swigc__p_uint32_t, + _swigc__p_void, }; /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */ static swig_const_info swig_const_table[] = { -{0}}; +{0, 0, 0, 0.0, 0, 0}}; #ifdef __cplusplus } #endif +/* ----------------------------------------------------------------------------- + * Type initialization: + * This problem is tough by the requirement that no dynamic + * memory is used. Also, since swig_type_info structures store pointers to + * swig_cast_info structures and swig_cast_info structures store pointers back + * to swig_type_info structures, we need some lookup code at initialization. + * The idea is that swig generates all the structures that are needed. + * The runtime then collects these partially filled structures. + * The SWIG_InitializeModule function takes these initial arrays out of + * swig_module, and does all the lookup, filling in the swig_module.types + * array with the correct data and linking the correct swig_cast_info + * structures together. + * + * The generated swig_type_info structures are assigned staticly to an initial + * array. We just loop though that array, and handle each type individually. + * First we lookup if this type has been already loaded, and if so, use the + * loaded structure instead of the generated one. Then we have to fill in the + * cast linked list. The cast data is initially stored in something like a + * two-dimensional array. Each row corresponds to a type (there are the same + * number of rows as there are in the swig_type_initial array). Each entry in + * a column is one of the swig_cast_info structures for that type. + * The cast_initial array is actually an array of arrays, because each row has + * a variable number of columns. So to actually build the cast linked list, + * we find the array of casts associated with the type, and loop through it + * adding the casts to the list. The one last trick we need to do is making + * sure the type pointer in the swig_cast_info struct is correct. + * + * First off, we lookup the cast->type name to see if it is already loaded. + * There are three cases to handle: + * 1) If the cast->type has already been loaded AND the type we are adding + * casting info to has not been loaded (it is in this module), THEN we + * replace the cast->type pointer with the type pointer that has already + * been loaded. + * 2) If BOTH types (the one we are adding casting info to, and the + * cast->type) are loaded, THEN the cast info has already been loaded by + * the previous module so we just ignore it. + * 3) Finally, if cast->type has not already been loaded, then we add that + * swig_cast_info to the linked list (because the cast->type) pointer will + * be correct. + * ----------------------------------------------------------------------------- */ #ifdef __cplusplus -extern "C" +extern "C" { +#if 0 +} /* c-mode */ +#endif +#endif + +#if 0 +#define SWIGRUNTIME_DEBUG +#endif + +SWIGRUNTIME void +SWIG_InitializeModule(void *clientdata) { + size_t i; + swig_module_info *module_head; + static int init_run = 0; + + clientdata = clientdata; + + if (init_run) return; + init_run = 1; + + /* Initialize the swig_module */ + swig_module.type_initial = swig_type_initial; + swig_module.cast_initial = swig_cast_initial; + + /* Try and load any already created modules */ + module_head = SWIG_GetModule(clientdata); + if (module_head) { + swig_module.next = module_head->next; + module_head->next = &swig_module; + } else { + /* This is the first module loaded */ + swig_module.next = &swig_module; + SWIG_SetModule(clientdata, &swig_module); + } + + /* Now work on filling in swig_module.types */ +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: size %d\n", swig_module.size); #endif -SWIGEXPORT(void) SWIG_init(void) { - static PyObject *SWIG_globals = 0; - static int typeinit = 0; - PyObject *m, *d; - int i; - if (!SWIG_globals) SWIG_globals = SWIG_newvarlink(); - m = Py_InitModule((char *) SWIG_name, SwigMethods); - d = PyModule_GetDict(m); + for (i = 0; i < swig_module.size; ++i) { + swig_type_info *type = 0; + swig_type_info *ret; + swig_cast_info *cast; - if (!typeinit) { - for (i = 0; swig_types_initial[i]; i++) { - swig_types[i] = SWIG_TypeRegister(swig_types_initial[i]); - } - typeinit = 1; +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name); +#endif + + /* if there is another module already loaded */ + if (swig_module.next != &swig_module) { + type = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, swig_module.type_initial[i]->name); + } + if (type) { + /* Overwrite clientdata field */ +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: found type %s\n", type->name); +#endif + if (swig_module.type_initial[i]->clientdata) { + type->clientdata = swig_module.type_initial[i]->clientdata; +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: found and overwrite type %s \n", type->name); +#endif + } + } else { + type = swig_module.type_initial[i]; } - SWIG_InstallConstants(d,swig_const_table); + /* Insert casting types */ + cast = swig_module.cast_initial[i]; + while (cast->type) { + /* Don't need to add information already in the list */ + ret = 0; +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: look cast %s\n", cast->type->name); +#endif + if (swig_module.next != &swig_module) { + ret = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name); +#ifdef SWIGRUNTIME_DEBUG + if (ret) printf("SWIG_InitializeModule: found cast %s\n", ret->name); +#endif + } + if (ret) { + if (type == swig_module.type_initial[i]) { +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: skip old type %s\n", ret->name); +#endif + cast->type = ret; + ret = 0; + } else { + /* Check for casting already in the list */ + swig_cast_info *ocast = SWIG_TypeCheck(ret->name, type); +#ifdef SWIGRUNTIME_DEBUG + if (ocast) printf("SWIG_InitializeModule: skip old cast %s\n", ret->name); +#endif + if (!ocast) ret = 0; + } + } + + if (!ret) { +#ifdef SWIGRUNTIME_DEBUG + printf("SWIG_InitializeModule: adding cast %s\n", cast->type->name); +#endif + if (type->cast) { + type->cast->prev = cast; + cast->next = type->cast; + } + type->cast = cast; + } + cast++; + } + /* Set entry in modules->types array equal to the type */ + swig_module.types[i] = type; + } + swig_module.types[i] = 0; + +#ifdef SWIGRUNTIME_DEBUG + printf("**** SWIG_InitializeModule: Cast List ******\n"); + for (i = 0; i < swig_module.size; ++i) { + int j = 0; + swig_cast_info *cast = swig_module.cast_initial[i]; + printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name); + while (cast->type) { + printf("SWIG_InitializeModule: cast type %s\n", cast->type->name); + cast++; + ++j; + } + printf("---- Total casts: %d\n",j); + } + printf("**** SWIG_InitializeModule: Cast List ******\n"); +#endif +} + +/* This function will propagate the clientdata field of type to +* any new swig_type_info structures that have been added into the list +* of equivalent types. It is like calling +* SWIG_TypeClientData(type, clientdata) a second time. +*/ +SWIGRUNTIME void +SWIG_PropagateClientData(void) { + size_t i; + swig_cast_info *equiv; + static int init_run = 0; + + if (init_run) return; + init_run = 1; + + for (i = 0; i < swig_module.size; i++) { + if (swig_module.types[i]->clientdata) { + equiv = swig_module.types[i]->cast; + while (equiv) { + if (!equiv->converter) { + if (equiv->type && !equiv->type->clientdata) + SWIG_TypeClientData(equiv->type, swig_module.types[i]->clientdata); + } + equiv = equiv->next; + } + } + } +} + +#ifdef __cplusplus +#if 0 +{ + /* c-mode */ +#endif +} +#endif + + + +#ifdef __cplusplus +extern "C" { +#endif + + /* Python-specific SWIG API */ +#define SWIG_newvarlink() SWIG_Python_newvarlink() +#define SWIG_addvarlink(p, name, get_attr, set_attr) SWIG_Python_addvarlink(p, name, get_attr, set_attr) +#define SWIG_InstallConstants(d, constants) SWIG_Python_InstallConstants(d, constants) + + /* ----------------------------------------------------------------------------- + * global variable support code. + * ----------------------------------------------------------------------------- */ + + typedef struct swig_globalvar { + char *name; /* Name of global variable */ + PyObject *(*get_attr)(void); /* Return the current value */ + int (*set_attr)(PyObject *); /* Set the value */ + struct swig_globalvar *next; + } swig_globalvar; + + typedef struct swig_varlinkobject { + PyObject_HEAD + swig_globalvar *vars; + } swig_varlinkobject; + + SWIGINTERN PyObject * + swig_varlink_repr(swig_varlinkobject *SWIGUNUSEDPARM(v)) { + return PyString_FromString("<Swig global variables>"); + } + + SWIGINTERN PyObject * + swig_varlink_str(swig_varlinkobject *v) { + PyObject *str = PyString_FromString("("); + swig_globalvar *var; + for (var = v->vars; var; var=var->next) { + PyString_ConcatAndDel(&str,PyString_FromString(var->name)); + if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", ")); + } + PyString_ConcatAndDel(&str,PyString_FromString(")")); + return str; + } + + SWIGINTERN int + swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) { + PyObject *str = swig_varlink_str(v); + fprintf(fp,"Swig global variables "); + fprintf(fp,"%s\n", PyString_AsString(str)); + Py_DECREF(str); + return 0; + } + + SWIGINTERN void + swig_varlink_dealloc(swig_varlinkobject *v) { + swig_globalvar *var = v->vars; + while (var) { + swig_globalvar *n = var->next; + free(var->name); + free(var); + var = n; + } + } + + SWIGINTERN PyObject * + swig_varlink_getattr(swig_varlinkobject *v, char *n) { + PyObject *res = NULL; + swig_globalvar *var = v->vars; + while (var) { + if (strcmp(var->name,n) == 0) { + res = (*var->get_attr)(); + break; + } + var = var->next; + } + if (res == NULL && !PyErr_Occurred()) { + PyErr_SetString(PyExc_NameError,"Unknown C global variable"); + } + return res; + } + + SWIGINTERN int + swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) { + int res = 1; + swig_globalvar *var = v->vars; + while (var) { + if (strcmp(var->name,n) == 0) { + res = (*var->set_attr)(p); + break; + } + var = var->next; + } + if (res == 1 && !PyErr_Occurred()) { + PyErr_SetString(PyExc_NameError,"Unknown C global variable"); + } + return res; + } + + SWIGINTERN PyTypeObject* + swig_varlink_type(void) { + static char varlink__doc__[] = "Swig var link object"; + static PyTypeObject varlink_type; + static int type_init = 0; + if (!type_init) { + const PyTypeObject tmp + = { + PyObject_HEAD_INIT(NULL) + 0, /* Number of items in variable part (ob_size) */ + (char *)"swigvarlink", /* Type name (tp_name) */ + sizeof(swig_varlinkobject), /* Basic size (tp_basicsize) */ + 0, /* Itemsize (tp_itemsize) */ + (destructor) swig_varlink_dealloc, /* Deallocator (tp_dealloc) */ + (printfunc) swig_varlink_print, /* Print (tp_print) */ + (getattrfunc) swig_varlink_getattr, /* get attr (tp_getattr) */ + (setattrfunc) swig_varlink_setattr, /* Set attr (tp_setattr) */ + 0, /* tp_compare */ + (reprfunc) swig_varlink_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + (reprfunc)swig_varlink_str, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + 0, /* tp_flags */ + varlink__doc__, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ +#if PY_VERSION_HEX >= 0x02020000 + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */ +#endif +#if PY_VERSION_HEX >= 0x02030000 + 0, /* tp_del */ +#endif +#ifdef COUNT_ALLOCS + 0,0,0,0 /* tp_alloc -> tp_next */ +#endif + }; + varlink_type = tmp; + varlink_type.ob_type = &PyType_Type; + type_init = 1; + } + return &varlink_type; + } + + /* Create a variable linking object for use later */ + SWIGINTERN PyObject * + SWIG_Python_newvarlink(void) { + swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type()); + if (result) { + result->vars = 0; + } + return ((PyObject*) result); + } + + SWIGINTERN void + SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) { + swig_varlinkobject *v = (swig_varlinkobject *) p; + swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar)); + if (gv) { + size_t size = strlen(name)+1; + gv->name = (char *)malloc(size); + if (gv->name) { + strncpy(gv->name,name,size); + gv->get_attr = get_attr; + gv->set_attr = set_attr; + gv->next = v->vars; + } + } + v->vars = gv; + } + + SWIGINTERN PyObject * + SWIG_globals() { + static PyObject *_SWIG_globals = 0; + if (!_SWIG_globals) _SWIG_globals = SWIG_newvarlink(); + return _SWIG_globals; + } + + /* ----------------------------------------------------------------------------- + * constants/methods manipulation + * ----------------------------------------------------------------------------- */ + + /* Install Constants */ + SWIGINTERN void + SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) { + PyObject *obj = 0; + size_t i; + for (i = 0; constants[i].type; ++i) { + switch(constants[i].type) { + case SWIG_PY_POINTER: + obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0); + break; + case SWIG_PY_BINARY: + obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype)); + break; + default: + obj = 0; + break; + } + if (obj) { + PyDict_SetItemString(d, constants[i].name, obj); + Py_DECREF(obj); + } + } + } + + /* -----------------------------------------------------------------------------*/ + /* Fix SwigMethods to carry the callback ptrs when needed */ + /* -----------------------------------------------------------------------------*/ + + SWIGINTERN void + SWIG_Python_FixMethods(PyMethodDef *methods, + swig_const_info *const_table, + swig_type_info **types, + swig_type_info **types_initial) { + size_t i; + for (i = 0; methods[i].ml_name; ++i) { + char *c = methods[i].ml_doc; + if (c && (c = strstr(c, "swig_ptr: "))) { + int j; + swig_const_info *ci = 0; + char *name = c + 10; + for (j = 0; const_table[j].type; ++j) { + if (strncmp(const_table[j].name, name, + strlen(const_table[j].name)) == 0) { + ci = &(const_table[j]); + break; + } + } + if (ci) { + size_t shift = (ci->ptype) - types; + swig_type_info *ty = types_initial[shift]; + size_t ldoc = (c - methods[i].ml_doc); + size_t lptr = strlen(ty->name)+2*sizeof(void*)+2; + char *ndoc = (char*)malloc(ldoc + lptr + 10); + if (ndoc) { + char *buff = ndoc; + void *ptr = (ci->type == SWIG_PY_POINTER) ? ci->pvalue : 0; + if (ptr) { + strncpy(buff, methods[i].ml_doc, ldoc); + buff += ldoc; + strncpy(buff, "swig_ptr: ", 10); + buff += 10; + SWIG_PackVoidPtr(buff, ptr, ty->name, lptr); + methods[i].ml_doc = ndoc; + } + } + } + } + } + } + +#ifdef __cplusplus +} +#endif + +/* -----------------------------------------------------------------------------* + * Partial Init method + * -----------------------------------------------------------------------------*/ + +#ifdef __cplusplus +extern "C" +#endif +SWIGEXPORT void SWIG_init(void) { + PyObject *m, *d; + + /* Fix SwigMethods to carry the callback ptrs when needed */ + SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial); + + m = Py_InitModule((char *) SWIG_name, SwigMethods); + d = PyModule_GetDict(m); + + SWIG_InitializeModule(0); + SWIG_InstallConstants(d,swig_const_table); + + } Modified: freeswitch/branches/greenlizard/src/switch_cpp.cpp ============================================================================== --- freeswitch/branches/greenlizard/src/switch_cpp.cpp (original) +++ freeswitch/branches/greenlizard/src/switch_cpp.cpp Wed May 16 18:49:51 2007 @@ -77,7 +77,9 @@ sanity_check(); if ((application_interface = switch_loadable_module_get_application_interface(app))) { + begin_allow_threads(); switch_core_session_exec(session, application_interface, data); + end_allow_threads(); } } @@ -88,9 +90,11 @@ if (switch_strlen_zero(timer_name)) { timer_name = NULL; } - + begin_allow_threads(); status = switch_ivr_play_file(session, NULL, 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) @@ -114,7 +118,9 @@ sanity_check(-1); codec = switch_core_session_get_read_codec(session); + begin_allow_threads(); status = switch_ivr_speak_text(session, tts_name, voice_name, codec->implementation->samples_per_second, text, ap); + end_allow_threads(); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } @@ -131,7 +137,9 @@ { 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); + end_allow_threads(); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } @@ -143,17 +151,33 @@ return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } -int CoreSession::playAndgetDigits(int min_digits, int max_digits, int max_tries, int timeout, char *terminators, +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); - status = switch_play_and_get_digits( session, (uint32_t) min_digits,(uint32_t) max_digits, - (uint32_t) max_tries, (uint32_t) timeout, - terminators, audio_files, bad_input_audio_files, dtmf_buf, 128, digits_regex); + begin_allow_threads(); + status = switch_play_and_get_digits( session, + (uint32_t) min_digits, + (uint32_t) max_digits, + (uint32_t) max_tries, + (uint32_t) timeout, + terminators, + audio_files, + bad_input_audio_files, + dtmf_buf, 128, + digits_regex); + end_allow_threads(); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } +void CoreSession::begin_allow_threads() { +} + +void CoreSession::end_allow_threads() { +} + + /* For Emacs: * Local Variables:

1 0

[commit] r5193 - freeswitch/branches/greenlizard/src/include
by Freeswitch SVN 16 May '07

16 May '07

Author: greenlizard Date: Wed May 16 14:12:23 2007 New Revision: 5193 Modified: freeswitch/branches/greenlizard/src/include/switch_ivr.h Log: Sync up changes from trunk version 5170 to 5186, attempt #2 due to merge error 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 Wed May 16 14:12:23 2007 @@ -92,13 +92,20 @@ /*! \brief Parse command from an event - \param session the session to send the message to - \param event the event to send + \param session the session on which to parse the event + \param event the event to parse \return SWITCH_STATUS_SUCCESS if successful */ SWITCH_DECLARE(switch_status_t) switch_ivr_parse_event(switch_core_session_t *session, switch_event_t *event); /*! + \brief Parse all commands from an event + \param session the session on which to parse the events + \return SWITCH_STATUS_SUCCESS if successful +*/ +SWITCH_DECLARE(switch_status_t) switch_ivr_parse_all_events(switch_core_session_t *session); + +/*! \brief Wait for time to pass for a specified number of milliseconds \param session the session to wait for. \param ms the number of milliseconds

1 0

[commit] r5190 - in freeswitch/branches/greenlizard: . docs libs/js/nsprpub/pr/src/misc scripts src src/include src/include/private src/mod/applications/mod_commands src/mod/endpoints/mod_sofia src/mod/languages/mod_spidermonkey
by Freeswitch SVN 16 May '07

16 May '07

Author: greenlizard Date: Wed May 16 12:53:25 2007 New Revision: 5190 Added: freeswitch/branches/greenlizard/scripts/api.js - copied unchanged from r5189, /freeswitch/trunk/scripts/api.js freeswitch/branches/greenlizard/src/include/private/switch_core_pvt.h - copied unchanged from r5189, /freeswitch/trunk/src/include/private/switch_core_pvt.h Removed: freeswitch/branches/greenlizard/src/include/private/switch_core.h freeswitch/branches/greenlizard/src/include/switch_sqlite.h Modified: freeswitch/branches/greenlizard/Makefile.am freeswitch/branches/greenlizard/bootstrap.sh freeswitch/branches/greenlizard/docs/Doxygen.conf freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/misc/pratom.c freeswitch/branches/greenlizard/src/include/switch.h freeswitch/branches/greenlizard/src/include/switch_apr.h freeswitch/branches/greenlizard/src/include/switch_core.h freeswitch/branches/greenlizard/src/include/switch_core_event_hook.h freeswitch/branches/greenlizard/src/include/switch_regex.h freeswitch/branches/greenlizard/src/include/switch_scheduler.h freeswitch/branches/greenlizard/src/include/switch_types.h freeswitch/branches/greenlizard/src/mod/applications/mod_commands/mod_commands.c freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/branches/greenlizard/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/branches/greenlizard/src/switch_console.c freeswitch/branches/greenlizard/src/switch_core.c freeswitch/branches/greenlizard/src/switch_core_asr.c freeswitch/branches/greenlizard/src/switch_core_codec.c freeswitch/branches/greenlizard/src/switch_core_db.c freeswitch/branches/greenlizard/src/switch_core_directory.c freeswitch/branches/greenlizard/src/switch_core_event_hook.c freeswitch/branches/greenlizard/src/switch_core_file.c freeswitch/branches/greenlizard/src/switch_core_hash.c freeswitch/branches/greenlizard/src/switch_core_io.c freeswitch/branches/greenlizard/src/switch_core_media_bug.c freeswitch/branches/greenlizard/src/switch_core_memory.c freeswitch/branches/greenlizard/src/switch_core_port_allocator.c freeswitch/branches/greenlizard/src/switch_core_rwlock.c freeswitch/branches/greenlizard/src/switch_core_session.c freeswitch/branches/greenlizard/src/switch_core_speech.c freeswitch/branches/greenlizard/src/switch_core_sqldb.c freeswitch/branches/greenlizard/src/switch_core_state_machine.c freeswitch/branches/greenlizard/src/switch_core_timer.c freeswitch/branches/greenlizard/src/switch_ivr.c freeswitch/branches/greenlizard/src/switch_ivr_async.c freeswitch/branches/greenlizard/src/switch_ivr_bridge.c Log: Sync up changes from trunk version 5170 to 5186 Modified: freeswitch/branches/greenlizard/Makefile.am ============================================================================== --- freeswitch/branches/greenlizard/Makefile.am (original) +++ freeswitch/branches/greenlizard/Makefile.am Wed May 16 12:53:25 2007 @@ -133,7 +133,7 @@ if ADD_LIBEDIT CORE_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT CORE_LIBS += libs/libedit/src/.libs/libedit.a -freeswitch_LDADD += -ltermcap +freeswitch_LDADD += -lcurses endif Modified: freeswitch/branches/greenlizard/bootstrap.sh ============================================================================== --- freeswitch/branches/greenlizard/bootstrap.sh (original) +++ freeswitch/branches/greenlizard/bootstrap.sh Wed May 16 12:53:25 2007 @@ -22,6 +22,8 @@ echo " to build FreeSWITCH from SVN." exit 1 fi +IFS=_; set $ac_version; IFS=' ' +ac_version=$1 IFS=.; set $ac_version; IFS=' ' if test "$1" = "2" -a "$2" -lt "59" || test "$1" -lt "2"; then echo "bootstrap: autoconf version $ac_version found." Modified: freeswitch/branches/greenlizard/docs/Doxygen.conf ============================================================================== --- freeswitch/branches/greenlizard/docs/Doxygen.conf (original) +++ freeswitch/branches/greenlizard/docs/Doxygen.conf Wed May 16 12:53:25 2007 @@ -83,7 +83,7 @@ #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../src ../src/include +INPUT = ../src ../src/include ../src/include/private FILE_PATTERNS = *.c \ *.cc \ *.cxx \ Modified: freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/misc/pratom.c ============================================================================== --- freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/misc/pratom.c (original) +++ freeswitch/branches/greenlizard/libs/js/nsprpub/pr/src/misc/pratom.c Wed May 16 12:53:25 2007 @@ -54,6 +54,50 @@ */ #if !defined(_PR_HAVE_ATOMIC_OPS) +#include "prbit.h" + +/* +** Compute the log of the least power of 2 greater than or equal to n +*/ +PR_IMPLEMENT(PRIntn) PR_CeilingLog2(PRUint32 n) +{ + PRIntn log2 = 0; + + if (n & (n-1)) + log2++; + if (n >> 16) + log2 += 16, n >>= 16; + if (n >> 8) + log2 += 8, n >>= 8; + if (n >> 4) + log2 += 4, n >>= 4; + if (n >> 2) + log2 += 2, n >>= 2; + if (n >> 1) + log2++; + return log2; +} + +/* +** Compute the log of the greatest power of 2 less than or equal to n. +** This really just finds the highest set bit in the word. +*/ +PR_IMPLEMENT(PRIntn) PR_FloorLog2(PRUint32 n) +{ + PRIntn log2 = 0; + + if (n >> 16) + log2 += 16, n >>= 16; + if (n >> 8) + log2 += 8, n >>= 8; + if (n >> 4) + log2 += 4, n >>= 4; + if (n >> 2) + log2 += 2, n >>= 2; + if (n >> 1) + log2++; + return log2; +} #if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS) /* Modified: freeswitch/branches/greenlizard/src/include/switch.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch.h (original) +++ freeswitch/branches/greenlizard/src/include/switch.h Wed May 16 12:53:25 2007 @@ -51,7 +51,9 @@ #define FREESWITCH_OID_PREFIX ".1.3.6.1.4.1." FREESWITCH_PEN #define FREESWITCH_ITAD "543" #define __EXTENSIONS__ 1 +#ifndef MACOSX #define _XOPEN_SOURCE 600 +#endif #include <stdlib.h> #include <stdio.h> #include <stdarg.h> Modified: freeswitch/branches/greenlizard/src/include/switch_apr.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_apr.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_apr.h Wed May 16 12:53:25 2007 @@ -167,7 +167,7 @@ /** * Continue iterating over the entries in a hash table. - * @param hi The iteration state + * @param ht The iteration state * @return a pointer to the updated iteration state. NULL if there are no more * entries. */ @@ -520,7 +520,7 @@ * create a FIFO queue * @param queue The new queue * @param queue_capacity maximum size of the queue - * @param a pool to allocate queue from + * @param pool a pool to allocate queue from */ SWITCH_DECLARE(switch_status_t) switch_queue_create(switch_queue_t ** queue, unsigned int queue_capacity, switch_memory_pool_t *pool); @@ -684,7 +684,7 @@ /** * Close the specified file. - * @param file The file descriptor to close. + * @param thefile The file descriptor to close. */ SWITCH_DECLARE(switch_status_t) switch_file_close(switch_file_t * thefile); @@ -771,7 +771,7 @@ /** * Create and initialize a new threadattr variable * @param new_attr The newly created threadattr. - * @param cont The pool to use + * @param pool The pool to use */ SWITCH_DECLARE(switch_status_t) switch_threadattr_create(switch_threadattr_t ** new_attr, switch_memory_pool_t *pool); @@ -904,7 +904,7 @@ * made the connection request. This is the socket which should * be used for all future communication. * @param sock The socket we are listening on. - * @param connection_pool The pool for the new socket. + * @param pool The pool for the new socket. */ SWITCH_DECLARE(switch_status_t) switch_socket_accept(switch_socket_t ** new_sock, switch_socket_t * sock, switch_memory_pool_t *pool); @@ -943,7 +943,7 @@ * isn't NULL and APR_HAVE_IPV6; mutually exclusive * with APR_IPV4_ADDR_OK * </PRE> - * @param p The pool for the apr_sockaddr_t and associated storage. + * @param pool The pool for the apr_sockaddr_t and associated storage. */ SWITCH_DECLARE(switch_status_t) switch_sockaddr_info_get(switch_sockaddr_t ** sa, const char *hostname, int32_t family, switch_port_t port, int32_t flags, switch_memory_pool_t *pool); @@ -1149,7 +1149,6 @@ /** @} */ -/** @} */ SWITCH_END_EXTERN_C #endif Modified: freeswitch/branches/greenlizard/src/include/switch_core.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_core.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_core.h Wed May 16 12:53:25 2007 @@ -491,7 +491,7 @@ SWITCH_DECLARE(char *) switch_core_get_uuid(void); #ifdef SWITCH_DEBUG_RWLOCKS -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_perform_locate(char *uuid_str, const char *file, const char *func, int line); +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_perform_locate(const char *uuid_str, const char *file, const char *func, int line); #endif /*! @@ -690,7 +690,7 @@ \param session the session to check \return the number of events */ -SWITCH_DECLARE(int32_t) switch_core_session_event_count(switch_core_session_t *session); +SWITCH_DECLARE(uint32_t) switch_core_session_event_count(switch_core_session_t *session); /*! \brief DE-Queue an event on a given session @@ -714,7 +714,7 @@ \param session the session to check \return the number of events */ -SWITCH_DECLARE(int32_t) switch_core_session_private_event_count(switch_core_session_t *session); +SWITCH_DECLARE(uint32_t) switch_core_session_private_event_count(switch_core_session_t *session); /*! \brief DE-Queue a private event on a given session Modified: freeswitch/branches/greenlizard/src/include/switch_core_event_hook.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_core_event_hook.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_core_event_hook.h Wed May 16 12:53:25 2007 @@ -226,7 +226,7 @@ /*! \brief Add an event hook to be executed when a session writes a video frame \param session session to bind hook to - \param write_frame hook to bind + \param video_write_frame hook to bind \return SWITCH_STATUS_SUCCESS on suceess */ SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_video_write_frame(switch_core_session_t *session, switch_video_write_frame_hook_t video_write_frame); Modified: freeswitch/branches/greenlizard/src/include/switch_regex.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_regex.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_regex.h Wed May 16 12:53:25 2007 @@ -36,7 +36,7 @@ SWITCH_BEGIN_EXTERN_C /** - * @defgroup switch_regex + * @defgroup switch_regex Regular Expressions * @ingroup FREESWITCH * @{ */ Modified: freeswitch/branches/greenlizard/src/include/switch_scheduler.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_scheduler.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_scheduler.h Wed May 16 12:53:25 2007 @@ -51,7 +51,7 @@ /*! \brief Schedule a task in the future - \param runtime the time in epoch seconds to execute the task. + \param task_runtime the time in epoch seconds to execute the task. \param func the callback function to execute when the task is executed. \param desc an arbitrary description of the task. \param group a group id tag to link multiple tasks to a single entity. 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 Wed May 16 12:53:25 2007 @@ -538,7 +538,7 @@ CF_ORIGINATOR = (1 << 3) - Channel is an originator CF_TRANSFER = (1 << 4) - Channel is being transfered CF_ACCEPT_CNG = (1 << 5) - Channel will accept CNG frames -CF_LOCK_THREAD = (1 << 6) - Prevent the channel thread from exiting while this flag is set +CF_WAIT_FOR_ME = (1 << 6) - Channel wants you to wait CF_BRIDGED = (1 << 7) - Channel in a bridge CF_HOLD = (1 << 8) - Channel is on hold CF_SERVICE = (1 << 9) - Channel has a service thread @@ -565,7 +565,7 @@ CF_ORIGINATOR = (1 << 3), CF_TRANSFER = (1 << 4), CF_ACCEPT_CNG = (1 << 5), - CF_LOCK_THREAD = (1 << 6), + CF_WAIT_FOR_ME = (1 << 6), CF_BRIDGED = (1 << 7), CF_HOLD = (1 << 8), CF_SERVICE = (1 << 9), Modified: freeswitch/branches/greenlizard/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/branches/greenlizard/src/mod/applications/mod_commands/mod_commands.c Wed May 16 12:53:25 2007 @@ -575,7 +575,7 @@ stream->write_function(stream, "-Error Cannot locate session!\n"); return SWITCH_STATUS_SUCCESS; } - + if (switch_strlen_zero(action) || switch_strlen_zero(path)) { goto usage; } @@ -594,11 +594,11 @@ stream->write_function(stream, "USAGE: %s\n", session_record_api_interface.syntax); switch_safe_free(mycmd); - return SWITCH_STATUS_SUCCESS; + done: - if (session) { + if (rsession) { switch_core_session_rwunlock(rsession); } Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.c Wed May 16 12:53:25 2007 @@ -39,7 +39,7 @@ #include "mod_sofia.h" struct mod_sofia_globals mod_sofia_globals; - +const switch_endpoint_interface_t sofia_endpoint_interface; static switch_frame_t silence_frame = { 0 }; static char silence_data[13] = ""; @@ -690,6 +690,11 @@ switch_core_session_t *other_session; switch_channel_t *other_channel; char *ip = NULL, *port = NULL; + + if (switch_channel_get_state(channel) >= CS_HANGUP) { + return SWITCH_STATUS_FALSE; + } + switch_channel_set_flag(channel, CF_BYPASS_MEDIA); tech_pvt->local_sdp_str = NULL; if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) @@ -710,6 +715,11 @@ break; case SWITCH_MESSAGE_INDICATE_MEDIA:{ uint32_t count = 0; + + if (switch_channel_get_state(channel) >= CS_HANGUP) { + return SWITCH_STATUS_FALSE; + } + switch_channel_clear_flag(channel, CF_BYPASS_MEDIA); tech_pvt->local_sdp_str = NULL; if (!switch_rtp_ready(tech_pvt->rtp_session)) { Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.h Wed May 16 12:53:25 2007 @@ -456,7 +456,7 @@ void sofia_glue_do_xfer_invite(switch_core_session_t *session); uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, sofia_regtype_t regtype, char *key, uint32_t keylen, switch_event_t **v_event); -const switch_endpoint_interface_t sofia_endpoint_interface; +extern const switch_endpoint_interface_t sofia_endpoint_interface; void sofia_presence_set_chat_hash(private_object_t *tech_pvt, sip_t const *sip); switch_status_t sofia_on_hangup(switch_core_session_t *session); char *sofia_glue_get_url_from_contact(char *buf, uint8_t to_dup); 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 Wed May 16 12:53:25 2007 @@ -327,10 +327,21 @@ } if (authorization) { + char *v_contact_str; if ((auth_res = sofia_reg_parse_auth(profile, authorization, sip->sip_request->rq_method_name, key, keylen, network_ip, v_event)) == AUTH_STALE) { stale = 1; } + if (v_event && *v_event && (v_contact_str = switch_event_get_header(*v_event, "force-contact"))) { + char *p; + switch_copy_string(contact_str, v_contact_str, sizeof(contact_str)); + for(p = contact_str; p && *p; p++) { + if (*p == '\'' || *p == '[' || *p == ']') { + *p = '"'; + } + } + } + if (auth_res != AUTH_OK && !stale) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "send %s for [%s@%s]\n", forbidden ? "forbidden" : "challange", from_user, from_host); if (auth_res == AUTH_FORBIDDEN) { @@ -459,6 +470,7 @@ void sofia_reg_handle_sip_i_register(nua_t * nua, sofia_profile_t *profile, nua_handle_t * nh, sofia_private_t * sofia_private, sip_t const *sip, tagi_t tags[]) { char key[128] = ""; + switch_event_t *v_event = NULL; if (!sip || !sip->sip_request || !sip->sip_request->rq_method_name) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received an invalid packet!\n"); @@ -472,7 +484,10 @@ return; } - sofia_reg_handle_register(nua, profile, nh, sip, REG_REGISTER, key, sizeof(key), NULL); + sofia_reg_handle_register(nua, profile, nh, sip, REG_REGISTER, key, sizeof(key), &v_event); + if (v_event) { + switch_event_fire(&v_event); + } } Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed May 16 12:53:25 2007 @@ -2678,14 +2678,17 @@ static JSBool js_api_execute(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) { - - if (argc > 1) { + if (argc > 0) { char *cmd = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); - char *arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + char *arg = NULL; switch_core_session_t *session = NULL; switch_stream_handle_t stream = { 0 }; char retbuf[2048] = ""; + if (argc > 1) { + arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + } + if (argc > 2) { JSObject *session_obj; struct js_session *jss; @@ -2801,6 +2804,7 @@ static JSFunctionSpec fs_functions[] = { {"console_log", js_log, 2}, + {"consoleLog", js_log, 2}, {"exit", js_exit, 0}, {"include", js_include, 1}, {"bridge", js_bridge, 2}, @@ -2853,6 +2857,9 @@ /* Emaculent conception of session object into the script if one is available */ if (session && new_js_session(cx, javascript_global_object, session, &jss, "session", flags)) { JS_SetPrivate(cx, javascript_global_object, session); + } else { + snprintf(buf, sizeof(buf), "~var session = false;"); + eval_some_js(buf, cx, javascript_global_object, &rval); } if (ro) { new_request(cx, javascript_global_object, ro); Modified: freeswitch/branches/greenlizard/src/switch_console.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_console.c (original) +++ freeswitch/branches/greenlizard/src/switch_console.c Wed May 16 12:53:25 2007 @@ -176,6 +176,7 @@ } static char hostname[256] = ""; +static int32_t running = 1; #ifdef SWITCH_HAVE_LIBEDIT #include <histedit.h> @@ -191,33 +192,16 @@ } -SWITCH_DECLARE(void) switch_console_loop(void) +static EditLine *el; +static History *myhistory; +static HistEvent ev; +static char *hfile = NULL; + +static void *SWITCH_THREAD_FUNC console_thread(switch_thread_t *thread, void *obj) { - EditLine *el; - History *myhistory; int count; const char *line; - HistEvent ev; - int32_t running = 1; - char *hfile; - - el = el_init(__FILE__, switch_core_get_console(), switch_core_get_console(), switch_core_get_console()); - el_set(el, EL_PROMPT, &prompt); - el_set(el, EL_EDITOR, "emacs"); - - myhistory = history_init(); - if (myhistory == 0) { - fprintf(stderr, "history could not be initialized\n"); - return; - } - - hfile = switch_mprintf("%s%sfreeswitch.history", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR); - assert(hfile != NULL); - - - history(myhistory, &ev, H_SETSIZE, 800); - el_set(el, EL_HIST, history, myhistory); - history(myhistory, &ev, H_LOAD, hfile); + switch_memory_pool_t *pool = (switch_memory_pool_t *) obj; while (running) { uint32_t arg; @@ -245,15 +229,63 @@ } } + switch_core_destroy_memory_pool(&pool); + return NULL; +} - history(myhistory, &ev, H_SAVE, hfile); +SWITCH_DECLARE(void) switch_console_loop(void) +{ + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; + switch_memory_pool_t *pool; + + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + return; + } + + el = el_init(__FILE__, switch_core_get_console(), switch_core_get_console(), switch_core_get_console()); + el_set(el, EL_PROMPT, &prompt); + el_set(el, EL_EDITOR, "emacs"); + + myhistory = history_init(); + if (myhistory == 0) { + fprintf(stderr, "history could not be initialized\n"); + return; + } + + hfile = switch_mprintf("%s%sfreeswitch.history", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR); + assert(hfile != NULL); + + + history(myhistory, &ev, H_SETSIZE, 800); + el_set(el, EL_HIST, history, myhistory); + history(myhistory, &ev, H_LOAD, hfile); + + + switch_threadattr_create(&thd_attr, pool); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_thread_create(&thread, thd_attr, console_thread, pool, pool); + + while (running) { + uint32_t arg = 0; + switch_core_session_ctl(SCSC_CHECK_RUNNING, &arg); + if (!arg) { + break; + } + switch_yield(1000000); + } + + history(myhistory, &ev, H_SAVE, hfile); free(hfile); /* Clean up our memory */ history_end(myhistory); el_end(el); - + + } #else @@ -262,7 +294,7 @@ { char cmd[2048]; - int32_t activity = 1, running = 1; + int32_t activity = 1; switch_size_t x = 0; gethostname(hostname, sizeof(hostname)); Modified: freeswitch/branches/greenlizard/src/switch_core.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core.c (original) +++ freeswitch/branches/greenlizard/src/switch_core.c Wed May 16 12:53:25 2007 @@ -35,7 +35,7 @@ #include <switch.h> #include <switch_version.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" SWITCH_DECLARE_DATA switch_directories SWITCH_GLOBAL_dirs = { 0 }; Modified: freeswitch/branches/greenlizard/src/switch_core_asr.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_asr.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_asr.c Wed May 16 12:53:25 2007 @@ -32,7 +32,7 @@ * */ #include <switch.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" SWITCH_DECLARE(switch_status_t) switch_core_asr_open(switch_asr_handle_t *ah, char *module_name, Modified: freeswitch/branches/greenlizard/src/switch_core_codec.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_codec.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_codec.c Wed May 16 12:53:25 2007 @@ -32,7 +32,7 @@ * */ #include <switch.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(switch_core_session_t *session, switch_codec_t *codec) { Modified: freeswitch/branches/greenlizard/src/switch_core_db.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_db.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_db.c Wed May 16 12:53:25 2007 @@ -31,7 +31,7 @@ */ #include <switch.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" #include <sqlite3.h> Modified: freeswitch/branches/greenlizard/src/switch_core_directory.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_directory.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_directory.c Wed May 16 12:53:25 2007 @@ -32,7 +32,7 @@ * */ #include <switch.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" SWITCH_DECLARE(switch_status_t) switch_core_directory_open(switch_directory_handle_t *dh, char *module_name, char *source, char *dsn, char *passwd, switch_memory_pool_t *pool) Modified: freeswitch/branches/greenlizard/src/switch_core_event_hook.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_event_hook.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_event_hook.c Wed May 16 12:53:25 2007 @@ -29,7 +29,7 @@ * */ #include "switch.h" -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" SWITCH_DECLARE(switch_status_t) switch_core_event_hook_add_outgoing(switch_core_session_t *session, switch_outgoing_channel_hook_t outgoing_channel) { Modified: freeswitch/branches/greenlizard/src/switch_core_file.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_file.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_file.c Wed May 16 12:53:25 2007 @@ -32,7 +32,7 @@ * */ #include <switch.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" SWITCH_DECLARE(switch_status_t) switch_core_file_open(switch_file_handle_t *fh, char *file_path, uint8_t channels, uint32_t rate, unsigned int flags, switch_memory_pool_t *pool) Modified: freeswitch/branches/greenlizard/src/switch_core_hash.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_hash.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_hash.c Wed May 16 12:53:25 2007 @@ -32,7 +32,7 @@ * */ #include <switch.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" SWITCH_DECLARE(switch_status_t) switch_core_hash_init(switch_hash_t ** hash, switch_memory_pool_t *pool) { Modified: freeswitch/branches/greenlizard/src/switch_core_io.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_io.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_io.c Wed May 16 12:53:25 2007 @@ -32,7 +32,7 @@ * */ #include <switch.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, int stream_id) Modified: freeswitch/branches/greenlizard/src/switch_core_media_bug.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_media_bug.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_media_bug.c Wed May 16 12:53:25 2007 @@ -32,7 +32,7 @@ * */ #include "switch.h" -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" static void switch_core_media_bug_destroy(switch_media_bug_t *bug) { Modified: freeswitch/branches/greenlizard/src/switch_core_memory.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_memory.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_memory.c Wed May 16 12:53:25 2007 @@ -32,7 +32,7 @@ * */ #include <switch.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" static struct { switch_memory_pool_t *memory_pool; Modified: freeswitch/branches/greenlizard/src/switch_core_port_allocator.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_port_allocator.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_port_allocator.c Wed May 16 12:53:25 2007 @@ -32,7 +32,7 @@ * */ #include <switch.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" struct switch_core_port_allocator { switch_port_t start; Modified: freeswitch/branches/greenlizard/src/switch_core_rwlock.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_rwlock.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_rwlock.c Wed May 16 12:53:25 2007 @@ -32,7 +32,7 @@ * */ #include <switch.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" #ifdef SWITCH_DEBUG_RWLOCKS SWITCH_DECLARE(switch_status_t) switch_core_session_perform_read_lock(switch_core_session_t *session, const char *file, const char *func, int line) Modified: freeswitch/branches/greenlizard/src/switch_core_session.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_session.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_session.c Wed May 16 12:53:25 2007 @@ -32,7 +32,7 @@ * */ #include <switch.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" static struct { switch_memory_pool_t *memory_pool; @@ -500,13 +500,13 @@ return status; } -SWITCH_DECLARE(int32_t) switch_core_session_event_count(switch_core_session_t *session) +SWITCH_DECLARE(uint32_t) switch_core_session_event_count(switch_core_session_t *session) { if (session->event_queue) { - return (int32_t) switch_queue_size(session->event_queue); + return switch_queue_size(session->event_queue); } - return -1; + return 0; } SWITCH_DECLARE(switch_status_t) switch_core_session_dequeue_event(switch_core_session_t *session, switch_event_t **event) @@ -547,13 +547,13 @@ return status; } -SWITCH_DECLARE(int32_t) switch_core_session_private_event_count(switch_core_session_t *session) +SWITCH_DECLARE(uint32_t) switch_core_session_private_event_count(switch_core_session_t *session) { if (session->private_event_queue) { - return (int32_t) switch_queue_size(session->private_event_queue); + return switch_queue_size(session->private_event_queue); } - - return -1; + + return 0; } SWITCH_DECLARE(switch_status_t) switch_core_session_dequeue_private_event(switch_core_session_t *session, switch_event_t **event) @@ -581,6 +581,7 @@ return status; } + SWITCH_DECLARE(void) switch_core_session_reset(switch_core_session_t *session) { switch_channel_t *channel; Modified: freeswitch/branches/greenlizard/src/switch_core_speech.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_speech.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_speech.c Wed May 16 12:53:25 2007 @@ -32,7 +32,7 @@ * */ #include <switch.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" SWITCH_DECLARE(switch_status_t) switch_core_speech_feed_tts(switch_speech_handle_t *sh, char *text, switch_speech_flag_t *flags) { Modified: freeswitch/branches/greenlizard/src/switch_core_sqldb.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_sqldb.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_sqldb.c Wed May 16 12:53:25 2007 @@ -32,7 +32,7 @@ * */ #include <switch.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" static struct { switch_core_db_t *db; Modified: freeswitch/branches/greenlizard/src/switch_core_state_machine.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_state_machine.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_state_machine.c Wed May 16 12:53:25 2007 @@ -32,7 +32,7 @@ * */ #include <switch.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" static void switch_core_standard_on_init(switch_core_session_t *session) { Modified: freeswitch/branches/greenlizard/src/switch_core_timer.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_timer.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_timer.c Wed May 16 12:53:25 2007 @@ -32,7 +32,7 @@ * */ #include <switch.h> -#include "private/switch_core.h" +#include "private/switch_core_pvt.h" SWITCH_DECLARE(switch_status_t) switch_core_timer_init(switch_timer_t *timer, char *timer_name, int interval, int samples, switch_memory_pool_t *pool) { Modified: freeswitch/branches/greenlizard/src/switch_ivr.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_ivr.c (original) +++ freeswitch/branches/greenlizard/src/switch_ivr.c Wed May 16 12:53:25 2007 @@ -374,6 +374,23 @@ } +SWITCH_DECLARE(switch_status_t) switch_ivr_parse_all_events(switch_core_session_t *session) +{ + switch_event_t *event; + switch_channel_t *channel; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + while (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { + switch_ivr_parse_event(session, event); + switch_event_fire(&event); + } + + return SWITCH_STATUS_SUCCESS; +} + + SWITCH_DECLARE(switch_status_t) switch_ivr_park(switch_core_session_t *session, switch_input_args_t *args) { switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -383,6 +400,7 @@ switch_event_t *event; switch_unicast_conninfo_t *conninfo = NULL; switch_codec_t *read_codec = switch_core_session_get_read_codec(session); + channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -467,10 +485,8 @@ } } - if (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { - switch_ivr_parse_event(session, event); - switch_channel_event_set_data(switch_core_session_get_channel(session), event); - switch_event_fire(&event); + if (switch_core_session_private_event_count(session)) { + switch_ivr_parse_all_events(session); } if (switch_channel_has_dtmf(channel)) { @@ -540,10 +556,9 @@ } } - if (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { - switch_ivr_parse_event(session, event); - switch_event_destroy(&event); - } + if (switch_core_session_private_event_count(session)) { + switch_ivr_parse_all_events(session); + } if (switch_channel_has_dtmf(channel)) { switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf)); @@ -606,8 +621,7 @@ while (switch_channel_ready(channel)) { switch_frame_t *read_frame; - switch_event_t *event; - + if (timeout) { elapsed = (uint32_t) ((switch_time_now() - started) / 1000); if (elapsed >= timeout) { @@ -615,10 +629,9 @@ } } - if (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { - switch_ivr_parse_event(session, event); - switch_event_destroy(&event); - } + if (switch_core_session_private_event_count(session)) { + switch_ivr_parse_all_events(session); + } if (switch_channel_has_dtmf(channel)) { char dtmf[128]; @@ -776,7 +789,7 @@ switch_core_session_message_t msg = { 0 }; switch_status_t status = SWITCH_STATUS_GENERR; uint8_t swap = 0; - + msg.message_id = SWITCH_MESSAGE_INDICATE_NOMEDIA; msg.from = __FILE__; @@ -790,16 +803,23 @@ } if ((flags & SMF_FORCE) || !switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { - switch_channel_set_flag(channel, CF_BYPASS_MEDIA); - switch_core_session_receive_message(session, &msg); + switch_ivr_parse_all_events(session); + if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(other_uuid))) { other_channel = switch_core_session_get_channel(other_session); assert(other_channel != NULL); + + switch_ivr_parse_all_events(other_session); + switch_core_session_receive_message(other_session, &msg); switch_channel_clear_state_handler(other_channel, NULL); - + } + + switch_channel_set_flag(channel, CF_BYPASS_MEDIA); + switch_core_session_receive_message(session, &msg); + if (other_channel) { switch_channel_clear_state_handler(channel, NULL); if (swap) { 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 Wed May 16 12:53:25 2007 @@ -771,7 +771,7 @@ if ((session = switch_core_session_locate(uuid))) { char *cause = NULL; - char *mypath = strdup(path); + char *mypath; char *p; master = session; @@ -779,6 +779,16 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); + if ((switch_channel_test_flag(channel, CF_EVENT_PARSE))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Channel [%s] already broadcasting...broadcast aborted\n", + switch_channel_get_name(channel)); + switch_core_session_rwunlock(session); + return SWITCH_STATUS_FALSE; + } + + mypath = strdup(path); + + if ((nomedia = switch_channel_test_flag(channel, CF_BYPASS_MEDIA))) { switch_ivr_media(uuid, SMF_REBRIDGE); } Modified: freeswitch/branches/greenlizard/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_ivr_bridge.c (original) +++ freeswitch/branches/greenlizard/src/switch_ivr_bridge.c Wed May 16 12:53:25 2007 @@ -55,6 +55,7 @@ switch_channel_t *chan_a, *chan_b; switch_frame_t *read_frame; switch_core_session_t *session_a, *session_b; + uint32_t loop_count = 0; session_a = data->session; if (!(session_b = switch_core_session_locate(data->b_uuid))) { @@ -80,6 +81,7 @@ switch_channel_state_t b_state; switch_status_t status; switch_event_t *event; + loop_count++; /* if you really want to make sure it's not ready, test it twice because it might be just a break */ if (!switch_channel_ready(chan_a) && !switch_channel_ready(chan_a)) { @@ -96,24 +98,22 @@ break; } - if (switch_channel_test_flag(chan_a, CF_SUSPEND) || switch_channel_test_flag(chan_b, CF_SUSPEND)) { - switch_yield(100000); - continue; - } - - if (switch_core_session_dequeue_private_event(session_a, &event) == SWITCH_STATUS_SUCCESS) { + if (loop_count > 10 && switch_core_session_private_event_count(session_a)) { switch_channel_set_flag(chan_b, CF_SUSPEND); msg.string_arg = data->b_uuid; msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE; msg.from = __FILE__; switch_core_session_receive_message(session_a, &msg); - switch_ivr_parse_event(session_a, event); + switch_ivr_parse_all_events(session_a); msg.message_id = SWITCH_MESSAGE_INDICATE_BRIDGE; switch_core_session_receive_message(session_a, &msg); switch_channel_clear_flag(chan_b, CF_SUSPEND); - switch_event_destroy(&event); } + if (switch_channel_test_flag(chan_a, CF_SUSPEND) || switch_channel_test_flag(chan_b, CF_SUSPEND)) { + switch_yield(1000); + continue; + } /* if 1 channel has DTMF pass it to the other */ if (switch_channel_has_dtmf(chan_a)) { @@ -644,14 +644,14 @@ switch_channel_set_state_flag(originator_channel, CF_TRANSFER); switch_channel_set_state_flag(originatee_channel, CF_TRANSFER); - /* release the read locks we have on the channels */ - switch_core_session_rwunlock(originator_session); - switch_core_session_rwunlock(originatee_session); - /* change the states and let the chips fall where they may */ switch_channel_set_state(originator_channel, CS_TRANSMIT); switch_channel_set_state(originatee_channel, CS_TRANSMIT); + /* release the read locks we have on the channels */ + switch_core_session_rwunlock(originator_session); + switch_core_session_rwunlock(originatee_session); + status = SWITCH_STATUS_SUCCESS; while (switch_channel_get_state(originatee_channel) < CS_HANGUP && switch_channel_test_flag(originatee_channel, CF_TAGGED)) {

1 0

[commit] r5189 - freeswitch/branches/anthonyl/fs-branch/src/mod/loggers/mod_log2file
by Freeswitch SVN 16 May '07

16 May '07

Author: anthonyl Date: Tue May 15 23:45:27 2007 New Revision: 5189 Modified: freeswitch/branches/anthonyl/fs-branch/src/mod/loggers/mod_log2file/mod_log2file.c Log: get rid of the old logic in log2file_openlogfile Modified: freeswitch/branches/anthonyl/fs-branch/src/mod/loggers/mod_log2file/mod_log2file.c ============================================================================== --- freeswitch/branches/anthonyl/fs-branch/src/mod/loggers/mod_log2file/mod_log2file.c (original) +++ freeswitch/branches/anthonyl/fs-branch/src/mod/loggers/mod_log2file/mod_log2file.c Tue May 15 23:45:27 2007 @@ -168,19 +168,11 @@ apr_status_t stat; stat = apr_file_open(&afd, globals.logfile, - APR_READ | APR_WRITE | APR_APPEND, NULL, NULL); + APR_CREATE| APR_READ | APR_WRITE | APR_APPEND, NULL, NULL); if (stat != APR_SUCCESS) { return SWITCH_STATUS_FALSE; } - - /* locate where we want to log file to be */ - fd = fopen(globals.logfile, "a+"); - - if (!fd) { - return SWITCH_STATUS_FALSE; - } - globals.log_afd = afd; mod_log2file_check(); return SWITCH_STATUS_SUCCESS;

1 0

[commit] r5188 - freeswitch/branches/anthonyl/fs-branch/src/mod/loggers/mod_log2file
by Freeswitch SVN 16 May '07

16 May '07

Author: anthonyl Date: Tue May 15 23:44:25 2007 New Revision: 5188 Modified: freeswitch/branches/anthonyl/fs-branch/src/mod/loggers/mod_log2file/mod_log2file.c Log: yay! more apr fileio logic Modified: freeswitch/branches/anthonyl/fs-branch/src/mod/loggers/mod_log2file/mod_log2file.c ============================================================================== --- freeswitch/branches/anthonyl/fs-branch/src/mod/loggers/mod_log2file/mod_log2file.c (original) +++ freeswitch/branches/anthonyl/fs-branch/src/mod/loggers/mod_log2file/mod_log2file.c Tue May 15 23:44:25 2007 @@ -194,14 +194,15 @@ unsigned int i; unsigned char *p; unsigned char *q; - + apr_status_t stat; + apr_file_t *l_afd; + globals.log_size = 0; - - ret = fseek(globals.log_fd, 0, SEEK_SET); + stat = apr_file_seek(globals.log_afd, APR_SET, 0); - if (ret < 0) { + if (stat != APR_SUCCESS) return SWITCH_STATUS_FALSE; - } + p = malloc(strlen(globals.logfile)+WARM_FUZZY_OFFSET); if (!p) { return SWITCH_STATUS_FALSE; @@ -214,14 +215,14 @@ memset(p, '\0', strlen(globals.logfile)+WARM_FUZZY_OFFSET); for (i=1;i<MAX_ROT; i++) { sprintf(p, "%s.%i", globals.logfile, i); - fd = fopen(p, "r"); - if (fd != NULL) { - fclose(fd); + stat = apr_file_open(l_afd, p, APR_READ, NULL, NULL); + if (stat == APR_SUCCESS) { + apr_file_close(l_afd); continue; } - if(fd = fopen(p, "w")) + stat = apr_file_open(l_afd, p, APR_READ | APR_WRITE | APR_CREATE , NULL, NULL); + if (stat == APR_SUCCESS) break; - } while( ret = fread(q, 1024, 1, globals.log_fd)) { fwrite(q, 1024, 1, fd);

1 0

[commit] r5187 - freeswitch/branches/anthonyl/fs-branch/src/mod/loggers/mod_log2file
by Freeswitch SVN 16 May '07

16 May '07

Author: anthonyl Date: Tue May 15 23:15:36 2007 New Revision: 5187 Modified: freeswitch/branches/anthonyl/fs-branch/src/mod/loggers/mod_log2file/mod_log2file.c Log: more apr integration. the size checking is now totally apr Modified: freeswitch/branches/anthonyl/fs-branch/src/mod/loggers/mod_log2file/mod_log2file.c ============================================================================== --- freeswitch/branches/anthonyl/fs-branch/src/mod/loggers/mod_log2file/mod_log2file.c (original) +++ freeswitch/branches/anthonyl/fs-branch/src/mod/loggers/mod_log2file/mod_log2file.c Tue May 15 23:15:36 2007 @@ -1,6 +1,5 @@ /* * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2005/2006, James Martelletti <james(a)nerdc0re.com> * * Version: MPL 1.1 * @@ -38,7 +37,7 @@ #define DEFAULT_LOGFILE "/var/log/freeswitch" #define DEFAULT_LIMIT 0x7FFFFFFF #define WARM_FUZZY_OFFSET 64 - +#define MAX_ROT 4096 /* why not */ static const uint8_t STATIC_LEVELS[] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; static const char modname[] = "mod_log2file"; @@ -53,13 +52,31 @@ 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; + apr_file_t *log_afd; } globals; SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_logfile, globals.logfile) SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_format, globals.format) - + +/* i know this is strange but it's the fastest way i could think of managing log levels. */ +/* i'd rather not try to search something each time we get a message to log */ +struct level_set { + int level; + int on; +}static levels[] = { + {SWITCH_LOG_EMERG, 0}, /* 0 */ + {SWITCH_LOG_ALERT, 0}, /* 1 */ + {SWITCH_LOG_CRIT, 0}, /* 2 */ + {SWITCH_LOG_ERROR, 0}, /* 3 */ + {SWITCH_LOG_WARNING, 0}, /* 4 */ + {SWITCH_LOG_NOTICE, 0}, /* 5 */ + {SWITCH_LOG_INFO, 0}, /* 6 */ + {SWITCH_LOG_DEBUG, 0}, /* 7 */ + {SWITCH_LOG_CONSOLE, 0}, /* 8 */ +}; static switch_loadable_module_interface_t log2file_module_interface = { /*.module_name */ modname, /*.endpoint_interface */ NULL, @@ -73,42 +90,98 @@ /*.directory_interface */ NULL }; -static void del_mapping(char *var) { - if (!strcasecmp(var, "all")) { - all_level = -1; - return; - } - switch_core_hash_insert(log_hash, var, NULL); +/* this may exist somewhere else in the code? */ +static void log_type2str(switch_log_level_t type) +{ + switch(type) { + case SWITCH_LOG_CONSOLE: + printf("[CONSOLE] "); + break; + case SWITCH_LOG_DEBUG: + printf("[DEBUG] "); + break; + case SWITCH_LOG_INFO: + printf("[INFO] "); + break; + case SWITCH_LOG_NOTICE: + printf("[NOTICE] "); + break; + case SWITCH_LOG_WARNING: + printf("[WARNING] "); + break; + case SWITCH_LOG_ERROR: + printf("[ERROR] "); + break; + case SWITCH_LOG_CRIT: + printf("[CRIT] "); + break; + case SWITCH_LOG_ALERT: + printf("[ALERT] "); + break; + case SWITCH_LOG_EMERG: + printf("[EMERG] "); + break; + default: + break; + } + return; } -static void add_mapping(char *var, char *val) +void process_levels(char *p) { - char *name; - - if (!strcasecmp(var, "all")) { - all_level = (int8_t) switch_log_str2level(val); - return; - } - - if (!(name = switch_core_hash_find(name_hash, var))) { - name = switch_core_strdup(module_pool, var); - switch_core_hash_insert(name_hash, name, name); - } - - del_mapping(name); - switch_core_hash_insert(log_hash, name, (void *) &STATIC_LEVELS[(uint8_t)switch_log_str2level(val)]); + char *q; + + while (q = strsep(&p, ",")) { + if (!strncasecmp(q, "emerg", strlen(q))) { + levels[SWITCH_LOG_EMERG].on = 1; + } else if (!strncasecmp(q, "alert", strlen(q))) { + levels[SWITCH_LOG_ALERT].on = 1; + } else if (!strncasecmp(q, "crit", strlen(q))) { + levels[SWITCH_LOG_CRIT].on = 1; + } else if (!strncasecmp(q, "error", strlen(q))) { + levels[SWITCH_LOG_ERROR].on = 1; + } else if (!strncasecmp(q, "warn", strlen(q))) { + levels[SWITCH_LOG_WARNING].on = 1; + } else if (!strncasecmp(q, "notice", strlen(q))) { + levels[SWITCH_LOG_NOTICE].on = 1; + } else if (!strncasecmp(q, "info", strlen(q))) { + levels[SWITCH_LOG_INFO].on = 1; + } else if (!strncasecmp(q, "debug", strlen(q))) { + levels[SWITCH_LOG_DEBUG].on = 1; + } else if (!strncasecmp(q, "console", strlen(q))) { + levels[SWITCH_LOG_CONSOLE].on = 1; + } else if (!strncasecmp(q, "all", strlen(q))) { + int i; + printf("all option!\n"); + for (i=0; i < (sizeof(levels) / sizeof(struct level_set)); i++) { + levels[i].on = 1; + } + } + + } + return; } - static switch_status_t mod_log2file_openlogfile(void) { int fd; + apr_file_t *afd; + apr_status_t stat; + stat = apr_file_open(&afd, globals.logfile, + APR_READ | APR_WRITE | APR_APPEND, NULL, NULL); + + if (stat != APR_SUCCESS) { + return SWITCH_STATUS_FALSE; + } + /* locate where we want to log file to be */ fd = fopen(globals.logfile, "a+"); + if (!fd) { return SWITCH_STATUS_FALSE; - } - globals.log_fd = fd; + } + + globals.log_afd = afd; mod_log2file_check(); return SWITCH_STATUS_SUCCESS; } @@ -139,24 +212,25 @@ return SWITCH_STATUS_FALSE; } memset(p, '\0', strlen(globals.logfile)+WARM_FUZZY_OFFSET); - for (i=1;i<MAX_UINT; i++) { + for (i=1;i<MAX_ROT; i++) { sprintf(p, "%s.%i", globals.logfile, i); - fd = fopen(p, 'w+'); - if (fd) + fd = fopen(p, "r"); + if (fd != NULL) { + fclose(fd); + continue; + } + if(fd = fopen(p, "w")) break; + } - - do { - memset(q, '\0', 1024); - ret = fread(q, 1024, 1, globals.log_fd); - fwrite(q, 1024, 1, fd); - globals.log_size = off; - } while(ret); - + while( ret = fread(q, 1024, 1, globals.log_fd)) { + fwrite(q, 1024, 1, fd); + memset(q, '\0', 1024); + } + /* now we need to resize the original file to 0 */ + /* or just remove it */ ret = fseek(globals.log_fd, 0, SEEK_SET); - fclose(fd); - free(p); free(q); return SWITCH_STATUS_SUCCESS; @@ -165,13 +239,16 @@ /* check the size of the file for rotation */ static switch_status_t mod_log2file_check(void) { + apr_status_t stat; + apr_finfo_t finfo; off_t off; - - if((off = ftello(globals.log_fd)) < 0) { + + stat = apr_file_info_get(&finfo, APR_FINFO_SIZE, &globals.log_afd); + + if (stat != APR_SUCCESS) return SWITCH_STATUS_FALSE; - } - - if (off >= DEFAULT_LIMIT) { + + if (finfo.size >= globals.roll_size) { return mod_log2file_rotate(); } @@ -203,48 +280,57 @@ static switch_status_t mod_log2file_logger(const switch_log_node_t *node, switch_log_level_t level) { - char *message = NULL; + uint8_t *lookup = NULL; char line_no[sizeof(int)*8+1]; char date[80] = ""; - uint8_t *lookup = NULL; - switch_log_level_t level = SWITCH_LOG_DEBUG; switch_time_exp_t time; switch_size_t retsize; - - message = (char *)malloc(strlen(globals.format)+2); + char *message = NULL; - if (!message) { - return SWITCH_STATUS_FALSE; + if (!levels[node->level].on) { + return SWITCH_STATUS_SUCCESS; } - switch_copy_string(message, globals.format, strlen(globals.format)+1); - - message = switch_string_replace(message, "${data}", node->data); - message = switch_string_replace(message, "${message}", node->content); - - if (switch_time_exp_lt(&time, node->timestamp) != SWITCH_STATUS_SUCCESS) { - free(message); - return SWITCH_STATUS_FALSE; + message = (char *)malloc(strlen(globals.format)+2); + switch_copy_string(message, globals.format, strlen(globals.format)+1); + + message = switch_string_replace(message, "${message}", node->content); + + if (switch_time_exp_lt(&time, node->timestamp) != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; } switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &time); + message = switch_string_replace(message, "${time}", date); - message = switch_string_replace(message, "${file}", node->file); message = switch_string_replace(message, "${func}", node->func); snprintf(line_no, sizeof(line_no), "%d", node->line); message = switch_string_replace(message, "${line}", line_no); - + + /* work with the log type */ + log_type2str(node->level); + printf("\n"); + printf("Type: (%i)\n", node->level); + if (node->file) + printf("File: %s\n", node->file); + if (node->line) + printf("Line: %i\n", node->line); + if (node->func) + printf("Func: %s\n", node->func); + if (node->data) + printf("Data: %s\n", node->data); + if (node->content) + printf("Cont: %s\n", node->content); + + if (!switch_strlen_zero(message)) { mod_log2file_write("%s", message); } - - free(message); - + return SWITCH_STATUS_SUCCESS; } - static switch_status_t load_config(void) { char *cf = "log2file.conf"; @@ -261,36 +347,43 @@ set_global_logfile(val); } else if (!strcmp(var, "format")) { set_global_format(val); - } - + } else if (!strcmp(var, "level")) { + process_levels(val); + } else if (!strcmp(var, "rollover")) { + globals.roll_size = atoi(val); + } } } switch_xml_free(xml); } - + if (globals.roll_size == 0) { + globals.roll_size = DEFAULT_LIMIT; + } if (switch_strlen_zero(globals.logfile)) { set_global_logfile(DEFAULT_LOGFILE); } - if (switch_strlen_zero(globals.format)) { set_global_format(DEFAULT_FORMAT); } - return 0; } SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename) { switch_status_t status; - *interface = &log2file_module_interface; + if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); + return SWITCH_STATUS_TERM; + } + + *interface = &log2file_module_interface; + if ((status=load_config()) != SWITCH_STATUS_SUCCESS) { return status; } - mod_log2file_openlogfile(); switch_log_bind_logger(mod_log2file_logger, SWITCH_LOG_DEBUG); - return SWITCH_STATUS_SUCCESS; }

1 0

14 May '07

Author: greenlizard Date: Mon May 14 10:50:37 2007 New Revision: 5172 Added: freeswitch/branches/greenlizard/build/ignore_helper.pl - copied unchanged from r5170, /freeswitch/trunk/build/ignore_helper.pl freeswitch/branches/greenlizard/src/mod/event_handlers/mod_radius_cdr/ - copied from r5170, /freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/ Modified: freeswitch/branches/greenlizard/ (props changed) freeswitch/branches/greenlizard/Makefile.am freeswitch/branches/greenlizard/bootstrap.sh freeswitch/branches/greenlizard/conf/default_context.xml freeswitch/branches/greenlizard/conf/directory.xml freeswitch/branches/greenlizard/conf/iax.conf.xml freeswitch/branches/greenlizard/conf/sofia.conf.xml freeswitch/branches/greenlizard/conf/xml_curl.conf.xml freeswitch/branches/greenlizard/libs/ (props changed) freeswitch/branches/greenlizard/libs/curl/ (props changed) freeswitch/branches/greenlizard/libs/iax/src/iax-client.h freeswitch/branches/greenlizard/libs/iax/src/iax-mutex.c freeswitch/branches/greenlizard/libs/iax/src/iax.c freeswitch/branches/greenlizard/libs/iax/src/iax.h freeswitch/branches/greenlizard/libs/iax/src/iax2-parser.h freeswitch/branches/greenlizard/libs/iax/src/iax2.h freeswitch/branches/greenlizard/libs/iax/src/jitterbuf.c freeswitch/branches/greenlizard/libs/iax/src/jitterbuf.h freeswitch/branches/greenlizard/libs/iax/src/md5.h freeswitch/branches/greenlizard/libs/libedit/ (props changed) freeswitch/branches/greenlizard/libs/libedit/doc/ (props changed) freeswitch/branches/greenlizard/libs/libedit/examples/ (props changed) freeswitch/branches/greenlizard/libs/libedit/src/ (props changed) freeswitch/branches/greenlizard/libs/portaudio/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/Makefile.am freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/bnf/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/docs/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/features/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/http/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/ipt/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/iptsec/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/msg/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/nea/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/nta/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/nth/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/nua/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/nua/nua.c freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/sdp/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/sip/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/soa/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/sresolv/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/stun/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/su/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/tport/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/url/ (props changed) freeswitch/branches/greenlizard/libs/sofia-sip/utils/ (props changed) freeswitch/branches/greenlizard/libs/xmlrpc-c/src/cpp/ (props changed) freeswitch/branches/greenlizard/scripts/socket/socket2me/ (props changed) freeswitch/branches/greenlizard/src/include/switch_buffer.h freeswitch/branches/greenlizard/src/include/switch_caller.h freeswitch/branches/greenlizard/src/include/switch_channel.h freeswitch/branches/greenlizard/src/include/switch_core.h freeswitch/branches/greenlizard/src/include/switch_cpp.h freeswitch/branches/greenlizard/src/include/switch_loadable_module.h freeswitch/branches/greenlizard/src/include/switch_regex.h freeswitch/branches/greenlizard/src/include/switch_rtp.h freeswitch/branches/greenlizard/src/include/switch_scheduler.h freeswitch/branches/greenlizard/src/include/switch_types.h freeswitch/branches/greenlizard/src/include/switch_utils.h freeswitch/branches/greenlizard/src/mod/applications/mod_commands/mod_commands.c freeswitch/branches/greenlizard/src/mod/applications/mod_conference/mod_conference.c freeswitch/branches/greenlizard/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/branches/greenlizard/src/mod/applications/mod_enum/mod_enum.c freeswitch/branches/greenlizard/src/mod/applications/mod_esf/ (props changed) freeswitch/branches/greenlizard/src/mod/codecs/mod_speex/mod_speex.c 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_iax/mod_iax.c freeswitch/branches/greenlizard/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/ (props changed) freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/Makefile.am freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.h 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/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/branches/greenlizard/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/branches/greenlizard/src/mod/event_handlers/mod_cdr/basecdr.h freeswitch/branches/greenlizard/src/mod/event_handlers/mod_cdr/mod_cdr.cpp 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.c freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python_wrap.cpp freeswitch/branches/greenlizard/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/branches/greenlizard/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c freeswitch/branches/greenlizard/src/switch_buffer.c freeswitch/branches/greenlizard/src/switch_caller.c freeswitch/branches/greenlizard/src/switch_channel.c freeswitch/branches/greenlizard/src/switch_core.c freeswitch/branches/greenlizard/src/switch_core_session.c freeswitch/branches/greenlizard/src/switch_cpp.cpp freeswitch/branches/greenlizard/src/switch_ivr_async.c freeswitch/branches/greenlizard/src/switch_ivr_play_say.c freeswitch/branches/greenlizard/src/switch_loadable_module.c freeswitch/branches/greenlizard/src/switch_regex.c freeswitch/branches/greenlizard/src/switch_rtp.c freeswitch/branches/greenlizard/src/switch_scheduler.c freeswitch/branches/greenlizard/src/switch_utils.c freeswitch/branches/greenlizard/w32/Library/FreeSwitchCore.vcproj Log: Sync up changes from trunk version 5123 to 5170 Modified: freeswitch/branches/greenlizard/Makefile.am ============================================================================== --- freeswitch/branches/greenlizard/Makefile.am (original) +++ freeswitch/branches/greenlizard/Makefile.am Mon May 14 10:50:37 2007 @@ -139,7 +139,7 @@ libs/libedit/Makefile: - cd libs/libedit && ./configure --disable-shared --with-pic + cd libs/libedit && ./configure CFLAGS="-D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1" --disable-shared --with-pic libs/libedit/src/.libs/libedit.a: libs/libedit/Makefile cd libs/libedit && $(MAKE) Modified: freeswitch/branches/greenlizard/bootstrap.sh ============================================================================== --- freeswitch/branches/greenlizard/bootstrap.sh (original) +++ freeswitch/branches/greenlizard/bootstrap.sh Mon May 14 10:50:37 2007 @@ -33,6 +33,7 @@ fi # automake 1.7 or newer + am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'` if test -z "$am_version"; then echo "bootstrap: automake not found." @@ -40,6 +41,8 @@ echo " to build FreeSWITCH from SVN." exit 1 fi +IFS=_; set $am_version; IFS=' ' +am_version=$1 IFS=.; set $am_version; IFS=' ' if test "$1" = "1" -a "$2" -lt "7"; then echo "bootstrap: automake version $am_version found." Modified: freeswitch/branches/greenlizard/conf/default_context.xml ============================================================================== --- freeswitch/branches/greenlizard/conf/default_context.xml (original) +++ freeswitch/branches/greenlizard/conf/default_context.xml Mon May 14 10:50:37 2007 @@ -42,8 +42,8 @@ <extension name="set_codec" continue="true"> <condition field="source" expression="mod_portaudio"> - <action application="set" data="absolute_codec_string=PCMU"/> - <action application="set" data="export_vars=absolute_codec_string"/> + <action application="export" data="absolute_codec_string=$${global_codec_prefs}"/> + <action application="export" data="nolocal:jitterbuffer_msec=180"/> </condition> </extension> Modified: freeswitch/branches/greenlizard/conf/directory.xml ============================================================================== --- freeswitch/branches/greenlizard/conf/directory.xml (original) +++ freeswitch/branches/greenlizard/conf/directory.xml Mon May 14 10:50:37 2007 @@ -9,6 +9,8 @@    +  +     @@ -21,6 +23,10 @@    +  +  +  +   </gateways> <params> Modified: freeswitch/branches/greenlizard/conf/iax.conf.xml ============================================================================== --- freeswitch/branches/greenlizard/conf/iax.conf.xml (original) +++ freeswitch/branches/greenlizard/conf/iax.conf.xml Mon May 14 10:50:37 2007 @@ -1,7 +1,7 @@ <configuration name="iax.conf" description="IAX Configuration"> <settings> <param name="debug" value="0"/> -  +  <param name="port" value="4569"/> <param name="dialplan" value="XML"/> <param name="codec-prefs" value="PCMU@20i,PCMA,speex,L16"/> Modified: freeswitch/branches/greenlizard/conf/sofia.conf.xml ============================================================================== --- freeswitch/branches/greenlizard/conf/sofia.conf.xml (original) +++ freeswitch/branches/greenlizard/conf/sofia.conf.xml Mon May 14 10:50:37 2007 @@ -12,6 +12,8 @@    +  +     @@ -26,6 +28,8 @@    +  +   </gateways> Modified: freeswitch/branches/greenlizard/conf/xml_curl.conf.xml ============================================================================== --- freeswitch/branches/greenlizard/conf/xml_curl.conf.xml (original) +++ freeswitch/branches/greenlizard/conf/xml_curl.conf.xml Mon May 14 10:50:37 2007 @@ -8,6 +8,8 @@ <param name="gateway-url" value="http://www.mydomain.com/test.cgi" bindings="dialplan"/>   +  +  </binding> </bindings> </configuration> Modified: freeswitch/branches/greenlizard/libs/iax/src/iax-client.h ============================================================================== --- freeswitch/branches/greenlizard/libs/iax/src/iax-client.h (original) +++ freeswitch/branches/greenlizard/libs/iax/src/iax-client.h Mon May 14 10:50:37 2007 @@ -81,6 +81,7 @@ #define IAX_EVENT_REGREJ 30 /* Registration reply */ #define IAX_EVENT_LINKURL 31 /* Unlink */ #define IAX_EVENT_CNG 32 /* Comfort-noise (almost silence) */ +#define IAX_EVENT_POKE 33 /* moved from iax.c to support attended transfer */ #define IAX_EVENT_REREQUEST 999 @@ -161,6 +162,9 @@ extern int iax_send_ping(struct iax_session *session); extern int iax_load_complete(struct iax_session *session); extern int iax_reject(struct iax_session *session, char *reason); +int iax_reject_registration(struct iax_session *session, char *reason); +int iax_ack_registration(struct iax_session *session); +int iax_auth_registration(struct iax_session *session); extern int iax_busy(struct iax_session *session); extern int iax_congestion(struct iax_session *session); extern int iax_hangup(struct iax_session *session, char *byemsg); @@ -225,6 +229,10 @@ extern char iax_pref_codec_add(struct iax_session *session, unsigned int format); extern void iax_pref_codec_del(struct iax_session *session, unsigned int format); extern int iax_pref_codec_get(struct iax_session *session, unsigned int *array, int len); + +/* Fine tune jitterbuffer */ +extern void iax_set_jb_target_extra( long value ); + extern char *iax_get_peer_ip(struct iax_session *session); extern char *iax_event_get_apparent_ip(struct iax_event *event); extern void iax_set_samplerate(struct iax_session *session, unsigned short samplemask); Modified: freeswitch/branches/greenlizard/libs/iax/src/iax-mutex.c ============================================================================== --- freeswitch/branches/greenlizard/libs/iax/src/iax-mutex.c (original) +++ freeswitch/branches/greenlizard/libs/iax/src/iax-mutex.c Mon May 14 10:50:37 2007 @@ -17,7 +17,8 @@ * */ - +#define _XOPEN_SOURCE 600 +#include <stdlib.h> #include "iax-mutex.h" @@ -40,22 +41,40 @@ mutex_status_t iax_mutex_create(mutex_t **mutex) { + mutex_status_t status = MUTEX_FAILURE; +#ifndef WIN32 + pthread_mutexattr_t attr; +#endif mutex_t *check = NULL; check = (mutex_t *)malloc(sizeof(**mutex)); if (!check) - return MUTEX_FAILURE; + goto done; #ifdef WIN32 InitializeCriticalSection(&check->mutex); #else - if (pthread_mutex_init(&check->mutex, NULL)) - return MUTEX_FAILURE; + if (pthread_mutexattr_init(&attr)) + goto done; -#endif + if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE)) + goto fail; + if (pthread_mutex_init(&check->mutex, &attr)) + goto fail; + + goto success; + +fail: + pthread_mutexattr_destroy(&attr); + goto done; + +success: +#endif *mutex = check; + status = MUTEX_SUCCESS; - return MUTEX_SUCCESS; +done: + return status; } mutex_status_t iax_mutex_destroy(mutex_t *mutex) 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 Mon May 14 10:50:37 2007 @@ -40,16 +40,12 @@ #else +#define _BSD_SOURCE 1 #include <netdb.h> #include <sys/socket.h> #include <netinet/in.h> #include <sys/time.h> #include <stdlib.h> -#ifdef __GNUC__ -#ifndef __USE_SVID -#define __USE_SVID -#endif -#endif #include <string.h> #include <stdarg.h> #include <stdio.h> @@ -60,7 +56,7 @@ #include <netinet/in.h> #include <arpa/inet.h> #include <time.h> - + #endif #include "iax2.h" @@ -70,7 +66,7 @@ #ifdef NEWJB #include "jitterbuf.h" #endif - +#include "iax-mutex.h" /* work around jitter-buffer shrinking in asterisk: channels/chan_iax2.c:schedule_delivery() shrinks jitter buffer by 2. @@ -144,6 +140,9 @@ /* Max timeouts */ static int maxretries = 10; +/* configurable jitterbuffer options */ +static long jb_target_extra = -1; + static int do_shutdown = 0; /* external global networking replacements */ @@ -330,6 +329,8 @@ struct iax_sched *next; }; +static mutex_t *sched_mutex = NULL; +static mutex_t *session_mutex = NULL; static struct iax_sched *schedq = NULL; static struct iax_session *sessions = NULL; static int callnums = 1; @@ -412,6 +413,7 @@ sched->func = func; sched->arg = arg; /* Put it in the list, in order */ + iax_mutex_lock(sched_mutex); cur = schedq; while(cur && cur->when <= sched->when) { prev = cur; @@ -423,6 +425,7 @@ } else { schedq = sched; } + iax_mutex_unlock(sched_mutex); return 0; } else { DEBU(G "Out of memory!\n"); @@ -433,7 +436,9 @@ static int iax_sched_del(struct iax_event *event, struct iax_frame *frame, sched_func func, void *arg, int all) { struct iax_sched *cur, *tmp, *prev = NULL; + int ret = 0; + iax_mutex_lock(sched_mutex); cur = schedq; while (cur) { if (cur->event == event && cur->frame == frame && cur->func == func && cur->arg == arg) { @@ -444,13 +449,18 @@ tmp = cur; cur = cur->next; free(tmp); - if (!all) - return -1; + if (!all) { + ret = -1; + goto done; + } } else { prev = cur; cur = cur->next; } } + done: + iax_mutex_unlock(sched_mutex); + return 0; } @@ -458,24 +468,31 @@ time_in_ms_t iax_time_to_next_event(void) { - struct iax_sched *cur = schedq; + struct iax_sched *cur = NULL; time_in_ms_t minimum = 999999999; + iax_mutex_lock(sched_mutex); + cur = schedq; + /* If there are no pending events, we don't need to timeout */ - if (!cur) + if (!cur) { + iax_mutex_unlock(sched_mutex); return -1; - + } while(cur) { if (cur->when < minimum) { minimum = cur->when; } cur = cur->next; } + iax_mutex_unlock(sched_mutex); if (minimum <= 0) { return -1; } + + return minimum - current_time_in_ms(); } @@ -497,7 +514,7 @@ callnums = 1; s->peercallno = 0; s->transferpeer = 0; /* for attended transfer */ - s->next = sessions; + s->sendto = iax_sendto; s->pingid = -1; #ifdef NEWJB @@ -507,10 +524,14 @@ jbconf.max_jitterbuf = 0; jbconf.resync_threshold = 1000; jbconf.max_contig_interp = 0; + jbconf.target_extra = jb_target_extra; jb_setconf(s->jb, &jbconf); } #endif + iax_mutex_lock(session_mutex); + s->next = sessions; sessions = s; + iax_mutex_unlock(session_mutex); } return s; } @@ -518,12 +539,19 @@ static int iax_session_valid(struct iax_session *session) { /* Return -1 on a valid iax session pointer, 0 on a failure */ - struct iax_session *cur = sessions; + struct iax_session *cur; + + iax_mutex_lock(session_mutex); + cur = sessions; while(cur) { - if (session == cur) + if (session == cur) { + iax_mutex_unlock(session_mutex); return -1; + } cur = cur->next; } + iax_mutex_unlock(session_mutex); + return 0; } @@ -764,9 +792,22 @@ return cnt; } +static inline int get_interp_len(int format) +{ + return (format == AST_FORMAT_ILBC) ? 30 : 20; +} + static int get_sample_cnt(struct iax_event *e) { int cnt = 0; + + /* + * In the case of zero length frames, do not return a cnt of 0 + */ + if ( e->datalen == 0 ) { + return get_interp_len( e->subclass ) * 8; + } + switch (e->subclass) { case AST_FORMAT_SPEEX: cnt = speex_get_samples(e->data, e->datalen); @@ -865,26 +906,29 @@ int __iax_shutdown(void) { + struct iax_sched *sp, *fp; + /* Hangup Calls */ if (sessions) { struct iax_session *sp = NULL, *fp = NULL; + iax_mutex_lock(session_mutex); for(sp = sessions; sp ;) { iax_hangup(sp, "System Shutdown"); fp = sp; sp = sp->next; destroy_session(fp); } + iax_mutex_unlock(session_mutex); } /* Clear Scheduler */ - if(schedq) { - struct iax_sched *sp, *fp; - for(sp = schedq; sp ;) { - fp = sp; - sp = sp->next; - free(fp); - } + iax_mutex_lock(sched_mutex); + for(sp = schedq; sp ;) { + fp = sp; + sp = sp->next; + free(fp); } + iax_mutex_unlock(sched_mutex); if (netfd > -1) { shutdown(netfd, 2); @@ -893,6 +937,9 @@ time_end(); + iax_mutex_destroy(sched_mutex); + iax_mutex_destroy(session_mutex); + return 0; } @@ -901,6 +948,12 @@ return do_shutdown++; } +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) { int portno = preferredportno; @@ -910,6 +963,9 @@ init_time(); + iax_mutex_create(&sched_mutex); + iax_mutex_create(&session_mutex); + if(iax_recvfrom == (recvfrom_t) recvfrom) { if (netfd > -1) { /* Sokay, just don't do anything */ @@ -923,23 +979,35 @@ return -1; } - if (preferredportno == 0) - preferredportno = IAX_DEFAULT_PORTNO; - - if (preferredportno > 0) { - sin.sin_family = AF_INET; - if (ip) { - inet_aton(ip, &sin.sin_addr); - } else { - sin.sin_addr.s_addr = 0; - } - - sin.sin_port = htons((short)preferredportno); - if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) { - DEBU(G "Unable to bind to preferred port. Using random one instead."); - } - } - sinlen = sizeof(sin); + 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) { close(netfd); netfd = -1; @@ -1187,7 +1255,11 @@ #endif int r; r = __send_command(i, type, command, ts, data, datalen, seqno, 0, 0, 1, 0); - if (r >= 0) destroy_session(i); + if (r >= 0) { + iax_mutex_lock(session_mutex); + destroy_session(i); + iax_mutex_unlock(session_mutex); + } return r; } @@ -1229,12 +1301,14 @@ { struct iax_sched *sch; + iax_mutex_lock(sched_mutex); sch = schedq; while(sch) { if (sch->frame && (sch->frame->session == session)) sch->frame->retries = -1; sch = sch->next; } + iax_mutex_unlock(sched_mutex); } /* stop_transfer */ static void complete_transfer(struct iax_session *session, int peercallno, int xfr2peer, int preserveSeq) @@ -1356,14 +1430,18 @@ static struct iax_session *iax_find_session2(short callno) { - struct iax_session *cur = sessions; + struct iax_session *cur; + iax_mutex_lock(session_mutex); + cur = sessions; while(cur) { if (callno == cur->callno && callno != 0) { + iax_mutex_unlock(session_mutex); return cur; } cur = cur->next; } + iax_mutex_unlock(session_mutex); return NULL; } @@ -1431,6 +1509,8 @@ struct iax_session *cur, *prev=NULL; struct iax_sched *curs, *prevs=NULL, *nexts=NULL; int loop_cnt=0; + + iax_mutex_lock(sched_mutex); curs = schedq; while(curs) { nexts = curs->next; @@ -1451,7 +1531,9 @@ curs = nexts; loop_cnt++; } - + iax_mutex_unlock(sched_mutex); + + cur = sessions; while(cur) { if (cur == session) { @@ -1505,6 +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; default: return event; } @@ -1585,6 +1673,24 @@ return res; } +int iax_reject_registration(struct iax_session *session, char *reason) +{ + struct iax_ie_data ied; + memset(&ied, 0, sizeof(ied)); + iax_ie_append_str(&ied, IAX_IE_CAUSE, reason ? (unsigned char *) reason : (unsigned char *) "Unspecified"); + return send_command_final(session, AST_FRAME_IAX, IAX_COMMAND_REGREJ, 0, ied.buf, ied.pos, -1); +} + +int iax_ack_registration(struct iax_session *session) +{ + return send_command_final(session, AST_FRAME_IAX, IAX_COMMAND_REGACK, 0, NULL, 0, -1); +} + +int iax_auth_registration(struct iax_session *session) +{ + return send_command_final(session, AST_FRAME_IAX, IAX_COMMAND_REGAUTH, 0, NULL, 0, -1); +} + int iax_reject(struct iax_session *session, char *reason) { struct iax_ie_data ied; @@ -2081,9 +2187,13 @@ short dcallno, int makenew) { - struct iax_session *cur = sessions; + struct iax_session *cur; + + iax_mutex_lock(session_mutex); + cur = sessions; while(cur) { if (forward_match(sin, callno, dcallno, cur)) { + iax_mutex_unlock(session_mutex); return cur; } cur = cur->next; @@ -2092,11 +2202,14 @@ cur = sessions; while(cur) { if (reverse_match(sin, callno, cur)) { + iax_mutex_unlock(session_mutex); return cur; } cur = cur->next; } + iax_mutex_unlock(session_mutex); + if (makenew && !dcallno) { cur = iax_session_new(); cur->peercallno = callno; @@ -2108,6 +2221,7 @@ } else { DEBU(G "No session, peer = %d, us = %d\n", callno, dcallno); } + return cur; } @@ -2428,6 +2542,7 @@ for (x=session->rseqno; x != fh->iseqno; x++) { /* Ack the packet with the given timestamp */ DEBU(G "Cancelling transmission of packet %d\n", x); + iax_mutex_lock(sched_mutex); sch = schedq; while(sch) { if (sch->frame && (sch->frame->session == session) && @@ -2435,6 +2550,7 @@ sch->frame->retries = -1; sch = sch->next; } + iax_mutex_unlock(sched_mutex); } /* Note how much we've received acknowledgement for */ session->rseqno = fh->iseqno; @@ -2586,8 +2702,11 @@ e->ts = ts; e = schedule_delivery(e, ts, updatehistory); break; + case IAX_COMMAND_POKE: + e->etype = IAX_EVENT_POKE; + e->ts = ts; + break; case IAX_COMMAND_PING: - case IAX_COMMAND_POKE: /* PINGS and PONGS don't get scheduled; */ e->etype = IAX_EVENT_PING; e->ts = ts; @@ -2622,6 +2741,14 @@ } e = schedule_delivery(e, ts, updatehistory); break; + case IAX_COMMAND_REGREQ: + e->etype = IAX_EVENT_REGREQ; + e = schedule_delivery(e, ts, updatehistory); + break; + case IAX_COMMAND_REGREL: + e->etype = IAX_EVENT_REGREQ; + e = schedule_delivery(e, ts, updatehistory); + break; case IAX_COMMAND_REGACK: e->etype = IAX_EVENT_REGACK; e = schedule_delivery(e, ts, updatehistory); @@ -2846,15 +2973,17 @@ void iax_destroy(struct iax_session *session) { + iax_mutex_lock(session_mutex); destroy_session(session); + iax_mutex_unlock(session_mutex); } static struct iax_event *iax_net_read(void) { unsigned char buf[65536]; - int res; + int res, sinlen; struct sockaddr_in sin; - unsigned int sinlen; + sinlen = sizeof(sin); res = iax_recvfrom(netfd, buf, sizeof(buf), 0, (struct sockaddr *) &sin, &sinlen); @@ -2894,6 +3023,7 @@ if (!ies.transferid) { return NULL; /* TXCNT without proper IAX_IE_TRANSFERID */ } + iax_mutex_lock(session_mutex); for( cur=sessions; cur; cur=cur->next ) { if ((cur->transferring) && (cur->transferid == ies.transferid) && (cur->callno == dcallno) && (cur->transfercallno == callno)) { @@ -2906,6 +3036,7 @@ break; } } + iax_mutex_unlock(session_mutex); return cur; } @@ -2923,6 +3054,7 @@ if (len < sizeof(struct ast_iax2_full_hdr)) { DEBU(G "Short header received from %s\n", inet_ntoa(sin->sin_addr)); IAXERROR "Short header received from %s\n", inet_ntoa(sin->sin_addr)); + return NULL; } /* Only allow it to make new sessions on types where that makes sense */ if ((fh->type == AST_FRAME_IAX) && ((subclass == IAX_COMMAND_NEW) || @@ -2945,6 +3077,7 @@ if (len < sizeof(struct ast_iax2_mini_hdr)) { DEBU(G "Short header received from %s\n", inet_ntoa(sin->sin_addr)); IAXERROR "Short header received from %s\n", inet_ntoa(sin->sin_addr)); + return NULL; } /* Miniature, voice frame */ session = iax_find_session(sin, ntohs(fh->scallno), 0, 0); @@ -2958,6 +3091,7 @@ static struct iax_sched *iax_get_sched(time_in_ms_t time_in_ms) { struct iax_sched *cur, *prev=NULL; + iax_mutex_lock(sched_mutex); cur = schedq; /* Check the event schedule first. */ while(cur) { @@ -2968,10 +3102,12 @@ } else { schedq = cur->next; } + iax_mutex_unlock(sched_mutex); return cur; } cur = cur->next; } + iax_mutex_unlock(sched_mutex); return NULL; } @@ -3005,8 +3141,11 @@ if (frame->retries < 0) { /* It's been acked. No need to send it. Destroy the old frame. If final, destroy the session. */ - if (frame->final) + if (frame->final) { + iax_mutex_lock(session_mutex); destroy_session(frame->session); + iax_mutex_unlock(session_mutex); + } if (frame->data) free(frame->data); free(frame); @@ -3023,7 +3162,9 @@ /* We haven't been able to get an ACK on this packet. If a final frame, destroy the session, otherwise, pass up timeout */ if (frame->final) { + iax_mutex_lock(session_mutex); destroy_session(frame->session); + iax_mutex_unlock(session_mutex); if (frame->data) free(frame->data); free(frame); @@ -3070,54 +3211,58 @@ { struct iax_session *cur; jb_frame frame; + iax_mutex_lock(session_mutex); for(cur=sessions; cur; cur=cur->next) { - int ret; - time_in_ms_t now; - time_in_ms_t next; - - now = time_in_ms - cur->rxcore; - if(now > (next = jb_next(cur->jb))) { - /* FIXME don't hardcode interpolation frame length in jb_get */ - ret = jb_get(cur->jb,&frame,now,20); - switch(ret) { - case JB_OK: -// if(frame.type == JB_TYPE_VOICE && next + 20 != jb_next(cur->jb)) fprintf(stderr, "NEXT %ld is not %ld+20!\n", jb_next(cur->jb), next); - event = frame.data; - event = handle_event(event); - if (event) { - return event; - } - break; - case JB_INTERP: -// if(next + 20 != jb_next(cur->jb)) fprintf(stderr, "NEXT %ld is not %ld+20!\n", jb_next(cur->jb), next); - /* create an interpolation frame */ - //fprintf(stderr, "Making Interpolation frame\n"); - event = (struct iax_event *)malloc(sizeof(struct iax_event)); - if (event) { - event->etype = IAX_EVENT_VOICE; - event->subclass = cur->voiceformat; - event->ts = now; /* XXX: ??? applications probably ignore this anyway */ - event->session = cur; - event->datalen = 0; - event = handle_event(event); - if(event) - return event; - } - break; - case JB_DROP: -// if(next != jb_next(cur->jb)) fprintf(stderr, "NEXT %ld is not next %ld!\n", jb_next(cur->jb), next); - iax_event_free(frame.data); - break; - case JB_NOFRAME: - case JB_EMPTY: - /* do nothing */ - break; - default: - /* shouldn't happen */ - break; - } - } + int ret; + time_in_ms_t now; + time_in_ms_t next; + + now = time_in_ms - cur->rxcore; + if(now > (next = jb_next(cur->jb))) { + ret = jb_get(cur->jb,&frame,now,get_interp_len(cur->voiceformat)); + switch(ret) { + case JB_OK: + // if(frame.type == JB_TYPE_VOICE && next + 20 != jb_next(cur->jb)) fprintf(stderr, "NEXT %ld is not %ld+20!\n", jb_next(cur->jb), next); + event = frame.data; + event = handle_event(event); + if (event) { + iax_mutex_unlock(session_mutex); + return event; + } + break; + case JB_INTERP: + // if(next + 20 != jb_next(cur->jb)) fprintf(stderr, "NEXT %ld is not %ld+20!\n", jb_next(cur->jb), next); + /* create an interpolation frame */ + //fprintf(stderr, "Making Interpolation frame\n"); + event = (struct iax_event *)malloc(sizeof(struct iax_event)); + if (event) { + event->etype = IAX_EVENT_VOICE; + event->subclass = cur->voiceformat; + event->ts = now; /* XXX: ??? applications probably ignore this anyway */ + event->session = cur; + event->datalen = 0; + event = handle_event(event); + if(event) { + iax_mutex_unlock(session_mutex); + return event; + } + } + break; + case JB_DROP: + // if(next != jb_next(cur->jb)) fprintf(stderr, "NEXT %ld is not next %ld!\n", jb_next(cur->jb), next); + iax_event_free(frame.data); + break; + case JB_NOFRAME: + case JB_EMPTY: + /* do nothing */ + break; + default: + /* shouldn't happen */ + break; + } + } } + iax_mutex_unlock(session_mutex); } #endif @@ -3169,8 +3314,10 @@ void iax_session_destroy(struct iax_session **session) { + iax_mutex_lock(session_mutex); destroy_session(*session); *session = NULL; + iax_mutex_unlock(session_mutex); } void iax_event_free(struct iax_event *event) @@ -3185,7 +3332,9 @@ case IAX_EVENT_HANGUP: /* Destroy this session -- it's no longer valid */ if (event->session) { /* maybe the user did it already */ + iax_mutex_lock(session_mutex); destroy_session(event->session); + iax_mutex_unlock(session_mutex); } break; } Modified: freeswitch/branches/greenlizard/libs/iax/src/iax.h ============================================================================== --- freeswitch/branches/greenlizard/libs/iax/src/iax.h (original) +++ freeswitch/branches/greenlizard/libs/iax/src/iax.h Mon May 14 10:50:37 2007 @@ -8,7 +8,7 @@ * Mark Spencer <markster(a)linux-support.net> * * This program is free software, distributed under the terms of - * the GNU General Public License + * the GNU Lesser (Library) General Public License */ #ifndef _IAX_H Modified: freeswitch/branches/greenlizard/libs/iax/src/iax2-parser.h ============================================================================== --- freeswitch/branches/greenlizard/libs/iax/src/iax2-parser.h (original) +++ freeswitch/branches/greenlizard/libs/iax/src/iax2-parser.h Mon May 14 10:50:37 2007 @@ -8,7 +8,7 @@ * Mark Spencer <markster(a)digium.com> * * This program is free software, distributed under the terms of - * the GNU General Public License + * the GNU Lesser (Library) General Public License */ #ifndef _IAX2_PARSER_H Modified: freeswitch/branches/greenlizard/libs/iax/src/iax2.h ============================================================================== --- freeswitch/branches/greenlizard/libs/iax/src/iax2.h (original) +++ freeswitch/branches/greenlizard/libs/iax/src/iax2.h Mon May 14 10:50:37 2007 @@ -8,7 +8,7 @@ * Mark Spencer <markster(a)linux-support.net> * * This program is free software, distributed under the terms of - * the GNU General Public License + * the GNU Lesser (Library) General Public License */ #ifndef _IAX2_H Modified: freeswitch/branches/greenlizard/libs/iax/src/jitterbuf.c ============================================================================== --- freeswitch/branches/greenlizard/libs/iax/src/jitterbuf.c (original) +++ freeswitch/branches/greenlizard/libs/iax/src/jitterbuf.c Mon May 14 10:50:37 2007 @@ -1,810 +1,834 @@ -/* - * jitterbuf: an application-independent jitterbuffer - * - * Copyrights: - * Copyright (C) 2004-2005, Horizon Wimba, Inc. - * - * Contributors: - * Steve Kann <stevek(a)stevek.com> - * - * This program is free software, distributed under the terms of - * the GNU Lesser (Library) General Public License - * - * Copyright on this file is disclaimed to Digium for inclusion in Asterisk - */ - -#include "iax2.h" -#include "jitterbuf.h" -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -/* define these here, just for ancient compiler systems */ -#define JB_LONGMAX 2147483647L -#define JB_LONGMIN (-JB_LONGMAX - 1L) - -/* MS VC can't do __VA_ARGS__ */ -#if defined(WIN32) && defined(_MSC_VER) -#define jb_warn if (warnf) warnf -#define jb_err if (errf) errf -#define jb_dbg if (dbgf) dbgf - -#ifdef DEEP_DEBUG - #define jb_dbg2 if (dbgf) dbgf -#else - #define jb_dbg2 if (0) dbgf -#endif - -#else - -#define jb_warn(...) (warnf ? warnf(__VA_ARGS__) : (void)0) -#define jb_err(...) (errf ? errf(__VA_ARGS__) : (void)0) -#define jb_dbg(...) (dbgf ? dbgf(__VA_ARGS__) : (void)0) - -#ifdef DEEP_DEBUG -#define jb_dbg2(...) (dbgf ? dbgf(__VA_ARGS__) : (void)0) -#else -#define jb_dbg2(...) ((void)0) -#endif - -#endif - -static jb_output_function_t warnf, errf, dbgf; - -void jb_setoutput(jb_output_function_t err, jb_output_function_t warn, jb_output_function_t dbg) -{ - errf = err; - warnf = warn; - dbgf = dbg; -} - -static void increment_losspct(jitterbuf *jb) -{ - jb->info.losspct = (100000 + 499 * jb->info.losspct)/500; -} - -static void decrement_losspct(jitterbuf *jb) -{ - jb->info.losspct = (499 * jb->info.losspct)/500; -} - -void jb_reset(jitterbuf *jb) -{ - /* only save settings */ - jb_conf s = jb->info.conf; - memset(jb,0,sizeof(jitterbuf)); - jb->info.conf = s; - - /* initialize length */ - jb->info.current = jb->info.target = JB_TARGET_EXTRA; - jb->info.silence_begin_ts = -1; -} - -jitterbuf * jb_new() -{ - jitterbuf *jb; - - - jb = malloc(sizeof(jitterbuf)); - if(!jb) return NULL; - - jb_reset(jb); - - jb_dbg2("jb_new() = %x\n", jb); - return jb; -} - -void jb_destroy(jitterbuf *jb) -{ - jb_frame *frame; - jb_dbg2("jb_destroy(%x)\n", jb); - - /* free all the frames on the "free list" */ - frame = jb->free; - while(frame != NULL) { - jb_frame *next = frame->next; - free(frame); - frame = next; - } - - /* free ourselves! */ - free(jb); -} - - - -/* simple history manipulation */ -/* maybe later we can make the history buckets variable size, or something? */ -/* drop parameter determines whether we will drop outliers to minimize - * delay */ -#if 0 -static int longcmp(const void *a, const void *b) -{ - return *(long *)a - *(long *)b; -} -#endif - -static int history_put(jitterbuf *jb, time_in_ms_t ts, time_in_ms_t now, long ms) -{ - time_in_ms_t delay = now - (ts - jb->info.resync_offset); - time_in_ms_t threshold = 2 * jb->info.jitter + jb->info.conf.resync_threshold; - time_in_ms_t kicked; - - /* don't add special/negative times to history */ - if (ts <= 0) - return 0; - - /* check for drastic change in delay */ - if (jb->info.conf.resync_threshold != -1) { - if (iax_abs(delay - jb->info.last_delay) > threshold) { - jb->info.cnt_delay_discont++; - if (jb->info.cnt_delay_discont > 3) { - /* resync the jitterbuffer */ - jb->info.cnt_delay_discont = 0; - jb->hist_ptr = 0; - jb->hist_maxbuf_valid = 0; - - jb_warn("Resyncing the jb. last_delay %ld, this delay %ld, threshold %ld, new offset %ld\n", jb->info.last_delay, delay, threshold, ts - now); - jb->info.resync_offset = ts - now; - jb->info.last_delay = delay = 0; /* after resync, frame is right on time */ - } else { - return -1; - } - } else { - jb->info.last_delay = delay; - jb->info.cnt_delay_discont = 0; - } - } - - kicked = jb->history[jb->hist_ptr & JB_HISTORY_SZ]; - - jb->history[(jb->hist_ptr++) % JB_HISTORY_SZ] = delay; - - /* optimization; the max/min buffers don't need to be recalculated, if this packet's - * entry doesn't change them. This happens if this packet is not involved, _and_ any packet - * that got kicked out of the history is also not involved - * We do a number of comparisons, but it's probably still worthwhile, because it will usually - * succeed, and should be a lot faster than going through all 500 packets in history */ - if(!jb->hist_maxbuf_valid) - return 0; - - /* don't do this until we've filled history - * (reduces some edge cases below) */ - if(jb->hist_ptr < JB_HISTORY_SZ) - goto invalidate; - - /* if the new delay would go into min */ - if(delay < jb->hist_minbuf[JB_HISTORY_MAXBUF_SZ-1]) - goto invalidate; - - /* or max.. */ - if(delay > jb->hist_maxbuf[JB_HISTORY_MAXBUF_SZ-1]) - goto invalidate; - - /* or the kicked delay would be in min */ - if(kicked <= jb->hist_minbuf[JB_HISTORY_MAXBUF_SZ-1]) - goto invalidate; - - if(kicked >= jb->hist_maxbuf[JB_HISTORY_MAXBUF_SZ-1]) - goto invalidate; - - /* if we got here, we don't need to invalidate, 'cause this delay didn't - * affect things */ - return 0; - /* end optimization */ - - -invalidate: - jb->hist_maxbuf_valid = 0; - return 0; -} - -static void history_calc_maxbuf(jitterbuf *jb) -{ - int i,j; - - if(jb->hist_ptr == 0) return; - - - /* initialize maxbuf/minbuf to the latest value */ - for(i=0;i<JB_HISTORY_MAXBUF_SZ;i++) { -/* - * jb->hist_maxbuf[i] = jb->history[(jb->hist_ptr-1) % JB_HISTORY_SZ]; - * jb->hist_minbuf[i] = jb->history[(jb->hist_ptr-1) % JB_HISTORY_SZ]; - */ - jb->hist_maxbuf[i] = JB_LONGMIN; - jb->hist_minbuf[i] = JB_LONGMAX; - } - - /* use insertion sort to populate maxbuf */ - /* we want it to be the top "n" values, in order */ - - /* start at the beginning, or JB_HISTORY_SZ frames ago */ - i = (jb->hist_ptr > JB_HISTORY_SZ) ? (jb->hist_ptr - JB_HISTORY_SZ) : 0; - - for(;i<jb->hist_ptr;i++) { - time_in_ms_t toins = jb->history[i % JB_HISTORY_SZ]; - - /* if the maxbuf should get this */ - if(toins > jb->hist_maxbuf[JB_HISTORY_MAXBUF_SZ-1]) { - - /* insertion-sort it into the maxbuf */ - for(j=0;j<JB_HISTORY_MAXBUF_SZ;j++) { - /* found where it fits */ - if(toins > jb->hist_maxbuf[j]) { - /* move over */ - memmove(jb->hist_maxbuf+j+1,jb->hist_maxbuf+j, (JB_HISTORY_MAXBUF_SZ-(j+1)) * sizeof(long)); - /* insert */ - jb->hist_maxbuf[j] = toins; - - break; - } - } - } - - /* if the minbuf should get this */ - if(toins < jb->hist_minbuf[JB_HISTORY_MAXBUF_SZ-1]) { - - /* insertion-sort it into the maxbuf */ - for(j=0;j<JB_HISTORY_MAXBUF_SZ;j++) { - /* found where it fits */ - if(toins < jb->hist_minbuf[j]) { - /* move over */ - memmove(jb->hist_minbuf+j+1,jb->hist_minbuf+j, (JB_HISTORY_MAXBUF_SZ-(j+1)) * sizeof(long)); - /* insert */ - jb->hist_minbuf[j] = toins; - - break; - } - } - } - - if(0) { - int k; - fprintf(stderr, "toins = %ld\n", toins); - fprintf(stderr, "maxbuf ="); - for(k=0;k<JB_HISTORY_MAXBUF_SZ;k++) - fprintf(stderr, "%ld ", jb->hist_maxbuf[k]); - fprintf(stderr, "\nminbuf ="); - for(k=0;k<JB_HISTORY_MAXBUF_SZ;k++) - fprintf(stderr, "%ld ", jb->hist_minbuf[k]); - fprintf(stderr, "\n"); - } - } - - jb->hist_maxbuf_valid = 1; -} - -static void history_get(jitterbuf *jb) -{ - time_in_ms_t max, min, jitter; - int index; - int count; - - if(!jb->hist_maxbuf_valid) - history_calc_maxbuf(jb); - - /* count is how many items in history we're examining */ - count = (jb->hist_ptr < JB_HISTORY_SZ) ? jb->hist_ptr : JB_HISTORY_SZ; - - /* index is the "n"ths highest/lowest that we'll look for */ - index = count * JB_HISTORY_DROPPCT / 100; - - /* sanity checks for index */ - if(index > (JB_HISTORY_MAXBUF_SZ - 1)) index = JB_HISTORY_MAXBUF_SZ - 1; - - - if(index < 0) { - jb->info.min = 0; - jb->info.jitter = 0; - return; - } - - max = jb->hist_maxbuf[index]; - min = jb->hist_minbuf[index]; - - jitter = max - min; - - /* these debug stmts compare the difference between looking at the absolute jitter, and the - * values we get by throwing away the outliers */ - /* - fprintf(stderr, "[%d] min=%d, max=%d, jitter=%d\n", index, min, max, jitter); - fprintf(stderr, "[%d] min=%d, max=%d, jitter=%d\n", 0, jb->hist_minbuf[0], jb->hist_maxbuf[0], jb->hist_maxbuf[0]-jb->hist_minbuf[0]); - */ - - jb->info.min = min; - jb->info.jitter = jitter; -} - -/* returns 1 if frame was inserted into head of queue, 0 otherwise */ -static int queue_put(jitterbuf *jb, void *data, int type, long ms, time_in_ms_t ts) -{ - jb_frame *frame; - jb_frame *p; - int head = 0; - time_in_ms_t resync_ts = ts - jb->info.resync_offset; - - frame = jb->free; - if(frame) { - jb->free = frame->next; - } else { - frame = malloc(sizeof(jb_frame)); - } - - if(!frame) { - jb_err("cannot allocate frame\n"); - return 0; - } - - jb->info.frames_cur++; - - frame->data = data; - frame->ts = resync_ts; - frame->ms = ms; - frame->type = type; - - /* - * frames are a circular list, jb-frames points to to the lowest ts, - * jb->frames->prev points to the highest ts - */ - - if(!jb->frames) { /* queue is empty */ - jb->frames = frame; - frame->next = frame; - frame->prev = frame; - head = 1; - } else if (resync_ts < jb->frames->ts) { - frame->next = jb->frames; - frame->prev = jb->frames->prev; - - frame->next->prev = frame; - frame->prev->next = frame; - - /* frame is out of order */ - jb->info.frames_ooo++; - - jb->frames = frame; - head = 1; - } else { - p = jb->frames; - - /* frame is out of order */ - if(ts < p->prev->ts) jb->info.frames_ooo++; - - while (resync_ts < p->prev->ts && p->prev != jb->frames) - p = p->prev; - - frame->next = p; - frame->prev = p->prev; - - frame->next->prev = frame; - frame->prev->next = frame; - } - return head; -} - -static time_in_ms_t queue_next(jitterbuf *jb) -{ - if(jb->frames) return jb->frames->ts; - else return -1; -} - -static time_in_ms_t queue_last(jitterbuf *jb) -{ - if(jb->frames) return jb->frames->prev->ts; - else return -1; -} - -static jb_frame *_queue_get(jitterbuf *jb, time_in_ms_t ts, int all) -{ - jb_frame *frame; - frame = jb->frames; - - if(!frame) - return NULL; - - /*jb_warn("queue_get: ASK %ld FIRST %ld\n", ts, frame->ts); */ - - if(all || ts >= frame->ts) { - /* remove this frame */ - frame->prev->next = frame->next; - frame->next->prev = frame->prev; - - if(frame->next == frame) - jb->frames = NULL; - else - jb->frames = frame->next; - - - /* insert onto "free" single-linked list */ - frame->next = jb->free; - jb->free = frame; - - jb->info.frames_cur--; - - /* we return the frame pointer, even though it's on free list, - * but caller must copy data */ - return frame; - } - - return NULL; -} - -static jb_frame *queue_get(jitterbuf *jb, time_in_ms_t ts) -{ - return _queue_get(jb,ts,0); -} - -static jb_frame *queue_getall(jitterbuf *jb) -{ - return _queue_get(jb,0,1); -} - -#if 0 -/* some diagnostics */ -static void jb_dbginfo(jitterbuf *jb) -{ - if(dbgf == NULL) return; - - jb_dbg("\njb info: fin=%ld fout=%ld flate=%ld flost=%ld fdrop=%ld fcur=%ld\n", - jb->info.frames_in, jb->info.frames_out, jb->info.frames_late, jb->info.frames_lost, jb->info.frames_dropped, jb->info.frames_cur); - - jb_dbg(" jitter=%ld current=%ld target=%ld min=%ld sil=%d len=%d len/fcur=%ld\n", - jb->info.jitter, jb->info.current, jb->info.target, jb->info.min, jb->info.silence_begin_ts, jb->info.current - jb->info.min, - jb->info.frames_cur ? (jb->info.current - jb->info.min)/jb->info.frames_cur : -8); - if(jb->info.frames_in > 0) - jb_dbg("jb info: Loss PCT = %ld%%, Late PCT = %ld%%\n", - jb->info.frames_lost * 100/(jb->info.frames_in + jb->info.frames_lost), - jb->info.frames_late * 100/jb->info.frames_in); - jb_dbg("jb info: queue %d -> %d. last_ts %d (queue len: %d) last_ms %d\n", - queue_next(jb), - queue_last(jb), - jb->info.next_voice_ts, - queue_last(jb) - queue_next(jb), - jb->info.last_voice_ms); -} -#endif - -#ifdef DEEP_DEBUG -static void jb_chkqueue(jitterbuf *jb) -{ - int i=0; - jb_frame *p = jb->frames; - - if(!p) { - return; - } - - do { - if(p->next == NULL) { - jb_err("Queue is BROKEN at item [%d]", i); - } - i++; - p=p->next; - } while (p->next != jb->frames); -} - -static void jb_dbgqueue(jitterbuf *jb) -{ - int i=0; - jb_frame *p = jb->frames; - - jb_dbg("queue: "); - - if(!p) { - jb_dbg("EMPTY\n"); - return; - } - - do { - jb_dbg("[%d]=%ld ", i++, p->ts); - p=p->next; - } while (p->next != jb->frames); - - jb_dbg("\n"); -} -#endif - -int jb_put(jitterbuf *jb, void *data, int type, long ms, time_in_ms_t ts, time_in_ms_t now) -{ - jb_dbg2("jb_put(%x,%x,%ld,%ld,%ld)\n", jb, data, ms, ts, now); - - jb->info.frames_in++; - - if(type == JB_TYPE_VOICE) { - /* presently, I'm only adding VOICE frames to history and drift calculations; mostly because with the - * IAX integrations, I'm sending retransmitted control frames with their awkward timestamps through */ - if (history_put(jb,ts,now,ms)) - return JB_DROP; - } - - /* if put into head of queue, caller needs to reschedule */ - if (queue_put(jb,data,type,ms,ts)) { - return JB_SCHED; - } - - return JB_OK; -} - - -static int _jb_get(jitterbuf *jb, jb_frame *frameout, time_in_ms_t now, long interpl) -{ - jb_frame *frame; - time_in_ms_t diff; - - /*if((now - jb_next(jb)) > 2 * jb->info.last_voice_ms) jb_warn("SCHED: %ld", (now - jb_next(jb))); */ - /* get jitter info */ - history_get(jb); - - - /* target */ - jb->info.target = jb->info.jitter + jb->info.min + JB_TARGET_EXTRA; - - /* if a hard clamp was requested, use it */ - if((jb->info.conf.max_jitterbuf) && ((jb->info.target - jb->info.min) > jb->info.conf.max_jitterbuf)) { - jb_dbg("clamping target from %d to %d\n", (jb->info.target - jb->info.min), jb->info.conf.max_jitterbuf); - jb->info.target = jb->info.min + jb->info.conf.max_jitterbuf; - } - - diff = jb->info.target - jb->info.current; - - /* jb_warn("diff = %d lms=%d last = %d now = %d\n", diff, */ - /* jb->info.last_voice_ms, jb->info.last_adjustment, now); */ - - /* let's work on non-silent case first */ - if(!jb->info.silence_begin_ts) { - /* we want to grow */ - if( (diff > 0) && - /* we haven't grown in the delay length */ - (((jb->info.last_adjustment + JB_ADJUST_DELAY) < now) || - /* we need to grow more than the "length" we have left */ - (diff > queue_last(jb) - queue_next(jb)) ) ) { - /* grow by interp frame len */ - jb->info.current += interpl; - jb->info.next_voice_ts += interpl; - jb->info.last_voice_ms = interpl; - jb->info.last_adjustment = now; - jb->info.cnt_contig_interp++; - jb_dbg("G"); - /* assume silence instead of continuing to interpolate */ - if (jb->info.conf.max_contig_interp && jb->info.cnt_contig_interp >= jb->info.conf.max_contig_interp) - jb->info.silence_begin_ts = jb->info.next_voice_ts - jb->info.current; - return JB_INTERP; - } - - frame = queue_get(jb, jb->info.next_voice_ts - jb->info.current); - - /* not a voice frame; just return it. */ - if(frame && frame->type != JB_TYPE_VOICE) { - /* track start of silence */ - if(frame->type == JB_TYPE_SILENCE) { - jb->info.silence_begin_ts = frame->ts; - jb->info.cnt_contig_interp = 0; - } - - *frameout = *frame; - jb->info.frames_out++; - jb_dbg("o"); - return JB_OK; - } - - /* voice frame is later than expected */ - if(frame && frame->ts + jb->info.current < jb->info.next_voice_ts) { - if (frame->ts + jb->info.current > jb->info.next_voice_ts - jb->info.last_voice_ms) { - /* either we interpolated past this frame in the last jb_get */ - /* or the frame is still in order, but came a little too quick */ - *frameout = *frame; - /* reset expectation for next frame */ - jb->info.next_voice_ts = frame->ts + jb->info.current + frame->ms; - jb->info.frames_out++; - decrement_losspct(jb); - jb->info.cnt_contig_interp = 0; - jb_dbg("v"); - return JB_OK; - } else { - /* voice frame is late */ - *frameout = *frame; - jb->info.frames_out++; - decrement_losspct(jb); - jb->info.frames_late++; - jb->info.frames_lost--; - jb_dbg("l"); - /*jb_warn("\nlate: wanted=%ld, this=%ld, next=%ld\n", jb->info.next_voice_ts - jb->info.current, frame->ts, queue_next(jb)); - jb_warninfo(jb); */ - return JB_DROP; - } - } - - /* keep track of frame sizes, to allow for variable sized-frames */ - if(frame && frame->ms > 0) { - jb->info.last_voice_ms = frame->ms; - } - - /* we want to shrink; shrink at 1 frame / 500ms */ - /* unless we don't have a frame, then shrink 1 frame */ - /* every 80ms (though perhaps we can shrink even faster */ - /* in this case) */ - if(diff < -JB_TARGET_EXTRA && - ((!frame && jb->info.last_adjustment + 80 < now) || - (jb->info.last_adjustment + 500 < now))) { - jb->info.last_adjustment = now; - jb->info.cnt_contig_interp = 0; - - if(frame) { - *frameout = *frame; - /* shrink by frame size we're throwing out */ - jb->info.current -= frame->ms; - jb->info.frames_out++; - decrement_losspct(jb); - jb->info.frames_dropped++; - jb_dbg("s"); - return JB_DROP; - } else { - /* shrink by last_voice_ms */ - jb->info.current -= jb->info.last_voice_ms; - jb->info.frames_lost++; - increment_losspct(jb); - jb_dbg("S"); - return JB_NOFRAME; - } - } - - /* lost frame */ - if(!frame) { - /* this is a bit of a hack for now, but if we're close to - * target, and we find a missing frame, it makes sense to - * grow, because the frame might just be a bit late; - * otherwise, we presently get into a pattern where we return - * INTERP for the lost frame, then it shows up next, and we - * throw it away because it's late */ - /* I've recently only been able to replicate this using - * iaxclient talking to app_echo on asterisk. In this case, - * my outgoing packets go through asterisk's (old) - * jitterbuffer, and then might get an unusual increasing delay - * there if it decides to grow?? */ - /* Update: that might have been a different bug, that has been fixed.. - * But, this still seemed like a good idea, except that it ended up making a single actual - * lost frame get interpolated two or more times, when there was "room" to grow, so it might - * be a bit of a bad idea overall */ - /*if(diff > -1 * jb->info.last_voice_ms) { - jb->info.current += jb->info.last_voice_ms; - jb->info.last_adjustment = now; - jb_warn("g"); - return JB_INTERP; - } */ - jb->info.frames_lost++; - increment_losspct(jb); - jb->info.next_voice_ts += interpl; - jb->info.last_voice_ms = interpl; - jb->info.cnt_contig_interp++; - /* assume silence instead of continuing to interpolate */ - if (jb->info.conf.max_contig_interp && jb->info.cnt_contig_interp >= jb->info.conf.max_contig_interp) - jb->info.silence_begin_ts = jb->info.next_voice_ts - jb->info.current; - jb_dbg("L"); - return JB_INTERP; - } - - /* normal case; return the frame, increment stuff */ - *frameout = *frame; - jb->info.next_voice_ts += frame->ms; - jb->info.frames_out++; - decrement_losspct(jb); - jb->info.cnt_contig_interp = 0; - jb_dbg("v"); - return JB_OK; - } else { - /* TODO: after we get the non-silent case down, we'll make the - * silent case -- basically, we'll just grow and shrink faster - * here, plus handle next_voice_ts a bit differently */ - - /* to disable silent special case altogether, just uncomment this: */ - /* jb->info.silence_begin_ts = 0; */ - - /* shrink interpl len every 10ms during silence */ - if (diff < -JB_TARGET_EXTRA && - jb->info.last_adjustment + 10 <= now) { - jb->info.current -= interpl; - jb->info.last_adjustment = now; - } - - frame = queue_get(jb, now - jb->info.current); - if(!frame) { - return JB_NOFRAME; - } else if (frame->type != JB_TYPE_VOICE) { - /* normal case; in silent mode, got a non-voice frame */ - *frameout = *frame; - jb->info.frames_out++; - return JB_OK; - } - if (frame->ts < jb->info.silence_begin_ts) { - /* voice frame is late */ - *frameout = *frame; - jb->info.frames_out++; - decrement_losspct(jb); - jb->info.frames_late++; - jb->info.frames_lost--; - jb_dbg("l"); - /*jb_warn("\nlate: wanted=%ld, this=%ld, next=%ld\n", jb->info.next_voice_ts - jb->info.current, frame->ts, queue_next(jb)); - jb_warninfo(jb); */ - return JB_DROP; - } else { - /* voice frame */ - /* try setting current to target right away here */ - jb->info.current = jb->info.target; - jb->info.silence_begin_ts = 0; - jb->info.next_voice_ts = frame->ts + jb->info.current + frame->ms; - jb->info.last_voice_ms = frame->ms; - jb->info.frames_out++; - decrement_losspct(jb); - *frameout = *frame; - jb_dbg("V"); - return JB_OK; - } - } -} - -time_in_ms_t jb_next(jitterbuf *jb) -{ - if(jb->info.silence_begin_ts) { - time_in_ms_t next = queue_next(jb); - if(next > 0) { - /* shrink during silence */ - if (jb->info.target - jb->info.current < -JB_TARGET_EXTRA) - return jb->info.last_adjustment + 10; - return next + jb->info.target; - } - else return JB_LONGMAX; - } else { - return jb->info.next_voice_ts; - } -} - -int jb_get(jitterbuf *jb, jb_frame *frameout, time_in_ms_t now, long interpl) -{ - int ret = _jb_get(jb,frameout,now,interpl); -#if 0 - static int lastts=0; - int thists = ((ret == JB_OK) || (ret == JB_DROP)) ? frameout->ts : 0; - jb_warn("jb_get(%x,%x,%ld) = %d (%d)\n", jb, frameout, now, ret, thists); - if(thists && thists < lastts) jb_warn("XXXX timestamp roll-back!!!\n"); - lastts = thists; -#endif - return ret; -} - -int jb_getall(jitterbuf *jb, jb_frame *frameout) -{ - jb_frame *frame; - frame = queue_getall(jb); - - if(!frame) { - return JB_NOFRAME; - } - - *frameout = *frame; - return JB_OK; -} - - -int jb_getinfo(jitterbuf *jb, jb_info *stats) -{ - - history_get(jb); - - *stats = jb->info; - - return JB_OK; -} - -int jb_setconf(jitterbuf *jb, jb_conf *conf) -{ - /* take selected settings from the struct */ - - jb->info.conf.max_jitterbuf = conf->max_jitterbuf; - jb->info.conf.resync_threshold = conf->resync_threshold; - jb->info.conf.max_contig_interp = conf->max_contig_interp; - - return JB_OK; -} - - +/* + * jitterbuf: an application-independent jitterbuffer + * + * Copyrights: + * Copyright (C) 2004-2005, Horizon Wimba, Inc. + * + * Contributors: + * Steve Kann <stevek(a)stevek.com> + * + * This program is free software, distributed under the terms of + * the GNU Lesser (Library) General Public License + * + * Copyright on this file is disclaimed to Digium for inclusion in Asterisk + */ + +#include "iax2.h" +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> + +#include "jitterbuf.h" + +/* define these here, just for ancient compiler systems */ +#define JB_LONGMAX 2147483647L +#define JB_LONGMIN (-JB_LONGMAX - 1L) + +/* MS VC can't do __VA_ARGS__ */ +#if (defined(WIN32) || defined(_WIN32_WCE)) && defined(_MSC_VER) +#define jb_warn if (warnf) warnf +#define jb_err if (errf) errf +#define jb_dbg if (dbgf) dbgf + +#ifdef DEEP_DEBUG + #define jb_dbg2 if (dbgf) dbgf +#else + #define jb_dbg2 if (0) dbgf +#endif + +#else + +#define jb_warn(...) (warnf ? warnf(__VA_ARGS__) : (void)0) +#define jb_err(...) (errf ? errf(__VA_ARGS__) : (void)0) +#define jb_dbg(...) (dbgf ? dbgf(__VA_ARGS__) : (void)0) + +#ifdef DEEP_DEBUG +#define jb_dbg2(...) (dbgf ? dbgf(__VA_ARGS__) : (void)0) +#else +#define jb_dbg2(...) ((void)0) +#endif + +#endif + +static jb_output_function_t warnf, errf, dbgf; + +void jb_setoutput(jb_output_function_t err, jb_output_function_t warn, jb_output_function_t dbg) +{ + errf = err; + warnf = warn; + dbgf = dbg; +} + +static void increment_losspct(jitterbuf *jb) +{ + jb->info.losspct = (100000 + 499 * jb->info.losspct)/500; +} + +static void decrement_losspct(jitterbuf *jb) +{ + jb->info.losspct = (499 * jb->info.losspct)/500; +} + +void jb_reset(jitterbuf *jb) +{ + /* only save settings */ + jb_conf s = jb->info.conf; + memset(jb, 0, sizeof(*jb)); + jb->info.conf = s; + + /* initialize length, using the configured value */ + jb->info.current = jb->info.target = jb->info.conf.target_extra; + jb->info.silence_begin_ts = -1; +} + +jitterbuf * jb_new() +{ + jitterbuf *jb; + + if (!(jb = (jitterbuf *)malloc(sizeof(*jb)))) + return NULL; + + jb->info.conf.target_extra = JB_TARGET_EXTRA; + + jb_reset(jb); + + jb_dbg2("jb_new() = %x\n", jb); + return jb; +} + +void jb_destroy(jitterbuf *jb) +{ + jb_frame *frame; + jb_dbg2("jb_destroy(%x)\n", jb); + + /* free all the frames on the "free list" */ + frame = jb->free; + while (frame != NULL) { + jb_frame *next = frame->next; + free(frame); + frame = next; + } + + /* free ourselves! */ + free(jb); +} + + + +#if 0 +static int longcmp(const void *a, const void *b) +{ + return *(long *)a - *(long *)b; +} +#endif + +/* simple history manipulation */ +/* maybe later we can make the history buckets variable size, or something? */ +/* drop parameter determines whether we will drop outliers to minimize + * delay */ +static int history_put(jitterbuf *jb, time_in_ms_t ts, time_in_ms_t now, long ms) +{ + time_in_ms_t delay = now - (ts - jb->info.resync_offset); + time_in_ms_t threshold = 2 * jb->info.jitter + jb->info.conf.resync_threshold; + time_in_ms_t kicked; + + /* don't add special/negative times to history */ + if (ts <= 0) + return 0; + + /* check for drastic change in delay */ + if (jb->info.conf.resync_threshold != -1) { + if (iax_abs(delay - jb->info.last_delay) > threshold) { + jb->info.cnt_delay_discont++; + if (jb->info.cnt_delay_discont > 3) { + /* resync the jitterbuffer */ + jb->info.cnt_delay_discont = 0; + jb->hist_ptr = 0; + jb->hist_maxbuf_valid = 0; + + jb_warn("Resyncing the jb. last_delay %ld, this delay %ld, threshold %ld, new offset %ld\n", jb->info.last_delay, delay, threshold, ts - now); + jb->info.resync_offset = ts - now; + jb->info.last_delay = delay = 0; /* after resync, frame is right on time */ + } else { + return -1; + } + } else { + jb->info.last_delay = delay; + jb->info.cnt_delay_discont = 0; + } + } + + kicked = jb->history[jb->hist_ptr % JB_HISTORY_SZ]; + + jb->history[(jb->hist_ptr++) % JB_HISTORY_SZ] = delay; + + /* optimization; the max/min buffers don't need to be recalculated, + * if this packet's entry doesn't change them. This happens if this + * packet is not involved, _and_ any packet that got kicked out of + * the history is also not involved. We do a number of comparisons, + * but it's probably still worthwhile, because it will usually + * succeed, and should be a lot faster than going through all 500 + * packets in history */ + if (!jb->hist_maxbuf_valid) + return 0; + + /* don't do this until we've filled history + * (reduces some edge cases below) */ + if (jb->hist_ptr < JB_HISTORY_SZ) + goto invalidate; + + /* if the new delay would go into min */ + if (delay < jb->hist_minbuf[JB_HISTORY_MAXBUF_SZ-1]) + goto invalidate; + + /* or max.. */ + if (delay > jb->hist_maxbuf[JB_HISTORY_MAXBUF_SZ-1]) + goto invalidate; + + /* or the kicked delay would be in min */ + if (kicked <= jb->hist_minbuf[JB_HISTORY_MAXBUF_SZ-1]) + goto invalidate; + + if (kicked >= jb->hist_maxbuf[JB_HISTORY_MAXBUF_SZ-1]) + goto invalidate; + + /* if we got here, we don't need to invalidate, 'cause this delay didn't + * affect things */ + return 0; + /* end optimization */ + + +invalidate: + jb->hist_maxbuf_valid = 0; + return 0; +} + +static void history_calc_maxbuf(jitterbuf *jb) +{ + int i,j; + + if (jb->hist_ptr == 0) + return; + + + /* initialize maxbuf/minbuf to the latest value */ + for (i=0;i<JB_HISTORY_MAXBUF_SZ;i++) { + /* + * jb->hist_maxbuf[i] = jb->history[(jb->hist_ptr-1) % JB_HISTORY_SZ]; + * jb->hist_minbuf[i] = jb->history[(jb->hist_ptr-1) % JB_HISTORY_SZ]; + */ + jb->hist_maxbuf[i] = JB_LONGMIN; + jb->hist_minbuf[i] = JB_LONGMAX; + } + + /* use insertion sort to populate maxbuf */ + /* we want it to be the top "n" values, in order */ + + /* start at the beginning, or JB_HISTORY_SZ frames ago */ + i = (jb->hist_ptr > JB_HISTORY_SZ) ? (jb->hist_ptr - JB_HISTORY_SZ) : 0; + + for (;i<jb->hist_ptr;i++) { + time_in_ms_t toins = jb->history[i % JB_HISTORY_SZ]; + + /* if the maxbuf should get this */ + if (toins > jb->hist_maxbuf[JB_HISTORY_MAXBUF_SZ-1]) { + + /* insertion-sort it into the maxbuf */ + for (j=0;j<JB_HISTORY_MAXBUF_SZ;j++) { + /* found where it fits */ + if (toins > jb->hist_maxbuf[j]) { + /* move over */ + memmove(jb->hist_maxbuf + j + 1, jb->hist_maxbuf + j, (JB_HISTORY_MAXBUF_SZ - (j + 1)) * sizeof(jb->hist_maxbuf[0])); + /* insert */ + jb->hist_maxbuf[j] = toins; + + break; + } + } + } + + /* if the minbuf should get this */ + if (toins < jb->hist_minbuf[JB_HISTORY_MAXBUF_SZ-1]) { + + /* insertion-sort it into the maxbuf */ + for (j=0;j<JB_HISTORY_MAXBUF_SZ;j++) { + /* found where it fits */ + if (toins < jb->hist_minbuf[j]) { + /* move over */ + memmove(jb->hist_minbuf + j + 1, jb->hist_minbuf + j, (JB_HISTORY_MAXBUF_SZ - (j + 1)) * sizeof(jb->hist_minbuf[0])); + /* insert */ + jb->hist_minbuf[j] = toins; + + break; + } + } + } + + if (0) { + int k; + fprintf(stderr, "toins = %ld\n", toins); + fprintf(stderr, "maxbuf ="); + for (k=0;k<JB_HISTORY_MAXBUF_SZ;k++) + fprintf(stderr, "%ld ", jb->hist_maxbuf[k]); + fprintf(stderr, "\nminbuf ="); + for (k=0;k<JB_HISTORY_MAXBUF_SZ;k++) + fprintf(stderr, "%ld ", jb->hist_minbuf[k]); + fprintf(stderr, "\n"); + } + } + + jb->hist_maxbuf_valid = 1; +} + +static void history_get(jitterbuf *jb) +{ + time_in_ms_t max, min, jitter; + int index; + int count; + + if (!jb->hist_maxbuf_valid) + history_calc_maxbuf(jb); + + /* count is how many items in history we're examining */ + count = (jb->hist_ptr < JB_HISTORY_SZ) ? jb->hist_ptr : JB_HISTORY_SZ; + + /* index is the "n"ths highest/lowest that we'll look for */ + index = count * JB_HISTORY_DROPPCT / 100; + + /* sanity checks for index */ + if (index > (JB_HISTORY_MAXBUF_SZ - 1)) + index = JB_HISTORY_MAXBUF_SZ - 1; + + + if (index < 0) { + jb->info.min = 0; + jb->info.jitter = 0; + return; + } + + max = jb->hist_maxbuf[index]; + min = jb->hist_minbuf[index]; + + jitter = max - min; + + /* these debug stmts compare the difference between looking at the absolute jitter, and the + * values we get by throwing away the outliers */ + /* + fprintf(stderr, "[%d] min=%d, max=%d, jitter=%d\n", index, min, max, jitter); + fprintf(stderr, "[%d] min=%d, max=%d, jitter=%d\n", 0, jb->hist_minbuf[0], jb->hist_maxbuf[0], jb->hist_maxbuf[0]-jb->hist_minbuf[0]); + */ + + jb->info.min = min; + jb->info.jitter = jitter; +} + +/* returns 1 if frame was inserted into head of queue, 0 otherwise */ +static int queue_put(jitterbuf *jb, void *data, const enum jb_frame_type type, long ms, time_in_ms_t ts) +{ + jb_frame *frame; + jb_frame *p; + int head = 0; + time_in_ms_t resync_ts = ts - jb->info.resync_offset; + + if ((frame = jb->free)) { + jb->free = frame->next; + } else if (!(frame = (jb_frame *)malloc(sizeof(*frame)))) { + jb_err("cannot allocate frame\n"); + return 0; + } + + jb->info.frames_cur++; + + frame->data = data; + frame->ts = resync_ts; + frame->ms = ms; + frame->type = type; + + /* + * frames are a circular list, jb-frames points to to the lowest ts, + * jb->frames->prev points to the highest ts + */ + + if (!jb->frames) { /* queue is empty */ + jb->frames = frame; + frame->next = frame; + frame->prev = frame; + head = 1; + } else if (resync_ts < jb->frames->ts) { + frame->next = jb->frames; + frame->prev = jb->frames->prev; + + frame->next->prev = frame; + frame->prev->next = frame; + + /* frame is out of order */ + jb->info.frames_ooo++; + + jb->frames = frame; + head = 1; + } else { + p = jb->frames; + + /* frame is out of order */ + if (resync_ts < p->prev->ts) jb->info.frames_ooo++; + + while (resync_ts < p->prev->ts && p->prev != jb->frames) + p = p->prev; + + frame->next = p; + frame->prev = p->prev; + + frame->next->prev = frame; + frame->prev->next = frame; + } + return head; +} + +static time_in_ms_t queue_next(jitterbuf *jb) +{ + if (jb->frames) + return jb->frames->ts; + else + return -1; +} + +static time_in_ms_t queue_last(jitterbuf *jb) +{ + if (jb->frames) + return jb->frames->prev->ts; + else + return -1; +} + +static jb_frame *_queue_get(jitterbuf *jb, time_in_ms_t ts, int all) +{ + jb_frame *frame; + frame = jb->frames; + + if (!frame) + return NULL; + + /*jb_warn("queue_get: ASK %ld FIRST %ld\n", ts, frame->ts); */ + + if (all || ts >= frame->ts) { + /* remove this frame */ + frame->prev->next = frame->next; + frame->next->prev = frame->prev; + + if (frame->next == frame) + jb->frames = NULL; + else + jb->frames = frame->next; + + + /* insert onto "free" single-linked list */ + frame->next = jb->free; + jb->free = frame; + + jb->info.frames_cur--; + + /* we return the frame pointer, even though it's on free list, + * but caller must copy data */ + return frame; + } + + return NULL; +} + +static jb_frame *queue_get(jitterbuf *jb, time_in_ms_t ts) +{ + return _queue_get(jb,ts,0); +} + +static jb_frame *queue_getall(jitterbuf *jb) +{ + return _queue_get(jb,0,1); +} + +#if 0 +/* some diagnostics */ +static void jb_dbginfo(jitterbuf *jb) +{ + if (dbgf == NULL) + return; + + jb_dbg("\njb info: fin=%ld fout=%ld flate=%ld flost=%ld fdrop=%ld fcur=%ld\n", + jb->info.frames_in, jb->info.frames_out, jb->info.frames_late, jb->info.frames_lost, jb->info.frames_dropped, jb->info.frames_cur); + + jb_dbg("jitter=%ld current=%ld target=%ld min=%ld sil=%d len=%d len/fcur=%ld\n", + jb->info.jitter, jb->info.current, jb->info.target, jb->info.min, jb->info.silence_begin_ts, jb->info.current - jb->info.min, + jb->info.frames_cur ? (jb->info.current - jb->info.min)/jb->info.frames_cur : -8); + if (jb->info.frames_in > 0) + jb_dbg("jb info: Loss PCT = %ld%%, Late PCT = %ld%%\n", + jb->info.frames_lost * 100/(jb->info.frames_in + jb->info.frames_lost), + jb->info.frames_late * 100/jb->info.frames_in); + jb_dbg("jb info: queue %d -> %d. last_ts %d (queue len: %d) last_ms %d\n", + queue_next(jb), + queue_last(jb), + jb->info.next_voice_ts, + queue_last(jb) - queue_next(jb), + jb->info.last_voice_ms); +} +#endif + +#ifdef DEEP_DEBUG +static void jb_chkqueue(jitterbuf *jb) +{ + int i=0; + jb_frame *p = jb->frames; + + if (!p) { + return; + } + + do { + if (p->next == NULL) { + jb_err("Queue is BROKEN at item [%d]", i); + } + i++; + p=p->next; + } while (p->next != jb->frames); +} + +static void jb_dbgqueue(jitterbuf *jb) +{ + int i=0; + jb_frame *p = jb->frames; + + jb_dbg("queue: "); + + if (!p) { + jb_dbg("EMPTY\n"); + return; + } + + do { + jb_dbg("[%d]=%ld ", i++, p->ts); + p=p->next; + } while (p->next != jb->frames); + + jb_dbg("\n"); +} +#endif + +enum jb_return_code jb_put(jitterbuf *jb, void *data, const enum jb_frame_type type, long ms, time_in_ms_t ts, time_in_ms_t now) +{ + jb_dbg2("jb_put(%x,%x,%ld,%ld,%ld)\n", jb, data, ms, ts, now); + + jb->info.frames_in++; + + if (type == JB_TYPE_VOICE) { + /* presently, I'm only adding VOICE frames to history and drift + * calculations; mostly because with the IAX integrations, I'm + * sending retransmitted control frames with their awkward + * timestamps through + */ + if (history_put(jb,ts,now,ms)) + return JB_DROP; + } + + /* if put into head of queue, caller needs to reschedule */ + if (queue_put(jb,data,type,ms,ts)) { + return JB_SCHED; + } + + return JB_OK; +} + + +static enum jb_return_code _jb_get(jitterbuf *jb, jb_frame *frameout, time_in_ms_t now, long interpl) +{ + jb_frame *frame; + time_in_ms_t diff; + + /*if ((now - jb_next(jb)) > 2 * jb->info.last_voice_ms) jb_warn("SCHED: %ld", (now - jb_next(jb))); */ + /* get jitter info */ + history_get(jb); + + + /* target */ + jb->info.target = jb->info.jitter + jb->info.min + jb->info.conf.target_extra; + + /* if a hard clamp was requested, use it */ + if ((jb->info.conf.max_jitterbuf) && ((jb->info.target - jb->info.min) > jb->info.conf.max_jitterbuf)) { + jb_dbg("clamping target from %d to %d\n", (jb->info.target - jb->info.min), jb->info.conf.max_jitterbuf); + jb->info.target = jb->info.min + jb->info.conf.max_jitterbuf; + } + + diff = jb->info.target - jb->info.current; + + /* jb_warn("diff = %d lms=%d last = %d now = %d\n", diff, */ + /* jb->info.last_voice_ms, jb->info.last_adjustment, now); */ + + /* let's work on non-silent case first */ + if (!jb->info.silence_begin_ts) { + /* we want to grow */ + if ((diff > 0) && + /* we haven't grown in the delay length */ + (((jb->info.last_adjustment + JB_ADJUST_DELAY) < now) || + /* we need to grow more than the "length" we have left */ + (diff > queue_last(jb) - queue_next(jb)) ) ) { + /* grow by interp frame length */ + jb->info.current += interpl; + jb->info.next_voice_ts += interpl; + jb->info.last_voice_ms = interpl; + jb->info.last_adjustment = now; + jb->info.cnt_contig_interp++; + /* assume silence instead of continuing to interpolate */ + if (jb->info.conf.max_contig_interp && jb->info.cnt_contig_interp >= jb->info.conf.max_contig_interp) { + jb->info.silence_begin_ts = jb->info.next_voice_ts - jb->info.current; + } + jb_dbg("G"); + return JB_INTERP; + } + + frame = queue_get(jb, jb->info.next_voice_ts - jb->info.current); + + /* not a voice frame; just return it. */ + if (frame && frame->type != JB_TYPE_VOICE) { + /* track start of silence */ + if (frame->type == JB_TYPE_SILENCE) { + jb->info.silence_begin_ts = frame->ts; + jb->info.cnt_contig_interp = 0; + } + + *frameout = *frame; + jb->info.frames_out++; + jb_dbg("o"); + return JB_OK; + } + + /* voice frame is later than expected */ + if (frame && frame->ts + jb->info.current < jb->info.next_voice_ts) { + if (frame->ts + jb->info.current > jb->info.next_voice_ts - jb->info.last_voice_ms) { + /* either we interpolated past this frame in the last jb_get */ + /* or the frame is still in order, but came a little too quick */ + *frameout = *frame; + /* reset expectation for next frame */ + jb->info.next_voice_ts = frame->ts + jb->info.current + frame->ms; + jb->info.frames_out++; + decrement_losspct(jb); + jb->info.cnt_contig_interp = 0; + jb_dbg("v"); + return JB_OK; + } else { + /* voice frame is late */ + *frameout = *frame; + jb->info.frames_out++; + decrement_losspct(jb); + jb->info.frames_late++; + jb->info.frames_lost--; + jb_dbg("l"); + /*jb_warn("\nlate: wanted=%ld, this=%ld, next=%ld\n", jb->info.next_voice_ts - jb->info.current, frame->ts, queue_next(jb)); + jb_warninfo(jb); */ + return JB_DROP; + } + } + + /* keep track of frame sizes, to allow for variable sized-frames */ + if (frame && frame->ms > 0) { + jb->info.last_voice_ms = frame->ms; + } + + /* we want to shrink; shrink at 1 frame / 500ms */ + /* unless we don't have a frame, then shrink 1 frame */ + /* every 80ms (though perhaps we can shrink even faster */ + /* in this case) */ + if (diff < -jb->info.conf.target_extra && + ((!frame && jb->info.last_adjustment + 80 < now) || + (jb->info.last_adjustment + 500 < now))) { + + jb->info.last_adjustment = now; + jb->info.cnt_contig_interp = 0; + + if (frame) { + *frameout = *frame; + /* shrink by frame size we're throwing out */ + jb->info.current -= frame->ms; + jb->info.frames_out++; + decrement_losspct(jb); + jb->info.frames_dropped++; + jb_dbg("s"); + return JB_DROP; + } else { + /* shrink by last_voice_ms */ + jb->info.current -= jb->info.last_voice_ms; + jb->info.frames_lost++; + increment_losspct(jb); + jb_dbg("S"); + return JB_NOFRAME; + } + } + + /* lost frame */ + if (!frame) { + /* this is a bit of a hack for now, but if we're close to + * target, and we find a missing frame, it makes sense to + * grow, because the frame might just be a bit late; + * otherwise, we presently get into a pattern where we return + * INTERP for the lost frame, then it shows up next, and we + * throw it away because it's late */ + /* I've recently only been able to replicate this using + * iaxclient talking to app_echo on asterisk. In this case, + * my outgoing packets go through asterisk's (old) + * jitterbuffer, and then might get an unusual increasing delay + * there if it decides to grow?? */ + /* Update: that might have been a different bug, that has been fixed.. + * But, this still seemed like a good idea, except that it ended up making a single actual + * lost frame get interpolated two or more times, when there was "room" to grow, so it might + * be a bit of a bad idea overall */ + /*if (diff > -1 * jb->info.last_voice_ms) { + jb->info.current += jb->info.last_voice_ms; + jb->info.last_adjustment = now; + jb_warn("g"); + return JB_INTERP; + } */ + jb->info.frames_lost++; + increment_losspct(jb); + jb->info.next_voice_ts += interpl; + jb->info.last_voice_ms = interpl; + jb->info.cnt_contig_interp++; + /* assume silence instead of continuing to interpolate */ + if (jb->info.conf.max_contig_interp && jb->info.cnt_contig_interp >= jb->info.conf.max_contig_interp) { + jb->info.silence_begin_ts = jb->info.next_voice_ts - jb->info.current; + } + jb_dbg("L"); + return JB_INTERP; + } + + /* normal case; return the frame, increment stuff */ + *frameout = *frame; + jb->info.next_voice_ts += frame->ms; + jb->info.frames_out++; + jb->info.cnt_contig_interp = 0; + decrement_losspct(jb); + jb_dbg("v"); + return JB_OK; + } else { + /* TODO: after we get the non-silent case down, we'll make the + * silent case -- basically, we'll just grow and shrink faster + * here, plus handle next_voice_ts a bit differently */ + + /* to disable silent special case altogether, just uncomment this: */ + /* jb->info.silence_begin_ts = 0; */ + + /* shrink interpl len every 10ms during silence */ + if (diff < -jb->info.conf.target_extra && + jb->info.last_adjustment + 10 <= now) { + jb->info.current -= interpl; + jb->info.last_adjustment = now; + } + + frame = queue_get(jb, now - jb->info.current); + if (!frame) { + return JB_NOFRAME; + } else if (frame->type != JB_TYPE_VOICE) { + /* normal case; in silent mode, got a non-voice frame */ + *frameout = *frame; + jb->info.frames_out++; + return JB_OK; + } + if (frame->ts < jb->info.silence_begin_ts) { + /* voice frame is late */ + *frameout = *frame; + jb->info.frames_out++; + decrement_losspct(jb); + jb->info.frames_late++; + jb->info.frames_lost--; + jb_dbg("l"); + /*jb_warn("\nlate: wanted=%ld, this=%ld, next=%ld\n", jb->info.next_voice_ts - jb->info.current, frame->ts, queue_next(jb)); + jb_warninfo(jb); */ + return JB_DROP; + } else { + /* voice frame */ + /* try setting current to target right away here */ + jb->info.current = jb->info.target; + jb->info.silence_begin_ts = 0; + jb->info.next_voice_ts = frame->ts + jb->info.current + frame->ms; + jb->info.last_voice_ms = frame->ms; + jb->info.frames_out++; + decrement_losspct(jb); + *frameout = *frame; + jb_dbg("V"); + return JB_OK; + } + } +} + +time_in_ms_t jb_next(jitterbuf *jb) +{ + if (jb->info.silence_begin_ts) { + if (jb->frames) { + time_in_ms_t next = queue_next(jb); + history_get(jb); + /* shrink during silence */ + if (jb->info.target - jb->info.current < -jb->info.conf.target_extra) + return jb->info.last_adjustment + 10; + return next + jb->info.target; + } + else + return JB_LONGMAX; + } else { + return jb->info.next_voice_ts; + } +} + +enum jb_return_code jb_get(jitterbuf *jb, jb_frame *frameout, time_in_ms_t now, long interpl) +{ + enum jb_return_code ret = _jb_get(jb, frameout, now, interpl); +#if 0 + static int lastts=0; + int thists = ((ret == JB_OK) || (ret == JB_DROP)) ? frameout->ts : 0; + jb_warn("jb_get(%x,%x,%ld) = %d (%d)\n", jb, frameout, now, ret, thists); + if (thists && thists < lastts) jb_warn("XXXX timestamp roll-back!!!\n"); + lastts = thists; +#endif + return ret; +} + +enum jb_return_code jb_getall(jitterbuf *jb, jb_frame *frameout) +{ + jb_frame *frame; + frame = queue_getall(jb); + + if (!frame) { + return JB_NOFRAME; + } + + *frameout = *frame; + return JB_OK; +} + + +enum jb_return_code jb_getinfo(jitterbuf *jb, jb_info *stats) +{ + history_get(jb); + + *stats = jb->info; + + return JB_OK; +} + +enum jb_return_code jb_setconf(jitterbuf *jb, jb_conf *conf) +{ + /* take selected settings from the struct */ + + jb->info.conf.max_jitterbuf = conf->max_jitterbuf; + jb->info.conf.resync_threshold = conf->resync_threshold; + jb->info.conf.max_contig_interp = conf->max_contig_interp; + + /* -1 indicates use of the default JB_TARGET_EXTRA value */ + jb->info.conf.target_extra = ( conf->target_extra == -1 ) + ? JB_TARGET_EXTRA + : conf->target_extra + ; + + /* update these to match new target_extra setting */ + jb->info.current = jb->info.conf.target_extra; + jb->info.target = jb->info.conf.target_extra; + + return JB_OK; +} + + Modified: freeswitch/branches/greenlizard/libs/iax/src/jitterbuf.h ============================================================================== --- freeswitch/branches/greenlizard/libs/iax/src/jitterbuf.h (original) +++ freeswitch/branches/greenlizard/libs/iax/src/jitterbuf.h Mon May 14 10:50:37 2007 @@ -1,160 +1,162 @@ -/* - * jitterbuf: an application-independent jitterbuffer - * - * Copyrights: - * Copyright (C) 2004-2005, Horizon Wimba, Inc. - * - * Contributors: - * Steve Kann <stevek(a)stevek.com> - * - * This program is free software, distributed under the terms of - * the GNU Lesser (Library) General Public License - * - * Copyright on this file is disclaimed to Digium for inclusion in Asterisk - */ - -#ifndef _JITTERBUF_H_ -#define _JITTERBUF_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/* configuration constants */ - /* Number of historical timestamps to use in calculating jitter and drift */ -#define JB_HISTORY_SZ 500 - /* what percentage of timestamps should we drop from the history when we examine it; - * this might eventually be something made configurable */ -#define JB_HISTORY_DROPPCT 3 - /* the maximum droppct we can handle (say it was configurable). */ -#define JB_HISTORY_DROPPCT_MAX 4 - /* the size of the buffer we use to keep the top and botton timestamps for dropping */ -#define JB_HISTORY_MAXBUF_SZ JB_HISTORY_SZ * JB_HISTORY_DROPPCT_MAX / 100 - /* amount of additional jitterbuffer adjustment */ -#define JB_TARGET_EXTRA 40 - /* ms between growing and shrinking; may not be honored if jitterbuffer runs out of space */ -#define JB_ADJUST_DELAY 40 - - -/* return codes */ -#define JB_OK 0 -#define JB_EMPTY 1 -#define JB_NOFRAME 2 -#define JB_INTERP 3 -#define JB_DROP 4 -#define JB_SCHED 5 - -/* frame types */ -#define JB_TYPE_CONTROL 0 -#define JB_TYPE_VOICE 1 -#define JB_TYPE_VIDEO 2 /* reserved */ -#define JB_TYPE_SILENCE 3 - - -typedef struct jb_conf { - /* settings */ - long max_jitterbuf; /* defines a hard clamp to use in setting the jitter buffer delay */ - long resync_threshold; /* the jb will resync when delay increases to (2 * jitter) + this param */ - long max_contig_interp; /* the max interp frames to return in a row */ -} jb_conf; - -typedef struct jb_info { - jb_conf conf; - - /* statistics */ - long frames_in; /* number of frames input to the jitterbuffer.*/ - long frames_out; /* number of frames output from the jitterbuffer.*/ - long frames_late; /* number of frames which were too late, and dropped.*/ - long frames_lost; /* number of missing frames.*/ - long frames_dropped; /* number of frames dropped (shrinkage) */ - long frames_ooo; /* number of frames received out-of-order */ - long frames_cur; /* number of frames presently in jb, awaiting delivery.*/ - time_in_ms_t jitter; /* jitter measured within current history interval*/ - time_in_ms_t min; /* minimum lateness within current history interval */ - time_in_ms_t current; /* the present jitterbuffer adjustment */ - time_in_ms_t target; /* the target jitterbuffer adjustment */ - long losspct; /* recent lost frame percentage (* 1000) */ - time_in_ms_t next_voice_ts; /* the ts of the next frame to be read from the jb - in receiver's time */ - long last_voice_ms; /* the duration of the last voice frame */ - time_in_ms_t silence_begin_ts; /* the time of the last CNG frame, when in silence */ - time_in_ms_t last_adjustment; /* the time of the last adjustment */ - time_in_ms_t last_delay; /* the last now added to history */ - long cnt_delay_discont; /* the count of discontinuous delays */ - time_in_ms_t resync_offset; /* the amount to offset ts to support resyncs */ - long cnt_contig_interp; /* the number of contiguous interp frames returned */ -} jb_info; - -typedef struct jb_frame { - void *data; /* the frame data */ - time_in_ms_t ts; /* the relative delivery time expected */ - long ms; /* the time covered by this frame, in sec/8000 */ - int type; /* the type of frame */ - struct jb_frame *next, *prev; -} jb_frame; - -typedef struct jitterbuf { - jb_info info; - - /* history */ - time_in_ms_t history[JB_HISTORY_SZ]; /* history */ - int hist_ptr; /* points to index in history for next entry */ - time_in_ms_t hist_maxbuf[JB_HISTORY_MAXBUF_SZ]; /* a sorted buffer of the max delays (highest first) */ - time_in_ms_t hist_minbuf[JB_HISTORY_MAXBUF_SZ]; /* a sorted buffer of the min delays (lowest first) */ - int hist_maxbuf_valid; /* are the "maxbuf"/minbuf valid? */ - - - jb_frame *frames; /* queued frames */ - jb_frame *free; /* free frames (avoid malloc?) */ -} jitterbuf; - - -/* new jitterbuf */ -extern jitterbuf * jb_new(void); - -/* destroy jitterbuf */ -extern void jb_destroy(jitterbuf *jb); - -/* reset jitterbuf */ -/* NOTE: The jitterbuffer should be empty before you call this, otherwise - * you will leak queued frames, and some internal structures */ -extern void jb_reset(jitterbuf *jb); - -/* queue a frame data=frame data, timings (in ms): ms=length of frame (for voice), ts=ts (sender's time) - * now=now (in receiver's time) return value is one of - * JB_OK: Frame added. Last call to jb_next() still valid - * JB_DROP: Drop this frame immediately - * JB_SCHED: Frame added. Call jb_next() to get a new time for the next frame - */ -extern int jb_put(jitterbuf *jb, void *data, int type, long ms, time_in_ms_t ts, time_in_ms_t now); - -/* get a frame for time now (receiver's time) return value is one of - * JB_OK: You've got frame! - * JB_DROP: Here's an audio frame you should just drop. Ask me again for this time.. - * JB_NOFRAME: There's no frame scheduled for this time. - * JB_INTERP: Please interpolate an interpl-length frame for this time (either we need to grow, or there was a lost frame) - * JB_EMPTY: The jb is empty. - */ -extern int jb_get(jitterbuf *jb, jb_frame *frame, time_in_ms_t now, long interpl); - -/* unconditionally get frames from jitterbuf until empty */ -extern int jb_getall(jitterbuf *jb, jb_frame *frameout); - -/* when is the next frame due out, in receiver's time (0=EMPTY) - * This value may change as frames are added (esp non-audio frames) */ -extern time_in_ms_t jb_next(jitterbuf *jb); - -/* get jitterbuf info: only "statistics" may be valid */ -extern int jb_getinfo(jitterbuf *jb, jb_info *stats); - -/* set jitterbuf conf */ -extern int jb_setconf(jitterbuf *jb, jb_conf *conf); - -typedef void (*jb_output_function_t)(const char *fmt, ...); -extern void jb_setoutput(jb_output_function_t err, jb_output_function_t warn, jb_output_function_t dbg); - -#ifdef __cplusplus -} -#endif - - -#endif +/* + * jitterbuf: an application-independent jitterbuffer + * + * Copyrights: + * Copyright (C) 2004-2005, Horizon Wimba, Inc. + * + * Contributors: + * Steve Kann <stevek(a)stevek.com> + * + * This program is free software, distributed under the terms of + * the GNU Lesser (Library) General Public License + * + * Copyright on this file is disclaimed to Digium for inclusion in Asterisk + */ + +#ifndef _JITTERBUF_H_ +#define _JITTERBUF_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/* configuration constants */ + /* Number of historical timestamps to use in calculating jitter and drift */ +#define JB_HISTORY_SZ 500 + /* what percentage of timestamps should we drop from the history when we examine it; + * this might eventually be something made configurable */ +#define JB_HISTORY_DROPPCT 3 + /* the maximum droppct we can handle (say it was configurable). */ +#define JB_HISTORY_DROPPCT_MAX 4 + /* the size of the buffer we use to keep the top and botton timestamps for dropping */ +#define JB_HISTORY_MAXBUF_SZ JB_HISTORY_SZ * JB_HISTORY_DROPPCT_MAX / 100 + /* amount of additional jitterbuffer adjustment */ +#define JB_TARGET_EXTRA 40 + /* ms between growing and shrinking; may not be honored if jitterbuffer runs out of space */ +#define JB_ADJUST_DELAY 40 + +enum jb_return_code { + /* return codes */ + JB_OK, /* 0 */ + JB_EMPTY, /* 1 */ + JB_NOFRAME, /* 2 */ + JB_INTERP, /* 3 */ + JB_DROP, /* 4 */ + JB_SCHED /* 5 */ +}; + +enum jb_frame_type { +/* frame types */ + JB_TYPE_CONTROL, /* 0 */ + JB_TYPE_VOICE, /* 1 */ + JB_TYPE_VIDEO, /* 2 - reserved */ + JB_TYPE_SILENCE /* 3 */ +}; + +typedef struct jb_conf { + /* settings */ + long max_jitterbuf; /* defines a hard clamp to use in setting the jitter buffer delay */ + long resync_threshold; /* the jb will resync when delay increases to (2 * jitter) + this param */ + long max_contig_interp; /* the max interp frames to return in a row */ + long target_extra; /* amount of additional jitterbuffer adjustment, overrides JB_TARGET_EXTRA */ +} jb_conf; + +typedef struct jb_info { + jb_conf conf; + + /* statistics */ + long frames_in; /* number of frames input to the jitterbuffer.*/ + long frames_out; /* number of frames output from the jitterbuffer.*/ + long frames_late; /* number of frames which were too late, and dropped.*/ + long frames_lost; /* number of missing frames.*/ + long frames_dropped; /* number of frames dropped (shrinkage) */ + long frames_ooo; /* number of frames received out-of-order */ + long frames_cur; /* number of frames presently in jb, awaiting delivery.*/ + time_in_ms_t jitter; /* jitter measured within current history interval*/ + time_in_ms_t min; /* minimum lateness within current history interval */ + time_in_ms_t current; /* the present jitterbuffer adjustment */ + time_in_ms_t target; /* the target jitterbuffer adjustment */ + long losspct; /* recent lost frame percentage (* 1000) */ + time_in_ms_t next_voice_ts; /* the ts of the next frame to be read from the jb - in receiver's time */ + long last_voice_ms; /* the duration of the last voice frame */ + time_in_ms_t silence_begin_ts; /* the time of the last CNG frame, when in silence */ + time_in_ms_t last_adjustment; /* the time of the last adjustment */ + time_in_ms_t last_delay; /* the last now added to history */ + long cnt_delay_discont; /* the count of discontinuous delays */ + time_in_ms_t resync_offset; /* the amount to offset ts to support resyncs */ + long cnt_contig_interp; /* the number of contiguous interp frames returned */ +} jb_info; + +typedef struct jb_frame { + void *data; /* the frame data */ + time_in_ms_t ts; /* the relative delivery time expected */ + long ms; /* the time covered by this frame, in sec/8000 */ + enum jb_frame_type type; /* the type of frame */ + struct jb_frame *next, *prev; +} jb_frame; + +typedef struct jitterbuf { + jb_info info; + + /* history */ + time_in_ms_t history[JB_HISTORY_SZ]; /* history */ + int hist_ptr; /* points to index in history for next entry */ + time_in_ms_t hist_maxbuf[JB_HISTORY_MAXBUF_SZ]; /* a sorted buffer of the max delays (highest first) */ + time_in_ms_t hist_minbuf[JB_HISTORY_MAXBUF_SZ]; /* a sorted buffer of the min delays (lowest first) */ + int hist_maxbuf_valid; /* are the "maxbuf"/minbuf valid? */ + + jb_frame *frames; /* queued frames */ + jb_frame *free; /* free frames (avoid malloc?) */ +} jitterbuf; + + +/* new jitterbuf */ +jitterbuf * jb_new(void); + +/* destroy jitterbuf */ +void jb_destroy(jitterbuf *jb); + +/* reset jitterbuf */ +/* NOTE: The jitterbuffer should be empty before you call this, otherwise + * you will leak queued frames, and some internal structures */ +void jb_reset(jitterbuf *jb); + +/* queue a frame data=frame data, timings (in ms): ms=length of frame (for voice), ts=ts (sender's time) + * now=now (in receiver's time) return value is one of + * JB_OK: Frame added. Last call to jb_next() still valid + * JB_DROP: Drop this frame immediately + * JB_SCHED: Frame added. Call jb_next() to get a new time for the next frame + */ +enum jb_return_code jb_put(jitterbuf *jb, void *data, const enum jb_frame_type type, long ms, time_in_ms_t ts, time_in_ms_t now); + +/* get a frame for time now (receiver's time) return value is one of + * JB_OK: You've got frame! + * JB_DROP: Here's an audio frame you should just drop. Ask me again for this time.. + * JB_NOFRAME: There's no frame scheduled for this time. + * JB_INTERP: Please interpolate an interpl-length frame for this time (either we need to grow, or there was a lost frame) + * JB_EMPTY: The jb is empty. + */ +enum jb_return_code jb_get(jitterbuf *jb, jb_frame *frame, time_in_ms_t now, long interpl); + +/* unconditionally get frames from jitterbuf until empty */ +enum jb_return_code jb_getall(jitterbuf *jb, jb_frame *frameout); + +/* when is the next frame due out, in receiver's time (0=EMPTY) + * This value may change as frames are added (esp non-audio frames) */ +time_in_ms_t jb_next(jitterbuf *jb); + +/* get jitterbuf info: only "statistics" may be valid */ +enum jb_return_code jb_getinfo(jitterbuf *jb, jb_info *stats); + +/* set jitterbuf conf */ +enum jb_return_code jb_setconf(jitterbuf *jb, jb_conf *conf); + +typedef void (*jb_output_function_t)(const char *fmt, ...); +extern void jb_setoutput(jb_output_function_t err, jb_output_function_t warn, jb_output_function_t dbg); + +#ifdef __cplusplus +} +#endif + + +#endif Modified: freeswitch/branches/greenlizard/libs/iax/src/md5.h ============================================================================== --- freeswitch/branches/greenlizard/libs/iax/src/md5.h (original) +++ freeswitch/branches/greenlizard/libs/iax/src/md5.h Mon May 14 10:50:37 2007 @@ -1,7 +1,7 @@ #ifndef MD5_H #define MD5_H -#ifdef __alpha +#if defined(__alpha) || defined(__x86_64) typedef unsigned int uint32; #else typedef unsigned long uint32; Modified: freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/Makefile.am ============================================================================== --- freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/Makefile.am (original) +++ freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/Makefile.am Mon May 14 10:50:37 2007 @@ -30,7 +30,7 @@ DOXYGEN = doxygen -lib_LTLIBRARIES = libsofia-sip-ua.la +noinst_LTLIBRARIES = libsofia-sip-ua.la libsofia_sip_ua_la_SOURCES = libsofia_sip_ua_la_LIBADD = bnf/libbnf.la \ Modified: freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/nua/nua.c ============================================================================== --- freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/nua/nua.c (original) +++ freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/nua/nua.c Mon May 14 10:50:37 2007 @@ -927,7 +927,7 @@ size_t len, xtra, e_len, l_len = 0, l_xtra = 0; ta_list ta; - if (nua == NULL || (nua->nua_shutdown_started && event != nua_r_shutdown)) + if (nua == NULL) return; ta_start(ta, tag, value); Modified: freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c ============================================================================== --- freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c (original) +++ freeswitch/branches/greenlizard/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Mon May 14 10:50:37 2007 @@ -378,7 +378,8 @@ 901, "Stack is going down", NULL); } - else switch (event) { + + switch (event) { case nua_r_get_params: nua_stack_get_params(nua, nh ? nh : nua->nua_dhandle, event, tags); break; @@ -485,8 +486,7 @@ su_timer_set(t, nua_stack_timer, a); if (nua->nua_shutdown) { - nua_stack_shutdown(nua); - return; + nua_stack_shutdown(nua); } for (nh = nua->nua_handles; nh; nh = nh_next) { Modified: freeswitch/branches/greenlizard/src/include/switch_buffer.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_buffer.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_buffer.h Mon May 14 10:50:37 2007 @@ -117,7 +117,7 @@ * \param datalen amount of data to be written * \return int amount of buffer used after the write, or 0 if no space available */ -SWITCH_DECLARE(switch_size_t) switch_buffer_write(switch_buffer_t *buffer, void *data, switch_size_t datalen); +SWITCH_DECLARE(switch_size_t) switch_buffer_write(switch_buffer_t *buffer, const void *data, switch_size_t datalen); /*! \brief Remove data from the buffer * \param buffer any buffer of type switch_buffer_t Modified: freeswitch/branches/greenlizard/src/include/switch_caller.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_caller.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_caller.h Mon May 14 10:50:37 2007 @@ -128,7 +128,7 @@ \param extension_number extension number \return a new extension object allocated from the session's memory pool */ -SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session, char *extension_name, char *extension_number); +SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session, const char *extension_name, const char *extension_number); /*! \brief Add an application (instruction) to the given extension @@ -138,7 +138,7 @@ \param extra_data optional argument to the application */ SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session_t *session, - switch_caller_extension_t *caller_extension, char *application_name, char *extra_data); + switch_caller_extension_t *caller_extension, const char *application_name, const char *extra_data); /*! @@ -147,7 +147,7 @@ \param name the name \note this function is meant for situations where the name paramater is the contents of the variable */ -SWITCH_DECLARE(char *) switch_caller_get_field_by_name(switch_caller_profile_t *caller_profile, char *name); +SWITCH_DECLARE(char *) switch_caller_get_field_by_name(switch_caller_profile_t *caller_profile, const char *name); /*! \brief Create a new caller profile object @@ -191,7 +191,7 @@ \param event the event to add the information to */ -SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, char *prefix, switch_event_t *event); +SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, const char *prefix, switch_event_t *event); SWITCH_END_EXTERN_C /** @} */ Modified: freeswitch/branches/greenlizard/src/include/switch_channel.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_channel.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_channel.h Mon May 14 10:50:37 2007 @@ -89,7 +89,7 @@ \param str the string to check \return the code */ -SWITCH_DECLARE(switch_call_cause_t) switch_channel_str2cause(char *str); +SWITCH_DECLARE(switch_call_cause_t) switch_channel_str2cause(const char *str); /*! \brief return the cause code for a given channel @@ -103,7 +103,7 @@ \param cause the code to check \return the string */ -SWITCH_DECLARE(char *) switch_channel_cause2str(switch_call_cause_t cause); +SWITCH_DECLARE(const char *) switch_channel_cause2str(switch_call_cause_t cause); /*! \brief View the timetable of a channel @@ -136,7 +136,7 @@ \param rpid the rpid if for the icon to use \param status the status message */ -SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, char *rpid, char *status); +SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, const char *rpid, const char *status); /*! \brief Uninitalize a channel @@ -218,7 +218,7 @@ \param varname the name of the variable \return the value of the requested variable */ -SWITCH_DECLARE(char *) switch_channel_get_variable(switch_channel_t *channel, char *varname); +SWITCH_DECLARE(char *) switch_channel_get_variable(switch_channel_t *channel, const char *varname); /*! * Start iterating over the entries in the channel variable list. @@ -373,7 +373,7 @@ \param private_info void pointer to private data \return SWITCH_STATUS_SUCCESS if data was set */ -SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, char *key, void *private_info); +SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, const char *key, const void *private_info); /*! \brief Retrieve private from a given channel @@ -381,7 +381,7 @@ \param key unique keyname to retrieve your private data \return void pointer to channel's private data */ -SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, char *key); +SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key); /*! \brief Assign a name to a given channel @@ -389,7 +389,7 @@ \param name name to assign \return SWITCH_STATUS_SUCCESS if name was assigned */ -SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channel, char *name); +SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channel, const char *name); /*! \brief Retrieve the name of a given channel @@ -423,7 +423,7 @@ \param dtmf string of digits to queue \return SWITCH_STATUS_SUCCESS if successful */ -SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf(switch_channel_t *channel, char *dtmf); +SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf(switch_channel_t *channel, const char *dtmf); /*! \brief Retrieve DTMF digits from a given channel @@ -446,7 +446,7 @@ \param name the name of the state \return the enum value (numeric) */ -SWITCH_DECLARE(switch_channel_state_t) switch_channel_name_state(char *name); +SWITCH_DECLARE(switch_channel_state_t) switch_channel_name_state(const char *name); /*! \brief Add information about a given channel to an event object Modified: freeswitch/branches/greenlizard/src/include/switch_core.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_core.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_core.h Mon May 14 10:50:37 2007 @@ -220,7 +220,7 @@ \param err a pointer to set any errors to \note to be called at application startup */ -SWITCH_DECLARE(switch_status_t) switch_core_init(char *console, const char **err); +SWITCH_DECLARE(switch_status_t) switch_core_init(const char *console, const char **err); /*! \brief Initilize the core and load modules @@ -228,7 +228,7 @@ \param err a pointer to set any errors to \note to be called at application startup instead of switch_core_init. Includes module loading. */ -SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(char *console, const char **err); +SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(const char *console, const char **err); /*! \brief Set/Get Session Limit @@ -428,12 +428,15 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(const switch_endpoint_interface_t *endpoint_interface, switch_memory_pool_t **pool); + +SWITCH_DECLARE(void) switch_core_session_perform_destroy(switch_core_session_t **session, const char *file, const char *func, int line); + /*! \brief Destroy a session and return the memory pool to the core \param session pointer to a pointer of the session to destroy \return */ -SWITCH_DECLARE(void) switch_core_session_destroy(switch_core_session_t **session); +#define switch_core_session_destroy(session) switch_core_session_perform_destroy(session, __FILE__, __SWITCH_FUNC__, __LINE__) /*! \brief Provide the total number of sessions @@ -458,8 +461,9 @@ /*! \brief Launch the session thread (state machine) on a given session \param session the session to activate the state machine on + \return SWITCH_STATUS_SUCCESS if the thread was launched */ -SWITCH_DECLARE(void) switch_core_session_thread_launch(switch_core_session_t *session); +SWITCH_DECLARE(switch_status_t) switch_core_session_thread_launch(switch_core_session_t *session); /*! \brief Retrieve a pointer to the channel object associated with a given session @@ -499,7 +503,7 @@ #ifdef SWITCH_DEBUG_RWLOCKS #define switch_core_session_locate(uuid_str) switch_core_session_perform_locate(uuid_str, __FILE__, __SWITCH_FUNC__, __LINE__) #else -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_locate(char *uuid_str); +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_locate(const char *uuid_str); #endif /*! @@ -507,14 +511,14 @@ \param varname the name of the variable \return the value of the desired variable */ -SWITCH_DECLARE(char *) switch_core_get_variable(char *varname); +SWITCH_DECLARE(char *) switch_core_get_variable(const char *varname); /*! \brief Add a global variable to the core \param varname the name of the variable \param value the value of the variable */ -SWITCH_DECLARE(void) switch_core_set_variable(char *varname, char *value); +SWITCH_DECLARE(void) switch_core_set_variable(const char *varname, const char *value); /*! \brief Hangup All Sessions @@ -1391,7 +1395,7 @@ \brief Set the output console to the desired file \param console the file path */ -SWITCH_DECLARE(switch_status_t) switch_core_set_console(char *console); +SWITCH_DECLARE(switch_status_t) switch_core_set_console(const char *console); /*! \brief Breakdown a number of milliseconds into various time spec 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 Mon May 14 10:50:37 2007 @@ -26,7 +26,7 @@ int preAnswer(); void hangup(char *cause); void setVariable(char *var, char *val); - void getVariable(char *var, char *val); + char *getVariable(char *var); int playFile(char *file, char *timer_name); void setDTMFCallback(switch_input_callback_function_t cb, void *buf, uint32_t buflen); int speakText(char *text); Modified: freeswitch/branches/greenlizard/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_loadable_module.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_loadable_module.h Mon May 14 10:50:37 2007 @@ -97,21 +97,21 @@ \param name the name of the endpoint \return the desired endpoint interface */ -SWITCH_DECLARE(switch_endpoint_interface_t *) switch_loadable_module_get_endpoint_interface(char *name); +SWITCH_DECLARE(switch_endpoint_interface_t *) switch_loadable_module_get_endpoint_interface(const char *name); /*! \brief Retrieve the codec interface by it's registered name \param name the name of the codec \return the desired codec interface */ -SWITCH_DECLARE(switch_codec_interface_t *) switch_loadable_module_get_codec_interface(char *name); +SWITCH_DECLARE(switch_codec_interface_t *) switch_loadable_module_get_codec_interface(const char *name); /*! \brief Retrieve the dialplan interface by it's registered name \param name the name of the dialplan \return the desired dialplan interface */ -SWITCH_DECLARE(switch_dialplan_interface_t *) switch_loadable_module_get_dialplan_interface(char *name); +SWITCH_DECLARE(switch_dialplan_interface_t *) switch_loadable_module_get_dialplan_interface(const char *name); /*! \brief build a dynamic module object and register it (for use in double embeded modules) @@ -132,70 +132,70 @@ \param name the name of the timer \return the desired timer interface */ -SWITCH_DECLARE(switch_timer_interface_t *) switch_loadable_module_get_timer_interface(char *name); +SWITCH_DECLARE(switch_timer_interface_t *) switch_loadable_module_get_timer_interface(const char *name); /*! \brief Retrieve the application interface by it's registered name \param name the name of the application \return the desired application interface */ -SWITCH_DECLARE(switch_application_interface_t *) switch_loadable_module_get_application_interface(char *name); +SWITCH_DECLARE(switch_application_interface_t *) switch_loadable_module_get_application_interface(const char *name); /*! \brief Retrieve the API interface by it's registered name \param name the name of the API \return the desired API interface */ -SWITCH_DECLARE(switch_api_interface_t *) switch_loadable_module_get_api_interface(char *name); +SWITCH_DECLARE(switch_api_interface_t *) switch_loadable_module_get_api_interface(const char *name); /*! \brief Retrieve the file format interface by it's registered name \param name the name of the file format \return the desired file format interface */ -SWITCH_DECLARE(switch_file_interface_t *) switch_loadable_module_get_file_interface(char *name); +SWITCH_DECLARE(switch_file_interface_t *) switch_loadable_module_get_file_interface(const char *name); /*! \brief Retrieve the speech interface by it's registered name \param name the name of the speech interface \return the desired speech interface */ -SWITCH_DECLARE(switch_speech_interface_t *) switch_loadable_module_get_speech_interface(char *name); +SWITCH_DECLARE(switch_speech_interface_t *) switch_loadable_module_get_speech_interface(const char *name); /*! \brief Retrieve the asr interface by it's registered name \param name the name of the asr interface \return the desired asr interface */ -SWITCH_DECLARE(switch_asr_interface_t *) switch_loadable_module_get_asr_interface(char *name); +SWITCH_DECLARE(switch_asr_interface_t *) switch_loadable_module_get_asr_interface(const char *name); /*! \brief Retrieve the directory interface by it's registered name \param name the name of the directory interface \return the desired directory interface */ -SWITCH_DECLARE(switch_directory_interface_t *) switch_loadable_module_get_directory_interface(char *name); +SWITCH_DECLARE(switch_directory_interface_t *) switch_loadable_module_get_directory_interface(const char *name); /*! \brief Retrieve the chat interface by it's registered name \param name the name of the chat interface \return the desired chat interface */ -SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(char *name); +SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(const char *name); /*! \brief Retrieve the say interface by it's registered name \param name the name of the say interface \return the desired say interface */ -SWITCH_DECLARE(switch_say_interface_t *) switch_loadable_module_get_say_interface(char *name); +SWITCH_DECLARE(switch_say_interface_t *) switch_loadable_module_get_say_interface(const char *name); /*! \brief Retrieve the management interface by it's registered name \param relative_oid the relative oid of the management interface \return the desired management interface */ -SWITCH_DECLARE(switch_management_interface_t *) switch_loadable_module_get_management_interface(char *relative_oid); +SWITCH_DECLARE(switch_management_interface_t *) switch_loadable_module_get_management_interface(const char *relative_oid); /*! \brief Retrieve the list of loaded codecs into an array @@ -226,7 +226,7 @@ \param stream stream for output \return the status returned by the API call */ -SWITCH_DECLARE(switch_status_t) switch_api_execute(char *cmd, char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); +SWITCH_DECLARE(switch_status_t) switch_api_execute(const char *cmd, const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); /*! \brief Load a module Modified: freeswitch/branches/greenlizard/src/include/switch_regex.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_regex.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_regex.h Mon May 14 10:50:37 2007 @@ -49,8 +49,8 @@ SWITCH_DECLARE(void) switch_regex_free(void *data); -SWITCH_DECLARE(int) switch_regex_perform(char *field, char *expression, switch_regex_t **new_re, int *ovector, uint32_t olen); -SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, char *data, char *field_data, +SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expression, switch_regex_t **new_re, int *ovector, uint32_t olen); +SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, const char *data, const char *field_data, char *substituted, uint32_t len, int *ovector); /*! @@ -59,7 +59,7 @@ \param expression The regular expression to run against the string \return Boolean if a match was found or not */ -SWITCH_DECLARE(switch_status_t) switch_regex_match(char *target, char *expression); +SWITCH_DECLARE(switch_status_t) switch_regex_match(const char *target, const char *expression); #define switch_regex_safe_free(re) if (re) {\ switch_regex_free(re);\ Modified: freeswitch/branches/greenlizard/src/include/switch_rtp.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_rtp.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_rtp.h Mon May 14 10:50:37 2007 @@ -111,9 +111,9 @@ \param pool a memory pool to use for the session \return the new RTP session or NULL on failure */ -SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(char *rx_host, +SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(const char *rx_host, switch_port_t rx_port, - char *tx_host, + const char *tx_host, switch_port_t tx_port, switch_payload_t payload, uint32_t samples_per_interval, @@ -128,7 +128,7 @@ \param port the remote port \param err pointer for error messages */ -SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err); +SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err); /*! \brief Assign a local address to the RTP session @@ -138,7 +138,7 @@ \param err pointer for error messages \note this call also binds the RTP session's socket to the new address */ -SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err); +SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err); /*! \brief Kill the socket on an existing RTP session Modified: freeswitch/branches/greenlizard/src/include/switch_scheduler.h ============================================================================== --- freeswitch/branches/greenlizard/src/include/switch_scheduler.h (original) +++ freeswitch/branches/greenlizard/src/include/switch_scheduler.h Mon May 14 10:50:37 2007 @@ -62,7 +62,7 @@ */ SWITCH_DECLARE(uint32_t) switch_scheduler_add_task(time_t task_runtime, switch_scheduler_func_t func, - char *desc, char *group, uint32_t cmd_id, void *cmd_arg, switch_scheduler_flag_t flags); + const char *desc, const char *group, uint32_t cmd_id, void *cmd_arg, switch_scheduler_flag_t flags); /*! \brief Delete a scheduled task @@ -76,7 +76,7 @@ \param group the group name \return the number of jobs deleted */ -SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(char *group); +SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(const char *group); /*! 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 Mon May 14 10:50:37 2007 @@ -1013,12 +1013,21 @@ typedef void (*switch_application_function_t) (switch_core_session_t *, char *); typedef void (*switch_event_callback_t) (switch_event_t *); typedef switch_caller_extension_t *(*switch_dialplan_hunt_function_t) (switch_core_session_t *, void *, switch_caller_profile_t *); + typedef struct switch_scheduler_task switch_scheduler_task_t; + typedef void (*switch_scheduler_func_t) (switch_scheduler_task_t *task); + +#define SWITCH_STANDARD_SCHED_FUNC(name) static void name (switch_scheduler_task_t *task) + typedef switch_status_t (*switch_state_handler_t) (switch_core_session_t *); typedef struct switch_stream_handle switch_stream_handle_t; typedef switch_status_t (*switch_stream_handle_write_function_t) (switch_stream_handle_t *handle, const char *fmt, ...); -typedef switch_status_t (*switch_api_function_t) (char *in, switch_core_session_t *session, switch_stream_handle_t *stream); + +typedef switch_status_t (*switch_api_function_t) (const char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream); + +#define SWITCH_STANDARD_API(name) static switch_status_t name (const char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) + typedef switch_status_t (*switch_input_callback_function_t) (switch_core_session_t *session, void *input, switch_input_type_t input_type, void *buf, unsigned int buflen); typedef struct switch_say_interface switch_say_interface_t; 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 Mon May 14 10:50:37 2007 @@ -55,7 +55,7 @@ #define switch_is_file_path(file) ((*file == '/') || strstr(file, SWITCH_URL_SEPARATOR)) #endif -static inline switch_bool_t switch_is_digit_string(char *s) { +static inline switch_bool_t switch_is_digit_string(const char *s) { while(s && *s) { if (*s < 48 || *s > 57) { @@ -104,7 +104,7 @@ \param priority the priority to get the name of \return the printable form of the priority */ -SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority); +SWITCH_DECLARE(const char *) switch_priority_name(switch_priority_t priority); /*! \brief Return the RFC2833 character based on an event id @@ -260,7 +260,7 @@ \param in the string \return the epoch time in usec */ -SWITCH_DECLARE(switch_time_t) switch_str_time(char *in); +SWITCH_DECLARE(switch_time_t) switch_str_time(const char *in); /*! \brief Declares a function designed to set a dymaic global string @@ -288,7 +288,7 @@ \param esc the escape character \return the escaped string */ -SWITCH_DECLARE(char *) switch_escape_char(switch_memory_pool_t *pool, char *in, char *delim, char esc); +SWITCH_DECLARE(char *) switch_escape_char(switch_memory_pool_t *pool, char *in, const char *delim, char esc); /*! \brief Wait for a socket Modified: freeswitch/branches/greenlizard/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/branches/greenlizard/src/mod/applications/mod_commands/mod_commands.c Mon May 14 10:50:37 2007 @@ -57,7 +57,7 @@ static switch_api_interface_t sched_transfer_api_interface; static switch_api_interface_t sched_hangup_api_interface; -static switch_status_t status_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(status_function) { uint8_t html = 0; switch_core_time_duration_t duration; @@ -107,18 +107,18 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t ctl_function(char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(ctl_function) { int argc; char *mydata, *argv[5]; uint32_t arg = 0; - if (switch_strlen_zero(data)) { + if (switch_strlen_zero(cmd)) { stream->write_function(stream, "USAGE: %s\n", ctl_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } - if ((mydata = strdup(data))) { + if ((mydata = strdup(cmd))) { argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); if (!strcmp(argv[0], "hupall")) { @@ -149,7 +149,7 @@ } -static switch_status_t load_function(char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(load_function) { const char *err; @@ -157,12 +157,12 @@ return SWITCH_STATUS_FALSE; } - if (switch_strlen_zero(mod)) { + if (switch_strlen_zero(cmd)) { stream->write_function(stream, "USAGE: %s\n", load_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } - if (switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) mod, SWITCH_TRUE, &err) == SWITCH_STATUS_SUCCESS) { + if (switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) cmd, SWITCH_TRUE, &err) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "OK\n"); } else { stream->write_function(stream, "ERROR [%s]\n", err); @@ -171,7 +171,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t unload_function(char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(unload_function) { const char *err; @@ -179,12 +179,12 @@ return SWITCH_STATUS_FALSE; } - if (switch_strlen_zero(mod)) { + if (switch_strlen_zero(cmd)) { stream->write_function(stream, "USAGE: %s\n", unload_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } - if (switch_loadable_module_unload_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) mod, &err) == SWITCH_STATUS_SUCCESS) { + if (switch_loadable_module_unload_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) cmd, &err) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "OK\n"); } else { stream->write_function(stream, "ERROR [%s]\n", err); @@ -193,7 +193,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t reload_function(char *args, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(reload_function) { const char *err; switch_xml_t xml_root; @@ -211,20 +211,20 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t kill_function(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(kill_function) { - switch_core_session_t *session = NULL; + switch_core_session_t *ksession = NULL; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } - if (!dest) { + if (!cmd) { stream->write_function(stream, "USAGE: %s\n", kill_api_interface.syntax); - } else if ((session = switch_core_session_locate(dest))) { - switch_channel_t *channel = switch_core_session_get_channel(session); + } else if ((ksession = switch_core_session_locate(cmd))) { + switch_channel_t *channel = switch_core_session_get_channel(ksession); switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - switch_core_session_rwunlock(session); + switch_core_session_rwunlock(ksession); stream->write_function(stream, "OK\n"); } else { stream->write_function(stream, "No Such Channel!\n"); @@ -233,56 +233,62 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t transfer_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(transfer_function) { - switch_core_session_t *session = NULL; - char *argv[4] = { 0 }; + switch_core_session_t *tsession = NULL; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - - if (switch_strlen_zero(cmd) || argc < 2 || argc > 4) { - stream->write_function(stream, "USAGE: %s\n", transfer_api_interface.syntax); - } else { - char *uuid = argv[0]; - char *dest = argv[1]; - char *dp = argv[2]; - char *context = argv[3]; + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (argc >= 2 && argc <= 4) { + char *uuid = argv[0]; + char *dest = argv[1]; + char *dp = argv[2]; + char *context = argv[3]; + + if ((tsession = switch_core_session_locate(uuid))) { + + if (switch_ivr_session_transfer(tsession, dest, dp, context) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "OK\n"); + } else { + stream->write_function(stream, "ERROR\n"); + } - if ((session = switch_core_session_locate(uuid))) { + switch_core_session_rwunlock(tsession); - if (switch_ivr_session_transfer(session, dest, dp, context) == SWITCH_STATUS_SUCCESS) { - stream->write_function(stream, "OK\n"); } else { - stream->write_function(stream, "ERROR\n"); + stream->write_function(stream, "No Such Channel!\n"); } - - switch_core_session_rwunlock(session); - - } else { - stream->write_function(stream, "No Such Channel!\n"); + goto done; } } + stream->write_function(stream, "USAGE: %s\n", transfer_api_interface.syntax); + +done: + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t sched_transfer_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(sched_transfer_function) { - switch_core_session_t *session = NULL; - char *argv[6] = { 0 }; + switch_core_session_t *tsession = NULL; + char *mycmd = NULL, *argv[6] = { 0 }; int argc = 0; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 2 || argc > 5) { stream->write_function(stream, "USAGE: %s\n", sched_transfer_api_interface.syntax); @@ -299,29 +305,32 @@ when = atol(argv[0]); } - if ((session = switch_core_session_locate(uuid))) { + if ((tsession = switch_core_session_locate(uuid))) { switch_ivr_schedule_transfer(when, uuid, dest, dp, context); stream->write_function(stream, "OK\n"); - switch_core_session_rwunlock(session); + switch_core_session_rwunlock(tsession); } else { stream->write_function(stream, "No Such Channel!\n"); } } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t sched_hangup_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(sched_hangup_function) { - switch_core_session_t *session = NULL; - char *argv[4] = { 0 }; + switch_core_session_t *hsession = NULL; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 1) { stream->write_function(stream, "USAGE: %s\n", sched_hangup_api_interface.syntax); @@ -341,30 +350,33 @@ cause = switch_channel_str2cause(cause_str); } - if ((session = switch_core_session_locate(uuid))) { + if ((hsession = switch_core_session_locate(uuid))) { switch_ivr_schedule_hangup(when, uuid, cause, SWITCH_FALSE); stream->write_function(stream, "OK\n"); - switch_core_session_rwunlock(session); + switch_core_session_rwunlock(hsession); } else { stream->write_function(stream, "No Such Channel!\n"); } } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t uuid_media_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(uuid_media_function) { - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; - if (isession) { + if (session) { return status; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 1) { stream->write_function(stream, "USAGE: %s\n", media_api_interface.syntax); @@ -382,21 +394,24 @@ stream->write_function(stream, "-ERR Operation Failed\n"); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t uuid_broadcast_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(uuid_broadcast_function) { - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; - if (isession) { + if (session) { return status; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 2) { stream->write_function(stream, "USAGE: %s\n", broadcast_api_interface.syntax); @@ -419,21 +434,24 @@ stream->write_function(stream, "+OK Message Sent\n"); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t sched_broadcast_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(sched_broadcast_function) { - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; - if (isession) { + if (session) { return status; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 3) { stream->write_function(stream, "USAGE: %s\n", sched_broadcast_api_interface.syntax); @@ -463,20 +481,23 @@ stream->write_function(stream, "+OK Message Scheduled\n"); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t uuid_hold_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(uuid_hold_function) { - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; - if (isession) { + if (session) { return status; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 1) { stream->write_function(stream, "USAGE: %s\n", hold_api_interface.syntax); @@ -494,19 +515,22 @@ stream->write_function(stream, "-ERR Operation Failed\n"); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t uuid_bridge_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(uuid_bridge_function) { - char *argv[4] = { 0 }; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc != 2) { stream->write_function(stream, "USAGE: %s\n", uuid_bridge_api_interface.syntax); @@ -516,17 +540,18 @@ } } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t session_record_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(session_record_function) { - switch_core_session_t *session = NULL; - char *argv[4] = { 0 }; + switch_core_session_t *rsession = NULL; + char *mycmd = NULL, *argv[4] = { 0 }; char *uuid = NULL, *action = NULL, *path = NULL; int argc = 0; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } @@ -534,7 +559,11 @@ goto usage; } - if ((argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) != 3) { + if (!(mycmd = strdup(cmd))) { + goto usage; + } + + if ((argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) != 3) { goto usage; } @@ -542,7 +571,7 @@ action = argv[1]; path = argv[2]; - if (!(session = switch_core_session_locate(uuid))) { + if (!(rsession = switch_core_session_locate(uuid))) { stream->write_function(stream, "-Error Cannot locate session!\n"); return SWITCH_STATUS_SUCCESS; } @@ -552,9 +581,9 @@ } if (!strcasecmp(action, "start")) { - switch_ivr_record_session(session, path, NULL); + switch_ivr_record_session(rsession, path, NULL); } else if (!strcasecmp(action, "stop")) { - switch_ivr_stop_record_session(session, path); + switch_ivr_stop_record_session(rsession, path); } else { goto usage; } @@ -564,28 +593,32 @@ usage: stream->write_function(stream, "USAGE: %s\n", session_record_api_interface.syntax); + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; done: if (session) { - switch_core_session_rwunlock(session); + switch_core_session_rwunlock(rsession); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t pause_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(pause_function) { - switch_core_session_t *session = NULL; - char *argv[4] = { 0 }; + switch_core_session_t *psession = NULL; + char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 2) { stream->write_function(stream, "USAGE: %s\n", pause_api_interface.syntax); @@ -593,8 +626,8 @@ char *uuid = argv[0]; char *dest = argv[1]; - if ((session = switch_core_session_locate(uuid))) { - switch_channel_t *channel = switch_core_session_get_channel(session); + if ((psession = switch_core_session_locate(uuid))) { + switch_channel_t *channel = switch_core_session_get_channel(psession); if (!strcasecmp(dest, "on")) { switch_channel_set_flag(channel, CF_HOLD); @@ -602,36 +635,40 @@ switch_channel_clear_flag(channel, CF_HOLD); } - switch_core_session_rwunlock(session); + switch_core_session_rwunlock(psession); } else { stream->write_function(stream, "No Such Channel!\n"); } } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } -static switch_status_t originate_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(originate_function) { switch_channel_t *caller_channel; switch_core_session_t *caller_session = NULL; - char *argv[7] = { 0 }; + char *mycmd = NULL, *argv[7] = { 0 }; int i = 0, x, argc = 0; char *aleg, *exten, *dp, *context, *cid_name, *cid_num; uint32_t timeout = 60; switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; uint8_t machine = 1; - if (isession) { + if (session) { stream->write_function(stream, "Illegal Usage\n"); return SWITCH_STATUS_SUCCESS; } - argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } if (switch_strlen_zero(cmd) || argc < 2 || argc > 7) { stream->write_function(stream, "USAGE: %s\n", originate_api_interface.syntax); + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } @@ -671,6 +708,7 @@ } else { stream->write_function(stream, "Cannot Create Outgoing Channel! [%s] cause: %s\n", aleg, switch_channel_cause2str(cause)); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } @@ -694,6 +732,7 @@ if ((extension = switch_caller_extension_new(caller_session, app_name, arg)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); switch_channel_hangup(caller_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + switch_safe_free(mycmd); return SWITCH_STATUS_MEMERR; } switch_caller_extension_add_application(caller_session, extension, app_name, arg); @@ -713,6 +752,7 @@ switch_core_session_rwunlock(caller_session); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } @@ -735,7 +775,7 @@ switch_safe_free(stream.data); } -static switch_status_t sched_del_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(sched_del_function) { uint32_t cnt = 0; @@ -754,7 +794,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t xml_wrap_api_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(xml_wrap_api_function) { char *dcommand, *edata = NULL, *send = NULL, *command, *arg = NULL; switch_stream_handle_t mystream = { 0 }; @@ -803,7 +843,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t sched_api_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(sched_api_function) { char *tm = NULL, *dcmd, *group; time_t when; @@ -939,7 +979,7 @@ return 0; } -static switch_status_t show_function(char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(show_function) { char sql[1024]; char *errmsg; @@ -948,18 +988,15 @@ int help = 0; char *mydata = NULL, *argv[6] = {0}; int argc; - char *cmd = NULL, *as = NULL; + char *command = NULL, *as = NULL; if (session) { return SWITCH_STATUS_FALSE; } - if (data) { - if ((mydata = strdup(data))) { - argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - } - - cmd = argv[0]; + if (cmd && (mydata = strdup(cmd))) { + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + command = argv[0]; if (argv[2] && !strcasecmp(argv[1], "as")) { as = argv[2]; } @@ -973,25 +1010,25 @@ // If you changes the field qty or order of any of these select // statmements, you must also change show_callback and friends to match! - if (!cmd) { + if (!command) { stream->write_function(stream, "USAGE: %s\n", show_api_interface.syntax); return SWITCH_STATUS_SUCCESS; - } else if (!strcmp(cmd, "codec") || !strcmp(cmd, "dialplan") || !strcmp(cmd, "file") || !strcmp(cmd, "timer")) { - sprintf(sql, "select type, name from interfaces where type = '%s'", cmd); - } else if (!strcmp(cmd, "tasks")) { - sprintf(sql, "select * from %s", cmd); - } else if (!strcmp(cmd, "application") || !strcmp(cmd, "api")) { - sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != ''", cmd); - } else if (!strcmp(cmd, "calls")) { + } else if (!strcmp(command, "codec") || !strcmp(command, "dialplan") || !strcmp(command, "file") || !strcmp(command, "timer")) { + sprintf(sql, "select type, name from interfaces where type = '%s'", command); + } else if (!strcmp(command, "tasks")) { + sprintf(sql, "select * from %s", command); + } else if (!strcmp(command, "application") || !strcmp(command, "api")) { + sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != ''", command); + } else if (!strcmp(command, "calls")) { sprintf(sql, "select * from calls"); - } else if (!strcmp(cmd, "channels")) { + } else if (!strcmp(command, "channels")) { sprintf(sql, "select * from channels"); - } else if (!strncasecmp(cmd, "help", 4)) { + } else if (!strncasecmp(command, "help", 4)) { char *cmdname = NULL; help = 1; holder.print_title = 0; - if ((cmdname = strchr(cmd, ' ')) != 0) { + if ((cmdname = strchr(command, ' ')) != 0) { *cmdname++ = '\0'; snprintf(sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api' and name = '%s'", cmdname); } else { @@ -1063,7 +1100,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t version_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(version_function) { char version_string[1024]; snprintf(version_string, sizeof(version_string) - 1, "FreeSwitch Version %s\n", SWITCH_VERSION_FULL); @@ -1072,7 +1109,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t help_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(help_function) { char showcmd[1024]; int all = 0; Modified: freeswitch/branches/greenlizard/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/greenlizard/src/mod/applications/mod_conference/mod_conference.c Mon May 14 10:50:37 2007 @@ -292,7 +292,7 @@ static switch_status_t conference_play_file(conference_obj_t * conference, char *file, uint32_t leadin, switch_channel_t *channel, uint8_t async); static switch_status_t conference_say(conference_obj_t * conference, const char *text, uint32_t leadin); static void conference_list(conference_obj_t * conference, switch_stream_handle_t *stream, char *delim); -static switch_status_t conf_api_main(char *buf, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t conf_api_main(const char *buf, switch_core_session_t *session, switch_stream_handle_t *stream); static switch_status_t audio_bridge_on_ring(switch_core_session_t *session); static switch_status_t conference_outcall(conference_obj_t * conference, char *conference_name, @@ -3445,7 +3445,7 @@ } /* API Interface Function */ -static switch_status_t conf_api_main(char *buf, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(conf_api_main) { char *lbuf = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -3453,8 +3453,8 @@ int argc; char *argv[25] = { 0 }; - if (!buf) { - buf = "help"; + if (!cmd) { + cmd = "help"; } if (session) { @@ -3470,7 +3470,7 @@ stream->write_function(stream, "<pre>\n"); } - if (!(lbuf = strdup(buf))) { + if (!(lbuf = strdup(cmd))) { return status; } @@ -3486,7 +3486,7 @@ goto done; } if (argc >= 2) { - conf_api_dispatch(conference, stream, argc, argv, (const char *) buf, 1); + conf_api_dispatch(conference, stream, argc, argv, cmd, 1); } else { stream->write_function(stream, "Conference command, not specified.\nTry 'help'\n"); } 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 Mon May 14 10:50:37 2007 @@ -502,14 +502,14 @@ } -static switch_status_t strepoch_api_function(char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(strepoch_api_function) { switch_time_t out; - if (switch_strlen_zero(data)) { + if (switch_strlen_zero(cmd)) { out = switch_time_now(); } else { - out = switch_str_time(data); + out = switch_str_time(cmd); } stream->write_function(stream, "%d", (uint32_t) ((out) / (int64_t) (1000000))); @@ -517,7 +517,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t strftime_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(strftime_api_function) { switch_size_t retsize; @@ -525,20 +525,20 @@ char date[80] = ""; switch_time_exp_lt(&tm, switch_time_now()); - switch_strftime(date, &retsize, sizeof(date), fmt ? fmt : "%Y-%m-%d %T", &tm); + switch_strftime(date, &retsize, sizeof(date), cmd ? cmd : "%Y-%m-%d %T", &tm); stream->write_function(stream, "%s", date); return SWITCH_STATUS_SUCCESS; } -static switch_status_t presence_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(presence_api_function) { switch_event_t *event; char *lbuf, *argv[4]; int argc = 0; switch_event_types_t type = SWITCH_EVENT_PRESENCE_IN; - if (fmt && (lbuf = strdup(fmt)) + if (cmd && (lbuf = strdup(cmd)) && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) > 0) { if (!strcasecmp(argv[0], "out")) { type = SWITCH_EVENT_PRESENCE_OUT; @@ -568,12 +568,12 @@ } -static switch_status_t chat_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(chat_api_function) { char *lbuf, *argv[4]; int argc = 0; - if (fmt && (lbuf = strdup(fmt)) + if (cmd && (lbuf = strdup(cmd)) && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) == 4) { switch_chat_interface_t *ci; Modified: freeswitch/branches/greenlizard/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/branches/greenlizard/src/mod/applications/mod_enum/mod_enum.c Mon May 14 10:50:37 2007 @@ -625,7 +625,7 @@ } -static switch_status_t enum_function(char *data, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(enum_function) { int argc = 0; @@ -640,7 +640,7 @@ return SWITCH_STATUS_FALSE; } - if (!(mydata = strdup(data))) { + if (!cmd || !(mydata = strdup(cmd))) { stream->write_function(stream, "Error!\n"); return SWITCH_STATUS_FALSE; } @@ -649,7 +649,7 @@ dest = argv[0]; root = argv[1] ? argv[1] : globals.root; - if (!enum_lookup(root, data, &results) == SWITCH_STATUS_SUCCESS) { + if (!enum_lookup(root, dest, &results) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "No Match!\n"); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/branches/greenlizard/src/mod/codecs/mod_speex/mod_speex.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/codecs/mod_speex/mod_speex.c (original) +++ freeswitch/branches/greenlizard/src/mod/codecs/mod_speex/mod_speex.c Mon May 14 10:50:37 2007 @@ -302,7 +302,73 @@ /*.next */ &speex_32k_implementation }; -static const switch_codec_implementation_t speex_8k_implementation = { + +static const switch_codec_implementation_t speex_8k_60ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 98, + /*.iananame */ "speex", + /*.fmtp */ NULL, + /*.samples_per_second */ 8000, + /*.bits_per_second */ 3300, + /*.nanoseconds_per_frame */ 60000, + /*.samples_per_frame */ 480, + /*.bytes_per_frame */ 960, + /*.encoded_bytes_per_frame */ 0, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_speex_init, + /*.encode */ switch_speex_encode, + /*.decode */ switch_speex_decode, + /*.destroy */ switch_speex_destroy, + /*.next */ &speex_16k_implementation +}; + +static const switch_codec_implementation_t speex_8k_40ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 98, + /*.iananame */ "speex", + /*.fmtp */ NULL, + /*.samples_per_second */ 8000, + /*.bits_per_second */ 22000, + /*.nanoseconds_per_frame */ 40000, + /*.samples_per_frame */ 240, + /*.bytes_per_frame */ 640, + /*.encoded_bytes_per_frame */ 0, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_speex_init, + /*.encode */ switch_speex_encode, + /*.decode */ switch_speex_decode, + /*.destroy */ switch_speex_destroy, + /*.next */ &speex_8k_60ms_implementation + +}; + + +static const switch_codec_implementation_t speex_8k_30ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 98, + /*.iananame */ "speex", + /*.fmtp */ NULL, + /*.samples_per_second */ 8000, + /*.bits_per_second */ 1650, + /*.nanoseconds_per_frame */ 30000, + /*.samples_per_frame */ 240, + /*.bytes_per_frame */ 480, + /*.encoded_bytes_per_frame */ 0, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_speex_init, + /*.encode */ switch_speex_encode, + /*.decode */ switch_speex_decode, + /*.destroy */ switch_speex_destroy, + /*.next */ &speex_8k_40ms_implementation +}; + +static const switch_codec_implementation_t speex_8k_20ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 98, /*.iananame */ "speex", @@ -320,12 +386,12 @@ /*.encode */ switch_speex_encode, /*.decode */ switch_speex_decode, /*.destroy */ switch_speex_destroy, - /*.next */ &speex_16k_implementation + /*.next */ &speex_8k_30ms_implementation }; static const switch_codec_interface_t speex_codec_interface = { /*.interface_name */ "speex", - /*.implementations */ &speex_8k_implementation + /*.implementations */ &speex_8k_20ms_implementation }; static switch_loadable_module_interface_t speex_module_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 Mon May 14 10:50:37 2007 @@ -1504,9 +1504,15 @@ switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); switch_channel_mark_answered(channel); switch_channel_set_state(channel, CS_INIT); - switch_core_session_thread_launch(tech_pvt->session); - add_pvt(tech_pvt, PA_MASTER); - stream->write_function(stream, "SUCCESS:%s:%s\n", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session)); + + if (switch_core_session_thread_launch(tech_pvt->session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + switch_core_session_destroy(&session); + stream->write_function(stream, "FAIL:Thread Error!\n"); + } else { + add_pvt(tech_pvt, PA_MASTER); + stream->write_function(stream, "SUCCESS:%s:%s\n", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session)); + } } else { switch_core_session_destroy(&session); stream->write_function(stream, "FAIL:Device Error!\n"); @@ -1516,7 +1522,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t pa_cmd(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(pa_cmd) { char *argv[1024] = { 0 }; int argc = 0; 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 Mon May 14 10:50:37 2007 @@ -191,10 +191,10 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_string, globals.codec_string) SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, globals.codec_rates_string) -static switch_status_t dl_login(char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); -static switch_status_t dl_logout(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); -static switch_status_t dl_pres(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); -static switch_status_t dl_debug(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t dl_login(const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t dl_logout(const char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t dl_pres(const char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t dl_debug(const char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); static switch_status_t channel_on_init(switch_core_session_t *session); static switch_status_t channel_on_hangup(switch_core_session_t *session); static switch_status_t channel_on_ring(switch_core_session_t *session); @@ -2028,7 +2028,7 @@ } } -static switch_status_t dl_debug(char *tf, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(dl_debug) { int on, cur; @@ -2036,8 +2036,8 @@ return SWITCH_STATUS_FALSE; } - if (tf) { - on = switch_true(tf); + if (cmd) { + on = switch_true(cmd); cur = ldl_global_debug(on); } else { cur = ldl_global_debug(-1); @@ -2049,7 +2049,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t dl_pres(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(dl_pres) { mdl_profile_t *profile; @@ -2057,26 +2057,26 @@ return SWITCH_STATUS_FALSE; } - if (!profile_name) { + if (!cmd) { stream->write_function(stream, "USAGE: %s\n", pres_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } - if ((profile = switch_core_hash_find(globals.profile_hash, profile_name))) { + if ((profile = switch_core_hash_find(globals.profile_hash, cmd))) { if (profile->user_flags & LDL_FLAG_COMPONENT) { sign_on(profile); stream->write_function(stream, "OK\n"); } else { - stream->write_function(stream, "NO PROFILE %s NOT A COMPONENT\n", profile_name); + stream->write_function(stream, "NO PROFILE %s NOT A COMPONENT\n", cmd); } } else { - stream->write_function(stream, "NO SUCH PROFILE %s\n", profile_name); + stream->write_function(stream, "NO SUCH PROFILE %s\n", cmd); } return SWITCH_STATUS_SUCCESS; } -static switch_status_t dl_logout(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(dl_logout) { mdl_profile_t *profile; @@ -2084,22 +2084,22 @@ return SWITCH_STATUS_FALSE; } - if (!profile_name) { + if (!cmd) { stream->write_function(stream, "USAGE: %s\n", logout_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } - if ((profile = switch_core_hash_find(globals.profile_hash, profile_name))) { + if ((profile = switch_core_hash_find(globals.profile_hash, cmd))) { ldl_handle_stop(profile->handle); stream->write_function(stream, "OK\n"); } else { - stream->write_function(stream, "NO SUCH PROFILE %s\n", profile_name); + stream->write_function(stream, "NO SUCH PROFILE %s\n", cmd); } return SWITCH_STATUS_SUCCESS; } -static switch_status_t dl_login(char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(dl_login) { char *argv[10] = { 0 }; int argc = 0; @@ -2111,16 +2111,16 @@ return SWITCH_STATUS_FALSE; } - if (switch_strlen_zero(arg)) { + if (switch_strlen_zero(cmd)) { stream->write_function(stream, "USAGE: %s\n", login_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } - myarg = strdup(arg); + myarg = strdup(cmd); argc = switch_separate_string(myarg, ';', argv, (sizeof(argv) / sizeof(argv[0]))); - if (switch_strlen_zero(arg) || argc != 1) { + if (switch_strlen_zero(cmd) || argc != 1) { stream->write_function(stream, "USAGE: %s\n", login_api_interface.syntax); return SWITCH_STATUS_SUCCESS; } @@ -2720,7 +2720,12 @@ tech_pvt->dlsession = dlsession; switch_channel_set_name(channel, "DingaLing/new"); switch_channel_set_state(channel, CS_INIT); - switch_core_session_thread_launch(session); + if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + terminate_session(&session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + status = LDL_STATUS_FALSE; + goto done; + } } else { status = LDL_STATUS_FALSE; goto done; Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_iax/mod_iax.c Mon May 14 10:50:37 2007 @@ -1036,6 +1036,10 @@ case IAX_EVENT_REGREJ: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Registration failed.\n"); break; + case IAX_EVENT_REGREQ: + /* what is the right way to handle this? */ + iax_reject_registration(iaxevent->session, NULL); + break; case IAX_EVENT_TIMEOUT: break; case IAX_EVENT_ACCEPT: @@ -1128,7 +1132,10 @@ iax_accept(tech_pvt->iax_session, tech_pvt->codec); iax_ring_announce(tech_pvt->iax_session); switch_channel_set_state(channel, CS_INIT); - switch_core_session_thread_launch(session); + if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + switch_core_session_destroy(&session); + } } } } Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_portaudio/mod_portaudio.c Mon May 14 10:50:37 2007 @@ -155,8 +155,8 @@ static switch_status_t load_config(void); static int get_dev_by_name(char *name, int in); static int get_dev_by_number(int number, int in); - static switch_status_t pa_cmd(char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); - static switch_status_t padep(char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); + static switch_status_t pa_cmd(const char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); + static switch_status_t padep(const char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); /* @@ -1694,9 +1694,14 @@ switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); switch_channel_mark_answered(channel); switch_channel_set_state(channel, CS_INIT); - switch_core_session_thread_launch(tech_pvt->session); - add_pvt(tech_pvt, PA_MASTER); - stream->write_function(stream, "SUCCESS:%s:%s\n", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session)); + if (switch_core_session_thread_launch(tech_pvt->session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + switch_core_session_destroy(&session); + stream->write_function(stream, "FAIL:Thread Error!\n"); + } else { + add_pvt(tech_pvt, PA_MASTER); + stream->write_function(stream, "SUCCESS:%s:%s\n", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session)); + } } else { switch_core_session_destroy(&session); stream->write_function(stream, "FAIL:Device Error!\n"); @@ -1706,13 +1711,13 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t padep(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(padep) { stream->write_function(stream, "This command no longer exists (try 'pa help')\n"); return SWITCH_STATUS_SUCCESS; } -static switch_status_t pa_cmd(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(pa_cmd) { char *argv[1024] = { 0 }; int argc = 0; Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/Makefile.am ============================================================================== --- freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/Makefile.am (original) +++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/Makefile.am Mon May 14 10:50:37 2007 @@ -1,6 +1,6 @@ AM_CFLAGS = $(SWITCH_AM_CFLAGS) AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS) -AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) +#AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) #we should set all these vars from configure, no reason to have these in each Makefile.am LIBTOOL = echo "`link=\`echo $@|grep .la;echo $@|grep .so;echo $@|grep .dll\`;if test -n "$$link"; then echo Creating $@;fi`";`if test -z "$(VERBOSE)" ; \ then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(SHELL) $(switch_builddir)/libtool; fi` @@ -12,9 +12,7 @@ MODNAME=mod_sofia -BASE=../../../.. - -SOFIA_DIR=$(BASE)/libs/sofia-sip +SOFIA_DIR=$(switch_builddir)/libs/sofia-sip SOFIAUA_DIR=$(SOFIA_DIR)/libsofia-sip-ua SOFIALA=$(SOFIAUA_DIR)/libsofia-sip-ua.la @@ -30,8 +28,8 @@ mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/soa -I$(SOFIAUA_DIR)/sresolv mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/stun -I$(SOFIAUA_DIR)/su mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/tport -I$(SOFIAUA_DIR)/url -mod_sofia_la_LIBADD = $(SOFIALA) $(switch_builddir)/libfreeswitch.la -mod_sofia_la_LDFLAGS = -module -avoid-version -no-undefined +mod_sofia_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SOFIALA) +mod_sofia_la_LDFLAGS = -avoid-version -module -no-undefined if ADD_ODBC mod_sofia_la_CFLAGS += -DSWITCH_HAVE_ODBC @@ -51,12 +49,12 @@ ../../../../libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua_tag.h: $(SOFIALA) -install-data-am: $(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN) +#install-data-am: $(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN) -$(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).la - @echo installing $(MODNAME).$(DYNAMIC_LIB_EXTEN) - @if [ -f .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) ] ; then \ - $(LIBTOOL) --mode=install $(INSTALL) .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ - else \ - $(LIBTOOL) --mode=install $(INSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ - fi +#$(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).la +# @echo installing $(MODNAME).$(DYNAMIC_LIB_EXTEN) +# @if [ -f .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) ] ; then \ +# $(LIBTOOL) --mode=install $(INSTALL) .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ +# else \ +# $(LIBTOOL) --mode=install $(INSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ +# fi Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.c Mon May 14 10:50:37 2007 @@ -339,7 +339,7 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); - if (switch_test_flag(tech_pvt, TFLAG_HUP) || !sofia_test_pflag(tech_pvt->profile, PFLAG_RUNNING)) { + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; } @@ -411,7 +411,7 @@ } } - if (switch_test_flag(tech_pvt, TFLAG_HUP) || !sofia_test_pflag(tech_pvt->profile, PFLAG_RUNNING)) { + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; } @@ -443,7 +443,7 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); - if (switch_test_flag(tech_pvt, TFLAG_HUP) || !sofia_test_pflag(tech_pvt->profile, PFLAG_RUNNING)) { + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; } @@ -538,7 +538,7 @@ } } - if (switch_test_flag(tech_pvt, TFLAG_HUP) || !sofia_test_pflag(tech_pvt->profile, PFLAG_RUNNING)) { + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; } @@ -1140,7 +1140,7 @@ if (!strcasecmp(argv[1], "stop") || !strcasecmp(argv[1], "restart")) { - int rsec = 30; + int rsec = 3; int diff = (int) (time(NULL) - profile->started); int remain = rsec - diff; if (diff < rsec) { @@ -1175,7 +1175,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t sofia_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(sofia_function) { char *argv[1024] = { 0 }; int argc = 0; @@ -1190,7 +1190,7 @@ "sofia status [[profile | gateway] <name>]\n" "--------------------------------------------------------------------------------\n"; - if (isession) { + if (session) { return SWITCH_STATUS_FALSE; } Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_sofia/mod_sofia.h Mon May 14 10:50:37 2007 @@ -242,6 +242,7 @@ switch_thread_rwlock_t *rwlock; switch_mutex_t *flag_mutex; uint32_t inuse; + uint32_t soft_max; time_t started; #ifdef SWITCH_HAVE_ODBC char *odbc_dsn; 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 Mon May 14 10:50:37 2007 @@ -363,11 +363,6 @@ su_root_step(profile->s_root, 1000); } - while(profile->inuse) { - switch_yield(500000); - } - - //sofia_reg_check_expire(profile, 0); //sofia_reg_check_gateway(profile, 0); @@ -481,7 +476,8 @@ *proxy = NULL, *context = "default", *expire_seconds = "3600", - *retry_seconds = "30"; + *retry_seconds = "30", + *from_domain = ""; gateway->pool = profile->pool; gateway->profile = profile; @@ -515,6 +511,8 @@ expire_seconds = val; } else if (!strcmp(var, "retry-seconds")) { retry_seconds = val; + } else if (!strcmp(var, "from-domain")) { + from_domain = val; } } @@ -544,6 +542,10 @@ gateway->state = REG_STATE_NOREG; } + if (switch_strlen_zero(from_domain)) { + from_domain = realm; + } + gateway->retry_seconds = atoi(retry_seconds); if (gateway->retry_seconds < 10) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "INVALID: retry_seconds correcting the value to 30\n"); @@ -557,7 +559,7 @@ if (switch_true(caller_id_in_from)) { switch_set_flag(gateway, REG_FLAG_CALLERID); } - gateway->register_from = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, realm); + 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); if (!strncasecmp(proxy, "sip:", 4)) { @@ -1708,10 +1710,17 @@ const char *context = NULL; char network_ip[80]; switch_event_t *v_event = NULL; + uint32_t sess_count = switch_core_session_count(); + uint32_t sess_max = switch_core_session_limit(0); + + if ((profile->soft_max && sess_count >= profile->soft_max) || sess_count >= sess_max) { + nua_respond(nh, 480, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); + return; + } if (!sip || !sip->sip_request || !sip->sip_request->rq_method_name) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received an invalid packet!\n"); - nua_respond(nh, SIP_500_INTERNAL_SERVER_ERROR, TAG_END()); + nua_respond(nh, SIP_503_SERVICE_UNAVAILABLE, TAG_END()); return; } @@ -1911,7 +1920,33 @@ switch_copy_string(tech_pvt->sofia_private->uuid, switch_core_session_get_uuid(session), sizeof(tech_pvt->sofia_private->uuid)); nua_handle_bind(nh, tech_pvt->sofia_private); tech_pvt->nh = nh; - switch_core_session_thread_launch(session); + + if (switch_core_session_thread_launch(session) == SWITCH_STATUS_SUCCESS) { + return; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "LUKE: I'm hit, but not bad.\n"); + + switch_mutex_lock(profile->flag_mutex); + + profile->soft_max = sess_count - 10; + switch_core_session_limit(profile->soft_max); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "LUKE'S VOICE: Artoo, see what you can do with it. Hang on back there....\n" + "Green laserfire moves past the beeping little robot as his head turns. " + "After a few beeps and a twist of his mechanical arm,\n" + "Artoo reduces the max sessions to %d thus, saving the switch from certian doom.\n", + profile->soft_max); + + switch_mutex_unlock(profile->flag_mutex); + + if (tech_pvt->hash_key) { + switch_core_hash_delete(tech_pvt->profile->chat_hash, tech_pvt->hash_key); + } + + nua_handle_bind(nh, NULL); + free(tech_pvt->sofia_private); + switch_core_session_destroy(&session); + nua_respond(nh, 480, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); } void sofia_handle_sip_i_options(int status, 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 Mon May 14 10:50:37 2007 @@ -281,7 +281,7 @@ if (!from_user || !from_host) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not do authorization without a complete from header\n"); - nua_respond(nh, SIP_500_INTERNAL_SERVER_ERROR, TAG_END()); + nua_respond(nh, SIP_401_UNAUTHORIZED, NUTAG_WITH_THIS(nua), TAG_END()); return 1; } Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Mon May 14 10:50:37 2007 @@ -1562,6 +1562,12 @@ switch_copy_string(chanmap->map[pevent->ring.channel], switch_core_session_get_uuid(session), sizeof(chanmap->map[pevent->ring.channel])); switch_channel_set_state(channel, CS_INIT); + if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + switch_core_session_destroy(&session); + ret = 0; + goto done; + } switch_core_session_thread_launch(session); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create new Inbound Channel!\n"); Modified: freeswitch/branches/greenlizard/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/branches/greenlizard/src/mod/endpoints/mod_woomera/mod_woomera.c Mon May 14 10:50:37 2007 @@ -1240,7 +1240,11 @@ break; } switch_channel_set_state(channel, CS_INIT); - switch_core_session_thread_launch(session); + if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + switch_core_session_destroy(&session); + break; + } } } } Modified: freeswitch/branches/greenlizard/src/mod/event_handlers/mod_cdr/basecdr.h ============================================================================== --- freeswitch/branches/greenlizard/src/mod/event_handlers/mod_cdr/basecdr.h (original) +++ freeswitch/branches/greenlizard/src/mod/event_handlers/mod_cdr/basecdr.h Mon May 14 10:50:37 2007 @@ -90,7 +90,7 @@ switch_time_t callenddate; switch_time_t calltransferdate; switch_call_cause_t hangupcause; - char *hangupcause_text; + const char *hangupcause_text; char clid[80]; bool originated; // Did they originate this call? char dialplan[80]; Modified: freeswitch/branches/greenlizard/src/mod/event_handlers/mod_cdr/mod_cdr.cpp ============================================================================== --- freeswitch/branches/greenlizard/src/mod/event_handlers/mod_cdr/mod_cdr.cpp (original) +++ freeswitch/branches/greenlizard/src/mod/event_handlers/mod_cdr/mod_cdr.cpp Mon May 14 10:50:37 2007 @@ -45,11 +45,11 @@ static CDRContainer *newcdrcontainer; static switch_memory_pool_t *module_pool; static switch_status_t my_on_hangup(switch_core_session_t *session); -static switch_status_t modcdr_reload(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); -static switch_status_t modcdr_queue_pause(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); -static switch_status_t modcdr_queue_resume(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); -static switch_status_t modcdr_show_active(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); -static switch_status_t modcdr_show_available(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_reload(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_queue_pause(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_queue_resume(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_show_active(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); +static switch_status_t modcdr_show_available(const char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream); static switch_thread_rwlock_t *cdr_rwlock; /* Now begins the glue that will tie this into the system. @@ -151,7 +151,7 @@ return RUNNING ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_TERM; } -static switch_status_t modcdr_reload(char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +SWITCH_STANDARD_API(modcdr_reload) { #ifdef SWITCH_QUEUE_ENHANCED switch_thread_rwlock_wrlock(cdr_rwlock); @@ -164,7 +164,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_queue_pause(char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +SWITCH_STANDARD_API(modcdr_queue_pause) { #ifdef SWITCH_QUEUE_ENHANCED newcdrcontainer->queue_pause(stream); @@ -174,7 +174,7 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_queue_resume(char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +SWITCH_STANDARD_API(modcdr_queue_resume) { #ifdef SWITCH_QUEUE_ENHANCED newcdrcontainer->queue_resume(stream); @@ -184,13 +184,13 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_show_active(char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +SWITCH_STANDARD_API(modcdr_show_active) { newcdrcontainer->active(stream); return SWITCH_STATUS_SUCCESS; } -static switch_status_t modcdr_show_available(char *dest=0, switch_core_session_t *isession=0, switch_stream_handle_t *stream=0) +SWITCH_STANDARD_API(modcdr_show_available) { newcdrcontainer->available(stream); return SWITCH_STATUS_SUCCESS; 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 Mon May 14 10:50:37 2007 @@ -51,10 +51,10 @@ switch_channel_set_variable(channel, var, val); } -void SessionContainer::get_variable(char *var, char *val) +char *SessionContainer::get_variable(char *var) { - sanity_check(); - switch_channel_get_variable(channel, var); + sanity_check(NULL); + return switch_channel_get_variable(channel, var); } void SessionContainer::execute(char *app, char *data) 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 Mon May 14 10:50:37 2007 @@ -34,7 +34,7 @@ int pre_answer(); void hangup(char *cause); void set_variable(char *var, char *val); - void get_variable(char *var, char *val); + char *get_variable(char *var); int play_file(char *file, char *timer_name); void set_dtmf_callback(PyObject * pyfunc); int speak_text(char *text); Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_python/mod_python.c Mon May 14 10:50:37 2007 @@ -161,14 +161,14 @@ return NULL; } -static switch_status_t launch_python(char *text, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(launch_python) { switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; switch_memory_pool_t *pool; struct switch_py_thread *pt; - if (switch_strlen_zero(text)) { + if (switch_strlen_zero(cmd)) { stream->write_function(stream, "USAGE: %s\n", python_run_interface.syntax); return SWITCH_STATUS_SUCCESS; } @@ -180,7 +180,7 @@ assert(pt != NULL); pt->pool = pool; - pt->args = switch_core_strdup(pt->pool, text); + pt->args = switch_core_strdup(pt->pool, cmd); switch_threadattr_create(&thd_attr, pt->pool); switch_threadattr_detach_set(thd_attr, 1); 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 Mon May 14 10:50:37 2007 @@ -1045,14 +1045,14 @@ PyObject *resultobj; SessionContainer *arg1 = (SessionContainer *) 0 ; char *arg2 ; - char *arg3 ; + char *result; PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"Oss:SessionContainer_get_variable",&obj0,&arg2,&arg3)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"Os:SessionContainer_get_variable",&obj0,&arg2)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_SessionContainer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - (arg1)->get_variable(arg2,arg3); + result = (char *)(arg1)->get_variable(arg2); - Py_INCREF(Py_None); resultobj = Py_None; + resultobj = result ? PyString_FromString(result) : Py_BuildValue((char*)""); return resultobj; fail: return NULL; Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon May 14 10:50:37 2007 @@ -45,6 +45,7 @@ static JSBool session_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval); static JSBool session_originate(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval); static switch_api_interface_t js_run_interface; +static switch_api_interface_t jsapi_interface; static struct { size_t gStackChunkSize; @@ -111,6 +112,190 @@ int32 bufsize; }; +struct request_obj { + const char *cmd; + switch_core_session_t *session; + switch_stream_handle_t *stream; +}; + + +/* Request Object */ +/*********************************************************************************/ + +static JSBool request_write(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + struct request_obj *ro = JS_GetPrivate(cx, obj); + + if (!ro) { + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; + } + + if (argc > 0) { + char *string = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + ro->stream->write_function(ro->stream, "%s", string); + *rval = BOOLEAN_TO_JSVAL(JS_TRUE); + return JS_TRUE; + } + + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; +} + +static JSBool request_add_header(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + struct request_obj *ro = JS_GetPrivate(cx, obj); + + if (!ro) { + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; + } + + if (argc > 1) { + char *hname = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + char *hval = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + switch_event_add_header(ro->stream->event, SWITCH_STACK_BOTTOM, hname, "%s", hval); + *rval = BOOLEAN_TO_JSVAL(JS_TRUE); + return JS_TRUE; + } + + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; +} + +static JSBool request_get_header(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + struct request_obj *ro = JS_GetPrivate(cx, obj); + + if (!ro) { + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; + } + + + if (argc > 0) { + char *hname = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + char *val = switch_event_get_header(ro->stream->event, hname); + *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, val)); + return JS_TRUE; + } + + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; +} + +static JSBool request_dump_env(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + struct request_obj *ro = JS_GetPrivate(cx, obj); + char *how = "text"; + + if (!ro) { + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; + } + + if (argc > 0) { + how = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + } + + if (!strcasecmp(how, "xml")) { + switch_xml_t xml; + char *xmlstr; + if ((xml = switch_event_xmlize(ro->stream->event, NULL))) { + xmlstr = switch_xml_toxml(xml); + *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, xmlstr)); + return JS_TRUE; + } + } else { + char *buf; + switch_event_serialize(ro->stream->event, &buf); + if (buf) { + *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, buf)); + free(buf); + return JS_TRUE; + } + } + + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_FALSE; +} + +static void request_destroy(JSContext * cx, JSObject * obj) +{ + +} + +enum request_tinyid { + REQUEST_COMMAND +}; + +static JSFunctionSpec request_methods[] = { + {"write", request_write, 1}, + {"getHeader", request_get_header, 1}, + {"addHeader", request_add_header, 1}, + {"dumpENV", request_dump_env, 1}, + {0} +}; + +static JSPropertySpec request_props[] = { + {"command", REQUEST_COMMAND, JSPROP_READONLY | JSPROP_PERMANENT}, + {0} +}; + + +static JSBool request_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) +{ + JSBool res = JS_TRUE; + struct request_obj *ro = JS_GetPrivate(cx, obj); + char *name; + int param = 0; + + if (!ro) { + *vp = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; + } + + + name = JS_GetStringBytes(JS_ValueToString(cx, id)); + /* numbers are our props anything else is a method */ + if (name[0] >= 48 && name[0] <= 57) { + param = atoi(name); + } else { + return JS_TRUE; + } + + switch (param) { + case REQUEST_COMMAND: + *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, ro->cmd)); + break; + } + + return res; +} + + +JSClass request_class = { + "Request", JSCLASS_HAS_PRIVATE, + JS_PropertyStub, JS_PropertyStub, request_getProperty, JS_PropertyStub, + JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, request_destroy, NULL, NULL, NULL, NULL +}; + + +static JSObject *new_request(JSContext *cx, JSObject *obj, struct request_obj *ro) +{ + JSObject *Request; + if ((Request = JS_DefineObject(cx, obj, "request", &request_class, NULL, 0))) { + if ((JS_SetPrivate(cx, Request, ro) && + JS_DefineProperties(cx, Request, request_props) && JS_DefineFunctions(cx, Request, request_methods))) { + return Request; + } + } + + return NULL; +} + + + struct event_obj { switch_event_t *event; int freed; @@ -402,8 +587,6 @@ }; - - static void js_error(JSContext * cx, const char *message, JSErrorReport * report) { const char *filename = __FILE__; @@ -2649,7 +2832,7 @@ return 1; } -static void js_parse_and_execute(switch_core_session_t *session, char *input_code) +static void js_parse_and_execute(switch_core_session_t *session, char *input_code, struct request_obj *ro) { JSObject *javascript_global_object = NULL; char buf[1024], *script, *arg, *argv[512]; @@ -2671,6 +2854,10 @@ if (session && new_js_session(cx, javascript_global_object, session, &jss, "session", flags)) { JS_SetPrivate(cx, javascript_global_object, session); } + if (ro) { + new_request(cx, javascript_global_object, ro); + } + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Allocation Error!\n"); return; @@ -2683,7 +2870,11 @@ argc = switch_separate_string(arg, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); } - if (argc) { /* create a js doppleganger of this argc/argv */ + if (!argc) { + snprintf(buf, sizeof(buf), "~var argv = new Array();"); + eval_some_js(buf, cx, javascript_global_object, &rval); + } else { + /* create a js doppleganger of this argc/argv */ snprintf(buf, sizeof(buf), "~var argv = new Array(%d);", argc); eval_some_js(buf, cx, javascript_global_object, &rval); snprintf(buf, sizeof(buf), "~var argc = %d", argc); @@ -2701,14 +2892,16 @@ } } - - +static void js_dp_function(switch_core_session_t *session, char *input_code) +{ + js_parse_and_execute(session, input_code, NULL); +} static void *SWITCH_THREAD_FUNC js_thread_run(switch_thread_t * thread, void *obj) { char *input_code = obj; - js_parse_and_execute(NULL, input_code); + js_parse_and_execute(NULL, input_code, NULL); if (input_code) { free(input_code); @@ -2720,7 +2913,7 @@ static switch_memory_pool_t *module_pool = NULL; -static void js_thread_launch(char *text) +static void js_thread_launch(const char *text) { switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; @@ -2738,16 +2931,33 @@ switch_thread_create(&thread, thd_attr, js_thread_run, strdup(text), module_pool); } +SWITCH_STANDARD_API(jsapi_function) +{ + struct request_obj ro = {0}; + + if (switch_strlen_zero(cmd)) { + stream->write_function(stream, "USAGE: %s\n", jsapi_interface.syntax); + return SWITCH_STATUS_SUCCESS; + } + + ro.cmd = cmd; + ro.session = session; + ro.stream = stream; + js_parse_and_execute(session, (char *) cmd, &ro); + + return SWITCH_STATUS_SUCCESS; +} + -static switch_status_t launch_async(char *text, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_STANDARD_API(launch_async) { - if (switch_strlen_zero(text)) { + if (switch_strlen_zero(cmd)) { stream->write_function(stream, "USAGE: %s\n", js_run_interface.syntax); return SWITCH_STATUS_SUCCESS; } - js_thread_launch(text); + js_thread_launch(cmd); stream->write_function(stream, "OK\n"); return SWITCH_STATUS_SUCCESS; } @@ -2755,7 +2965,7 @@ static const switch_application_interface_t ivrtest_application_interface = { /*.interface_name */ "javascript", - /*.application_function */ js_parse_and_execute, + /*.application_function */ js_dp_function, /* long_desc */ "Run a javascript ivr on a channel", /* short_desc */ "Launch JS ivr.", /* syntax */ "<script> [additional_vars [...]]", @@ -2764,12 +2974,21 @@ /*.next */ NULL }; + +static switch_api_interface_t jsapi_interface = { + /*.interface_name */ "jsapi", + /*.desc */ "execute an api call", + /*.function */ jsapi_function, + /*.syntax */ "jsapi <script> [additional_vars [...]]", + /*.next */ NULL +}; + static switch_api_interface_t js_run_interface = { /*.interface_name */ "jsrun", /*.desc */ "run a script", /*.function */ launch_async, /*.syntax */ "jsrun <script> [additional_vars [...]]", - /*.next */ NULL + /*.next */ &jsapi_interface }; static switch_loadable_module_interface_t spidermonkey_module_interface = { Modified: freeswitch/branches/greenlizard/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/branches/greenlizard/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/branches/greenlizard/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Mon May 14 10:50:37 2007 @@ -37,6 +37,7 @@ char *url; char *bindings; char *cred; + int disable100continue; }; typedef struct xml_binding xml_binding_t; @@ -68,6 +69,7 @@ char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; xml_binding_t *binding = (xml_binding_t *) user_data; char *file_url; + struct curl_slist *slist = NULL; if (!binding) { return NULL; @@ -115,6 +117,12 @@ curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback); curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); + + if (binding->disable100continue) { + slist = curl_slist_append(slist,"Expect:"); + curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist); + } + curl_easy_perform(curl_handle); curl_easy_cleanup(curl_handle); close(config_data.fd); @@ -169,6 +177,7 @@ char *url = NULL; char *bind_cred = NULL; char *bind_mask = NULL; + int disable100continue = 0; for (param = switch_xml_child(binding_tag, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -180,6 +189,8 @@ } } else if (!strcasecmp(var, "gateway-credentials")) { bind_cred = val; + } else if (!strcasecmp(var, "disable-100-continue") && switch_true(val)) { + disable100continue = 1; } } @@ -203,6 +214,8 @@ binding->cred = strdup(bind_cred); } + binding->disable100continue = disable100continue; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding [%s] XML Fetch Function [%s] [%s]\n", switch_strlen_zero(bname) ? "N/A" : bname, binding->url, binding->bindings ? binding->bindings : "all"); switch_xml_bind_search_function(xml_url_fetch, switch_xml_parse_section_string(binding->bindings), binding); Modified: freeswitch/branches/greenlizard/src/switch_buffer.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_buffer.c (original) +++ freeswitch/branches/greenlizard/src/switch_buffer.c Mon May 14 10:50:37 2007 @@ -193,7 +193,7 @@ return reading; } -SWITCH_DECLARE(switch_size_t) switch_buffer_write(switch_buffer_t *buffer, void *data, switch_size_t datalen) +SWITCH_DECLARE(switch_size_t) switch_buffer_write(switch_buffer_t *buffer, const void *data, switch_size_t datalen) { switch_size_t freespace, actual_freespace; Modified: freeswitch/branches/greenlizard/src/switch_caller.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_caller.c (original) +++ freeswitch/branches/greenlizard/src/switch_caller.c Mon May 14 10:50:37 2007 @@ -92,7 +92,7 @@ return profile; } -SWITCH_DECLARE(char *) switch_caller_get_field_by_name(switch_caller_profile_t *caller_profile, char *name) +SWITCH_DECLARE(char *) switch_caller_get_field_by_name(switch_caller_profile_t *caller_profile, const char *name) { if (!strcasecmp(name, "dialplan")) { return caller_profile->dialplan; @@ -136,7 +136,7 @@ return NULL; } -SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, char *prefix, switch_event_t *event) +SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, const char *prefix, switch_event_t *event) { char header_name[1024]; @@ -207,7 +207,7 @@ } -SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session, char *extension_name, char *extension_number) +SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session, const char *extension_name, const char *extension_number) { switch_caller_extension_t *caller_extension = NULL; @@ -222,7 +222,7 @@ SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session_t *session, - switch_caller_extension_t *caller_extension, char *application_name, char *application_data) + switch_caller_extension_t *caller_extension, const char *application_name, const char *application_data) { switch_caller_application_t *caller_application = NULL; Modified: freeswitch/branches/greenlizard/src/switch_channel.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_channel.c (original) +++ freeswitch/branches/greenlizard/src/switch_channel.c Mon May 14 10:50:37 2007 @@ -119,21 +119,21 @@ }; -SWITCH_DECLARE(char *) switch_channel_cause2str(switch_call_cause_t cause) +SWITCH_DECLARE(const char *) switch_channel_cause2str(switch_call_cause_t cause) { uint8_t x; - char *str = "UNKNOWN"; + const char *str = "UNKNOWN"; for (x = 0; CAUSE_CHART[x].name; x++) { if (CAUSE_CHART[x].cause == cause) { - str = (char *) CAUSE_CHART[x].name; + str = CAUSE_CHART[x].name; } } return str; } -SWITCH_DECLARE(switch_call_cause_t) switch_channel_str2cause(char *str) +SWITCH_DECLARE(switch_call_cause_t) switch_channel_str2cause(const char *str) { uint8_t x; switch_call_cause_t cause = SWITCH_CAUSE_UNALLOCATED; @@ -198,12 +198,12 @@ return has; } -SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf(switch_channel_t *channel, char *dtmf) +SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf(switch_channel_t *channel, const char *dtmf) { switch_status_t status; register switch_size_t len, inuse; switch_size_t wr = 0; - char *p; + const char *p; assert(channel != NULL); @@ -270,7 +270,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, char *rpid, char *status) +SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, const char *rpid, const char *status) { char *id = switch_channel_get_variable(channel, "presence_id"); switch_event_t *event; @@ -302,7 +302,7 @@ } -SWITCH_DECLARE(char *) switch_channel_get_variable(switch_channel_t *channel, char *varname) +SWITCH_DECLARE(char *) switch_channel_get_variable(switch_channel_t *channel, const char *varname) { char *v = NULL; assert(channel != NULL); @@ -343,7 +343,7 @@ return hi; } -SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, char *key, void *private_info) +SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, const char *key, const void *private_info) { assert(channel != NULL); switch_mutex_lock(channel->profile_mutex); @@ -352,7 +352,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, char *key) +SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key) { void *val; assert(channel != NULL); @@ -362,7 +362,7 @@ return val; } -SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channel, char *name) +SWITCH_DECLARE(switch_status_t) switch_channel_set_name(switch_channel_t *channel, const char *name) { assert(channel != NULL); channel->name = NULL; @@ -532,7 +532,7 @@ } -SWITCH_DECLARE(switch_channel_state_t) switch_channel_name_state(char *name) +SWITCH_DECLARE(switch_channel_state_t) switch_channel_name_state(const char *name) { uint32_t x = 0; for (x = 0; state_names[x]; x++) { Modified: freeswitch/branches/greenlizard/src/switch_core.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core.c (original) +++ freeswitch/branches/greenlizard/src/switch_core.c Mon May 14 10:50:37 2007 @@ -71,16 +71,16 @@ } } -static void heartbeat_callback(switch_scheduler_task_t *task) +SWITCH_STANDARD_SCHED_FUNC(heartbeat_callback) { send_heartbeat(); /* reschedule this task */ - task->runtime += 20; + task->runtime = time(NULL) + 20; } -SWITCH_DECLARE(switch_status_t) switch_core_set_console(char *console) +SWITCH_DECLARE(switch_status_t) switch_core_set_console(const char *console) { if ((runtime.console = fopen(console, "a")) == 0) { fprintf(stderr, "Cannot open output file %s.\n", console); @@ -135,12 +135,12 @@ } -SWITCH_DECLARE(char *) switch_core_get_variable(char *varname) +SWITCH_DECLARE(char *) switch_core_get_variable(const char *varname) { return (char *) switch_core_hash_find(runtime.global_vars, varname); } -SWITCH_DECLARE(void) switch_core_set_variable(char *varname, char *value) +SWITCH_DECLARE(void) switch_core_set_variable(const char *varname, const char *value) { switch_core_hash_insert(runtime.global_vars, switch_core_strdup(runtime.memory_pool, varname), switch_core_strdup(runtime.memory_pool, value)); } @@ -392,7 +392,7 @@ } -SWITCH_DECLARE(switch_status_t) switch_core_init(char *console, const char **err) +SWITCH_DECLARE(switch_status_t) switch_core_init(const char *console, const char **err) { switch_xml_t xml = NULL, cfg = NULL; switch_uuid_t uuid; @@ -538,7 +538,7 @@ if (sig); return; } -SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(char *console, const char **err) +SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(const char *console, const char **err) { switch_event_t *event; if (switch_core_init(console, err) != SWITCH_STATUS_SUCCESS) { Modified: freeswitch/branches/greenlizard/src/switch_core_session.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_core_session.c (original) +++ freeswitch/branches/greenlizard/src/switch_core_session.c Mon May 14 10:50:37 2007 @@ -45,9 +45,9 @@ #ifdef SWITCH_DEBUG_RWLOCKS -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_perform_locate(char *uuid_str, const char *file, const char *func, int line) +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_perform_locate(const char *uuid_str, const char *file, const char *func, int line) #else -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_locate(char *uuid_str) +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_locate(const char *uuid_str) #endif { switch_core_session_t *session = NULL; @@ -651,13 +651,15 @@ } -SWITCH_DECLARE(void) switch_core_session_destroy(switch_core_session_t **session) +SWITCH_DECLARE(void) switch_core_session_perform_destroy(switch_core_session_t **session, const char *file, const char *func, int line) { switch_memory_pool_t *pool; switch_event_t *event; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Close Channel %s\n", switch_channel_get_name((*session)->channel)); - + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_NOTICE, "Close Channel %s [%s]\n", + switch_channel_get_name((*session)->channel), + switch_channel_state_name(switch_channel_get_state((*session)->channel))); + switch_ivr_deactivate_unicast(*session); switch_scheduler_del_task_group((*session)->uuid_str); @@ -711,7 +713,7 @@ } -SWITCH_DECLARE(void) switch_core_session_thread_launch(switch_core_session_t *session) +SWITCH_DECLARE(switch_status_t) switch_core_session_thread_launch(switch_core_session_t *session) { switch_thread_t *thread; switch_threadattr_t *thd_attr;; @@ -720,10 +722,16 @@ if (!session->thread_running) { switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - if (switch_thread_create(&thread, thd_attr, switch_core_session_thread, session, session->pool) != SWITCH_STATUS_SUCCESS) { - switch_core_session_destroy(&session); + if (switch_thread_create(&thread, thd_attr, switch_core_session_thread, session, session->pool) == SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_SUCCESS; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot create thread!\n"); } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot double-launch thread!\n"); } + + return SWITCH_STATUS_FALSE; } Modified: freeswitch/branches/greenlizard/src/switch_cpp.cpp ============================================================================== --- freeswitch/branches/greenlizard/src/switch_cpp.cpp (original) +++ freeswitch/branches/greenlizard/src/switch_cpp.cpp Mon May 14 10:50:37 2007 @@ -1,6 +1,10 @@ #include <switch.h> #include <switch_cpp.h> +#ifdef _MSC_VER +#pragma warning(disable:4127 4003) +#endif + #define sanity_check(x) do { if (!session) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return x;}} while(0) #define init_vars() do { session = NULL; channel = NULL; uuid = NULL; tts_name = NULL; voice_name = NULL; memset(&args, 0, sizeof(args)); ap = NULL;} while(0) @@ -45,7 +49,7 @@ { switch_status_t status; sanity_check(-1); - switch_channel_pre_answer(channel); + status = switch_channel_pre_answer(channel); return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } @@ -61,10 +65,10 @@ switch_channel_set_variable(channel, var, val); } -void CoreSession::getVariable(char *var, char *val) +char *CoreSession::getVariable(char *var) { - sanity_check(); - switch_channel_get_variable(channel, var); + sanity_check(NULL); + return switch_channel_get_variable(channel, var); } void CoreSession::execute(char *app, char *data) 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 Mon May 14 10:50:37 2007 @@ -615,7 +615,7 @@ switch_call_cause_t cause; }; -static void sch_hangup_callback(switch_scheduler_task_t *task) +SWITCH_STANDARD_SCHED_FUNC(sch_hangup_callback) { struct hangup_helper *helper; switch_core_session_t *session, *other_session; @@ -665,7 +665,7 @@ char *context; }; -static void sch_transfer_callback(switch_scheduler_task_t *task) +SWITCH_STANDARD_SCHED_FUNC(sch_transfer_callback) { struct transfer_helper *helper; switch_core_session_t *session; @@ -732,7 +732,7 @@ switch_media_flag_t flags; }; -static void sch_broadcast_callback(switch_scheduler_task_t *task) +SWITCH_STANDARD_SCHED_FUNC(sch_broadcast_callback) { struct broadcast_helper *helper; assert(task); Modified: freeswitch/branches/greenlizard/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_ivr_play_say.c (original) +++ freeswitch/branches/greenlizard/src/switch_ivr_play_say.c Mon May 14 10:50:37 2007 @@ -917,8 +917,7 @@ //Make sure we made it out alive if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - break; + goto done; } //we only get one digit out of playback, see if thats all we needed and what we got if (max_digits == 1 && status == SWITCH_STATUS_BREAK) { @@ -938,8 +937,7 @@ //Make sure we made it out alive if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - break; + goto done; } } } @@ -957,8 +955,7 @@ //Make sure we made it out alive if (status != SWITCH_STATUS_SUCCESS) { //Bail - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - break; + goto done; } //see if we got enough if (min_digits <= strlen(digit_buffer)) { @@ -977,8 +974,7 @@ //Make sure we made it out alive if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - break; + goto done; } } } @@ -989,6 +985,7 @@ } } + done: //if we got here, we got no digits or lost the channel digit_buffer = "\0"; return SWITCH_STATUS_FALSE; Modified: freeswitch/branches/greenlizard/src/switch_loadable_module.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_loadable_module.c (original) +++ freeswitch/branches/greenlizard/src/switch_loadable_module.c Mon May 14 10:50:37 2007 @@ -1110,7 +1110,7 @@ } -SWITCH_DECLARE(switch_endpoint_interface_t *) switch_loadable_module_get_endpoint_interface(char *name) +SWITCH_DECLARE(switch_endpoint_interface_t *) switch_loadable_module_get_endpoint_interface(const char *name) { switch_endpoint_interface_t *ptr; @@ -1121,7 +1121,7 @@ return ptr; } -SWITCH_DECLARE(switch_codec_interface_t *) switch_loadable_module_get_codec_interface(char *name) +SWITCH_DECLARE(switch_codec_interface_t *) switch_loadable_module_get_codec_interface(const char *name) { char altname[256] = ""; switch_codec_interface_t *codec; @@ -1143,57 +1143,57 @@ return codec; } -SWITCH_DECLARE(switch_dialplan_interface_t *) switch_loadable_module_get_dialplan_interface(char *name) +SWITCH_DECLARE(switch_dialplan_interface_t *) switch_loadable_module_get_dialplan_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.dialplan_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_timer_interface_t *) switch_loadable_module_get_timer_interface(char *name) +SWITCH_DECLARE(switch_timer_interface_t *) switch_loadable_module_get_timer_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.timer_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_application_interface_t *) switch_loadable_module_get_application_interface(char *name) +SWITCH_DECLARE(switch_application_interface_t *) switch_loadable_module_get_application_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.application_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_api_interface_t *) switch_loadable_module_get_api_interface(char *name) +SWITCH_DECLARE(switch_api_interface_t *) switch_loadable_module_get_api_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.api_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_file_interface_t *) switch_loadable_module_get_file_interface(char *name) +SWITCH_DECLARE(switch_file_interface_t *) switch_loadable_module_get_file_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.file_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_speech_interface_t *) switch_loadable_module_get_speech_interface(char *name) +SWITCH_DECLARE(switch_speech_interface_t *) switch_loadable_module_get_speech_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.speech_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_asr_interface_t *) switch_loadable_module_get_asr_interface(char *name) +SWITCH_DECLARE(switch_asr_interface_t *) switch_loadable_module_get_asr_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.asr_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_directory_interface_t *) switch_loadable_module_get_directory_interface(char *name) +SWITCH_DECLARE(switch_directory_interface_t *) switch_loadable_module_get_directory_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.directory_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(char *name) +SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.chat_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_say_interface_t *) switch_loadable_module_get_say_interface(char *name) +SWITCH_DECLARE(switch_say_interface_t *) switch_loadable_module_get_say_interface(const char *name) { return switch_core_hash_find_locked(loadable_modules.say_hash, name, loadable_modules.mutex); } -SWITCH_DECLARE(switch_management_interface_t *) switch_loadable_module_get_management_interface(char *relative_oid) +SWITCH_DECLARE(switch_management_interface_t *) switch_loadable_module_get_management_interface(const char *relative_oid) { return switch_core_hash_find_locked(loadable_modules.management_hash, relative_oid, loadable_modules.mutex); } @@ -1319,7 +1319,7 @@ return i; } -SWITCH_DECLARE(switch_status_t) switch_api_execute(char *cmd, char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) +SWITCH_DECLARE(switch_status_t) switch_api_execute(const char *cmd, const char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) { switch_api_interface_t *api; switch_status_t status; Modified: freeswitch/branches/greenlizard/src/switch_regex.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_regex.c (original) +++ freeswitch/branches/greenlizard/src/switch_regex.c Mon May 14 10:50:37 2007 @@ -32,12 +32,19 @@ #include <switch.h> #include <pcre.h> - SWITCH_DECLARE(switch_regex_t *) switch_regex_compile(const char *pattern, - int options, const char **errorptr, int *erroroffset, const unsigned char *tables) + + +SWITCH_DECLARE(switch_regex_t *) switch_regex_compile(const char *pattern, + int options, const char **errorptr, int *erroroffset, +const unsigned char *tables) { - return pcre_compile(pattern, options, errorptr, erroroffset, tables); - } - SWITCH_DECLARE(int) switch_regex_copy_substring(const char *subject, int *ovector, int stringcount, int stringnumber, char *buffer, int size) + +return pcre_compile(pattern, options, errorptr, erroroffset, tables); + +} + + +SWITCH_DECLARE(int) switch_regex_copy_substring(const char *subject, int *ovector, int stringcount, int stringnumber, char *buffer, int size) { return pcre_copy_substring(subject, ovector, stringcount, stringnumber, buffer, size); } @@ -45,7 +52,10 @@ SWITCH_DECLARE(void) switch_regex_free(void *data) { pcre_free(data); - } SWITCH_DECLARE(int) switch_regex_perform(char *field, char *expression, switch_regex_t **new_re, int *ovector, uint32_t olen) + +} + +SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expression, switch_regex_t **new_re, int *ovector, uint32_t olen) { const char *error = NULL; int erroffset = 0; @@ -87,7 +97,7 @@ } -SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, char *data, char *field_data, +SWITCH_DECLARE(void) switch_perform_substitution(switch_regex_t *re, int match_count, const char *data, const char *field_data, char *substituted, uint32_t len, int *ovector) { char index[10] = ""; @@ -124,7 +134,8 @@ } substituted[y++] = '\0'; } - SWITCH_DECLARE(switch_status_t) switch_regex_match(char *target, char *expression) + +SWITCH_DECLARE(switch_status_t) switch_regex_match(const char *target, const char *expression) { const char *error = NULL; //Used to hold any errors int error_offset = 0; //Holds the offset of an error Modified: freeswitch/branches/greenlizard/src/switch_rtp.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_rtp.c (original) +++ freeswitch/branches/greenlizard/src/switch_rtp.c Mon May 14 10:50:37 2007 @@ -319,7 +319,7 @@ } -SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err) +SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err) { switch_socket_t *new_sock = NULL, *old_sock = NULL; switch_status_t status = SWITCH_STATUS_FALSE; @@ -389,7 +389,7 @@ return status; } -SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, char *host, switch_port_t port, const char **err) +SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err) { *err = "Success"; @@ -545,9 +545,9 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(char *rx_host, +SWITCH_DECLARE(switch_rtp_t *) switch_rtp_new(const char *rx_host, switch_port_t rx_port, - char *tx_host, + const char *tx_host, switch_port_t tx_port, switch_payload_t payload, uint32_t samples_per_interval, Modified: freeswitch/branches/greenlizard/src/switch_scheduler.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_scheduler.c (original) +++ freeswitch/branches/greenlizard/src/switch_scheduler.c Mon May 14 10:50:37 2007 @@ -77,6 +77,11 @@ } else { int64_t now = time(NULL); if (now >= tp->task.runtime && !tp->in_thread) { + int32_t diff = (int32_t)(now - tp->task.runtime); + if (diff > 1) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Task was executed late by %d seconds %u %s (%s)\n", + diff, tp->task.task_id, tp->desc, switch_str_nil(tp->task.group)); + } tp->executed = now; if (switch_test_flag(tp, SSHF_OWN_THREAD)) { switch_thread_t *thread; @@ -144,7 +149,7 @@ SWITCH_DECLARE(uint32_t) switch_scheduler_add_task(time_t task_runtime, switch_scheduler_func_t func, - char *desc, char *group, uint32_t cmd_id, void *cmd_arg, switch_scheduler_flag_t flags) + const char *desc, const char *group, uint32_t cmd_id, void *cmd_arg, switch_scheduler_flag_t flags) { switch_scheduler_task_container_t *container, *tp; switch_event_t *event; @@ -218,7 +223,7 @@ return delcnt; } -SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(char *group) +SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(const char *group) { switch_scheduler_task_container_t *tp; switch_event_t *event; Modified: freeswitch/branches/greenlizard/src/switch_utils.c ============================================================================== --- freeswitch/branches/greenlizard/src/switch_utils.c (original) +++ freeswitch/branches/greenlizard/src/switch_utils.c Mon May 14 10:50:37 2007 @@ -177,7 +177,7 @@ } -SWITCH_DECLARE(switch_time_t) switch_str_time(char *in) +SWITCH_DECLARE(switch_time_t) switch_str_time(const char *in) { switch_time_exp_t tm = { 0 }; int proceed = 0, ovector[30]; @@ -229,7 +229,7 @@ } -SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority) +SWITCH_DECLARE(const char *) switch_priority_name(switch_priority_t priority) { switch (priority) { /*lol */ case SWITCH_PRIORITY_NORMAL: @@ -284,9 +284,10 @@ return '\0'; } -SWITCH_DECLARE(char *) switch_escape_char(switch_memory_pool_t *pool, char *in, char *delim, char esc) +SWITCH_DECLARE(char *) switch_escape_char(switch_memory_pool_t *pool, char *in, const char *delim, char esc) { - char *data, *p, *d; + char *data; + const char *p, *d; int count = 1, i = 0; p = in; Modified: freeswitch/branches/greenlizard/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/branches/greenlizard/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/branches/greenlizard/w32/Library/FreeSwitchCore.vcproj Mon May 14 10:50:37 2007 @@ -340,6 +340,30 @@ > </File> <File + RelativePath="..\..\src\switch_cpp.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> + </File> + <File RelativePath="..\..\src\switch_event.c" > </File> @@ -450,11 +474,11 @@ > </File> <File - RelativePath="..\..\src\include\private\switch_core.h" + RelativePath="..\..\src\include\switch_core.h" > </File> <File - RelativePath="..\..\src\include\switch_core.h" + RelativePath="..\..\src\include\private\switch_core.h" > </File> <File @@ -466,6 +490,10 @@ > </File> <File + RelativePath="..\..\src\include\switch_cpp.h" + > + </File> + <File RelativePath="..\..\src\include\switch_event.h" > </File>

1 0

[commit] r5138 - freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 10 May '07

10 May '07

Author: cparker Date: Thu May 10 17:20:54 2007 New Revision: 5138 Modified: freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: more making it work, and getting some real channel information passed Modified: freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Thu May 10 17:20:54 2007 @@ -48,13 +48,13 @@ static switch_status_t my_on_hangup(switch_core_session_t *session) { switch_xml_t cdr; + switch_channel_t *channel = switch_core_session_get_channel(session); rc_handle *rad_config; int retval = 0; VALUE_PAIR *send = NULL; UINT4 client_port = 0; UINT4 status_type = PW_STATUS_STOP; - char src[] = "8475551212"; char *uuid_str; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Entering my_on_hangup\n"); @@ -75,7 +75,6 @@ } if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { - /*switch_channel_t *channel = switch_core_session_get_channel(session);*/ uuid_str = switch_core_session_get_uuid(session); /* Some hardcoded ( for now ) defaults needed to initialize radius */ @@ -153,12 +152,66 @@ return SWITCH_STATUS_TERM; } - /* Add VSA */ - if (rc_avpair_add(rad_config, &send, PW_FS_SRC, src, -1, PW_FS_PEC) == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Src: %s\n", src); - rc_destroy(rad_config); - return SWITCH_STATUS_TERM; - } + /* Add VSAs */ + + if(channel) { + switch_call_cause_t cause; + switch_caller_profile_t *profile; + + cause = switch_channel_get_cause(channel); + if (rc_avpair_add(rad_config, &send, PW_FS_HANGUPCAUSE, &cause, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Hangupcause: %d\n", cause); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + + profile = switch_channel_get_caller_profile(channel); + + if(profile) { + if(profile->caller_id_number) { + if (rc_avpair_add(rad_config, &send, PW_FS_SRC, profile->caller_id_number, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Src: %s\n", profile->caller_id_number); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->caller_id_name) { + if (rc_avpair_add(rad_config, &send, PW_FS_CLID, profile->caller_id_name, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-CLID: %s\n", profile->caller_id_name); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->destination_number) { + if (rc_avpair_add(rad_config, &send, PW_FS_DST, profile->destination_number, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Dst: %s\n", profile->destination_number); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->dialplan) { + if (rc_avpair_add(rad_config, &send, PW_FS_DIALPLAN, profile->dialplan, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Dialplan: %s\n", profile->dialplan); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->source) { + if (rc_avpair_add(rad_config, &send, PW_FS_LASTAPP, profile->source, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Lastapp: %s\n", profile->source); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "profile == NULL\n"); + } + } if(rc_acct(rad_config, client_port, send) == OK_RC) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RADIUS Accounting OK\n");

1 0

[commit] r5132 - freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 10 May '07

10 May '07

Author: cparker Date: Thu May 10 15:28:39 2007 New Revision: 5132 Modified: freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: make it actually work Modified: freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Thu May 10 15:28:39 2007 @@ -29,22 +29,26 @@ * mod_radius_cdr.c -- RADIUS CDR Module * */ -#include <sys/stat.h> + +#define _BSD_SOURCE 1 + #include <switch.h> +#include <sys/stat.h> #include <freeradius-client.h> #include "mod_radius_cdr.h" static const char modname[] = "mod_radius_cdr"; -static rc_handle *rad_config; static char cf[] = "mod_radius_cdr.conf"; -static char dictionary[PATH_MAX]; -static char * timeout; /* 5 */ -static char * retries; /* 3 */ +static char my_dictionary[PATH_MAX]; +static char * my_timeout; /* 5 */ +static char * my_retries; /* 3 */ +static char my_servers[SERVER_MAX][255]; static switch_status_t my_on_hangup(switch_core_session_t *session) { - switch_xml_t cdr; + switch_xml_t cdr; + rc_handle *rad_config; int retval = 0; VALUE_PAIR *send = NULL; UINT4 client_port = 0; @@ -53,58 +57,70 @@ char src[] = "8475551212"; char *uuid_str; - if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { - /*switch_channel_t *channel = switch_core_session_get_channel(session);*/ - uuid_str = switch_core_session_get_uuid(session); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Entering my_on_hangup\n"); - rad_config = rc_new(); + rad_config = rc_new(); - if (rad_config == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing rc_handle!\n"); - return SWITCH_STATUS_TERM; - switch_xml_free(cdr); - } + if (rad_config == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing rc_handle!\n"); + return SWITCH_STATUS_TERM; + } - rad_config = rc_config_init(rad_config); + rad_config = rc_config_init(rad_config); - if (rad_config == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing radius config!\n"); - rc_destroy(rad_config); - switch_xml_free(cdr); - return SWITCH_STATUS_TERM; - } + if (rad_config == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing radius config!\n"); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } - if (rc_add_config(rad_config, "dictionary", dictionary, cf, 0) != 0) { + if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { + /*switch_channel_t *channel = switch_core_session_get_channel(session);*/ + uuid_str = switch_core_session_get_uuid(session); + + /* Some hardcoded ( for now ) defaults needed to initialize radius */ + if (rc_add_config(rad_config, "auth_order", "radius", "internal radius config", 0) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting dictionary = %s failed\n", dictionary); + "failed setting auth_order = radius failed\n"); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } - if (rc_add_config(rad_config, "radius_timeout", timeout, cf, 0) != 0) { + if (rc_add_config(rad_config, "seqfile", "/var/run/radius.seq", "internal radius config", 0) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting radius_timeout = %s failed\n", timeout); + "failed setting seqfile = /var/run/radius.seq\n"); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } - if (rc_add_config(rad_config, "radius_timeout", timeout, cf, 0) != 0) { + + /* Add the module configs to initialize rad_config */ + + for (int i = 0; i < SERVER_MAX && my_servers[i][0] != '\0'; i++) { + if (rc_add_config(rad_config, "acctserver", my_servers[i], cf, 0) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setting acctserver = %s failed\n", my_servers[i]); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + + if (rc_add_config(rad_config, "dictionary", my_dictionary, cf, 0) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting radius_retries = %s failed\n", retries); + "failed setting dictionary = %s failed\n", my_dictionary); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } - /* Some hardcoded ( for now ) defaults needed to initialize radius */ - if (rc_add_config(rad_config, "auth_order", "radius", "internal radius config", 0) != 0) { + if (rc_add_config(rad_config, "radius_timeout", my_timeout, cf, 0) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting auth_order = radius failed\n"); + "failed setting radius_timeout = %s failed\n", my_timeout); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } - if (rc_add_config(rad_config, "seqfile", "/var/run/radius.seq", "internal radius config", 0) != 0) { + + if (rc_add_config(rad_config, "radius_retries", my_retries, cf, 0) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting seqfile = /var/run/radius.seq\n"); + "failed setting radius_retries = %s failed\n", my_retries); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } @@ -112,7 +128,7 @@ /* Read the dictionary file(s) */ if (rc_read_dictionary(rad_config, rc_conf_str(rad_config, "dictionary")) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed reading dictionary file(s): %s\n", dictionary); + "failed reading dictionary file(s): %s\n", my_dictionary); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } @@ -160,16 +176,14 @@ { switch_xml_t cfg, xml, settings, param; - /* Config Variables and Defaults */ - /*char *cf = "radius_cdr.conf.xml";*/ - /*char dictionary[PATH_MAX] = "/usr/local/freeswitch/conf/radius/dictionary";*/ - /*char *timeout = NULL;*/ - /*char *retries = NULL;*/ - int num_servers = 0; - timeout = "5"; - retries = "3"; + my_timeout = "5"; + my_retries = "3"; + + for( int i = 0; i < SERVER_MAX; i++ ) { + my_servers[i][0] = '\0'; + } if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); @@ -183,12 +197,7 @@ if (!strcmp(var, "acctserver")) { if (num_servers < SERVER_MAX) { - if (rc_add_config(rad_config, var, val, cf, 0) != 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting %s = %s failed\n", var, val); - rc_destroy(rad_config); - return SWITCH_STATUS_TERM; - } + strncpy(my_servers[num_servers],val,255-1); num_servers++; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, @@ -196,13 +205,13 @@ } } else if (!strcmp(var, "dictionary")) { - strncpy(dictionary,val,PATH_MAX-1); + strncpy(my_dictionary,val,PATH_MAX-1); } else if (!strcmp(var, "radius_timeout")) { - timeout = strdup(val); + my_timeout = strdup(val); } else if (!strcmp(var, "radius_retries")) { - retries = strdup(val); + my_retries = strdup(val); } } }

1 0

Jump to page: