diff options
| author | Damian Johnson <atagar@torproject.org> | 2013-02-11 08:13:36 -0800 |
|---|---|---|
| committer | Damian Johnson <atagar@torproject.org> | 2013-02-11 08:13:36 -0800 |
| commit | 74b96e9dc15346a82d871ec7792d09e9c11e074a (patch) | |
| tree | a86c9855349de3cfdf6fd31ae29fa92846dbfc98 | |
| parent | fe5f30f9738587229ed80b6daf1251eeba7738a1 (diff) | |
| download | torspec-74b96e9dc15346a82d871ec7792d09e9c11e074a.tar.gz torspec-74b96e9dc15346a82d871ec7792d09e9c11e074a.zip | |
Replacing CircID with CircuitID
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.
| -rw-r--r-- | control-spec.txt | 4 | ||||
| -rw-r--r-- | proposals/218-usage-controller-events.txt | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/control-spec.txt b/control-spec.txt index 5ea5038..02f4705 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -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] diff --git a/proposals/218-usage-controller-events.txt b/proposals/218-usage-controller-events.txt index a912b52..b835b69 100644 --- a/proposals/218-usage-controller-events.txt +++ b/proposals/218-usage-controller-events.txt @@ -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" / "_" ) |