Changeset 3022 for pjproject/trunk/pjnath/src/pjnath/ice_session.c

Timestamp:

Nov 23, 2009 3:02:18 PM (14 years ago)

Author:

bennylp

Message:

More #953 (ICE may find the wrong best candidate):

• the sorting process may cause valid checks to point to the wrong candidate pair. This is reproducible by pjnath-test

File:

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

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

@@ -950 +950 @@
 
 /* Sort checklist based on priority */
-static void sort_checklist(pj_ice_sess_checklist *clist)
+static void sort_checklist(pj_ice_sess *ice, pj_ice_sess_checklist *clist)
 {
     unsigned i;
+    pj_ice_sess_check **check_ptr[PJ_ICE_MAX_COMP*2];
+    unsigned check_ptr_cnt = 0;
+
+    for (i=0; i<ice->comp_cnt; ++i) {
+        if (ice->comp[i].valid_check) {
+            check_ptr[check_ptr_cnt++] = &ice->comp[i].valid_check;
+        }
+        if (ice->comp[i].nominated_check) {
+            check_ptr[check_ptr_cnt++] = &ice->comp[i].nominated_check;
+        }
+    }
 
     for (i=0; i<clist->count-1; ++i) {
         unsigned j, highest = i;
+
         for (j=i+1; j<clist->count; ++j) {
             if (CMP_CHECK_PRIO(&clist->checks[j], &clist->checks[highest]) > 0) {
@@ -964 +976 @@
         if (highest != i) {
             pj_ice_sess_check tmp;
+            unsigned k;
 
             pj_memcpy(&tmp, &clist->checks[i], sizeof(pj_ice_sess_check));
@@ -970 +983 @@
             pj_memcpy(&clist->checks[highest], &tmp, 
                       sizeof(pj_ice_sess_check));
+
+            /* Update valid and nominated check pointers, since we're moving
+             * around checks
+             */
+            for (k=0; k<check_ptr_cnt; ++k) {
+                if (*check_ptr[k] == &clist->checks[highest])
+                    *check_ptr[k] = &clist->checks[i];
+                else if (*check_ptr[k] == &clist->checks[i])
+                    *check_ptr[k] = &clist->checks[highest];
+            }
         }
     }
@@ -1667 +1690 @@
 
     /* Sort checklist based on priority */
-    sort_checklist(clist);
+    sort_checklist(ice, clist);
 
     /* Prune the checklist */
@@ -2335 +2358 @@
      * new_check will point to something else (#953)
      */
-    sort_checklist(&ice->valid_list);
+    sort_checklist(ice, &ice->valid_list);
 
     /* 7.1.2.2.2.  Updating Pair States