Rename Header Options Tlv

hawkinsw · hawkinsw · commit aa7cdb755da7 · 2025-06-09T08:48:33.000-04:00
Signed-off-by: Will Hawkins &lt;hawkinsw@obs.cr&gt;
diff --git a/src/custom_handlers.rs b/src/custom_handlers.rs
@@ -18,7 +18,7 @@
 
 use std::sync::{Arc, Mutex};
 
-use crate::{custom_handlers::ch::HeaderOptionsTlv, handlers};
+use crate::{custom_handlers::ch::V6ExtensionHeadersReflectionTlv, handlers};
 
 // Allow dead code in here because it is an API and, yes, there
 // are fields that are not read ... yet.
@@ -2322,42 +2322,42 @@ pub mod ch {
     }
 
     #[derive(Default, Debug)]
-    pub struct HeaderOptionsTlv {
+    pub struct V6ExtensionHeadersReflectionTlv {
         headers: Vec<Ipv6ExtHeader>
     }
 
     #[derive(Subcommand, Clone, Debug)]
-    enum HeaderOptionsTlvCommand {
-        HeaderOptions {
+    enum V6ExtensionHeadersTlvCommand {
+        V6ExtensionHeaderReflection {
             #[arg(last = true)]
             next_tlv_command: Vec<String>,
         },
     }
 
-    impl TlvHandler for HeaderOptionsTlv {
+    impl TlvHandler for V6ExtensionHeadersReflectionTlv {
         fn tlv_name(&self) -> String {
-            "IPv6 Header Options".into()
+            "IPv6 Extension Header Reflection".into()
         }
 
         fn tlv_cli_command(&self, existing: Command) -> Command {
-            HeaderOptionsTlvCommand::augment_subcommands(existing)
+            V6ExtensionHeadersTlvCommand::augment_subcommands(existing)
         }
 
         fn tlv_type(&self) -> Vec<u8> {
-            [Tlv::HEADER_OPTIONS].to_vec()
+            [Tlv::V6_EXTENSION_HEADERS_REFLECTION].to_vec()
         }
 
         fn request(
             &mut self,
             _args: Option<TestArguments>,
             matches: &mut ArgMatches,
         ) -> TlvRequestResult {
-            let maybe_our_command = HeaderOptionsTlvCommand::from_arg_matches(matches);
+            let maybe_our_command = V6ExtensionHeadersTlvCommand::from_arg_matches(matches);
             if maybe_our_command.is_err() {
                 return None;
             }
             let our_command = maybe_our_command.unwrap();
-            let HeaderOptionsTlvCommand::HeaderOptions { next_tlv_command } = our_command;
+            let V6ExtensionHeadersTlvCommand::V6ExtensionHeaderReflection { next_tlv_command } = our_command;
 
             let next_tlv_command = if !next_tlv_command.is_empty() {
                 Some(next_tlv_command.join(" "))
@@ -2411,7 +2411,7 @@ pub mod ch {
             let header_options = response
                 .tlvs
                 .iter_mut()
-                .filter(|tlv| tlv.tpe == Tlv::HEADER_OPTIONS);
+                .filter(|tlv| tlv.tpe == Tlv::V6_EXTENSION_HEADERS_REFLECTION);
 
             for (ipv6_header, tlv) in self.headers.iter().as_slice().iter().zip(header_options) {
                 // Punt if the IPv6 header is not at least 4 bytes!
@@ -2448,7 +2448,7 @@ pub mod ch {
                 _config.add_configuration(
                     NetConfigurationItemKind::ExtensionHeader,
                     NetConfigurationArgument::ExtensionHeader(ipv6_header.clone()),
-                    Tlv::HEADER_OPTIONS,
+                    Tlv::V6_EXTENSION_HEADERS_REFLECTION,
                 );
             }
 
@@ -2715,7 +2715,7 @@ impl CustomHandlers {
         let ber_tlv: BitErrorRateTlv = Default::default();
         let ber_tlv_handler = Arc::new(Mutex::new(ber_tlv));
         handlers.add(ber_tlv_handler);
-        let header_options_tlv: HeaderOptionsTlv = Default::default();
+        let header_options_tlv: V6ExtensionHeadersReflectionTlv = Default::default();
         let header_options_tlv_handler = Arc::new(Mutex::new(header_options_tlv));
         handlers.add(header_options_tlv_handler);
         handlers
diff --git a/src/tlv.rs b/src/tlv.rs
@@ -457,7 +457,7 @@ fn ber_count_tlv_display(tlv: &Tlv, f: &mut Formatter) -> std::fmt::Result {
 }
 fn ipv6_extension_header_tlv_display(tlv: &Tlv, f: &mut Formatter) -> std::fmt::Result {
     basic_tlv_display(tlv, f)?;
-    write!(f, " IPv6 Extension Header: {:2x?}", tlv.value)
+    write!(f, " IPv6 Extension Header Reflection: {:2x?}", tlv.value)
 }
 
 #[allow(clippy::type_complexity)]
@@ -478,7 +478,7 @@ static TLV_DISPLAY: LazyLock<HashMap<u8, fn(&Tlv, f: &mut Formatter) -> std::fmt
         m.insert(Tlv::HMAC_TLV, hmac_tlv_display);
         m.insert(Tlv::BER_PATTERN, ber_pattern_tlv_display);
         m.insert(Tlv::BER_COUNT, ber_count_tlv_display);
-        m.insert(Tlv::HEADER_OPTIONS, ipv6_extension_header_tlv_display);
+        m.insert(Tlv::V6_EXTENSION_HEADERS_REFLECTION, ipv6_extension_header_tlv_display);
         m
     });
 
@@ -588,7 +588,7 @@ impl Tlv {
     pub const HMAC_TLV: u8 = 8;
     pub const BER_COUNT: u8 = 9;
     pub const BER_PATTERN: u8 = 10;
-    pub const HEADER_OPTIONS: u8 = 11;
+    pub const V6_EXTENSION_HEADERS_REFLECTION: u8 = 11;
 
     pub fn type_to_string(tpe: u8) -> String {
         match tpe {
@@ -606,7 +606,7 @@ impl Tlv {
             Self::HMAC_TLV => "HMAC".into(),
             Self::BER_COUNT => "BER Count".into(),
             Self::BER_PATTERN => "BER Pattern".into(),
-            Self::HEADER_OPTIONS => "Reflected IPv6 Extension Header Data".into(),
+            Self::V6_EXTENSION_HEADERS_REFLECTION => "Reflected IPv6 Extension Header Data".into(),
             _ => "Unrecognized".into(),
         }
     }
