diff options
| author | teor <teor@torproject.org> | 2020-02-12 22:15:17 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-02-12 22:15:17 +1000 |
| commit | 4fed49e0dd4754dcc03688af2a30c42de64168bf (patch) | |
| tree | d4b621c47e193697a30faa185ae6c74a169c02ab /src | |
| parent | 14cb337e803c766c2831364f71516f4c247810db (diff) | |
| download | tor-4fed49e0dd4754dcc03688af2a30c42de64168bf.tar.gz tor-4fed49e0dd4754dcc03688af2a30c42de64168bf.zip | |
protover: Sort tor's supported protocol versions
As recommended by the tor directory specification.
Fixes bug 33285; bugfix on 0.4.0.1-alpha.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/or/protover.c | 4 | ||||
| -rw-r--r-- | src/rust/protover/protover.rs | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/core/or/protover.c b/src/core/or/protover.c index 2a0a06f951..621111622e 100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@ -391,6 +391,7 @@ protover_get_supported_protocols(void) "Cons=1-2 " "Desc=1-2 " "DirCache=1-2 " + "FlowCtrl=1 " "HSDir=1-2 " "HSIntro=3-5 " "HSRend=1-2 " @@ -401,9 +402,8 @@ protover_get_supported_protocols(void) "LinkAuth=3 " #endif "Microdesc=1-2 " - "Relay=1-2 " "Padding=2 " - "FlowCtrl=1"; + "Relay=1-2"; } /** The protocols from protover_get_supported_protocols(), as parsed into a diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 0ca960bd69..6d2ef33eec 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -161,30 +161,30 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { "Cons=1-2 \ Desc=1-2 \ DirCache=1-2 \ + FlowCtrl=1 \ HSDir=1-2 \ HSIntro=3-4 \ HSRend=1-2 \ Link=1-5 \ LinkAuth=3 \ Microdesc=1-2 \ - Relay=1-2 \ Padding=2 \ - FlowCtrl=1" + Relay=1-2" ) } else { cstr!( "Cons=1-2 \ Desc=1-2 \ DirCache=1-2 \ + FlowCtrl=1 \ HSDir=1-2 \ HSIntro=3-4 \ HSRend=1-2 \ Link=1-5 \ LinkAuth=1,3 \ Microdesc=1-2 \ - Relay=1-2 \ Padding=2 \ - FlowCtrl=1" + Relay=1-2" ) } } |