调整错误输出

vnt-dev · Apr 23, 2024 · 4f52d58 · 4f52d58
1 parent 441e374
commit 4f52d58
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/vnt/src/util/dns_query.rs b/vnt/src/util/dns_query.rs
@@ -26,10 +26,19 @@ pub fn address_choose(addrs: Vec<SocketAddr>) -> anyhow::Result<SocketAddr> {
         }
         Err(anyhow::anyhow!("Unable to connect to address {:?}", addrs))
     };
-    if let Ok(addr) = check_addr(&v6) {
-        return Ok(addr);
+    if v6.is_empty() {
+        return check_addr(&v4);
+    }
+    if v4.is_empty() {
+        return check_addr(&v6);
+    }
+    match check_addr(&v6) {
+        Ok(addr) => Ok(addr),
+        Err(e1) => match check_addr(&v4) {
+            Ok(addr) => Ok(addr),
+            Err(e2) => Err(anyhow::anyhow!("{} , {}", e1, e2)),
+        },
     }
-    check_addr(&v4)
 }
 
 pub fn dns_query_all(domain: &str, name_servers: Vec<String>) -> anyhow::Result<Vec<SocketAddr>> {