Changeset 1215 for pjproject

Timestamp:

Apr 28, 2007 4:14:42 AM (18 years ago)

Author:

bennylp

Message:

ICE: prune host candidates (not in ICE)

File:

• pjproject/branches/split-3rd-party/pjnath/src/pjnath/ice_session.c (modified) (2 diffs)

pjproject/branches/split-3rd-party/pjnath/src/pjnath/ice_session.c

@@ -903 +903 @@
      * list
      */
+    /*
+     * Not in ICE!
+     * Remove host candidates if their base are the the same!
+     */
     for (i=0; i<clist->count; ++i) {
         pj_ice_sess_cand *licand = clist->checks[i].lcand;
@@ -911 +915 @@
             pj_ice_sess_cand *ljcand = clist->checks[j].lcand;
             pj_ice_sess_cand *rjcand = clist->checks[j].rcand;
+            const char *reason = NULL;
 
             if ((licand == ljcand) && (ricand == rjcand)) {
+                reason = "duplicate found";
+            } else if (sockaddr_cmp(&ljcand->base_addr, 
+                                    &licand->base_addr)==0) 
+            {
+                reason = "equal base";
+            }
+
+            if (reason != NULL) {
                 /* Found duplicate, remove it */
                 char buf[CHECK_NAME_LEN];
 
-                LOG5((ice->obj_name, "Check %s pruned",
-                     dump_check(buf, sizeof(buf), &ice->clist, 
-                                &clist->checks[j])));
+                LOG5((ice->obj_name, "Check %s pruned (%s)",
+                      dump_check(buf, sizeof(buf), &ice->clist, 
+                                 &clist->checks[j]),
+                      reason));
 
                 pj_array_erase(clist->checks, sizeof(clist->checks[0]),