diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-17 20:09:44 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-17 20:09:44 -0500 |
| commit | a742637f5ae033a1f05490cbf1d4444cd0529d32 (patch) | |
| tree | e2f1787a182d80458963e5cfdf4c3fd35347d065 /src | |
| parent | 427dcb29b573d839551e8e3982af6e40d7d42609 (diff) | |
| parent | 307d244640ff9ad829bfe0769ddb2f903ec80ea8 (diff) | |
| download | tor-a742637f5ae033a1f05490cbf1d4444cd0529d32.tar.gz tor-a742637f5ae033a1f05490cbf1d4444cd0529d32.zip | |
Merge remote-tracking branch 'public/bug20630'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/connection_edge.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 875c911f01..3874d52c23 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1627,11 +1627,9 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, } tor_assert(!automap); rep_hist_note_used_resolve(now); /* help predict this next time */ - } + } else if (socks->command == SOCKS_COMMAND_CONNECT) { + /* Now see if this is a connect request that we can reject immediately */ - /* Now see if this is a connect request that we can reject immediately */ - if (socks->command == SOCKS_COMMAND_CONNECT) { - /* Special handling for attempts to connect */ tor_assert(!automap); /* Don't allow connections to port 0. */ if (socks->port == 0) { @@ -1771,7 +1769,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, rep_hist_note_used_resolve(now); /* help predict this next time */ /* no extra processing needed */ } else { - /* We should only be doing CONNECT or RESOLVE! */ + /* We should only be doing CONNECT, RESOLVE, or RESOLVE_PTR! */ tor_fragile_assert(); } |