[or-cvs] r12933: If we receive a general-purpose descriptor and then receive (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2007-12-22 20:18:14 -0500 (Sat, 22 Dec 2007)
New Revision: 12933

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/routerlist.c
Log:
If we receive a general-purpose descriptor and then receive an
identical bridge-purpose descriptor soon after, don't discard
the next one as a duplicate.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-12-22 19:01:44 UTC (rev 12932)
+++ tor/trunk/ChangeLog	2007-12-23 01:18:14 UTC (rev 12933)
@@ -28,6 +28,9 @@
     - Fix test for rlim_t on OSX 10.3: sys/resource.h doesn't want to
       be included unless sys/time.h is already included.  Fixes
       bug 553.  Bugfix on 0.2.0.x.
+    - If we receive a general-purpose descriptor and then receive an
+      identical bridge-purpose descriptor soon after, don't discard
+      the next one as a duplicate.
 
   o Minor features:
     - If BridgeRelay is set to 1, then the default for

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-12-22 19:01:44 UTC (rev 12932)
+++ tor/trunk/src/or/routerlist.c	2007-12-23 01:18:14 UTC (rev 12933)
@@ -4121,6 +4121,7 @@
       strcasecmp(r1->nickname, r2->nickname) ||
       r1->or_port != r2->or_port ||
       r1->dir_port != r2->dir_port ||
+      r1->purpose != r2->purpose ||
       crypto_pk_cmp_keys(r1->onion_pkey, r2->onion_pkey) ||
       crypto_pk_cmp_keys(r1->identity_pkey, r2->identity_pkey) ||
       strcasecmp(r1->platform, r2->platform) ||