tor

commit 6f2151be9a3e8b535bff4477a17f9c41d3f1d7f4
parent ae4c94bb6468078ba16de481991e781e1b486340
Author: David Goulet <dgoulet@torproject.org>
Date:   Tue, 13 Nov 2018 10:37:25 -0500

Merge branch 'tor-github/pr/487' into maint-0.3.5

Diffstat:
A
changes/bug27841
 | 
7
+++++++
M
src/feature/hs/hs_intropoint.c
 | 
6
------

2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/changes/bug27841 b/changes/bug27841
@@ -0,0 +1,7 @@
+  o Minor bugfixes (onion services):
+    - On an intro point for a version 3 onion service, we do not close
+      an introduction circuit on an NACK. This lets the client decide
+      whether to reuse the circuit or discard it. Previously, we closed
+      intro circuits on NACKs. Fixes bug 27841; bugfix on 0.3.2.1-alpha.
+      Patch by Neel Chaunan
+
diff --git a/src/feature/hs/hs_intropoint.c b/src/feature/hs/hs_intropoint.c
@@ -503,12 +503,6 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request,
     /* Circuit has been closed on failure of transmission. */
     goto done;
   }
-  if (status != HS_INTRO_ACK_STATUS_SUCCESS) {
-    /* We just sent a NACK that is a non success status code so close the
-     * circuit because it's not useful to keep it open. Remember, a client can
-     * only send one INTRODUCE1 cell on a circuit. */
-    circuit_mark_for_close(TO_CIRCUIT(client_circ), END_CIRC_REASON_INTERNAL);
-  }
  done:
   trn_cell_introduce1_free(parsed_cell);
   return ret;