Changeset 3139 for pjproject/trunk

Timestamp:

Apr 14, 2010 8:12:08 AM (15 years ago)

Author:

nanang

Message:

Minor fix #1044:

• Moved the code of disconnecting calls (after first re-reg attempt failure) to schedule_reregistration(), so it will be executed earlier (right after the failure of re-reg attempt).

File:

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

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

@@ -1986 +1986 @@
         schedule_reregistration(acc);
 
+on_return:
+    PJSUA_UNLOCK();
+}
+
+
+/* Schedule reregistration for specified account. Note that the first 
+ * re-registration after a registration failure will be done immediately.
+ * Also note that this function should be called within PJSUA mutex.
+ */
+static void schedule_reregistration(pjsua_acc *acc)
+{
+    pj_time_val delay;
+
+    pj_assert(acc && acc->valid && acc->cfg.reg_retry_interval);
+
     /* If configured, disconnect calls of this account after the first
      * reregistration attempt failed.
      */
-    if (acc->cfg.drop_calls_on_reg_fail && acc->auto_rereg.attempt_cnt > 1)
+    if (acc->cfg.drop_calls_on_reg_fail && acc->auto_rereg.attempt_cnt >= 1)
     {
         unsigned i, cnt;
@@ -2006 +2021 @@
         }
     }
-
-on_return:
-
-    PJSUA_UNLOCK();
-}
-
-
-/* Schedule reregistration for specified account. Note that the first 
- * re-registration after a registration failure will be done immediately.
- * Also note that this function should be called within PJSUA mutex.
- */
-static void schedule_reregistration(pjsua_acc *acc)
-{
-    pj_time_val delay;
-
-    pj_assert(acc && acc->valid && acc->cfg.reg_retry_interval);
 
     /* Cancel any re-registration timer */