Fix handling of ISO_STREAM

Now we track *which* stream with ISO_STREAM set is associated to a
particular circuit, so that we won't think that stream is incompatible
with its circuit and launch another one a second later, and we use that
same field to mark circuits which have had an ISO_STREAM stream attached
to them, so that we won't ever put a second stream on that circuit.

Fixes bug 3695.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/or/or.h b/src/or/or.h
index eb271b5ee..9c5d354c7 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2530,6 +2530,9 @@ typedef struct origin_circuit_t {
      socks_username_len and socks_password_len for their lengths. */
   char *socks_username;
   char *socks_password;
+  /** Global identifier for the first stream attached here; used by
+   * ISO_STREAM. */
+  uint64_t associated_isolated_stream_global_id;
   /**@}*/
 
 } origin_circuit_t;