Changeset 1207

Timestamp:

Apr 19, 2007 11:03:23 AM (17 years ago)

Author:

bennylp

Message:

ICE: check for duplicate candidates, and change foundation to use the base address instead

File:

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

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

@@ -213 +213 @@
 {
     pj_ice_strans_cand *cand;
+    unsigned i;
 
     PJ_ASSERT_RETURN(ice_st && comp && addr, PJ_EINVAL);
     PJ_ASSERT_RETURN(comp->cand_cnt < PJ_ICE_ST_MAX_CAND, PJ_ETOOMANY);
+
+    /* Check that we don't have candidate with the same
+     * address.
+     */
+    for (i=0; i<comp->cand_cnt; ++i) {
+        if (pj_memcmp(addr, &comp->cand_list[i].addr, 
+                      sizeof(pj_sockaddr_in))==0)
+        {
+            /* Duplicate */
+            PJ_LOG(5,(ice_st->obj_name, "Duplicate candidate not added"));
+            return PJ_SUCCESS;
+        }
+    }
 
     cand = &comp->cand_list[comp->cand_cnt];
@@ -226 +240 @@
     cand->local_pref = local_pref;
     pj_ice_calc_foundation(ice_st->pool, &cand->foundation, type, 
-                           (const pj_sockaddr*)addr);
+                           &comp->local_addr);
 
     if (set_default)