From: David Goulet <dgoulet@ev0ke.net>
Date: Fri, 16 Jan 2015 22:43:33 +0000 (-0500)
Subject: Fix: close intro circuit if no more intro points are usable
X-Git-Tag: tor-0.2.6.3-alpha~129^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3c1152bae9e021e10dd014970913114753ac74d;p=thirdparty%2Ftor.git

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@ev0ke.net>
---

diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 19a8cef1bf..1353ee38d5 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;