[or-cvs] r14416: Backport: Correctly notify one-hop connections when a circui (in tor/branches/tor-0_2_0-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-04-22 13:44:36 -0400 (Tue, 22 Apr 2008)
New Revision: 14416

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/circuituse.c
Log:
 r15284 at tombo:  nickm | 2008-04-22 13:44:22 -0400
 Backport: Correctly notify one-hop connections when a circuit build has failed. possible fix for bug 669. found by lodger.



Property changes on: tor/branches/tor-0_2_0-patches
___________________________________________________________________
 svk:merge ticket from /tor/020 [r15284] on 49666b30-7950-49c5-bedf-9dc8f3168102

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-04-22 17:44:28 UTC (rev 14415)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-04-22 17:44:36 UTC (rev 14416)
@@ -34,6 +34,8 @@
       by adding "new stream" events for DNS requests, and removing
       spurious "stream closed" events" for cached reverse resolves.
       Patch from mwenge.  Fixes bug 646.
+    - Correctly notify one-hop connections when a circuit build has
+      failed.  Possible fix for bug 669.  Found by lodger.
 
   o Minor features (security):
     - Reject requests for reverse-dns lookup of names in a private

Modified: tor/branches/tor-0_2_0-patches/src/or/circuituse.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/circuituse.c	2008-04-22 17:44:28 UTC (rev 14415)
+++ tor/branches/tor-0_2_0-patches/src/or/circuituse.c	2008-04-22 17:44:36 UTC (rev 14416)
@@ -745,10 +745,10 @@
       n_conn->_base.or_is_obsolete = 1;
       entry_guard_register_connect_status(n_conn->identity_digest, 0,
                                           time(NULL));
-      /* if there are any one-hop streams waiting on this circuit, fail
-       * them now so they can retry elsewhere. */
-      connection_ap_fail_onehop(n_conn->identity_digest);
     }
+    /* if there are any one-hop streams waiting on this circuit, fail
+     * them now so they can retry elsewhere. */
+    connection_ap_fail_onehop(circ->_base.n_conn_id_digest);
   }
 
   switch (circ->_base.purpose) {