fixup! Add a state machine for protocol upgrades to the peer

pendulum-project · Oct 31, 2023 · 6598597 · 6598597
1 parent 4a2bc7d
commit 6598597
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ntp-proto/src/packet/extension_fields.rs b/ntp-proto/src/packet/extension_fields.rs
@@ -463,6 +463,7 @@ impl<'a> ExtensionField<'a> {
 
     fn decode(
         raw: RawExtensionField<'a>,
+        #[cfg_attr(not(feature = "ntpv5"), allow(unused_variables))]
         extension_header_version: ExtensionHeaderVersion,
     ) -> Result<Self, ParsingError<std::convert::Infallible>> {
         type EF<'a> = ExtensionField<'a>;

diff --git a/ntp-proto/src/peer.rs b/ntp-proto/src/peer.rs
@@ -311,7 +311,10 @@ pub enum ProtocolVersion {
 impl ProtocolVersion {
     pub fn expected_incoming_version(&self) -> u8 {
         match self {
-            ProtocolVersion::V4 | ProtocolVersion::V4UpgradingToV5 { .. } => 4,
+            ProtocolVersion::V4 => 4,
+            #[cfg(feature = "ntpv5")]
+            ProtocolVersion::V4UpgradingToV5 { .. } => 4,
+            #[cfg(feature = "ntpv5")]
             ProtocolVersion::V5 => 5,
         }
     }