From c88803d924abab3c8ea62597e506a0a896e5bc1d Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Sun, 19 Aug 2007 04:58:55 +0000 Subject: Fix a bug in ADDRMAP controller replies that would sometimes try to print a NULL. Patch from tup. svn:r11181 --- doc/spec/control-spec.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'doc/spec/control-spec.txt') diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt index edd6833615..9263eb4656 100644 --- a/doc/spec/control-spec.txt +++ b/doc/spec/control-spec.txt @@ -762,7 +762,7 @@ $Id$ PIVERSION: 1*DIGIT Tor MAY give its InfoLines in any order; controllers MUST ignore InfoLines - with keywords it does not recognize. Controllers MUST ignore extraneous + with keywords they do not recognize. Controllers MUST ignore extraneous data on any InfoLine. PIVERSION is there in case we drastically change the syntax one day. For @@ -1044,10 +1044,14 @@ $Id$ 4.1.7. New Address mapping Syntax: - "650" SP "ADDRMAP" SP Address SP Address SP Expiry SP Error SP GMTExpiry + "650" SP "ADDRMAP" SP Address SP NewAddress SP Expiry + [SP Error] SP GMTExpiry CRLF + + NewAddress = Address / "" Expiry = DQUOTE ISOTime DQUOTE / "NEVER" - Error = / "error=" ErrorCode + Error = "error=" ErrorCode + ErrorCode = XXXX GMTExpiry = "EXPIRES=" DQUOTE IsoTime DQUOTE Error and GMTExpiry are only provided if extended events are enabled. -- cgit v1.2.3-54-g00ecf