Commit 45cc25c0 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

minor fixes and notes 


svn:r15111
parent 67a1658d

src/or/circuitbuild.c

+1 −1
Original line number Diff line number Diff line
@@ -1917,7 +1917,7 @@ entry_is_live(entry_guard_t *e, int need_uptime, int need_capacity, 
  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);

src/or/connection_or.c

+2 −0
Original line number Diff line number Diff line
@@ -898,6 +898,8 @@ connection_or_set_state_open(or_connection_t *conn) 
       * 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;

    }

src/or/or.h

+2 −1
Original line number Diff line number Diff line
@@ -673,7 +673,8 @@ typedef enum { 
#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. */

src/or/relay.c

+1 −1
Original line number Diff line number Diff line
@@ -1289,7 +1289,7 @@ uint64_t stats_n_data_bytes_received = 0; 
 * 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