[or-cvs] a minimal (ha) backport of the entrynodes fix.

[arma@xxxxxxxx]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/tor-011x/tor/src/or

Modified Files:
      Tag: tor-0_1_1-patches
	circuitbuild.c 
Log Message:
a minimal (ha) backport of the entrynodes fix.


Index: circuitbuild.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.230.2.4
retrieving revision 1.230.2.5
diff -u -p -d -r1.230.2.4 -r1.230.2.5
--- circuitbuild.c	8 Jun 2006 09:38:18 -0000	1.230.2.4
+++ circuitbuild.c	9 Jun 2006 09:08:48 -0000	1.230.2.5
@@ -1548,6 +1548,14 @@ choose_good_entry_server(uint8_t purpose
         smartlist_add(excluded, r);
     }
   }
+  /* and exclude current entry guards, if applicable */
+  if (options->UseEntryGuards && entry_guards) {
+    SMARTLIST_FOREACH(entry_guards, entry_guard_t *, entry,
+      {
+        if ((r = router_get_by_digest(entry->identity)))
+          smartlist_add(excluded, r);
+      });
+  }
   // XXX we should exclude busy exit nodes here, too,
   // but only if there are enough other nodes available.
   choice = router_choose_random_node(