adjust ip error handling

luludotdev · Jun 3, 2021 · 5880787 · 5880787
1 parent 1916d50
commit 5880787
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/autodns/pkg/iptools/address.go b/autodns/pkg/iptools/address.go
@@ -5,7 +5,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/lolPants/autodns/autodns/pkg/logger"
@@ -35,9 +34,7 @@ func getAddress(subdomain string) <-chan *result {
 
 		if err != nil {
 			logger.Stderr.Printf(1, "failed to resolve IP"+subdomain+" address, error: `%s`\n", err.Error())
-			if strings.Contains(err.Error(), "no such host") == false {
-				res.Error = err
-			}
+			res.Error = err
 
 			r <- res
 			return

diff --git a/autodns/pkg/iptools/iptools.go b/autodns/pkg/iptools/iptools.go
@@ -1,5 +1,9 @@
 package iptools
 
+import (
+	"errors"
+)
+
 // Result represents the result of an IP Lookup
 type Result struct {
 	Error error
@@ -19,15 +23,8 @@ func Lookup() <-chan *Result {
 		v4task, v6task := getAddress("v4"), getAddress("v6")
 		v4ptr, v6ptr := <-v4task, <-v6task
 
-		if v4ptr.Error != nil {
-			res.Error = v4ptr.Error
-			r <- res
-
-			return
-		}
-
-		if v6ptr.Error != nil {
-			res.Error = v6ptr.Error
+		if v4ptr.Data == nil && v6ptr.Data == nil {
+			res.Error = errors.New("both IPv4 and IPv6 cannot be found")
 			r <- res
 
 			return