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: https://svn.pjsip.org/repos/pjproject/trunk@3352 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjsip-apps/src/python/_pjsua.c b/pjsip-apps/src/python/_pjsua.c
index 6d28d17..d25be6c 100644
--- a/pjsip-apps/src/python/_pjsua.c
+++ b/pjsip-apps/src/python/_pjsua.c
@@ -2183,7 +2183,7 @@
}
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 @@
}
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 3b99c0d..754066a 100644
--- a/pjsip-apps/src/python/_pjsua.h
+++ b/pjsip-apps/src/python/_pjsua.h
@@ -1666,7 +1666,7 @@
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 @@
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 @@
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 @@
"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,