- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3369 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: anthm Date: Tue Nov 14 12:41:35 2006 New Revision: 3369 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Nov 14 12:41:35 2006 @@ -1486,21 +1486,28 @@ *dnis++ = '\0'; } - if ((p = strchr(profile_name, '@'))) { - *p++ = '\0'; - u = profile_name; - profile_name = p; - snprintf(ubuf, sizeof(ubuf), "%s@%s/talk", u, profile_name); - user = ubuf; - } else { - user = (char *) modname; - } + if ((mdl_profile->user_flags & LDL_FLAG_COMPONENT)) { + if ((p = strchr(profile_name, '@'))) { + *p++ = '\0'; + u = profile_name; + profile_name = p; + snprintf(ubuf, sizeof(ubuf), "%s@%s/talk", u, profile_name); + user = ubuf; + } else { + terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return SWITCH_STATUS_GENERR; + } + } if ((mdl_profile = switch_core_hash_find(globals.profile_hash, profile_name))) { - + if ((mdl_profile->user_flags & LDL_FLAG_COMPONENT) && strchr(outbound_profile->caller_id_number, '@')) { snprintf(ubuf, sizeof(ubuf), "%s/talk", outbound_profile->caller_id_number); user = ubuf; + } + + if (!user) { + user = mdl_profile->login; } if (!ldl_handle_ready(mdl_profile->handle)) {

1 0

[commit] r3368 - freeswitch/branches/kvk
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: sphere Date: Tue Nov 14 09:21:18 2006 New Revision: 3368 Added: freeswitch/branches/kvk/ Log: Creating empty folder for kvk

1 0

[commit] r3367 - freeswitch/branches/venrag78
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: sphere Date: Tue Nov 14 05:30:19 2006 New Revision: 3367 Added: freeswitch/branches/venrag78/ Log: Creating empty folder for venrag78

1 0

[commit] r3366 - in freeswitch/trunk: . scripts src/mod/languages/mod_python
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: mikej Date: Tue Nov 14 01:13:04 2006 New Revision: 3366 Added: freeswitch/trunk/scripts/mytest.py - copied unchanged from r3365, /freeswitch/branches/jkr888/trunk/scripts/mytest.py Modified: freeswitch/trunk/AUTHORS freeswitch/trunk/src/mod/languages/mod_python/Makefile freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Log: merge mod_python fixes from Johny Kadarisman <jkr888 at gmail.com>. mod_python actually works now, please report problems. Modified: freeswitch/trunk/AUTHORS ============================================================================== --- freeswitch/trunk/AUTHORS (original) +++ freeswitch/trunk/AUTHORS Tue Nov 14 01:13:04 2006 @@ -29,6 +29,7 @@ Paul D. Tinsley - Various patches and support. <pdt at jackhammer.org> Ken Rice of Asteria Solutions Group, INC <ken AT asteriasgi.com> - xmlcdr, sofia improvements, load testing. Neal Horman <neal at wanlink dot com> - conference improvements, switch_ivr menu additions and other tweaks. + Johny Kadarisman <jkr888 at gmail.com> - mod_python fixups. A big THANK YOU goes to: Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_python/Makefile Tue Nov 14 01:13:04 2006 @@ -1,7 +1,7 @@ LCFLAGS=-fPIC CFLAGS += -fPIC -I$(PREFIX)/include/python2.4/ PYMOD=freeswitch -LDFLAGS=-lpython2.4 -Xlinker -L$(PREFIX)/lib/python2.4/config/ +LDFLAGS=-lpython2.4 -Xlinker -export-dynamic -L$(PREFIX)/lib/python2.4/config/ -lutil SWIGCFILE=../../../switch_swig.c SWIGIFILE=../../../switch_swig.i @@ -32,13 +32,13 @@ $(CC) $(SOLINK) -o py_$(PYMOD).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o $(LDFLAGS) -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS) Makefile - $(CC) $(LCFLAGS) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS) switch_swig_wrap.o switch_swig.o Makefile + $(CC) $(LCFLAGS) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o switch_swig_wrap.o switch_swig.o $(OBJS) $(LDFLAGS) clean: rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ install: - #cp -f py_$(PYMOD).$(DYNAMIC_LIB_EXTEN) $(MDIR) + # cp -f py_$(PYMOD).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Tue Nov 14 01:13:04 2006 @@ -24,6 +24,7 @@ * Contributor(s): * * Brian Fertig <brian.fertig(a)convergencetek.com> + * Johny Kadarisman <jkr888 at gmail.com> * * mod_python.c -- Python Module * @@ -41,104 +42,24 @@ #include <switch.h> +void init_freeswitch(void); + const char modname[] = "mod_python"; -static int numargs=0; -static PyObject* emb_numargs(PyObject *self, PyObject *args) -{ - if(!PyArg_ParseTuple(args, ":numargs")) - return NULL; - return Py_BuildValue("i", numargs); -} - -static PyMethodDef EmbMethods[] = { - {"numargs", emb_numargs, METH_VARARGS, - "Return the number of arguments received by the process."}, - {NULL, NULL, 0, NULL} -}; - static void python_function(switch_core_session_t *session, char *data) { char *uuid = switch_core_session_get_uuid(session); - uint32_t ulen = strlen(uuid); - uint32_t len = strlen((char *) data) + ulen + 2; - char *mydata = switch_core_session_alloc(session, len); - int argc, i; - char *argv[5]; - char python_code[1024]; -// void*** tsrm_ls = NULL; + char *argv[1]; + FILE* pythonfile; - PyObject *pName, *pModule, *pFunc; - PyObject *pArgs, *pValue; + argv[0] = uuid; + pythonfile = fopen(data, "r"); - - snprintf(mydata, len, "%s %s", uuid, data); - - argc = switch_separate_string(mydata, ' ',argv,(sizeof(argv) / sizeof(argv[0]))); - - sprintf(python_code, "$uuid=\"%s\"; include(\"%s\");\n", argv[0], argv[1]); - //python_embed_init(argc, argv, &tsrm_ls); - //python_EMBED_START_BLOCK(argc, argv); - //zend_eval_string(python_code, NULL, "Embedded code" TSRMLS_CC); - //python_EMBED_END_BLOCK(); - //python_embed_shutdown(tsrm_ls); - - Py_Initialize(); - numargs = argc; - Py_InitModule("emb", EmbMethods); - pName = PyString_FromString(data); - /* Error checking of pName left out */ - - pModule = PyImport_Import(pName); - Py_DECREF(pName); - - if (pModule != NULL) { - pFunc = PyObject_GetAttrString(pModule, "main"); - /* pFunc is a new reference */ - - if (pFunc && PyCallable_Check(pFunc)) { - pArgs = PyTuple_New(argc - 3); - for (i = 0; i < argc - 3; ++i) { - pValue = PyInt_FromLong(atoi(argv[i + 3])); - if (!pValue) { - Py_DECREF(pArgs); - Py_DECREF(pModule); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot convert argument\n"); - - } - /* pValue reference stolen here: */ - PyTuple_SetItem(pArgs, i, pValue); - } - pValue = PyObject_CallObject(pFunc, pArgs); - Py_DECREF(pArgs); - if (pValue != NULL) { - printf("Result of call: %ld\n", PyInt_AsLong(pValue)); - Py_DECREF(pValue); - } - else { - Py_DECREF(pFunc); - Py_DECREF(pModule); - PyErr_Print(); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Call failed\n"); - - } - } - else { - if (PyErr_Occurred()) - PyErr_Print(); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find function \"%s\"\n", argv[2]); - } - Py_XDECREF(pFunc); - Py_DECREF(pModule); - } - else { - PyErr_Print(); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to load \"%s\"\n", argv[1]); - - } + PySys_SetArgv(1, argv); + init_freeswitch(); + PyRun_SimpleFile(pythonfile, ""); Py_Finalize(); - }

