nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

rust: Refactor Rust impl of protover_list_supports_protocol_or_later().

Browse Source 
This includes a subtle difference in behaviour, as in 4258f1e18, where we return
(matching the C impl's return behaviour) earlier than before if parsing failed,
saving us computation in parsing the versions into a
protover::protoset::ProtoSet.

 * REFACTOR `protover::ffi::protover_list_supports_protocol_or_later()` to use
   new types and methods.
This commit is contained in:
Isis Lovecruft 2018-03-21 02:59:25 +00:00
parent 63eeda89ea
commit 269053a380
No known key found for this signature in database
GPG Key ID: B8938BC5E86C046F
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rust/protover/ffi.rs
View File

@ -141,11 +141,15 @@ pub extern "C" fn protocol_list_supports_protocol_or_later(
Err(_) => return 0,
};
let is_supported =
protover_string_supports_protocol_or_later(
protocol_list, protocol, version);
let proto_entry: UnvalidatedProtoEntry = match protocol_list.parse() {
Ok(n) => n,
Err(_) => return 1,
};
return if is_supported { 1 } else { 0 };
if proto_entry.supports_protocol_or_later(&protocol.into(), &version) {
return 1;
}
0
}
/// Provide an interface for C to translate arguments and return types for