diff options
| author | Benny Prijono <bennylp@teluu.com> | 2010-10-21 02:22:41 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2010-10-21 02:22:41 +0000 |
| commit | 98c8866ae62162694b7da51128d310ec27fabd0a (patch) | |
| tree | 7cd934446c47dfcb9a9f11341264b8817d2c8d64 | |
| parent | 3fde079dd8b4ab7b422a441973faca783051b564 (diff) | |
Misc (re #1134): fixed compilation error in python module due to last change in session timer field from require_timer to use_timer. Thanks Beau Gunderson for the patch!
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3352 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjsip-apps/src/python/_pjsua.c | 4 | ||||
| -rw-r--r-- | pjsip-apps/src/python/_pjsua.h | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pjsip-apps/src/python/_pjsua.c b/pjsip-apps/src/python/_pjsua.c index 6d28d170..d25be6c8 100644 --- a/pjsip-apps/src/python/_pjsua.c +++ b/pjsip-apps/src/python/_pjsua.c @@ -2183,7 +2183,7 @@ static PyObject *py_pjsua_im_send(PyObject *pSelf, PyObject *pArgs) } status = pjsua_im_send(acc_id, &to, mime_type, &content, - &msg_data, (void *)user_data); + &msg_data, (void*)(long)user_data); if (pool) pj_pool_release(pool); @@ -3710,7 +3710,7 @@ static PyObject *py_pjsua_call_send_im(PyObject *pSelf, PyObject *pArgs) } status = pjsua_call_send_im(call_id, mime_type, &content, - &msg_data, (void *)user_data); + &msg_data, (void*)(long)user_data); if (pool) pj_pool_release(pool); diff --git a/pjsip-apps/src/python/_pjsua.h b/pjsip-apps/src/python/_pjsua.h index 3b99c0d6..754066a4 100644 --- a/pjsip-apps/src/python/_pjsua.h +++ b/pjsip-apps/src/python/_pjsua.h @@ -1666,7 +1666,7 @@ typedef struct PyObject *contact_params; PyObject *contact_uri_params; int require_100rel; - int require_timer; + int use_timer; unsigned timer_se; unsigned timer_min_se; int allow_contact_rewrite; @@ -1744,7 +1744,7 @@ static void PyObj_pjsua_acc_config_import(PyObj_pjsua_acc_config *obj, Py_XDECREF(obj->contact_uri_params); obj->contact_uri_params = PyString_FromPJ(&cfg->contact_uri_params); obj->require_100rel = cfg->require_100rel; - obj->require_timer = cfg->require_timer; + obj->use_timer = cfg->use_timer; obj->timer_se = cfg->timer_setting.sess_expires; obj->timer_min_se = cfg->timer_setting.min_se; obj->allow_contact_rewrite = cfg->allow_contact_rewrite; @@ -1794,7 +1794,7 @@ static void PyObj_pjsua_acc_config_export(pjsua_acc_config *cfg, cfg->contact_params = PyString_ToPJ(obj->contact_params); cfg->contact_uri_params = PyString_ToPJ(obj->contact_uri_params); cfg->require_100rel = obj->require_100rel; - cfg->require_timer = obj->require_timer; + cfg->use_timer = obj->use_timer; cfg->timer_setting.sess_expires = obj->timer_se; cfg->timer_setting.min_se = obj->timer_min_se; cfg->allow_contact_rewrite = obj->allow_contact_rewrite; @@ -1947,9 +1947,10 @@ static PyMemberDef PyObj_pjsua_acc_config_members[] = "Require reliable provisional response." }, { - "require_timer", T_INT, - offsetof(PyObj_pjsua_acc_config, require_timer), 0, - "Require session timer." + "use_timer", T_INT, + offsetof(PyObj_pjsua_acc_config, use_timer), 0, + "Use SIP session timers? (default=1)" + "0:inactive, 1:optional, 2:mandatory, 3:always" }, { "timer_se", T_INT, |