torproject/torspec
1
0
Fork 0
mirror of https://github.com/torproject/torspec.git synced 2025-02-11 19:46:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'rransom-tor/feature3457-v2'

Browse Source 
Conflicts:
	control-spec.txt
This commit is contained in:
Nick Mathewson 2012-01-11 12:13:15 -05:00
commit e398656414
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
control-spec.txt
View File

@ -277,7 +277,8 @@
"INFO" / "NOTICE" / "WARN" / "ERR" / "NEWDESC" / "ADDRMAP" / "INFO" / "NOTICE" / "WARN" / "ERR" / "NEWDESC" / "ADDRMAP" /
"AUTHDIR_NEWDESCS" / "DESCCHANGED" / "STATUS_GENERAL" / "AUTHDIR_NEWDESCS" / "DESCCHANGED" / "STATUS_GENERAL" /
"STATUS_CLIENT" / "STATUS_SERVER" / "GUARD" / "NS" / "STREAM_BW" / "STATUS_CLIENT" / "STATUS_SERVER" / "GUARD" / "NS" / "STREAM_BW" /
"CLIENTS_SEEN" / "NEWCONSENSUS" / "BUILDTIMEOUT_SET" / "SIGNAL" "CLIENTS_SEEN" / "NEWCONSENSUS" / "BUILDTIMEOUT_SET" / "SIGNAL" /
"CIRC2"
Any events *not* listed in the SETEVENTS line are turned off; thus, sending Any events *not* listed in the SETEVENTS line are turned off; thus, sending
SETEVENTS with an empty body turns off all event reporting. SETEVENTS with an empty body turns off all event reporting.
@ -1152,6 +1153,7 @@
"650" SP "CIRC" SP CircuitID SP CircStatus [SP Path] "650" SP "CIRC" SP CircuitID SP CircStatus [SP Path]
[SP "BUILD_FLAGS=" BuildFlags] [SP "PURPOSE=" Purpose] [SP "BUILD_FLAGS=" BuildFlags] [SP "PURPOSE=" Purpose]
[SP "HS_STATE=" HSState] [SP "REND_QUERY=" HSAddress] [SP "HS_STATE=" HSState] [SP "REND_QUERY=" HSAddress]
[SP "TIME_CREATED=" TimeCreated]
[SP "REASON=" Reason [SP "REMOTE_REASON=" Reason]] CRLF [SP "REASON=" Reason [SP "REMOTE_REASON=" Reason]] CRLF
CircStatus = CircStatus =
@ -1184,6 +1186,10 @@
HSAddress = 16*Base32Character HSAddress = 16*Base32Character
Base32Character = ALPHA / "2" / "3" / "4" / "5" / "6" / "7" Base32Character = ALPHA / "2" / "3" / "4" / "5" / "6" / "7"
TimeCreated = Seconds "," MicroSeconds
Seconds = 1*DIGIT
Microseconds = 1*DIGIT
Reason = "NONE" / "TORPROTOCOL" / "INTERNAL" / "REQUESTED" / Reason = "NONE" / "TORPROTOCOL" / "INTERNAL" / "REQUESTED" /
"HIBERNATING" / "RESOURCELIMIT" / "CONNECTFAILED" / "HIBERNATING" / "RESOURCELIMIT" / "CONNECTFAILED" /
"OR_IDENTITY" / "OR_CONN_CLOSED" / "TIMEOUT" / "OR_IDENTITY" / "OR_CONN_CLOSED" / "TIMEOUT" /
@ -1244,6 +1250,11 @@
MUST accept hidden service addresses in formats other than that MUST accept hidden service addresses in formats other than that
specified above. specified above.
The "TIME_CREATED" field is provided only in versions 0.2.3.2-alpha
and later. Seconds is the tv_sec field of a 'struct timeval';
Microseconds is the tv_usec field. TIME_CREATED is the time at
which the circuit was created or cannibalized.
The "REASON" field is provided only for FAILED and CLOSED events, and only The "REASON" field is provided only for FAILED and CLOSED events, and only
if extended events are enabled (see 3.19). Clients MUST accept reasons if extended events are enabled (see 3.19). Clients MUST accept reasons
not listed above. Reasons are as given in tor-spec.txt, except for: not listed above. Reasons are as given in tor-spec.txt, except for:
@ -1989,6 +2000,31 @@
signal). KEYWORD and VALUE specify the configuration option that was changed. signal). KEYWORD and VALUE specify the configuration option that was changed.
Undefined configuration options contain only the KEYWORD. Undefined configuration options contain only the KEYWORD.
4.1.19. Circuit status changed slightly
The syntax is:
"650" SP "CIRC_MINOR" SP CircuitID SP CircEvent [SP Path]
[SP "BUILD_FLAGS=" BuildFlags] [SP "PURPOSE=" Purpose]
[SP "HS_STATE=" HSState] [SP "REND_QUERY=" HSAddress]
[SP "TIME_CREATED=" TimeCreated]
[SP "OLD_PURPOSE=" Purpose [SP "OLD_HS_STATE=" HSState]] CRLF
CircEvent =
"PURPOSE_CHANGED" / ; circuit purpose or HS-related state changed
"CANNIBALIZED" ; circuit cannibalized
Clients MUST accept circuit events not listed above.
The "OLD_PURPOSE" field is provided for both PURPOSE_CHANGED and
CANNIBALIZED events. The "OLD_HS_STATE" field is provided whenever
the "OLD_PURPOSE" field is provided and is a hidden-service-related
purpose.
Other fields are as specified in section 4.1.1 above.
[First added in 0.2.3.2-alpha]
5. Implementation notes 5. Implementation notes
5.1. Authentication 5.1. Authentication