[tor-commits] [torspec/master] Add StreamId to ADDRMAP entry in control-spec

[nickm at torproject.org]

commit c91d596262c5e5b0c285f611aa437d99a400ff33
Author: Neel Chauhan <neel at neelc.org>
Date:   Tue Jan 26 14:26:51 2021 -0800

    Add StreamId to ADDRMAP entry in control-spec
---
 control-spec.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/control-spec.txt b/control-spec.txt
index 72d3195..e160da0 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -2567,7 +2567,7 @@
 
      "650" SP "ADDRMAP" SP Address SP NewAddress SP Expiry
        [SP "error=" ErrorCode] [SP "EXPIRES=" UTCExpiry] [SP "CACHED=" Cached]
-       CRLF
+       [SP "STREAMID=" StreamId] CRLF
 
      NewAddress = Address / "<error>"
      Expiry = DQUOTE ISOTime DQUOTE / "NEVER"
@@ -2576,6 +2576,7 @@
      UTCExpiry = DQUOTE IsoTime DQUOTE
 
      Cached = DQUOTE "YES" DQUOTE / DQUOTE "NO" DQUOTE
+     StreamId = DQUOTE StreamId DQUOTE
 
   Error and UTCExpiry are only provided if extended events are enabled.
   The values for Error are mostly useless.  Future values will be
@@ -2589,6 +2590,9 @@
   Cached indicates whether the mapping will be stored until it expires, or if
   it is just a notification in response to a RESOLVE command.
 
+  StreamId is the global stream identifier of the stream or circuit from which
+  the address was resolved.
+
 4.1.8. Descriptors uploaded to us in our role as authoritative dirserver
 
   [NOTE: This feature was removed in Tor 0.3.2.1-alpha.]