[tor-commits] [tor/master] Fix: close intro circuit if no more intro points are usable

[nickm at torproject.org]

commit b3c1152bae9e021e10dd014970913114753ac74d
Author: David Goulet <dgoulet at ev0ke.net>
Date:   Fri Jan 16 17:43:33 2015 -0500

    Fix: close intro circuit if no more intro points are usable
    
    Once a NACK is received on the intro circuit, tor tries an other usable one
    by extending the current circuit to it. If no more intro points are usable,
    now close the circuit.
    
    Fixes #14224
    
    Signed-off-by: David Goulet <dgoulet at ev0ke.net>
---
 src/or/rendclient.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 19a8cef..1353ee3 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -468,6 +468,10 @@ rend_client_introduction_acked(origin_circuit_t *circ,
       /* XXXX If that call failed, should we close the rend circuit,
        * too? */
       return result;
+    } else {
+      /* Close circuit because no more intro points are usable thus this
+       * circuit is not useful anymore. */
+      circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_FINISHED);
     }
   }
   return 0;