From dd779d99ea041789a58d921cc8b1b86cbc49cceb Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 27 Jul 2006 04:10:51 +0000 Subject: [PATCH] Fix comments that implied that only dir connections had a purpose field, and the code that believed in those comments. svn:r6918 --- src/or/connection.c | 6 +++--- src/or/or.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 6528e2b4f2..48ceb2623d 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2235,9 +2235,9 @@ assert_connection_ok(connection_t *conn, time_t now) tor_assert(conn->purpose == EXIT_PURPOSE_CONNECT || conn->purpose == EXIT_PURPOSE_RESOLVE); } - } - if (conn->type != CONN_TYPE_DIR) { - tor_assert(!conn->purpose); /* only used for dir types currently */ + } else if (conn->type != CONN_TYPE_DIR) { + /* Purpose is only used for dir and exit types currently */ + tor_assert(!conn->purpose); } switch (conn->type) diff --git a/src/or/or.h b/src/or/or.h index f3dc9e4b7b..8624214e9f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -605,7 +605,7 @@ struct connection_t { uint8_t type; /**< What kind of connection is this? */ uint8_t state; /**< Current state of this connection. */ - uint8_t purpose; /**< Only used for DIR types currently. */ + uint8_t purpose; /**< Only used for DIR and EXIT types currently. */ unsigned wants_to_read:1; /**< Boolean: should we start reading again once * the bandwidth throttler allows it? */ unsigned wants_to_write:1; /**< Boolean: should we start writing again once