From 1f8a3cdf53f81f8a649ada5dd48c7e288de491bd Mon Sep 17 00:00:00 2001
From: nadoo <287492+nadoo@users.noreply.github.com>
Date: Fri, 3 Aug 2018 19:27:47 +0800
Subject: [PATCH] general: remove unnecessary SetKeepAlive

---
 config/glider.conf.example | 1 -
 dns/cache.go               | 1 -
 main.go                    | 4 ++--
 proxy/http/http.go         | 5 -----
 proxy/socks5/socks5.go     | 8 --------
 proxy/ss/ss.go             | 4 ----
 proxy/ssr/ssr.go           | 4 ----
 7 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/config/glider.conf.example b/config/glider.conf.example
index bf51833..c5eb884 100644
--- a/config/glider.conf.example
+++ b/config/glider.conf.example
@@ -118,7 +118,6 @@ checkduration=30
 
 # DNS FORWARDING SERVER
 # ----------------
-# A dns forwarding server listens on UDP and forward dns requests to remote dns server in TCP via forwarders 
 # we can specify different upstream dns server in rule file for different destinations
 
 # Setup a dns forwarding server
diff --git a/dns/cache.go b/dns/cache.go
index 87aa2aa..e3d7b0f 100644
--- a/dns/cache.go
+++ b/dns/cache.go
@@ -33,7 +33,6 @@ func NewCache() (c *Cache) {
 			c.l.Unlock()
 		}
 	}()
-
 	return
 }
 
diff --git a/main.go b/main.go
index ad41ad7..3c107ce 100644
--- a/main.go
+++ b/main.go
@@ -25,7 +25,7 @@ import (
 )
 
 // VERSION .
-const VERSION = "0.6.5"
+const VERSION = "0.6.6"
 
 func dialerFromConf() proxy.Dialer {
 	// global forwarders in xx.conf
@@ -71,7 +71,7 @@ func main() {
 		for _, r := range conf.rules {
 			for _, domain := range r.Domain {
 				if len(r.DNSServer) > 0 {
-					d.SetServer(domain, r.DNSServer[0])
+					d.SetServer(domain, r.DNSServer...)
 				}
 			}
 		}
diff --git a/proxy/http/http.go b/proxy/http/http.go
index f2af98c..49615e3 100644
--- a/proxy/http/http.go
+++ b/proxy/http/http.go
@@ -227,12 +227,7 @@ func (s *HTTP) Dial(network, addr string) (net.Conn, error) {
 		return nil, err
 	}
 
-	if c, ok := rc.(*net.TCPConn); ok {
-		c.SetKeepAlive(true)
-	}
-
 	var buf bytes.Buffer
-
 	buf.Write([]byte("CONNECT " + addr + " HTTP/1.1\r\n"))
 	buf.Write([]byte("Proxy-Connection: Keep-Alive\r\n"))
 
diff --git a/proxy/socks5/socks5.go b/proxy/socks5/socks5.go
index 7e1d87e..3d0cf51 100644
--- a/proxy/socks5/socks5.go
+++ b/proxy/socks5/socks5.go
@@ -234,10 +234,6 @@ func (s *SOCKS5) Dial(network, addr string) (net.Conn, error) {
 		return nil, err
 	}
 
-	if c, ok := c.(*net.TCPConn); ok {
-		c.SetKeepAlive(true)
-	}
-
 	if err := s.connect(c, addr); err != nil {
 		c.Close()
 		return nil, err
@@ -254,10 +250,6 @@ func (s *SOCKS5) DialUDP(network, addr string) (pc net.PacketConn, writeTo net.A
 		return nil, nil, err
 	}
 
-	if c, ok := c.(*net.TCPConn); ok {
-		c.SetKeepAlive(true)
-	}
-
 	// send VER, NMETHODS, METHODS
 	c.Write([]byte{5, 1, 0})
 
diff --git a/proxy/ss/ss.go b/proxy/ss/ss.go
index d6cd52a..919ac95 100644
--- a/proxy/ss/ss.go
+++ b/proxy/ss/ss.go
@@ -255,10 +255,6 @@ func (s *SS) Dial(network, addr string) (net.Conn, error) {
 		return nil, err
 	}
 
-	if c, ok := c.(*net.TCPConn); ok {
-		c.SetKeepAlive(true)
-	}
-
 	c = s.StreamConn(c)
 	if _, err = c.Write(target); err != nil {
 		c.Close()
diff --git a/proxy/ssr/ssr.go b/proxy/ssr/ssr.go
index 34e0cb7..216cae0 100644
--- a/proxy/ssr/ssr.go
+++ b/proxy/ssr/ssr.go
@@ -98,10 +98,6 @@ func (s *SSR) Dial(network, addr string) (net.Conn, error) {
 		return nil, err
 	}
 
-	if c, ok := c.(*net.TCPConn); ok {
-		c.SetKeepAlive(true)
-	}
-
 	ssrconn := shadowsocksr.NewSSTCPConn(c, cipher)
 	if ssrconn.Conn == nil || ssrconn.RemoteAddr() == nil {
 		return nil, errors.New("[ssr] nil connection")