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_all_supported().

Browse Source 
This includes differences in behaviour to before, which should now more closely
match the C version:

 - If parsing a protover `char*` from C, and the string is not parseable, this
   function will return 1 early, which matches the C behaviour when protocols
   are unparseable.  Previously, we would parse it and its version numbers
   simultaneously, i.e. there was no fail early option, causing us to spend more
   time unnecessarily parsing versions.

 * REFACTOR `protover::ffi::protover_all_supported()` to use new types and
   methods.
This commit is contained in:
Isis Lovecruft 2018-03-21 02:45:41 +00:00
parent 493e565226
commit c7bcca0233
No known key found for this signature in database
GPG Key ID: B8938BC5E86C046F
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,19 +59,26 @@ pub extern "C" fn protover_all_supported(
Err(_) => return 1,
};
let (is_supported, unsupported) = all_supported(relay_version);
let relay_proto_entry: UnvalidatedProtoEntry = match relay_version.parse() {
Ok(n) => n,
Err(_) => return 1,
};
let maybe_unsupported: Option<UnvalidatedProtoEntry> = relay_proto_entry.all_supported();
if unsupported.len() > 0 {
let c_unsupported = match CString::new(unsupported) {
if maybe_unsupported.is_some() {
let unsupported: UnvalidatedProtoEntry = maybe_unsupported.unwrap();
let c_unsupported: CString = match CString::new(unsupported.to_string()) {
Ok(n) => n,
Err(_) => return 1,
};
let ptr = c_unsupported.into_raw();
unsafe { *missing_out = ptr };
return 0;
}
return if is_supported { 1 } else { 0 };
1
}
/// Provide an interface for C to translate arguments and return types for