diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-08-19 04:58:55 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-08-19 04:58:55 +0000 |
| commit | c88803d924abab3c8ea62597e506a0a896e5bc1d (patch) | |
| tree | 05f058bbfa9d7ceeec5a6007628b0378905cb8a7 /doc/spec/control-spec.txt | |
| parent | 86734616c73f75a540e4adccb898c8f636e7f270 (diff) | |
| download | tor-c88803d924abab3c8ea62597e506a0a896e5bc1d.tar.gz tor-c88803d924abab3c8ea62597e506a0a896e5bc1d.zip | |
Fix a bug in ADDRMAP controller replies that would sometimes
try to print a NULL. Patch from tup.
svn:r11181
Diffstat (limited to 'doc/spec/control-spec.txt')
| -rw-r--r-- | doc/spec/control-spec.txt | 10 |
1 files changed, 7 insertions, 3 deletions
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 / "<error>" 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. |