Changeset 1392 for pjproject/trunk

Timestamp:

Jun 26, 2007 10:10:24 AM (17 years ago)

Author:

bennylp

Message:

Ticket #344: ICE negotiation failed when remote doesn't support RTCP

File:

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

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

@@ -1196 +1196 @@
     timer_data *td;
     unsigned i, j;
+    unsigned highest_comp = 0;
     pj_status_t status;
 
@@ -1232 +1233 @@
             continue;
         }
+
+        if (rcand[i].comp_id > highest_comp)
+            highest_comp = rcand[i].comp_id;
 
         pj_memcpy(cn, &rcand[i], sizeof(pj_ice_sess_cand));
@@ -1281 +1285 @@
         pj_mutex_unlock(ice->mutex);
         return status;
+    }
+
+    /* Disable our components which don't have matching component */
+    if (ice->comp_cnt==2 && highest_comp==1) {
+        ice->comp_cnt = 1;
     }
 
@@ -2255 +2264 @@
     pj_ice_sess_comp *comp;
 
-    PJ_ASSERT_RETURN(ice && comp_id && comp_id <= ice->comp_cnt, PJ_EINVAL);
+    PJ_ASSERT_RETURN(ice && comp_id, PJ_EINVAL);
     
+    /* It is possible that comp_cnt is less than comp_id, when remote
+     * doesn't support all the components that we have.
+     */
+    if (comp_id > ice->comp_cnt) {
+        return PJNATH_EICEINCOMPID;
+    }
+
     pj_mutex_lock(ice->mutex);