Changeset 5215 for pjproject/trunk

Timestamp:

Dec 16, 2015 3:58:09 AM (9 years ago)

Author:

riza

Message:

Re #1882 (misc): Check for duplicate entry when building list of ICE host candidate. Thanks to Dusan Klenic for the original patch.

File:

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

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

@@ -348 +348 @@
 }
 
+static pj_bool_t ice_cand_equals(pj_ice_sess_cand *lcand, 
+                                 pj_ice_sess_cand *rcand)
+{
+    if (lcand == NULL && rcand == NULL){
+        return PJ_TRUE;
+    }
+    if (lcand == NULL || rcand == NULL){
+        return PJ_FALSE;
+    }
+    
+    if (lcand->type != rcand->type
+        || lcand->status != rcand->status
+        || lcand->comp_id != rcand->comp_id
+        || lcand->transport_id != rcand->transport_id
+        || lcand->local_pref != rcand->local_pref
+        || lcand->prio != rcand->prio
+        || pj_sockaddr_cmp(&lcand->addr, &rcand->addr) != 0
+        || pj_sockaddr_cmp(&lcand->base_addr, &rcand->base_addr) != 0)
+    {
+        return PJ_FALSE;
+    }
+    
+    return PJ_TRUE;
+}
 
 /*
@@ -479 +503 @@
                       i<ice_st->cfg.stun.max_host_cands; ++i)
             {
+                unsigned j;
+                pj_bool_t cand_duplicate = PJ_FALSE;
                 char addrinfo[PJ_INET6_ADDRSTRLEN+10];
                 const pj_sockaddr *addr = &stun_sock_info.aliases[i];
@@ -496 +522 @@
                 }
 
-                cand = &comp->cand_list[comp->cand_cnt++];
+                cand = &comp->cand_list[comp->cand_cnt];
 
                 cand->type = PJ_ICE_CAND_TYPE_HOST;
@@ -506 +532 @@
                 pj_sockaddr_cp(&cand->base_addr, addr);
                 pj_bzero(&cand->rel_addr, sizeof(cand->rel_addr));
+            
+                /* Check if not already in list */
+                for (j=0; j<comp->cand_cnt; j++) {
+                    if (ice_cand_equals(cand, &comp->cand_list[j])) {
+                        cand_duplicate = PJ_TRUE;
+                        break;
+                    }
+                }
+
+                if (cand_duplicate) {
+                    PJ_LOG(4, (ice_st->obj_name,
+                           "Comp %d: host candidate %s is a duplicate",
+                           comp_id, pj_sockaddr_print(&cand->addr, addrinfo,
+                           sizeof(addrinfo), 3)));
+
+                    pj_bzero(&cand->addr, sizeof(cand->addr));
+                    pj_bzero(&cand->base_addr, sizeof(cand->base_addr));
+                    continue;
+                } else {
+                    comp->cand_cnt+=1;
+                }
+            
                 pj_ice_calc_foundation(ice_st->pool, &cand->foundation,
                                        cand->type, &cand->base_addr);