July 2018 - tor-commits - lists.torproject.org

[collector/release] Bump version to 1.7.0-dev.
by karsten＠torproject.org 15 Jul '18

15 Jul '18

commit 78fbb4d60ebdcdcf15a48c61d15c916183393add Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jul 15 08:59:40 2018 +0200 Bump version to 1.7.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index a6ddd00..ea88b8a 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.7.0" /> + <property name="release.version" value="1.7.0-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.4.0" />

1 0

[collector/release] Prepare for 1.7.0 release.
by karsten＠torproject.org 15 Jul '18

15 Jul '18

commit aee8e52b20d68d886b00e8fa72f2a2048c9d07d4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jul 14 20:49:48 2018 +0200 Prepare for 1.7.0 release. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 0c79d1e..a6ddd00 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.6.0-dev" /> + <property name="release.version" value="1.7.0" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.4.0" />

1 0

[collector/master] Bump version to 1.7.0-dev.
by karsten＠torproject.org 15 Jul '18

15 Jul '18

commit 78fbb4d60ebdcdcf15a48c61d15c916183393add Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jul 15 08:59:40 2018 +0200 Bump version to 1.7.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index a6ddd00..ea88b8a 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.7.0" /> + <property name="release.version" value="1.7.0-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.4.0" />

1 0

[collector/master] Prepare for 1.7.0 release.
by karsten＠torproject.org 15 Jul '18

15 Jul '18

commit aee8e52b20d68d886b00e8fa72f2a2048c9d07d4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jul 14 20:49:48 2018 +0200 Prepare for 1.7.0 release. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 0c79d1e..a6ddd00 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.6.0-dev" /> + <property name="release.version" value="1.7.0" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.4.0" />

1 0

[collector/master] Recognize new bridge authority Serge.
by karsten＠torproject.org 14 Jul '18

14 Jul '18

commit 2472f0129621c576deaaccb07e876456a78bd3f9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jul 14 20:33:13 2018 +0200 Recognize new bridge authority Serge. Fixes #26786. --- CHANGELOG.md | 5 ++++- .../metrics/collector/bridgedescs/BridgeSnapshotReader.java | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31788f1..aad7213 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -# Changes in version 1.?.? - 2018-??-?? +# Changes in version 1.7.0 - 2018-07-14 + + * Medium changes + - Recognize new bridge authority Serge. * Minor changes - Rename root package org.torproject.collector to diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java index 1a58d84..85c593d 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java @@ -121,6 +121,10 @@ public class BridgeSnapshotReader { authorityFingerprint = "1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1"; break; + case "from-serge-": + authorityFingerprint = + "BA44A889E64B93FAA2B114E02C2A279A8555C533"; + break; default: logger.warn("Did not recognize the bridge authority that " + "generated " + fn + ". Skipping.");

1 0

[tor/master] Utilize `if..else` for switching on boolean values.
by nickm＠torproject.org 13 Jul '18

13 Jul '18

