Fix dns rule match logic

sower-proxy · Dec 8, 2018 · 049e805 · 049e805
1 parent b83f202
commit 049e805
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/dns/dns.go b/dns/dns.go
@@ -78,10 +78,17 @@ func manual(w dns.ResponseWriter, r *dns.Msg, domain, dnsServer string) {
 
 	if conf.Conf.Verbose != 0 && len(msg.Answer) != 0 {
 		go func() {
-			_, err := net.DialTimeout("tcp", domain+":http", 3*time.Second)
-			if err != nil && strings.Contains(err.Error(), "timeout") {
-				glog.V(1).Infof("SUGGEST check (%s) http(s) service: %s", domain, err)
+			_, err := net.DialTimeout("tcp", domain+":http", 2*time.Second)
+			if err == nil || !strings.Contains(err.Error(), "timeout") {
+				return
 			}
+
+			_, err = net.DialTimeout("tcp", domain+":https", 3*time.Second)
+			if err == nil || !strings.Contains(err.Error(), "timeout") {
+				return
+			}
+
+			glog.V(1).Infof("SUGGEST check (%s) http(s) service: %s", domain, err)
 		}()
 	}
 }

diff --git a/dns/suffixTree.go b/dns/suffixTree.go
@@ -53,7 +53,7 @@ func (n *Node) Match(addr string) bool {
 func (n *Node) matchSecs(secs []string) bool {
 	length := len(secs)
 	if length == 0 {
-		return true
+		return len(n.Node) == 0
 	}
 
 	if n, ok := n.Node[secs[length-1]]; ok {