Changeset 3352 for pjproject/trunk

Timestamp:

Oct 21, 2010 2:22:41 AM (14 years ago)

Author:

bennylp

Message:

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!

Location:

pjproject/trunk/pjsip-apps/src/python

Files:

• _pjsua.c (modified) (2 diffs)
• _pjsua.h (modified) (4 diffs)

pjproject/trunk/pjsip-apps/src/python/_pjsua.c

@@ -2184 +2184 @@
 
     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);
@@ -3711 +3711 @@
     
     status = pjsua_call_send_im(call_id, mime_type, &content, 
-                                &msg_data, (void *)user_data);
+                                &msg_data, (void*)(long)user_data);
 
     if (pool)

pjproject/trunk/pjsip-apps/src/python/_pjsua.h

@@ -1667 +1667 @@
     PyObject        *contact_uri_params;
     int              require_100rel;
-    int              require_timer;
+    int              use_timer;
     unsigned         timer_se;
     unsigned         timer_min_se;
@@ -1745 +1745 @@
     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;
@@ -1795 +1795 @@
     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;
@@ -1948 +1948 @@
     },
     {
-        "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"
     },
     {