[tor-commits] [torspec/master] Adding or-address from proposal 186

[nickm at torproject.org]

commit 56cb98640e59a228c4c15e3ae14505f87771d07a
Author: Damian Johnson <atagar at torproject.org>
Date:   Tue Apr 10 09:28:57 2012 -0700

    Adding or-address from proposal 186
    
    IPv6 support has already been implemented without its corresponding spec
    change. Fixing that.
    
    This drops the 'A node must not list more than 8 or-address lines.' requirement
    because that is a tor implementation detail and should not be a limitation
    imposed by controllers or alternative tor implementations.
---
 dir-spec.txt |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index ab8b064..b1e80aa 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -595,6 +595,21 @@
        included for specialized controllers designed to support perspective
        access and such.
 
+   "or-address" SP ADDRESS ":" PORTLIST NL
+
+       [Any number]
+
+       ADDRESS = IP6ADDR | IP4ADDR
+       IPV6ADDR = an ipv6 address, surrounded by square brackets.
+       IPV4ADDR = an ipv4 address, represented as a dotted quad.
+       PORTLIST = PORTSPEC | PORTSPEC "," PORTLIST
+       PORTSPEC = PORT
+       PORT = a number between 1 and 65535 inclusive.
+
+       An alternative address that can be used instead of ORListenAddress.
+
+       A descriptor should not include an or-address line that does nothing but
+       duplicate the address:port pair from its "router" line.
 
 2.2. Extra-info documents