1 0

[commit] r3365 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: mikej Date: Tue Nov 14 01:08:49 2006 New Revision: 3365 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: remove debugging message. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Nov 14 01:08:49 2006 @@ -2078,7 +2078,6 @@ snprintf(tech_pvt->dest, strlen(dest) + 5, "sip:%s", dest); } - printf("WTF [%s]\n", dest); attach_private(nsession, profile, tech_pvt, dest); nchannel = switch_core_session_get_channel(nsession);

1 0

[commit] r3364 - freeswitch/branches/jkr888/trunk/scripts
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: jkr888 Date: Mon Nov 13 23:21:30 2006 New Revision: 3364 Added: freeswitch/branches/jkr888/trunk/scripts/mytest.py Log: python test scripts Added: freeswitch/branches/jkr888/trunk/scripts/mytest.py ============================================================================== --- (empty file) +++ freeswitch/branches/jkr888/trunk/scripts/mytest.py Mon Nov 13 23:21:30 2006 @@ -0,0 +1,18 @@ +import sys +from _freeswitch import * + +print "Hello World" +print sys.path +print dir() +print sys.argv + +uuid = sys.argv[0] +fs_consol_log("1","test from my python program\n") +fs_consol_clean("This is fs_consol_clean\n") +fs_consol_clean("My uuid is " + uuid + "\n") + +session = fs_core_session_locate(uuid) + +fs_channel_answer(session) + +fs_switch_ivr_session_transfer(session, "1234", "XML", "default")

