Check if this is already an FQDN

Author: korken89

embassy-net/src/lib.rs

@@ -532,20 +532,12 @@ impl<D: Driver> Stack<D> {
             _ => {}
         }
 
-        // Form name together with domain name.
         #[cfg(feature = "dhcpv4-domainname")]
-        let name = &{
-            use core::str::FromStr;
-
-            let mut name = String::<MAX_DNS_QUERY_LEN>::from_str(name).map_err(|_| dns::Error::NameTooLong)?;
-
-            if let Some(Some(domain_name)) = &self.inner.borrow().static_v4.as_ref().map(|c| &c.domain_name) {
-                if !domain_name.is_empty() {
-                    name.push('.').map_err(|_| dns::Error::NameTooLong)?;
-                    name.push_str(&domain_name).map_err(|_| dns::Error::NameTooLong)?;
-                }
-            }
+        let name = if name.contains(".") {
+            // Already a FQDN.
             name
+        } else {
+            &self.create_fqdn(name)?
         };
 
         let query = poll_fn(|cx| {
@@ -623,6 +615,23 @@ impl<D: Driver> Stack<D> {
 
         res
     }
+
+    #[cfg(feature = "dhcpv4-domainname")]
+    fn create_fqdn(&self, name: &str) -> Result<String<MAX_DNS_QUERY_LEN>, dns::Error> {
+        use core::str::FromStr;
+
+        // Form name together with domain name.
+        let mut name = String::<MAX_DNS_QUERY_LEN>::from_str(name).map_err(|_| dns::Error::NameTooLong)?;
+
+        if let Some(Some(domain_name)) = &self.inner.borrow().static_v4.as_ref().map(|c| &c.domain_name) {
+            if !domain_name.is_empty() {
+                name.push('.').map_err(|_| dns::Error::NameTooLong)?;
+                name.push_str(&domain_name).map_err(|_| dns::Error::NameTooLong)?;
+            }
+        }
+
+        Ok(name)
+    }
 }
 
 #[cfg(feature = "igmp")]