diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-27 22:24:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-02 15:38:00 -0400 |
| commit | c230ff4ca97ae6bf8ddbf2d19a1a7d33371cde3a (patch) | |
| tree | 4e74636d71900d4b3da6b74d0a12281d34017a35 /src/or/connection_edge.c | |
| parent | 4fb3ae69a6f81d45843998bd1fb6cecf541ef5b8 (diff) | |
| download | tor-c230ff4ca97ae6bf8ddbf2d19a1a7d33371cde3a.tar.gz tor-c230ff4ca97ae6bf8ddbf2d19a1a7d33371cde3a.zip | |
Look at all of a RESOLVED cell; not just the first answer.
Also, stop accepting the old kind of RESOLVED cells with no TTL
fields; they haven't been sent since 0.1.1.6-alpha.
This patch won't work without the fix to #10468 -- it will break
DNSPorts unless they set the proper ipv4/6 flags on entry_connection_t.
Diffstat (limited to 'src/or/connection_edge.c')
| -rw-r--r-- | src/or/connection_edge.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 630c3b918b..1ecc553e56 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -62,11 +62,6 @@ static int connection_ap_process_natd(entry_connection_t *conn); static int connection_exit_connect_dir(edge_connection_t *exitconn); static int consider_plaintext_ports(entry_connection_t *conn, uint16_t port); static int connection_ap_supports_optimistic_data(const entry_connection_t *); -static void connection_ap_handshake_socks_resolved_addr( - entry_connection_t *conn, - const tor_addr_t *answer, - int ttl, - time_t expires); /** An AP stream has failed/finished. If it hasn't already sent back * a socks reply, send one now (based on endreason). Also set @@ -2065,7 +2060,7 @@ tell_controller_about_resolved_result(entry_connection_t *conn, * As connection_ap_handshake_socks_resolved, but take a tor_addr_t to send * as the answer. */ -static void +void connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn, const tor_addr_t *answer, int ttl, |