Changeset 4155

Timestamp:

Jun 5, 2012 11:49:43 AM (12 years ago)

Author:

bennylp

Message:

Re #1527: fixed bug in pjsua-lib, where registration operation may cause wrong timer entry (with _timer_id=0) to be cancelled accidentally. This could happen when turning registration ON after it was off. Thanks Itay Bianco for the report

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -599 +599 @@
 
     /* Cancel any re-registration timer */
-    pjsua_cancel_timer(&acc->auto_rereg.timer);
+    if (acc->auto_rereg.timer.id) {
+        acc->auto_rereg.timer.id = PJ_FALSE;
+        pjsua_cancel_timer(&acc->auto_rereg.timer);
+    }
 
     /* Delete registration */
@@ -2107 +2110 @@
 
     /* Cancel any re-registration timer */
-    pjsua_cancel_timer(&pjsua_var.acc[acc_id].auto_rereg.timer);
+    if (pjsua_var.acc[acc_id].auto_rereg.timer.id) {
+        pjsua_var.acc[acc_id].auto_rereg.timer.id = PJ_FALSE;
+        pjsua_cancel_timer(&pjsua_var.acc[acc_id].auto_rereg.timer);
+    }
 
     /* Reset pointer to registration transport */
@@ -2906 +2912 @@
 
     /* Cancel any re-registration timer */
-    pjsua_cancel_timer(&acc->auto_rereg.timer);
+    if (acc->auto_rereg.timer.id) {
+        acc->auto_rereg.timer.id = PJ_FALSE;
+        pjsua_cancel_timer(&acc->auto_rereg.timer);
+    }
 
     /* Update re-registration flag */
@@ -2933 +2942 @@
               acc->index, delay.sec));
 
-    pjsua_schedule_timer(&acc->auto_rereg.timer, &delay);
+    acc->auto_rereg.timer.id = PJ_TRUE;
+    if (pjsua_schedule_timer(&acc->auto_rereg.timer, &delay) != PJ_SUCCESS)
+        acc->auto_rereg.timer.id = PJ_FALSE;
 }