diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-13 10:03:09 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-10-10 23:14:09 -0400 |
| commit | 1b0645acba905c37759194c222aacbbe40771223 (patch) | |
| tree | 86cbb2bd41f0391f7cfe2757f45d56ee6da5183a /src/or/connection.c | |
| parent | fdbb9cdf746bbf0c39c34188baa8872471183ff7 (diff) | |
| download | tor-1b0645acba905c37759194c222aacbbe40771223.tar.gz tor-1b0645acba905c37759194c222aacbbe40771223.zip | |
Cell types and states for new OR handshake
Also, define all commands > 128 as variable-length when using
v3 or later link protocol. Running into a var cell with an
unrecognized type is no longer a bug.
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 45a12715a3..2bd2d07e94 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -140,10 +140,13 @@ conn_state_to_string(int type, int state) case OR_CONN_STATE_PROXY_HANDSHAKING: return "handshaking (proxy)"; case OR_CONN_STATE_TLS_HANDSHAKING: return "handshaking (TLS)"; case OR_CONN_STATE_TLS_CLIENT_RENEGOTIATING: - return "renegotiating (TLS)"; + return "renegotiating (TLS, v2 handshake)"; case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING: - return "waiting for renegotiation (TLS)"; - case OR_CONN_STATE_OR_HANDSHAKING: return "handshaking (Tor)"; + return "waiting for renegotiation or V3 handshake"; + case OR_CONN_STATE_OR_HANDSHAKING_V2: + return "handshaking (Tor, v2 handshake)"; + case OR_CONN_STATE_OR_HANDSHAKING_V3: + return "handshaking (Tor, v3 handshake)"; case OR_CONN_STATE_OPEN: return "open"; } break; |