diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-03-17 03:37:59 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-03-17 03:37:59 +0000 |
| commit | 8785759e0d7d752e5b83fde7363dc600d0444760 (patch) | |
| tree | d340c38240eb409ad4d8228300c59f92f80c2435 | |
| parent | a8d72cdfff39167c6f1cd877dfdd0199cd5c1e01 (diff) | |
| download | tor-8785759e0d7d752e5b83fde7363dc600d0444760.tar.gz tor-8785759e0d7d752e5b83fde7363dc600d0444760.zip | |
r18863@catbus: nickm | 2008-03-16 23:37:39 -0400
{in 0.2.0} Part of fix for bug 617: do not mark-for-close on invalid .in-addr.arpa DNSPort request, since it would be a duplicate mark.
svn:r14067
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 5 |
2 files changed, 7 insertions, 1 deletions
@@ -34,6 +34,9 @@ Changes in version 0.2.0.22-rc - 2008-03-?? 0.2.0.x. - Detect mismatched page sizes when using --enable-openbsd-malloc. Bugfix on 0.2.0.x. + - Avoid double-marked-for-close warning when certain kinds of invalid + .in-addr.arpa addresses are passed to the DNSPort. Part of a fix + for bug 617. Bugfix on 0.2.0.1-alpha. Changes in version 0.2.0.21-rc - 2008-03-02 diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 2cb8e5e807..27dc4d05f5 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2012,7 +2012,10 @@ connection_ap_handshake_send_resolve(edge_connection_t *ap_conn) ap_conn->socks_request->address[len-13] = '\0'; } if (tor_inet_aton(ap_conn->socks_request->address, &in) == 0) { - connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_INTERNAL); + /* Do not mark here; every caller of + * connection_ap_attach_{chosen_}circuit() [which calls this function + * will also mark on a -1 return value. */ + // connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_INTERNAL); return -1; } if (c) { |