From a8821e2d826755209f793f7ce61e04e9f8bfed64 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 25 Jul 2007 22:56:54 +0000 Subject: r13905@catbus: nickm | 2007-07-25 18:48:44 -0400 ADDRMAP events should never have specified local time. Extend them to have the proper gmt time, and make GETINFO address-mappings always do the right thing (since it is new in this version). svn:r10930 --- doc/spec/control-spec.txt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt index 2c3e961e4..e7131ccee 100644 --- a/doc/spec/control-spec.txt +++ b/doc/spec/control-spec.txt @@ -387,7 +387,8 @@ $Id$ client-side DNS cache; the 'control' key returns the mappings set via the control interface; the 'all' target returns the mappings set through any mechanism. - Expiry is formatted as with ADDRMAP events; see section 4.1.7. + Expiry is formatted as with ADDRMAP events, except that "expiry" is + always a time in GMT or the string "NEVER"; see section 4.1.7. First introduced in 0.2.0.3-alpha. "addr-mappings/*" -- as for address-mappings/*, but without the @@ -925,7 +926,7 @@ $Id$ If extended events are enabled (see 3.19), optional reason and circuit counting information is provided for CLOSED and FAILED - events. + events. Reason = "MISC" / "DONE" / "CONNECTREFUSED" / "IDENTITY" / "CONNECTRESET" / "TIMEOUT" / "NOROUTE" / @@ -963,10 +964,17 @@ $Id$ 4.1.7. New Address mapping Syntax: - "650" SP "ADDRMAP" SP Address SP Address SP Expiry + "650" SP "ADDRMAP" SP Address SP Address SP Expiry SP Error SP GMTExpiry Expiry = DQUOTE ISOTime DQUOTE / "NEVER" - Expiry is expressed as the local time (rather than GMT). + Error = / "error=" ErrorCode + GMTExpiry = "EXPIRES=" DQUOTE IsoTime DQUOTE + + Error and GMTExpiry are only provided if extended events are enabled. + + Expiry is expressed as the local time (rather than GMT). This is a bug, + left in for backward compatibility; new code should look at GMTExpiry + instead. These events are generated when a new address mapping is entered in the cache, or when the answer for a RESOLVE command is found. -- cgit v1.2.3