aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-07-30 03:41:02 -0400
committerRoger Dingledine <arma@torproject.org>2009-07-30 03:41:02 -0400
commit6bb10a28fb3f0286c61bc39b5fc2ced4aac43a95 (patch)
tree1c7a067588e71ca4258e0e0fb44ca6882a509ad2
parente8e88922a789e3317c881521110bfa9a7bdce597 (diff)
downloadtor-6bb10a28fb3f0286c61bc39b5fc2ced4aac43a95.tar.gz
tor-6bb10a28fb3f0286c61bc39b5fc2ced4aac43a95.zip
Patch from atagar to fix control-spec
Specifically, admit that the "newconsensus" event exists, and status/reachability has secretly been status/reachability-succeeded all along, but nobody used it so we didn't notice.
-rw-r--r--doc/spec/control-spec.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt
index 4fdf409742..20952996b2 100644
--- a/doc/spec/control-spec.txt
+++ b/doc/spec/control-spec.txt
@@ -219,7 +219,7 @@
"INFO" / "NOTICE" / "WARN" / "ERR" / "NEWDESC" / "ADDRMAP" /
"AUTHDIR_NEWDESCS" / "DESCCHANGED" / "STATUS_GENERAL" /
"STATUS_CLIENT" / "STATUS_SERVER" / "GUARD" / "NS" / "STREAM_BW" /
- "CLIENTS_SEEN"
+ "CLIENTS_SEEN" / "NEWCONSENSUS"
Any events *not* listed in the SETEVENTS line are turned off; thus, sending
SETEVENTS with an empty body turns off all event reporting.
@@ -562,14 +562,14 @@
states. See Section 4.1.10 for explanations. (Only a few of the
status events are available as getinfo's currently. Let us know if
you want more exposed.)
- "status/reachability/or"
+ "status/reachability-succeeded/or"
0 or 1, depending on whether we've found our ORPort reachable.
- "status/reachability/dir"
+ "status/reachability-succeeded/dir"
0 or 1, depending on whether we've found our DirPort reachable.
- "status/reachability"
+ "status/reachability-succeeded"
"OR=" ("0"/"1") SP "DIR=" ("0"/"1")
- Combines status/reachability/*; controllers MUST ignore unrecognized
- elements in this entry.
+ Combines status/reachability-succeeded/*; controllers MUST ignore
+ unrecognized elements in this entry.
"status/bootstrap-phase"
Returns the most recent bootstrap phase status event
sent. Specifically, it returns a string starting with either