From 0bcf74961796181b5d1d4903496afd087d85384c Mon Sep 17 00:00:00 2001
From: Sebastian Ziebell <sebastian.ziebell@ferrous-systems.com>
Date: Mon, 13 May 2024 16:54:57 +0200
Subject: [PATCH] Add function to set referral via other nameserver

* fix clippy lints
---
 packages/dns-test/examples/explore.rs |  8 ++------
 packages/dns-test/src/name_server.rs  | 15 ++++++++++-----
 packages/dns-test/src/tshark.rs       |  8 ++------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/packages/dns-test/examples/explore.rs b/packages/dns-test/examples/explore.rs
index 73a43a86..dc080c30 100644
--- a/packages/dns-test/examples/explore.rs
+++ b/packages/dns-test/examples/explore.rs
@@ -32,11 +32,7 @@ fn main() -> Result<()> {
         nameservers_ns.start()?
     };
 
-    com_ns.referral(
-        nameservers_ns.zone().clone(),
-        nameservers_ns.fqdn().clone(),
-        nameservers_ns.ipv4_addr(),
-    );
+    com_ns.referral_nameserver(&nameservers_ns);
 
     let com_ns = if args.dnssec {
         let com_ns = com_ns.sign()?;
@@ -46,7 +42,7 @@ fn main() -> Result<()> {
         com_ns.start()?
     };
 
-    root_ns.referral(FQDN::COM, com_ns.fqdn().clone(), com_ns.ipv4_addr());
+    root_ns.referral_nameserver(&com_ns);
 
     let mut trust_anchor = TrustAnchor::empty();
     let root_ns = if args.dnssec {
diff --git a/packages/dns-test/src/name_server.rs b/packages/dns-test/src/name_server.rs
index 6e599a9d..d8549303 100644
--- a/packages/dns-test/src/name_server.rs
+++ b/packages/dns-test/src/name_server.rs
@@ -71,11 +71,7 @@ impl Graph {
                 unreachable!()
             };
 
-            parent.referral(
-                child.zone().clone(),
-                child.fqdn().clone(),
-                child.ipv4_addr(),
-            );
+            parent.referral_nameserver(child);
         }
 
         let root = nameservers.last().unwrap();
@@ -188,6 +184,15 @@ impl NameServer<Stopped> {
         self
     }
 
+    /// Adds a NS + A record pair to the zone file from another NameServer
+    pub fn referral_nameserver<T>(&mut self, nameserver: &NameServer<T>) -> &mut Self {
+        self.referral(
+            nameserver.zone().clone(),
+            nameserver.fqdn().clone(),
+            nameserver.ipv4_addr(),
+        )
+    }
+
     /// Adds a record to the name server's zone file
     pub fn add(&mut self, record: impl Into<Record>) -> &mut Self {
         self.zone_file.add(record);
diff --git a/packages/dns-test/src/tshark.rs b/packages/dns-test/src/tshark.rs
index 6364d437..6af22c17 100644
--- a/packages/dns-test/src/tshark.rs
+++ b/packages/dns-test/src/tshark.rs
@@ -316,14 +316,10 @@ mod tests {
         nameservers_ns.add(root_ns.a()).add(com_ns.a());
         let nameservers_ns = nameservers_ns.start()?;
 
-        com_ns.referral(
-            nameservers_ns.zone().clone(),
-            nameservers_ns.fqdn().clone(),
-            nameservers_ns.ipv4_addr(),
-        );
+        com_ns.referral_nameserver(&nameservers_ns);
         let com_ns = com_ns.start()?;
 
-        root_ns.referral(FQDN::COM, com_ns.fqdn().clone(), com_ns.ipv4_addr());
+        root_ns.referral_nameserver(&com_ns);
         let root_ns = root_ns.start()?;
 
         let resolver = Resolver::new(