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

Timestamp:

Oct 8, 2015 8:55:52 AM (9 years ago)

Author:

ming

Message:

Fixed #1873: iOS application getting killed after pjsua fail to release a disconnected transport

File:

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

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

@@ -2200 +2200 @@
 
             /* Reset pointer to registration transport */
-            acc->auto_rereg.reg_tp = NULL;
+            //acc->auto_rereg.reg_tp = NULL;
 
             /* Stop keep-alive timer if any. */
@@ -2592 +2592 @@
     /* Update pointer to registration transport */
     if (status == PJ_SUCCESS) {
-        pjsip_regc_info reg_info;
-
-        pjsip_regc_get_info(pjsua_var.acc[acc_id].regc, &reg_info);
-        pjsua_var.acc[acc_id].auto_rereg.reg_tp = reg_info.transport;
+        /* Variable auto_rereg.reg_tp is currently unused since it may differ
+         * with the transport used by regc (for example, when a resolver is
+         * employed). A more reliable way is to query the regc directly
+         * when needed.
+         */
+        //pjsip_regc_info reg_info;
+
+        //pjsip_regc_get_info(pjsua_var.acc[acc_id].regc, &reg_info);
+        //pjsua_var.acc[acc_id].auto_rereg.reg_tp = reg_info.transport;
         
         if (pjsua_var.ua_cfg.cb.on_reg_started) {
@@ -3631 +3636 @@
         pjsua_acc *acc = &pjsua_var.acc[i];
 
-        /* Skip if this account is not valid OR auto re-registration
-         * feature is disabled OR this transport is not used by this account.
-         */
-        if (!acc->valid || !acc->cfg.reg_retry_interval || 
-            tp != acc->auto_rereg.reg_tp)
-        {
+        /* Skip if this account is not valid. */
+        if (!acc->valid)
             continue;
-        }
-
-        /* Release regc transport immediately
+
+        /* Release transport immediately if regc is using it
          * See https://trac.pjsip.org/repos/ticket/1481
          */
-        if (pjsua_var.acc[i].regc) {
+        if (acc->regc) {
+            pjsip_regc_info reg_info;
+
+            pjsip_regc_get_info(acc->regc, &reg_info);
+            if (reg_info.transport != tp)
+                continue;
+
             pjsip_regc_release_transport(pjsua_var.acc[i].regc);
-        }
-
-        /* Schedule reregistration for this account */
-        schedule_reregistration(acc);
+
+            /* Schedule reregistration for this account */
+            if (acc->cfg.reg_retry_interval) {
+                schedule_reregistration(acc);
+            }
+        }
     }