dns-test: add getters & make some fields public

ferrous-systems · May 22, 2024 · fef26b7 · fef26b7
1 parent 3a54e69
commit fef26b7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/packages/dns-test/src/record.rs b/packages/dns-test/src/record.rs
@@ -142,6 +142,14 @@ impl Record {
         }
         .into()
     }
+
+    pub fn try_into_ds(self) -> CoreResult<DS, Self> {
+        if let Self::DS(v) = self {
+            Ok(v)
+        } else {
+            Err(self)
+        }
+    }
 }
 
 impl FromStr for Record {
@@ -327,12 +335,12 @@ impl fmt::Display for DNSKEY {
 
 #[derive(Clone, Debug)]
 pub struct DS {
-    zone: FQDN,
-    ttl: u32,
-    key_tag: u16,
-    algorithm: u8,
-    digest_type: u8,
-    digest: String,
+    pub zone: FQDN,
+    pub ttl: u32,
+    pub key_tag: u16,
+    pub algorithm: u8,
+    pub digest_type: u8,
+    pub digest: String,
 }
 
 impl FromStr for DS {

diff --git a/packages/dns-test/src/tshark.rs b/packages/dns-test/src/tshark.rs
@@ -179,6 +179,10 @@ impl Message {
             .ok()
     }
 
+    pub fn as_value(&self) -> &serde_json::Value {
+        &self.inner
+    }
+
     fn opt_record(&self) -> Option<&serde_json::Value> {
         for (key, value) in self.inner.get("Additional records")?.as_object()? {
             if key.ends_with(": type OPT") {