Commit 8b36d4cc authored by Andrea Shepard's avatar Andrea Shepard
Browse files

Merge branch 'bug6816_squashed_nowarn' of git://git.torproject.org/nickm/tor

parents ec973194 bd28322d

changes/bug6465

0 → 100644
+12 −0
Changes for changes/bug6465: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line 
  o Infrastructure features:

    - Introduce new channel_t abstraction between circuits and or_connection_t

      to allow for implementing alternate OR-to-OR transports.  A channel_t is

      an abstract object which can either be a cell-bearing channel, which is

      responsible for authenticating and handshaking with the remote OR and

      transmitting cells to and from it, or a listening channel, which spawns

      new cell-bearing channels at the request of remote ORs.



    - Also new is the channel_tls_t subclass of channel_t, adapting it to the

      existing or_connection_t code.  The V2/V3 protocol handshaking code

      which formerly resided in command.c has been moved below the channel_t

      abstraction layer and may be found in channeltls.c now.

changes/bug6816

0 → 100644
+6 −0
Changes for changes/bug6816: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line 
  o Infrastructure features:

    - Introduce new circuitmux_t storing the queue of circuits for a channel;

      this encapsulates and abstracts the queue logic and circuit selection

      policy, and allows the latter to be overridden easily by switching out

      a policy object.  The existing EWMA behavior is now implemented as a

      circuitmux_policy_t.  This fixes bug 6816.

src/common/crypto.c

+4 −2
Changes for src/common/crypto.c: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -244,8 +244,10 @@ crypto_global_init(int useAccel, const char *accelName, const char *accelDir) 
    }



    if (SSLeay() < OPENSSL_V_SERIES(1,0,0)) {

      log_notice(LD_CRYPTO, "Your OpenSSL version seems to be %s. We "

                 "recommend 1.0.0 or later.", crypto_openssl_get_version_str());

      log_notice(LD_CRYPTO,

                 "Your OpenSSL version seems to be %s. We recommend 1.0.0 "

                 "or later.",

                 crypto_openssl_get_version_str());

    }



    if (useAccel > 0) {

src/common/log.c

+1 −1
Changes for src/common/log.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -907,7 +907,7 @@ log_level_to_string(int level) 
static const char *domain_list[] = {

  "GENERAL", "CRYPTO", "NET", "CONFIG", "FS", "PROTOCOL", "MM",

  "HTTP", "APP", "CONTROL", "CIRC", "REND", "BUG", "DIR", "DIRSERV",

  "OR", "EDGE", "ACCT", "HIST", "HANDSHAKE", "HEARTBEAT", NULL

  "OR", "EDGE", "ACCT", "HIST", "HANDSHAKE", "HEARTBEAT", "CHANNEL", NULL

};



/** Return a bitmask for the log domain for which <b>domain</b> is the name,

src/common/torlog.h

+3 −1
Changes for src/common/torlog.h: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -94,8 +94,10 @@ 
#define LD_HANDSHAKE (1u<<19)

/** Heartbeat messages */

#define LD_HEARTBEAT (1u<<20)

/** Abstract channel_t code */

#define LD_CHANNEL   (1u<<21)

/** Number of logging domains in the code. */

#define N_LOGGING_DOMAINS 21

#define N_LOGGING_DOMAINS 22



/** This log message is not safe to send to a callback-based logger

 * immediately.  Used as a flag, not a log domain. */