summaryrefslogtreecommitdiff
path: root/doc/spec/control-spec.txt
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-07-25 22:56:58 +0000
committerNick Mathewson <nickm@torproject.org>2007-07-25 22:56:58 +0000
commit5b821883332a9d557e85ae07c69e77cc9a0d0165 (patch)
treed60081cfc734ef77c02540a3bacc90103dd680a6 /doc/spec/control-spec.txt
parenta8821e2d826755209f793f7ce61e04e9f8bfed64 (diff)
downloadtor-5b821883332a9d557e85ae07c69e77cc9a0d0165.tar.gz
tor-5b821883332a9d557e85ae07c69e77cc9a0d0165.zip
r13906@catbus: nickm | 2007-07-25 18:49:50 -0400
Patch from tup: correct grammar for asynchonous reply lines in control-spec.txt svn:r10931
Diffstat (limited to 'doc/spec/control-spec.txt')
-rw-r--r--doc/spec/control-spec.txt16
1 files changed, 9 insertions, 7 deletions
diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt
index e7131cceee..df1d8752e7 100644
--- a/doc/spec/control-spec.txt
+++ b/doc/spec/control-spec.txt
@@ -62,14 +62,16 @@ $Id$
2.3. Replies from Tor to the controller
- Reply = *(MidReplyLine / DataReplyLine) EndReplyLine
-
- MidReplyLine = "-" ReplyLine
- DataReplyLine = "+" ReplyLine Data
- EndReplyLine = SP ReplyLine
- ReplyLine = StatusCode [ SP ReplyText ] CRLF
+ Reply = SyncReply / AsyncReply
+ SyncReply = *(MidReplyLine / DataReplyLine) EndReplyLine
+ AsyncReply = *MidReplyLine EndReplyLine / DataReplyLine
+
+ MidReplyLine = StatusCode "-" ReplyLine
+ DataReplyLine = StatusCode "+" ReplyLine Data
+ EndReplyLine = StatusCode SP ReplyLine
+ ReplyLine = [ReplyText] CRLF
ReplyText = XXXX
- StatusCode = XXXX
+ StatusCode = 3DIGIT
Specific replies are mentioned below in section 3, and described more fully
in section 4.