Changeset 3185 for pjproject/trunk

Timestamp:

May 26, 2010 3:04:43 PM (15 years ago)

Author:

nanang

Message:

Fix #1087:

• Moved auto reregistration scheduling to be before the registration callback.
• Updated validations in auto_rereg_timer_cb() & schedule_reregistration().

File:

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

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

@@ -1481 +1481 @@
     acc->reg_last_code = param->code;
 
-    if (pjsua_var.ua_cfg.cb.on_reg_state)
-        (*pjsua_var.ua_cfg.cb.on_reg_state)(acc->index);
-
     /* Check if we need to auto retry registration. Basically, registration
      * failure codes triggering auto-retry are those of temporal failures
@@ -1498 +1495 @@
         schedule_reregistration(acc);
     }
+
+    if (pjsua_var.ua_cfg.cb.on_reg_state)
+        (*pjsua_var.ua_cfg.cb.on_reg_state)(acc->index);
 
     PJSUA_UNLOCK();
@@ -2369 +2369 @@
     PJSUA_LOCK();
 
-    if (!acc->valid || !acc->auto_rereg.active)
+    /* Check if the reregistration timer is still valid, e.g: while waiting
+     * timeout timer application might have deleted the account or disabled
+     * the auto-reregistration.
+     */
+    if (!acc->valid || !acc->auto_rereg.active || 
+        acc->cfg.reg_retry_interval == 0)
+    {
         goto on_return;
+    }
 
     /* Start re-registration */
@@ -2391 +2398 @@
     pj_time_val delay;
 
-    pj_assert(acc && acc->valid && acc->cfg.reg_retry_interval);
+    pj_assert(acc);
+
+    /* Validate the account and re-registration feature status */
+    if (!acc->valid || acc->cfg.reg_retry_interval == 0) {
+        return;
+    }
 
     /* If configured, disconnect calls of this account after the first