Changeset 2206 for pjproject/trunk

Timestamp:

Aug 12, 2008 12:20:21 PM (16 years ago)

Author:

bennylp

Message:

More ticket #591: Assertion failure in ICE session (thanks Pedro Gonçalves for the report)

File:

• pjproject/trunk/pjnath/src/pjnath/ice_session.c (modified) (2 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_session.c

@@ -1667 +1667 @@
     }
 
-    /* Set this check to WAITING */
-    check_set_state(ice, &clist->checks[i], 
-                    PJ_ICE_SESS_CHECK_STATE_WAITING, PJ_SUCCESS);
+    /* Set this check to WAITING only if state is frozen. It may be possible
+     * that this check has already been started by a trigger check
+     */
+    if (clist->checks[i].state == PJ_ICE_SESS_CHECK_STATE_FROZEN) {
+        check_set_state(ice, &clist->checks[i], 
+                        PJ_ICE_SESS_CHECK_STATE_WAITING, PJ_SUCCESS);
+    }
+
     cand0 = clist->checks[i].lcand;
     flist[flist_cnt++] = &clist->checks[i].lcand->foundation;
@@ -1685 +1690 @@
             find_str(flist, flist_cnt, &cand1->foundation)==NULL)
         {
-            check_set_state(ice, &clist->checks[i], 
-                            PJ_ICE_SESS_CHECK_STATE_WAITING, PJ_SUCCESS);
+            if (clist->checks[i].state == PJ_ICE_SESS_CHECK_STATE_FROZEN) {
+                check_set_state(ice, &clist->checks[i], 
+                                PJ_ICE_SESS_CHECK_STATE_WAITING, PJ_SUCCESS);
+            }
             flist[flist_cnt++] = &cand1->foundation;
         }