r18056@catbus: nickm | 2008-02-12 17:21:10 -0500

 Add roger's responses from IRC to some XXX020 items.


svn:r13487

src/or/circuitlist.c

@@ -808,6 +808,9 @@ circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info,
 {
   /*XXXX020 arma: The purpose argument is ignored.  Can that possibly be
    * right? */
+  /* XXXX <arma> i don't know of any actual bugs that this causes. since i
+   * think we only call the function for purposes where we want it to do what
+   * the function does. somebody should check this though. */
 
   circuit_t *_circ;
   origin_circuit_t *best=NULL;

src/or/connection_or.c

@@ -406,6 +406,11 @@ connection_or_init_conn_from_address(or_connection_t *conn,
        * its actual addr/port, we won't remember. Careful! */
       /* XXXX020 arma: this is stupid, and it's the reason we need real_addr
        * to track is_canonical properly.  What requires it? */
+      /* XXXX <arma> i believe the reason we did this, originally, is because
+       * we wanted to log what OR a connection was to, and if we logged the
+       * right IP address and port 56244, that wouldn't be as helpful. now we
+       * log the "right" port too, so we know if it's moria1 or moria2.
+      */
       conn->_base.addr = r->addr;
       conn->_base.port = r->or_port;
     }

src/or/routerlist.c

@@ -838,6 +838,8 @@ router_pick_directory_server(authority_type_t type, int flags)
     return choice;
 
   /* XXXX020 arma: what's the point of *reloading* and trying again?? -NM */
+  /* XXXX020 <arma> once upon a time, reloading set the is_running back
+     to 1. i think. i bet it has no purpose now. */
   log_info(LD_DIR,"Still no %s router entries. Reloading and trying again.",
            (flags & PDS_IGNORE_FASCISTFIREWALL) ? "known" : "reachable");
   if (router_reload_router_list()) {