aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-08-20 14:52:56 -0400
committerNick Mathewson <nickm@torproject.org>2013-08-21 11:28:57 -0400
commit0daa26a4732234333e67d04c9b215ff6704fa9cd (patch)
tree1abe16b99d9cf7d5edffe7ed3cc765a6dd022ddb /src/or/or.h
parent64410cc88888ff964a82613cc53475def98d9de7 (diff)
downloadtor-0daa26a4732234333e67d04c9b215ff6704fa9cd.tar
tor-0daa26a4732234333e67d04c9b215ff6704fa9cd.tar.gz
Send NETINFO on receiving a NETINFO if we have not yet sent one.
(Backport to Tor 0.2.3) Relays previously, when initiating a connection, would only send a NETINFO after sending an AUTHENTICATE. But bridges, when receiving a connection, would never send AUTH_CHALLENGE. So relays wouldn't AUTHENTICATE, and wouldn't NETINFO, and then bridges would be surprised to be receiving CREATE cells on a non-open circuit. Fixes bug 9546.
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index dd95c349c..b8f334ece 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1161,6 +1161,9 @@ typedef struct or_handshake_state_t {
/* True iff we've received valid authentication to some identity. */
unsigned int authenticated : 1;
+ /* True iff we have sent a netinfo cell */
+ unsigned int sent_netinfo : 1;
+
/** True iff we should feed outgoing cells into digest_sent and
* digest_received respectively.
*