🎨 Fix rule_addr

Author: mokeyish

src/dns.rs

@@ -41,9 +41,15 @@ impl DnsContext {
         }
     }
 
+    #[inline]
     pub fn cfg(&self) -> &Arc<SmartDnsConfig> {
         &self.cfg
     }
+
+    #[inline]
+    pub fn server_opts(&self) -> &ServerOpts {
+        &self.server_opts
+    } 
 }
 
 #[derive(Clone)]

src/dns_mw_addr.rs

@@ -20,58 +20,11 @@ impl Middleware<DnsContext, DnsRequest, DnsResponse, DnsError> for AddressMiddle
         &self,
         ctx: &mut DnsContext,
         req: &DnsRequest,
-        next: crate::middleware::Next<'_, DnsContext, DnsRequest, DnsResponse, DnsError>,
+        next: Next<'_, DnsContext, DnsRequest, DnsResponse, DnsError>,
     ) -> Result<DnsResponse, DnsError> {
         let query_type = req.query().query_type();
 
-        let mut rdata = None;
-
-        let no_rule_soa = ctx.server_opts.no_rule_soa();
-
-        if !no_rule_soa
-            && (ctx.cfg().force_aaaa_soa() && query_type == RecordType::AAAA
-                || ctx.cfg().force_qtype_soa().contains(&query_type))
-        {
-            // force SOA
-            rdata = Some(RData::default_soa());
-        } else if matches!(query_type, RecordType::AAAA | RecordType::A if !ctx.server_opts.no_rule_addr())
-        {
-            let mut node = ctx.domain_rule.as_ref();
-
-            while let Some(rule) = node {
-                use crate::dns_conf::DomainAddress::*;
-
-                if let Some(address) = rule.address {
-                    rdata = match address {
-                        IPv4(ipv4) => Some(RData::A(ipv4)),
-                        IPv6(ipv6) => Some(RData::AAAA(ipv6)),
-                        SOA if !no_rule_soa => Some(RData::default_soa()),
-                        SOAv4 if !no_rule_soa && query_type == RecordType::A => {
-                            Some(RData::default_soa())
-                        }
-                        SOAv6 if !no_rule_soa && query_type == RecordType::AAAA => {
-                            Some(RData::default_soa())
-                        }
-                        IGN => {
-                            node = rule.zone();
-                            continue;
-                        }
-                        IGNv4 if query_type == RecordType::A => {
-                            node = rule.zone();
-                            continue;
-                        }
-                        IGNv6 if query_type == RecordType::AAAA => continue,
-                        _ => None, // skip rules
-                    };
-                    break;
-                } else {
-                    node = rule.zone();
-                    continue;
-                }
-            }
-        }
-
-        if let Some(rdata) = rdata {
+        if let Some(rdata) = handle_rule_addr(query_type, ctx) {
             let local_ttl = ctx.cfg().local_ttl();
 
             let query = req.query().original().clone();
@@ -111,3 +64,54 @@ impl Middleware<DnsContext, DnsRequest, DnsResponse, DnsError> for AddressMiddle
         }
     }
 }
+
+fn handle_rule_addr(query_type: RecordType, ctx: &DnsContext) -> Option<RData> {
+    use RecordType::{A, AAAA};
+
+    let cfg = ctx.cfg();
+    let server_opts = ctx.server_opts();
+    let rule = ctx.domain_rule.as_ref();
+
+    let no_rule_soa = server_opts.no_rule_soa();
+
+    if !no_rule_soa {
+        // force AAAA query return SOA
+        if query_type == AAAA && (server_opts.force_aaaa_soa() || cfg.force_aaaa_soa()) {
+            return Some(RData::default_soa());
+        }
+
+        // force AAAA query return SOA
+        if cfg.force_qtype_soa().contains(&query_type) {
+            return Some(RData::default_soa());
+        }
+    }
+
+    // skip address rule.
+    if server_opts.no_rule_addr() || !query_type.is_ip_addr() {
+        return None;
+    }
+
+    let mut node = rule;
+
+    while let Some(rule) = node {
+        use crate::dns_conf::DomainAddress::*;
+
+        if let Some(address) = rule.address {
+            match address {
+                IPv4(ipv4) if query_type == A => return Some(RData::A(ipv4)),
+                IPv6(ipv6) if query_type == AAAA => return Some(RData::AAAA(ipv6)),
+                SOA if !no_rule_soa => return Some(RData::default_soa()),
+                SOAv4 if !no_rule_soa && query_type == A => return Some(RData::default_soa()),
+                SOAv6 if !no_rule_soa && query_type == AAAA => return Some(RData::default_soa()),
+                IGN => return None, // ignore rule
+                IGNv4 if query_type == A => return None,
+                IGNv6 if query_type == AAAA => return None,
+                _ => (),
+            };
+        }
+
+        node = rule.zone(); // find parent rule
+    }
+
+    None
+}