Changeset 6048 for pjproject

Timestamp:

Jul 29, 2019 7:07:11 AM (5 years ago)

Author:

ming

Message:

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

Thanks to Sébastien Blin for the patch.

File:

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

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

@@ -1404 +1404 @@
             pj_sockaddr addrs[PJ_ICE_ST_MAX_CAND];
             unsigned j, count=0;
+
+            if (!comp->turn[n].sock)
+                continue;
 
             /* Gather remote addresses for this component */
@@ -2202 +2205 @@
 
     } else if ((old_state == PJ_TURN_STATE_RESOLVING ||
-                old_state == PJ_TURN_STATE_RESOLVED) &&
-               new_state == PJ_TURN_STATE_DESTROYING)
+                old_state == PJ_TURN_STATE_RESOLVED ||
+                old_state == PJ_TURN_STATE_ALLOCATING) &&
+               new_state >= PJ_TURN_STATE_DEALLOCATING)
     {
         pj_ice_sess_cand *cand = NULL;
@@ -2238 +2242 @@
          */
         if (cand) {
-            cand->status = PJ_ERESOLVE;
+            cand->status = (old_state == PJ_TURN_STATE_RESOLVING)?
+                           PJ_ERESOLVE : PJ_EINVALIDOP;
             PJ_LOG(4,(comp->ice_st->obj_name,
-                      "Comp %d/%d: TURN resolving (tpid=%d) failed",
-                      comp->comp_id, cand_idx, cand->transport_id));
+                      "Comp %d/%d: TURN error (tpid=%d) during state %s",
+                      comp->comp_id, cand_idx, cand->transport_id,
+                      pj_turn_state_name(old_state)));
         }