Changeset 5474

Timestamp:

Oct 28, 2016 3:57:55 AM (8 years ago)

Author:

ming

Message:

Re #1972: ICE initialization issues when creating a component/candidate fails.

Fixed ICE stuck if TURN creation fails in resolved state, assertions when trying to access other components/candidates, and crash when trying to access destroyed TURN socket.

Location:

pjproject/trunk/pjnath/src/pjnath

Files:

• ice_strans.c (modified) (8 diffs)
• turn_sock.c (modified) (1 diff)

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

@@ -165 +165 @@
     } turn[PJ_ICE_MAX_TURN];
 
+    pj_bool_t            creating;      /**< Is creating the candidates?*/
     unsigned             cand_cnt;      /**< # of candidates/aliaes.    */
     pj_ice_sess_cand     cand_list[PJ_ICE_ST_MAX_CAND]; /**< Cand array */
@@ -666 +667 @@
     comp->ice_st = ice_st;
     comp->comp_id = comp_id;
+    comp->creating = PJ_TRUE;
 
     ice_st->comp[comp_id-1] = comp;
@@ -693 +695 @@
         }
     }
+
+    /* Done creating all the candidates */
+    comp->creating = PJ_FALSE;
 
     /* It's possible that we end up without any candidates */
@@ -933 +938 @@
         pj_ice_strans_comp *comp = ice_st->comp[i];
 
+        /* This function can be called when all components or candidates
+         * have not been created.
+         */
+        if (!comp || comp->creating) return;
+
         for (j=0; j<comp->cand_cnt; ++j) {
             pj_ice_sess_cand *cand = &comp->cand_list[j];
@@ -1308 +1318 @@
             }
 
-            if (count) {
+            if (count && !comp->turn[n].err_cnt && comp->turn[n].sock) {
                 status = pj_turn_sock_set_perm(comp->turn[n].sock, count,
                                                addrs, 0);
@@ -1990 +2000 @@
         sess_init_update(comp->ice_st);
 
-    } else if (old_state == PJ_TURN_STATE_RESOLVING &&
+    } else if ((old_state == PJ_TURN_STATE_RESOLVING ||
+                old_state == PJ_TURN_STATE_RESOLVED) &&
                new_state == PJ_TURN_STATE_DESTROYING)
     {
@@ -1996 +2007 @@
         unsigned i;
 
-        /* DNS resolution has failed! */
+        /* DNS resolution or TURN transport creation/allocation
+         * has failed.
+         */
         ++comp->turn[tp_idx].err_cnt;
 
@@ -2015 +2028 @@
             }
         }
-        pj_assert(cand != NULL);
 
         pj_grp_lock_release(comp->ice_st->grp_lock);
 
-        cand->status = PJ_ERESOLVE;
+        /* If the error happens during pj_turn_sock_create() or
+         * pj_turn_sock_alloc(), the candidate hasn't been added
+         * to the list.
+         */
+        if (cand) cand->status = PJ_ERESOLVE;
 
         sess_init_update(comp->ice_st);

pjproject/trunk/pjnath/src/pjnath/turn_sock.c

@@ -891 +891 @@
             on_connect_complete(turn_sock->active_sock, PJ_SUCCESS);
         } else if (status != PJ_EPENDING) {
+            pj_perror(3, turn_sock->pool->obj_name, status,
+                      "Failed to connect to %s",
+                      pj_sockaddr_print(&info.server, addrtxt,
+                                        sizeof(addrtxt), 3));
             pj_turn_sock_destroy(turn_sock);
             return;