sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug in Python module's normalize_stun_config(), and added Makefile for building Python module 

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@944 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Benny Prijono 2007-02-14 01:45:08 +00:00
parent 53932c05aa
commit 40d2cc7aff
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pjsip-apps/src/py_pjsua/Makefile Normal file
View File

@ -0,0 +1,6 @@
all:
python setup.py install
clean:
python setup.py clean
rm -rf ./build

42
pjsip-apps/src/py_pjsua/py_pjsua.c
View File

@ -3130,38 +3130,36 @@ static PyObject *py_pjsua_normalize_stun_config
{
PyObject * tmpObj;
stun_config_Object *obj;
pjsua_stun_config *cfg;
pjsua_stun_config cfg;
if (!PyArg_ParseTuple(pArgs, "O", &tmpObj))
{
return NULL;
}
if (tmpObj != Py_None)
{
obj = (stun_config_Object *) tmpObj;
cfg = (pjsua_stun_config *)malloc(sizeof(pjsua_stun_config));
cfg->stun_port1 = obj->stun_port1;
cfg->stun_port2 = obj->stun_port2;
cfg->stun_srv1.ptr = PyString_AsString(obj->stun_srv1);
cfg->stun_srv1.slen = strlen(PyString_AsString(obj->stun_srv1));
cfg->stun_srv2.ptr = PyString_AsString(obj->stun_srv2);
cfg->stun_srv2.slen = strlen(PyString_AsString(obj->stun_srv2));
} else {
cfg = NULL;
if (tmpObj == Py_None) {
Py_INCREF(Py_None);
return Py_None;
}
pjsua_normalize_stun_config(cfg);
obj->stun_port1 = cfg->stun_port1;
obj->stun_port2 = cfg->stun_port2;
obj = (stun_config_Object *) tmpObj;
cfg.stun_port1 = obj->stun_port1;
cfg.stun_port2 = obj->stun_port2;
cfg.stun_srv1.ptr = PyString_AsString(obj->stun_srv1);
cfg.stun_srv1.slen = strlen(PyString_AsString(obj->stun_srv1));
cfg.stun_srv2.ptr = PyString_AsString(obj->stun_srv2);
cfg.stun_srv2.slen = strlen(PyString_AsString(obj->stun_srv2));
pjsua_normalize_stun_config(&cfg);
obj->stun_port1 = cfg.stun_port1;
obj->stun_port2 = cfg.stun_port2;
Py_XDECREF(obj->stun_srv1);
obj->stun_srv1 =
PyString_FromStringAndSize(cfg->stun_srv1.ptr, cfg->stun_srv1.slen);
PyString_FromStringAndSize(cfg.stun_srv1.ptr, cfg.stun_srv1.slen);
Py_XDECREF(obj->stun_srv2);
obj->stun_srv2 =
PyString_FromStringAndSize(cfg->stun_srv2.ptr, cfg->stun_srv2.slen);
if (cfg != NULL)
{
free(cfg);
}
PyString_FromStringAndSize(cfg.stun_srv2.ptr, cfg.stun_srv2.slen);
Py_INCREF(Py_None);
return Py_None;
}