diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-12-13 00:28:56 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-12-13 00:28:56 +0000 |
| commit | 0dbf725927c0b3a7f88b852b272573c91857be9b (patch) | |
| tree | bea851e8726f18a8b463f950bfc1694ae6be6aa2 /src/or/control.c | |
| parent | f5164ba61d8cf062bbc1beb2dfbca0abb3415e93 (diff) | |
| download | tor-0dbf725927c0b3a7f88b852b272573c91857be9b.tar.gz tor-0dbf725927c0b3a7f88b852b272573c91857be9b.zip | |
Infrastructure to test BEGIN_DIR cells.
New socks command CONNECT_DIR. New config option TunnelDirConns that
builds a circ ending at the directory server and delivers a BEGIN_DIR
cell if it's running 0.1.2.2-alpha or later. We still need to make
one-hop circs when appropriate, while making other conns avoid them.
svn:r9098
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/control.c b/src/or/control.c index 0b9502359a..9672a8ed66 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1619,8 +1619,7 @@ getinfo_helper_events(control_connection_t *control_conn, case AP_CONN_STATE_CONTROLLER_WAIT: case AP_CONN_STATE_CIRCUIT_WAIT: if (conn->socks_request && - (conn->socks_request->command == SOCKS_COMMAND_RESOLVE || - conn->socks_request->command == SOCKS_COMMAND_RESOLVE_PTR)) + SOCKS_COMMAND_IS_RESOLVE(conn->socks_request->command)) state = "NEWRESOLVE"; else state = "NEW"; |