Changeset 6072 for pjproject

Timestamp:

Sep 23, 2019 7:27:53 AM (5 years ago)

Author:

ming

Message:

Re #2218: ICE initialization issue if an error happens during allocating state

File:

• pjproject/trunk/pjnath/src/pjnath/ice_strans.c (modified) (4 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -1074 +1074 @@
 {
     unsigned i;
+    pj_status_t status = PJ_EUNKNOWN;
 
     /* Ignore if ICE is destroying or init callback has been called */
@@ -1093 +1094 @@
         }
 
+        status = PJ_EUNKNOWN;
         for (j=0; j<comp->cand_cnt; ++j) {
             pj_ice_sess_cand *cand = &comp->cand_list[j];
@@ -1103 +1105 @@
                 return;
             }
-        }
-    }
-
-    /* All candidates have been gathered */
+            
+            if (status == PJ_EUNKNOWN) {
+                status = cand->status;
+            } else {
+                /* We only need one successful candidate. */
+                if (cand->status == PJ_SUCCESS)
+                    status = PJ_SUCCESS;
+            }
+        }
+        
+        if (status != PJ_SUCCESS)
+            break;
+    }
+
+    /* All candidates have been gathered or there's no successful
+     * candidate for a component.
+     */
     ice_st->cb_called = PJ_TRUE;
     ice_st->state = PJ_ICE_STRANS_STATE_READY;
     if (ice_st->cb.on_ice_complete)
         (*ice_st->cb.on_ice_complete)(ice_st, PJ_ICE_STRANS_OP_INIT,
-                                      PJ_SUCCESS);
+                                      status);
 }
 
@@ -2504 +2519 @@
          */
         if (cand) {
+            pj_turn_session_info info;
+
+            pj_turn_sock_get_info(turn_sock, &info);
             cand->status = (old_state == PJ_TURN_STATE_RESOLVING)?
-                           PJ_ERESOLVE : PJ_EINVALIDOP;
+                           PJ_ERESOLVE : info.last_status;
             PJ_LOG(4,(comp->ice_st->obj_name,
                       "Comp %d/%d: TURN error (tpid=%d) during state %s",