1 0

[commit] r3363 - freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: jkr888 Date: Mon Nov 13 22:52:36 2006 New Revision: 3363 Modified: freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python/Makefile freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python/mod_python.c Log: fixes by jkr888(a)gmail.com Modified: freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python/Makefile ============================================================================== --- freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python/Makefile (original) +++ freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python/Makefile Mon Nov 13 22:52:36 2006 @@ -1,7 +1,7 @@ LCFLAGS=-fPIC CFLAGS += -fPIC -I$(PREFIX)/include/python2.4/ PYMOD=freeswitch -LDFLAGS=-lpython2.4 -Xlinker -L$(PREFIX)/lib/python2.4/config/ +LDFLAGS=-lpython2.4 -Xlinker -export-dynamic -L$(PREFIX)/lib/python2.4/config/ -lutil SWIGCFILE=../../../switch_swig.c SWIGIFILE=../../../switch_swig.i @@ -32,13 +32,13 @@ $(CC) $(SOLINK) -o py_$(PYMOD).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o $(LDFLAGS) -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS) Makefile - $(CC) $(LCFLAGS) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS) switch_swig_wrap.o switch_swig.o Makefile + $(CC) $(LCFLAGS) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o switch_swig_wrap.o switch_swig.o $(OBJS) $(LDFLAGS) clean: rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ install: - #cp -f py_$(PYMOD).$(DYNAMIC_LIB_EXTEN) $(MDIR) + # cp -f py_$(PYMOD).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod Modified: freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python/mod_python.c Mon Nov 13 22:52:36 2006 @@ -41,104 +41,24 @@ #include <switch.h> +void init_freeswitch(void); + const char modname[] = "mod_python"; -static int numargs=0; -static PyObject* emb_numargs(PyObject *self, PyObject *args) -{ - if(!PyArg_ParseTuple(args, ":numargs")) - return NULL; - return Py_BuildValue("i", numargs); -} - -static PyMethodDef EmbMethods[] = { - {"numargs", emb_numargs, METH_VARARGS, - "Return the number of arguments received by the process."}, - {NULL, NULL, 0, NULL} -}; - static void python_function(switch_core_session_t *session, char *data) { char *uuid = switch_core_session_get_uuid(session); - uint32_t ulen = strlen(uuid); - uint32_t len = strlen((char *) data) + ulen + 2; - char *mydata = switch_core_session_alloc(session, len); - int argc, i; - char *argv[5]; - char python_code[1024]; -// void*** tsrm_ls = NULL; + char *argv[1]; + FILE* pythonfile; - PyObject *pName, *pModule, *pFunc; - PyObject *pArgs, *pValue; + argv[0] = uuid; + pythonfile = fopen(data, "r"); - - snprintf(mydata, len, "%s %s", uuid, data); - - argc = switch_separate_string(mydata, ' ',argv,(sizeof(argv) / sizeof(argv[0]))); - - sprintf(python_code, "$uuid=\"%s\"; include(\"%s\");\n", argv[0], argv[1]); - //python_embed_init(argc, argv, &tsrm_ls); - //python_EMBED_START_BLOCK(argc, argv); - //zend_eval_string(python_code, NULL, "Embedded code" TSRMLS_CC); - //python_EMBED_END_BLOCK(); - //python_embed_shutdown(tsrm_ls); - - Py_Initialize(); - numargs = argc; - Py_InitModule("emb", EmbMethods); - pName = PyString_FromString(data); - /* Error checking of pName left out */ - - pModule = PyImport_Import(pName); - Py_DECREF(pName); - - if (pModule != NULL) { - pFunc = PyObject_GetAttrString(pModule, "main"); - /* pFunc is a new reference */ - - if (pFunc && PyCallable_Check(pFunc)) { - pArgs = PyTuple_New(argc - 3); - for (i = 0; i < argc - 3; ++i) { - pValue = PyInt_FromLong(atoi(argv[i + 3])); - if (!pValue) { - Py_DECREF(pArgs); - Py_DECREF(pModule); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot convert argument\n"); - - } - /* pValue reference stolen here: */ - PyTuple_SetItem(pArgs, i, pValue); - } - pValue = PyObject_CallObject(pFunc, pArgs); - Py_DECREF(pArgs); - if (pValue != NULL) { - printf("Result of call: %ld\n", PyInt_AsLong(pValue)); - Py_DECREF(pValue); - } - else { - Py_DECREF(pFunc); - Py_DECREF(pModule); - PyErr_Print(); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Call failed\n"); - - } - } - else { - if (PyErr_Occurred()) - PyErr_Print(); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find function \"%s\"\n", argv[2]); - } - Py_XDECREF(pFunc); - Py_DECREF(pModule); - } - else { - PyErr_Print(); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to load \"%s\"\n", argv[1]); - - } + PySys_SetArgv(1, argv); + init_freeswitch(); + PyRun_SimpleFile(pythonfile, ""); Py_Finalize(); - }

