[or-cvs] r15111: minor fixes and notes (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2008-06-10 19:00:11 -0400 (Tue, 10 Jun 2008)
New Revision: 15111

Modified:
   tor/trunk/src/or/circuitbuild.c
   tor/trunk/src/or/connection_or.c
   tor/trunk/src/or/or.h
   tor/trunk/src/or/relay.c
Log:
minor fixes and notes


Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2008-06-10 22:49:36 UTC (rev 15110)
+++ tor/trunk/src/or/circuitbuild.c	2008-06-10 23:00:11 UTC (rev 15111)
@@ -1917,7 +1917,7 @@
   if (e->bad_since)
     return NULL;
   /* no good if it's unreachable, unless assume_unreachable or can_retry. */
-  if ((!assume_reachable && !e->can_retry) &&
+  if (!assume_reachable && !e->can_retry &&
       e->unreachable_since && !entry_is_time_to_retry(e, time(NULL)))
     return NULL;
   r = router_get_by_digest(e->identity);

Modified: tor/trunk/src/or/connection_or.c
===================================================================
--- tor/trunk/src/or/connection_or.c	2008-06-10 22:49:36 UTC (rev 15110)
+++ tor/trunk/src/or/connection_or.c	2008-06-10 23:00:11 UTC (rev 15111)
@@ -898,6 +898,8 @@
        * chose not to use it. (Otherwise
        * connection_about_to_close_connection() will call a big pile of
        * functions to indicate we shouldn't try it again.) */
+      log_debug(LD_OR, "New entry guard was reachable, but closing this "
+                "connection so we can retry the earlier entry guards.");
       circuit_n_conn_done(conn, 0);
       return -1;
     }

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2008-06-10 22:49:36 UTC (rev 15110)
+++ tor/trunk/src/or/or.h	2008-06-10 23:00:11 UTC (rev 15111)
@@ -673,7 +673,8 @@
 #define LEGAL_NICKNAME_CHARACTERS \
   "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-/** Name to use in client TLS certificates if no nickname is given. */
+/** Name to use in client TLS certificates if no nickname is given. Once
+ * Tor 0.1.2.x is obsolete, we can remove this. */
 #define DEFAULT_CLIENT_NICKNAME "client"
 
 /** Number of bytes in a SOCKS4 header. */

Modified: tor/trunk/src/or/relay.c
===================================================================
--- tor/trunk/src/or/relay.c	2008-06-10 22:49:36 UTC (rev 15110)
+++ tor/trunk/src/or/relay.c	2008-06-10 23:00:11 UTC (rev 15111)
@@ -1289,7 +1289,7 @@
  * and the appropriate package windows aren't empty, grab a cell
  * and send it down the circuit.
  *
- * Return -1 (and send a RELAY_END cell if necessary) if conn should
+ * Return -1 (and send a RELAY_COMMAND_END cell if necessary) if conn should
  * be marked for close, else return 0.
  */
 int