aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-10-23 05:51:46 +0000
committerRoger Dingledine <arma@torproject.org>2006-10-23 05:51:46 +0000
commit2a1c2947172998278e38050f17ad4857079e17e7 (patch)
treea182e4ac1be32a0b553ba6a624b933ab20195343 /doc
parentc804eea39dd91cdbeacba5698adafc0295a949bb (diff)
downloadtor-2a1c2947172998278e38050f17ad4857079e17e7.tar
tor-2a1c2947172998278e38050f17ad4857079e17e7.tar.gz
implement a few status events, so we can make sure they work,
and so vidalia can start handling them if it wants. svn:r8802
Diffstat (limited to 'doc')
-rw-r--r--doc/TODO1
-rw-r--r--doc/control-spec.txt12
2 files changed, 10 insertions, 3 deletions
diff --git a/doc/TODO b/doc/TODO
index 8a77e9555..1d4b8367a 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -278,6 +278,7 @@ d - Write limiting; separate token bucket for write
- Implement
Minor items for 0.1.2.x as time permits:
+ - don't do dns hijacking tests if we're reject *:* exit policy?
o Some way for the authorities to set BadExit for some nodes manually.
- When we export something from foo.c file for testing purposes only,
make a foo_test.h file for test.c to include.
diff --git a/doc/control-spec.txt b/doc/control-spec.txt
index 8ded5448e..0c260c6d3 100644
--- a/doc/control-spec.txt
+++ b/doc/control-spec.txt
@@ -938,13 +938,19 @@ $Id$
Type = "STATUS_GENERAL" / "STATUS_CLIENT" / "STATUS_SERVER"
Severity = "NOTICE" / "WARN" / "ERR"
- Action is a string, and Arguments is a series of key=value
+ Action is a string, and Arguments is a series of keyword=value
pairs on the same line.
+ Controllers who listen to these events will be assumed to want
+ both EXTENDED_EVENTS and VERBOSE_NAMES; see the USEFEATURE command
+ for details.
+
+[
The reserved keyword "message" can optionally be used to provide a
string describing the nature of the action. Message strings MUST
NOT include items that a controller might be tempted to parse,
such as numbers.
+no plans to use this yet -RD]
Actions for STATUS_GENERAL severity NOTICE events can be as follows:
@@ -969,10 +975,10 @@ $Id$
since we don't really know what the user should do anyway. Hm.]
TOO_MANY_CONNECTIONS
- "limit=NUM"
+ "current=NUM"
Tor has reached its ulimit -n or whatever the native limit is on
file descriptors or sockets. The user should really do something
- about this. The "limit" argument shows the number of connections
+ about this. The "current" argument shows the number of connections
currently open.
BUG