[or-cvs] r11890: minor cleanups (tor/trunk/src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2007-10-11 18:19:18 -0400 (Thu, 11 Oct 2007)
New Revision: 11890

Modified:
   tor/trunk/src/or/circuituse.c
   tor/trunk/src/or/connection.c
   tor/trunk/src/or/or.h
Log:
minor cleanups


Modified: tor/trunk/src/or/circuituse.c
===================================================================
--- tor/trunk/src/or/circuituse.c	2007-10-11 22:16:05 UTC (rev 11889)
+++ tor/trunk/src/or/circuituse.c	2007-10-11 22:19:18 UTC (rev 11890)
@@ -102,7 +102,6 @@
     } else {
       if (conn->socks_request->command == SOCKS_COMMAND_CONNECT_DIR) {
         /* don't use three-hop circuits -- that could hurt our anonymity. */
-//        log_debug(LD_CIRC,"Skipping multi-hop circuit for CONNECT_DIR.");
         return 0;
       }
     }

Modified: tor/trunk/src/or/connection.c
===================================================================
--- tor/trunk/src/or/connection.c	2007-10-11 22:16:05 UTC (rev 11889)
+++ tor/trunk/src/or/connection.c	2007-10-11 22:19:18 UTC (rev 11890)
@@ -529,8 +529,8 @@
   }
 }
 
-/** Return true iff connection_close_immediate has been called on this
- * connection */
+/** Return true iff connection_close_immediate() has been called on this
+ * connection. */
 #define CONN_IS_CLOSED(c) \
   ((c)->linked ? ((c)->linked_conn_is_closed) : ((c)->s < 0))
 
@@ -2271,7 +2271,7 @@
     if (conn->type == CONN_TYPE_OR &&
         conn->outbuf_flushlen-len < MIN_TLS_FLUSHLEN &&
         conn->outbuf_flushlen >= MIN_TLS_FLUSHLEN) {
-      /* We just pushed outbuf_flushelen to MIN_TLS_FLUSHLEN or above;
+      /* We just pushed outbuf_flushlen to MIN_TLS_FLUSHLEN or above;
        * we can send out a full TLS frame now if we like. */
       extra = conn->outbuf_flushlen - MIN_TLS_FLUSHLEN;
       conn->outbuf_flushlen = MIN_TLS_FLUSHLEN;
@@ -2671,7 +2671,7 @@
 {
   tor_assert(conn);
 
-  /* If the connection is don't try to do anything more here. */
+  /* If the connection is closed, don't try to do anything more here. */
   if (CONN_IS_CLOSED(conn))
     return 0;
 

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-10-11 22:16:05 UTC (rev 11889)
+++ tor/trunk/src/or/or.h	2007-10-11 22:19:18 UTC (rev 11890)
@@ -781,8 +781,8 @@
   /** True iff we're currently able to read on the linked conn, and our
    * read_event should be made active with libevent. */
   unsigned int active_on_link:1;
-  /** True iff we've called connection_close_immediate on this linked
-   * connection */
+  /** True iff we've called connection_close_immediate() on this linked
+   * connection. */
   unsigned int linked_conn_is_closed:1;
 
   int s; /**< Our socket; -1 if this connection is closed, or has no