Changeset 5143 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

Timestamp:

Jul 31, 2015 11:35:20 AM (9 years ago)

Author:

nanang

Message:

Fixed #1873: Only reset account transport pointer after a successful unregistration.

File:

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

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

@@ -2199 +2199 @@
             acc->rfc5626_status = OUTBOUND_UNKNOWN;
 
+            /* Reset pointer to registration transport */
+            acc->auto_rereg.reg_tp = NULL;
+
             /* Stop keep-alive timer if any. */
             update_keep_alive(acc, PJ_FALSE, NULL);
@@ -2510 +2513 @@
 
     /* Reset pointer to registration transport */
-    pjsua_var.acc[acc_id].auto_rereg.reg_tp = NULL;
+    // Do not reset this here, as if currently there is another registration
+    // on progress, this registration will fail but transport pointer will
+    // become NULL which will prevent transport to be destroyed immediately
+    // after disconnected (which may cause iOS app getting killed (see #1482).
+    //pjsua_var.acc[acc_id].auto_rereg.reg_tp = NULL;
 
     if (renew) {