summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-03-02 20:54:09 +0000
committerNick Mathewson <nickm@torproject.org>2005-03-02 20:54:09 +0000
commitfc0e67bc7241d0a439ee73747c373d7ed2af4b01 (patch)
tree11104e43b02d8944290ef710b6018b0abbf583b1 /doc
parentb494c2223df3a53e47045cf8044bbaeb2377ebf1 (diff)
downloadtor-fc0e67bc7241d0a439ee73747c373d7ed2af4b01.tar.gz
tor-fc0e67bc7241d0a439ee73747c373d7ed2af4b01.zip
Clarify some confusion about what GETINFO(addr-mappings) should return.
svn:r3727
Diffstat (limited to 'doc')
-rw-r--r--doc/control-spec.txt12
1 files changed, 10 insertions, 2 deletions
diff --git a/doc/control-spec.txt b/doc/control-spec.txt
index e12998cd4d..0f197c46a1 100644
--- a/doc/control-spec.txt
+++ b/doc/control-spec.txt
@@ -300,8 +300,16 @@ the message.
"desc/all-ids" -- a comma-separated list of all known OR identities.
- "addr-mappings" -- a NL-terminated list of address mappings, each in
- the form of "from-address" SP "to-address".
+ "addr-mappings/all"
+ "addr-mappings/config"
+ "addr-mappings/cache"
+ "addr-mappings/control" -- a NL-terminated list of address mappings, each
+ in the form of "from-address" SP "to-address". The 'config' key
+ returns those address mappings set in the configuration; the 'cache'
+ key returns the mappings in the 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.
+
3.13 INFOVALUE (Type 0x000C)