From 213b8d78c98cb68f2121e42e87133d9b36a1474f Mon Sep 17 00:00:00 2001 From: onyinyang Date: Thu, 9 Mar 2023 18:18:02 -0500 Subject: [PATCH] Revert "Add fields to BridgeLine" This reverts commit 4a014725cdae582401f5d166a722317ed45b8bfe. --- crates/lox-library/src/bridge_table.rs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/crates/lox-library/src/bridge_table.rs b/crates/lox-library/src/bridge_table.rs index b33af2c..aa64d98 100644 --- a/crates/lox-library/src/bridge_table.rs +++ b/crates/lox-library/src/bridge_table.rs @@ -36,20 +36,16 @@ pub const MAX_BRIDGES_PER_BUCKET: usize = 3; /// level 1) pub const MIN_BUCKET_REACHABILITY: usize = 2; - /// A bridge information line #[serde_as] -#[derive(Serialize, Deserialize, Clone, Copy, Hash, Eq, PartialEq, Debug)] +#[derive(Serialize, Deserialize, Copy, Clone, Hash, Eq, PartialEq, Debug)] pub struct BridgeLine { - /// pluggable transport protocol string as a byte array - pub pt_type: [u8; 25], /// IPv4 or IPv6 address pub addr: [u8; 16], /// port pub port: u16, - /// fingerprint as a byte array - pub fingerprint: [u8; 20], - /// other protocol information, including cert and iat mode + /// other protocol information, including pluggable transport, + /// public key, etc. #[serde_as(as = "[_; BRIDGE_BYTES - 18]")] pub info: [u8; BRIDGE_BYTES - 18], } @@ -72,10 +68,8 @@ impl Default for BridgeLine { /// An "empty" BridgeLine is represented by all zeros fn default() -> Self { Self { - pt_type: [0; 25], addr: [0; 16], port: 0, - fingerprint: [0; 20], info: [0; BRIDGE_BYTES - 18], } }