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/control.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/control.c')
| -rw-r--r-- | src/or/control.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c index 757a078e5f..28b87c21af 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1423,7 +1423,8 @@ handle_getinfo_helper(const char *question, char **answer) origin_circuit_t *origin_circ = NULL; if (conns[i]->type != CONN_TYPE_AP || conns[i]->marked_for_close || - conns[i]->state == AP_CONN_STATE_SOCKS_WAIT) + conns[i]->state == AP_CONN_STATE_SOCKS_WAIT || + conns[i]->state == AP_CONN_STATE_ORIGDST_WAIT) continue; conn = TO_EDGE_CONN(conns[i]); switch (conn->_base.state) |