diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-19 09:09:25 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-19 09:09:25 -0500 |
| commit | 86105a4009bf3e128abfa3e735d8fa6f1f4d5975 (patch) | |
| tree | aed21bc05c8d864f30ec5460f013f9c80ea8b1a6 /src/or/connection_edge.c | |
| parent | 0e22da1b8de0bc10ebe80eb00f9e848a392edbdd (diff) | |
| download | tor-86105a4009bf3e128abfa3e735d8fa6f1f4d5975.tar.gz tor-86105a4009bf3e128abfa3e735d8fa6f1f4d5975.zip | |
Check ENABLE_TOR2WEB_MODE before any tor2webmode code
Diffstat (limited to 'src/or/connection_edge.c')
| -rw-r--r-- | src/or/connection_edge.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index dd2f8d42a0..3c817decfb 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1278,6 +1278,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, return -1; } +#ifdef ENABLE_TOR2WEB_MODE /* If we're running in Tor2webMode, we don't allow anything BUT .onion * addresses. */ if (options->Tor2webMode) { @@ -1287,6 +1288,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, connection_mark_unattached_ap(conn, END_STREAM_REASON_ENTRYPOLICY); return -1; } +#endif /* See if this is a hostname lookup that we can answer immediately. * (For example, an attempt to look up the IP address for an IP address.) |