[or-cvs] Resolve FIXME items: clarify two XXXX comments for 009

[Nick Mathewson]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv32516/src/or

Modified Files:
	circuitbuild.c 
Log Message:
Resolve FIXME items: clarify two XXXX comments for 009

Index: circuitbuild.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuitbuild.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- circuitbuild.c	7 Nov 2004 01:33:05 -0000	1.52
+++ circuitbuild.c	10 Nov 2004 14:27:26 -0000	1.53
@@ -350,9 +350,14 @@
   tor_assert(circ->n_conn->type == CONN_TYPE_OR);
   tor_assert(payload);
 
-  /* XXXX008 How can we keep a good upgrade path here?  We should
+  /* XXXX009 How can we keep a good upgrade path here?  We should
    * compare keys, not nicknames...but older servers will compare nicknames.
    * Should we check server version from the most recent directory? Hm.
+   *
+   * This is important if anybody is unverified.
+   *
+   * Solution: switch to identity-based comparison, but if we get
+   * any circuits in the wrong half of the space, switch.
    */
   circ_id_type = decide_circ_id_type(get_options()->Nickname,
                                      circ->n_conn->nickname);
@@ -1062,7 +1067,8 @@
     }
     if(r->is_verified == 0) {
       log_fn(LOG_DEBUG,"Nope, the directory says %d is not verified.",i);
-      goto next_i_loop; /* XXX008 */
+      /* XXXX009 But unverified routers *are* sometimes acceptable. */
+      goto next_i_loop;
     }
     num++;
     log_fn(LOG_DEBUG,"I like %d. num_acceptable_routers now %d.",i, num);