torproject/torspec
1
0
Fork 0
mirror of https://github.com/torproject/torspec.git synced 2024-11-27 20:00:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replacing CircID with CircuitID

Browse Source 
CircuitID is defined in section 2.4, but 'CircID' isn't. Using that general
definition in proposal 218 and also fixing a couple spots in the control-spec.
This commit is contained in:
Damian Johnson 2013-02-11 08:13:36 -08:00
parent fe5f30f973
commit 74b96e9dc1
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
control-spec.txt
View File

@ -567,7 +567,7 @@
"stream-status"
A series of lines as for a stream status event. Each is of the form:
StreamID SP StreamStatus SP CircID SP Target CRLF
StreamID SP StreamStatus SP CircuitID SP Target CRLF
"orconn-status"
A series of lines as for an OR connection status event. In Tor
@ -1394,7 +1394,7 @@
The syntax is:
"650" SP "STREAM" SP StreamID SP StreamStatus SP CircID SP Target
"650" SP "STREAM" SP StreamID SP StreamStatus SP CircuitID SP Target
[SP "REASON=" Reason [ SP "REMOTE_REASON=" Reason ]]
[SP "SOURCE=" Source] [ SP "SOURCE_ADDR=" Address ":" Port ]
[SP "PURPOSE=" Purpose]

5
proposals/218-usage-controller-events.txt
View File

@ -88,13 +88,12 @@ Target: 0.2.5.x
The syntax is:
"650" SP "CELL_STATS"
[ SP "PCircID=" PCircID ] [ SP "PConnID=" ConnID ]
[ SP "PCircID=" CircuitID ] [ SP "PConnID=" ConnID ]
[ SP "PAdded=" PAdded ] [ SP "PRemoved=" PRemoved ]
[ SP "PTime=" PTime ]
[ SP "NCircID=" NCircID ] [ SP "NConnID=" ConnID ]
[ SP "NCircID=" CircuitID ] [ SP "NConnID=" ConnID ]
[ SP "NAdded=" NAdded ] [ SP "NRemoved=" NRemoved ]
[ SP "NTime=" NTime ] CRLF
PCircID, NCircID = 1*16 IDChar
PAdded, PRemoved, PTime, NAdded, NRemoved, NTime =
CellType ":" 1*DIGIT 0*( "," CellType ":" 1*DIGIT )
CellType = 1*( "a" - "z" / "0" - "9" / "_" )