[or-cvs] r14067: {in 0.2.0} Part of fix for bug 617: do not mark-for-close on (in tor/branches/tor-0_2_0-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-03-16 23:37:59 -0400 (Sun, 16 Mar 2008)
New Revision: 14067

Modified:
   tor/branches/tor-0_2_0-patches/
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/connection_edge.c
Log:
 r18863 at 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.



Property changes on: tor/branches/tor-0_2_0-patches
___________________________________________________________________
 svk:merge ticket from /tor/020 [r18863] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-17 03:37:54 UTC (rev 14066)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-17 03:37:59 UTC (rev 14067)
@@ -34,6 +34,9 @@
       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

Modified: tor/branches/tor-0_2_0-patches/src/or/connection_edge.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/connection_edge.c	2008-03-17 03:37:54 UTC (rev 14066)
+++ tor/branches/tor-0_2_0-patches/src/or/connection_edge.c	2008-03-17 03:37:59 UTC (rev 14067)
@@ -2012,7 +2012,10 @@
       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) {