aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_edge.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-03-27 22:24:48 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-02 15:38:00 -0400
commitc230ff4ca97ae6bf8ddbf2d19a1a7d33371cde3a (patch)
tree4e74636d71900d4b3da6b74d0a12281d34017a35 /src/or/connection_edge.h
parent4fb3ae69a6f81d45843998bd1fb6cecf541ef5b8 (diff)
downloadtor-c230ff4ca97ae6bf8ddbf2d19a1a7d33371cde3a.tar
tor-c230ff4ca97ae6bf8ddbf2d19a1a7d33371cde3a.tar.gz
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.h')
-rw-r--r--src/or/connection_edge.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h
index e3a95ad9e..cbca31a21 100644
--- a/src/or/connection_edge.h
+++ b/src/or/connection_edge.h
@@ -50,6 +50,10 @@ void connection_ap_handshake_socks_resolved(entry_connection_t *conn,
const uint8_t *answer,
int ttl,
time_t expires);
+void connection_ap_handshake_socks_resolved_addr(entry_connection_t *conn,
+ const tor_addr_t *answer,
+ int ttl,
+ time_t expires);
int connection_exit_begin_conn(cell_t *cell, circuit_t *circ);
int connection_exit_begin_resolve(cell_t *cell, or_circuit_t *circ);