commit 59d4505749073f45db9a32d606b760eb9e07df69 Author: Corey Farwell <coreyf(a)rwell.org> Date: Sun Jun 24 10:27:46 2018 -0400 Utilize `if..else` for switching on boolean values. --- src/rust/protover/ffi.rs | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index f668dba80..ba156cb1b 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -105,9 +105,10 @@ pub extern "C" fn protocol_list_supports_protocol( Ok(n) => n.into(), Err(_) => return 0, }; - match proto_entry.supports_protocol(&protocol, &version) { - false => return 0, - true => return 1, + if proto_entry.supports_protocol(&protocol, &version) { + 1 + } else { + 0 } } @@ -206,13 +207,16 @@ pub extern "C" fn protover_compute_vote( let mut proto_entries: Vec<UnvalidatedProtoEntry> = Vec::new(); for datum in data { - let entry: UnvalidatedProtoEntry = match allow_long_proto_names { - true => match UnvalidatedProtoEntry::from_str_any_len(datum.as_str()) { + let entry: UnvalidatedProtoEntry = if allow_long_proto_names { + match UnvalidatedProtoEntry::from_str_any_len(datum.as_str()) { Ok(n) => n, - Err(_) => continue}, - false => match datum.parse() { + Err(_) => continue + } + } else { + match datum.parse() { Ok(n) => n, - Err(_) => continue}, + Err(_) => continue + } }; proto_entries.push(entry); }

1 0

[tor/master] Utilize type param in method invocation.
by nickm＠torproject.org 13 Jul '18

13 Jul '18

commit 6d2e4dea109ec5a499d11a4fee4f8ca3465ad30c Author: Corey Farwell <coreyf(a)rwell.org> Date: Sun Jun 24 22:45:07 2018 -0400 Utilize type param in method invocation. --- src/rust/protover/ffi.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index ba156cb1b..40a7354cb 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -129,10 +129,7 @@ pub extern "C" fn protover_contains_long_protocol_names_( Err(_) => return 1 }; - let protocol_entry : Result<UnvalidatedProtoEntry,_> = - protocol_list.parse(); - - match protocol_entry { + match protocol_list.parse::<UnvalidatedProtoEntry>() { Ok(_) => 0, Err(_) => 1, }

1 0

[tor/master] Utilize `if let` construct instead of explicit unwrapping.
by nickm＠torproject.org 13 Jul '18

13 Jul '18

commit 94880b2db73d514e0352d70be8eda2b36132aa4d Author: Corey Farwell <coreyf(a)rwell.org> Date: Sun Jun 24 10:16:11 2018 -0400 Utilize `if let` construct instead of explicit unwrapping. --- src/rust/protover/ffi.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index 0470cd487..f668dba80 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -61,10 +61,8 @@ pub extern "C" fn protover_all_supported( Ok(n) => n, Err(_) => return 1, }; - let maybe_unsupported: Option<UnvalidatedProtoEntry> = relay_proto_entry.all_supported(); - if maybe_unsupported.is_some() { - let unsupported: UnvalidatedProtoEntry = maybe_unsupported.unwrap(); + if let Some(unsupported) = relay_proto_entry.all_supported() { let c_unsupported: CString = match CString::new(unsupported.to_string()) { Ok(n) => n, Err(_) => return 1,

1 0

[tor/master] Run rustfmt on 'src/rust/protover/ffi.rs'.
by nickm＠torproject.org 13 Jul '18

13 Jul '18

commit e62582e9fe67d742d5d422758fe588d22e8599f7 Author: Corey Farwell <coreyf(a)rwell.org> Date: Sun Jun 24 22:56:58 2018 -0400 Run rustfmt on 'src/rust/protover/ffi.rs'. --- src/rust/protover/ffi.rs | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index 40a7354cb..034f16e22 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -42,7 +42,6 @@ pub extern "C" fn protover_all_supported( c_relay_version: *const c_char, missing_out: *mut *mut c_char, ) -> c_int { - if c_relay_version.is_null() { return 1; } @@ -58,12 +57,13 @@ pub extern "C" fn protover_all_supported( let relay_proto_entry: UnvalidatedProtoEntry = match UnvalidatedProtoEntry::from_str_any_len(relay_version) { - Ok(n) => n, - Err(_) => return 1, - }; + Ok(n) => n, + Err(_) => return 1, + }; if let Some(unsupported) = relay_proto_entry.all_supported() { - let c_unsupported: CString = match CString::new(unsupported.to_string()) { + let c_unsupported: CString = match CString::new(unsupported.to_string()) + { Ok(n) => n, Err(_) => return 1, }; @@ -98,7 +98,7 @@ pub extern "C" fn protocol_list_supports_protocol( Err(_) => return 1, }; let proto_entry: UnvalidatedProtoEntry = match protocol_list.parse() { - Ok(n) => n, + Ok(n) => n, Err(_) => return 0, }; let protocol: UnknownProtocol = match translate_to_rust(c_protocol) { @@ -114,7 +114,7 @@ pub extern "C" fn protocol_list_supports_protocol( #[no_mangle] pub extern "C" fn protover_contains_long_protocol_names_( - c_protocol_list: *const c_char + c_protocol_list: *const c_char, ) -> c_int { if c_protocol_list.is_null() { return 1; @@ -126,7 +126,7 @@ pub extern "C" fn protover_contains_long_protocol_names_( let protocol_list = match c_str.to_str() { Ok(n) => n, - Err(_) => return 1 + Err(_) => return 1, }; match protocol_list.parse::<UnvalidatedProtoEntry>() { @@ -162,7 +162,7 @@ pub extern "C" fn protocol_list_supports_protocol_or_later( }; let proto_entry: UnvalidatedProtoEntry = match protocol_list.parse() { - Ok(n) => n, + Ok(n) => n, Err(_) => return 1, }; @@ -192,7 +192,6 @@ pub extern "C" fn protover_compute_vote( threshold: c_int, allow_long_proto_names: bool, ) -> *mut c_char { - if list.is_null() { return allocate_and_copy_string(""); } @@ -206,18 +205,19 @@ pub extern "C" fn protover_compute_vote( for datum in data { let entry: UnvalidatedProtoEntry = if allow_long_proto_names { match UnvalidatedProtoEntry::from_str_any_len(datum.as_str()) { - Ok(n) => n, - Err(_) => continue + Ok(n) => n, + Err(_) => continue, } } else { match datum.parse() { - Ok(n) => n, - Err(_) => continue + Ok(n) => n, + Err(_) => continue, } }; proto_entries.push(entry); } - let vote: UnvalidatedProtoEntry = ProtoverVote::compute(&proto_entries, &hold); + let vote: UnvalidatedProtoEntry = + ProtoverVote::compute(&proto_entries, &hold); allocate_and_copy_string(&vote.to_string()) } @@ -242,7 +242,9 @@ pub extern "C" fn protover_is_supported_here( /// Provide an interface for C to translate arguments and return types for /// protover::compute_for_old_tor #[no_mangle] -pub extern "C" fn protover_compute_for_old_tor(version: *const c_char) -> *const c_char { +pub extern "C" fn protover_compute_for_old_tor( + version: *const c_char, +) -> *const c_char { let supported: &'static CStr; let empty: &'static CStr;

1 0

[tor/master] Change `allocate_and_copy_string` to take a `&str` instead of `&String`.
by nickm＠torproject.org 13 Jul '18

13 Jul '18

commit 7e9c37f9cb33d937a664dec83ee28da447a41aa6 Author: Corey Farwell <coreyf(a)rwell.org> Date: Sun Jun 24 08:58:26 2018 -0400 Change `allocate_and_copy_string` to take a `&str` instead of `&String`. --- src/rust/protover/ffi.rs | 3 +-- src/rust/tor_allocate/tor_allocate.rs | 12 +++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index cd49e5f93..0470cd487 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -198,8 +198,7 @@ pub extern "C" fn protover_compute_vote( ) -> *mut c_char { if list.is_null() { - let empty = String::new(); - return allocate_and_copy_string(&empty); + return allocate_and_copy_string(""); } // Dereference of raw pointer requires an unsafe block. The pointer is diff --git a/src/rust/tor_allocate/tor_allocate.rs b/src/rust/tor_allocate/tor_allocate.rs index 47fa5fc59..d0c0d7994 100644 --- a/src/rust/tor_allocate/tor_allocate.rs +++ b/src/rust/tor_allocate/tor_allocate.rs @@ -9,9 +9,9 @@ use libc::c_void; // Define a no-op implementation for testing Rust modules without linking to C #[cfg(feature = "testing")] -pub fn allocate_and_copy_string(s: &String) -> *mut c_char { +pub fn allocate_and_copy_string(s: &str) -> *mut c_char { use std::ffi::CString; - CString::new(s.as_str()).unwrap().into_raw() + CString::new(s).unwrap().into_raw() } // Defined only for tests, used for testing purposes, so that we don't need @@ -39,7 +39,7 @@ extern "C" { /// A `*mut c_char` that should be freed by tor_free in C /// #[cfg(not(feature = "testing"))] -pub fn allocate_and_copy_string(src: &String) -> *mut c_char { +pub fn allocate_and_copy_string(src: &str) -> *mut c_char { let bytes: &[u8] = src.as_bytes(); let size = mem::size_of_val::<[u8]>(bytes); @@ -77,8 +77,7 @@ mod test { use tor_allocate::allocate_and_copy_string; - let empty = String::new(); - let allocated_empty = allocate_and_copy_string(&empty); + let allocated_empty = allocate_and_copy_string(""); let allocated_empty_rust = unsafe { CStr::from_ptr(allocated_empty).to_str().unwrap() }; @@ -95,8 +94,7 @@ mod test { use tor_allocate::allocate_and_copy_string; - let empty = String::from("foo bar biz"); - let allocated_empty = allocate_and_copy_string(&empty); + let allocated_empty = allocate_and_copy_string("foo bar biz"); let allocated_empty_rust = unsafe { CStr::from_ptr(allocated_empty).to_str().unwrap() };

1 0