[tor-commits] [torspec/master] Clarifications for extrainfo desc transport lines

[nickm at torproject.org]

commit 904d3d45583e9f916c74fab77784184defe53598
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Aug 4 19:57:22 2012 -0700

    Clarifications for extrainfo desc transport lines
    
    Couple clarifications from discussions with asn...
    
    1. The 'transportname' in descriptor lines are unique
    
      As discussed on ticket #6257, George is fine with the 'transportname' being
      unique per a descriptor. This is useful to me because I can now model this as
      a 'transportname => attributes' hash which will be more user friendly.
    
    2. The transport name can appear on non-bridges
    
      Though this attribute only makes sense for bridges, it can appear on the
      extrainfo descriptors for non-bridges as well. Actually, we already have one
      in the wild...
    
      extra-info toorvoid 0B37323298FF98CD86ED404895BB27B7426E8AE1
      published 2012-08-04 12:19:13
      transport obfs2 83.212.96.201:33570
---
 dir-spec.txt |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index f88ceb3..c18efcf 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -891,7 +891,12 @@
         [Any number.]
 
         Signals that the router supports the 'transportname' pluggable
-        transport in IP address 'address' and TCP port 'port'.
+        transport in IP address 'address' and TCP port 'port'. A single
+        descriptor MUST not have more than one transport line with the
+        same 'transportname'.
+
+        Pluggable transports are only relevant to bridges, but these entries
+        can appear in non-bridge relays as well.
 
     "router-signature" NL Signature NL
         [At end, exactly once.]