diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-08-10 09:01:37 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-08-10 09:01:37 +0000 |
| commit | 5cff4164a08af2a869e5e85aa6d359b865eee9aa (patch) | |
| tree | e529cd925b0c3634b512bf638e9edb31dbde22f2 /src/or/relay.c | |
| parent | 8cbd03fdaf3c138a2ca41b41c995643146fdac94 (diff) | |
| download | tor-5cff4164a08af2a869e5e85aa6d359b865eee9aa.tar.gz tor-5cff4164a08af2a869e5e85aa6d359b865eee9aa.zip | |
r7299@Kushana: nickm | 2006-08-10 01:08:58 -0700
Patch from Tup to add support for transparent AP connections: this basically bundles the functionality of trans-proxy-tor into the tor mainline. Now hosts with compliant pf/netfilter implementations can redirect TCP connections straight to Tor without diverting through SOCKS.
svn:r7007
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index f7eee2917b..666cd891a1 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -845,7 +845,9 @@ connection_edge_process_relay_cell_not_open( conn->chosen_exit_name, ttl); } circuit_log_path(LOG_INFO,LD_APP,TO_ORIGIN_CIRCUIT(circ)); - connection_ap_handshake_socks_reply(conn, NULL, 0, SOCKS5_SUCCEEDED); + /* don't send a socks reply to transparent conns */ + if (!conn->socks_request->has_finished) + connection_ap_handshake_socks_reply(conn, NULL, 0, SOCKS5_SUCCEEDED); /* handle anything that might have queued */ if (connection_edge_package_raw_inbuf(conn, 1) < 0) { /* (We already sent an end cell if possible) */ |