1 0

[commit] r3362 - freeswitch/branches/tholo/trunk
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: tholo Date: Mon Nov 13 22:49:20 2006 New Revision: 3362 Modified: freeswitch/branches/tholo/trunk/ (props changed) Log: Initialized merge tracking via "svnmerge" with revisions "1-3360" from http://svn.freeswitch.org/svn/freeswitch/trunk

1 0

[commit] r3361 - freeswitch/branches/tholo/trunk
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: tholo Date: Mon Nov 13 22:46:06 2006 New Revision: 3361 Added: freeswitch/branches/tholo/trunk/ - copied from r3360, /freeswitch/trunk/ Log: Set up fresh copy of trunk

1 0

[commit] r3360 - in freeswitch/branches/tholo: . build conf docs libs mac patches scripts src support w32
by Freeswitch SVN 14 Nov '06

14 Nov '06

Author: tholo Date: Mon Nov 13 22:42:22 2006 New Revision: 3360 Removed: freeswitch/branches/tholo/.indent.pro freeswitch/branches/tholo/AUTHORS freeswitch/branches/tholo/COPYING freeswitch/branches/tholo/ChangeLog freeswitch/branches/tholo/Freeswitch.sln freeswitch/branches/tholo/INSTALL freeswitch/branches/tholo/Makefile.am freeswitch/branches/tholo/Makefile.in freeswitch/branches/tholo/NEWS freeswitch/branches/tholo/README freeswitch/branches/tholo/aclocal.m4 freeswitch/branches/tholo/build/ freeswitch/branches/tholo/build.sh freeswitch/branches/tholo/conf/ freeswitch/branches/tholo/configure freeswitch/branches/tholo/configure.in freeswitch/branches/tholo/docs/ freeswitch/branches/tholo/generic_mod.mk freeswitch/branches/tholo/indent_options.sh freeswitch/branches/tholo/libs/ freeswitch/branches/tholo/mac/ freeswitch/branches/tholo/mkinstalldirs freeswitch/branches/tholo/modules.conf.in freeswitch/branches/tholo/patches/ freeswitch/branches/tholo/scripts/ freeswitch/branches/tholo/src/ freeswitch/branches/tholo/support/ freeswitch/branches/tholo/w32/ Modified: freeswitch/branches/tholo/ (props changed) Log: Remove outdated trunk copy

1 0