bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-02-24 01:45:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

general: remove unnecessary SetKeepAlive

Browse Source
This commit is contained in:
nadoo 2018-08-03 19:27:47 +08:00
parent 6cdfbc3552
commit 1f8a3cdf53
7 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/glider.conf.example
View File

@ -118,7 +118,6 @@ checkduration=30
# DNS FORWARDING SERVER # 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 # we can specify different upstream dns server in rule file for different destinations
# Setup a dns forwarding server # Setup a dns forwarding server

1
dns/cache.go
View File

@ -33,7 +33,6 @@ func NewCache() (c *Cache) {
c.l.Unlock() c.l.Unlock()
} }
}() }()
return return
} }

4
main.go
View File

@ -25,7 +25,7 @@ import (
) )
// VERSION . // VERSION .
const VERSION = "0.6.5" const VERSION = "0.6.6"
func dialerFromConf() proxy.Dialer { func dialerFromConf() proxy.Dialer {
// global forwarders in xx.conf // global forwarders in xx.conf
@ -71,7 +71,7 @@ func main() {
for _, r := range conf.rules { for _, r := range conf.rules {
for _, domain := range r.Domain { for _, domain := range r.Domain {
if len(r.DNSServer) > 0 { if len(r.DNSServer) > 0 {
d.SetServer(domain, r.DNSServer[0]) d.SetServer(domain, r.DNSServer...)
} }
} }
} }

5
proxy/http/http.go
View File

@ -227,12 +227,7 @@ func (s *HTTP) Dial(network, addr string) (net.Conn, error) {
return nil, err return nil, err
} }
if c, ok := rc.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
var buf bytes.Buffer var buf bytes.Buffer
buf.Write([]byte("CONNECT " + addr + " HTTP/1.1\r\n")) buf.Write([]byte("CONNECT " + addr + " HTTP/1.1\r\n"))
buf.Write([]byte("Proxy-Connection: Keep-Alive\r\n")) buf.Write([]byte("Proxy-Connection: Keep-Alive\r\n"))

8
proxy/socks5/socks5.go
View File

@ -234,10 +234,6 @@ func (s *SOCKS5) Dial(network, addr string) (net.Conn, error) {
return nil, err return nil, err
} }
if c, ok := c.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
if err := s.connect(c, addr); err != nil { if err := s.connect(c, addr); err != nil {
c.Close() c.Close()
return nil, err return nil, err
@ -254,10 +250,6 @@ func (s *SOCKS5) DialUDP(network, addr string) (pc net.PacketConn, writeTo net.A
return nil, nil, err return nil, nil, err
} }
if c, ok := c.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
// send VER, NMETHODS, METHODS // send VER, NMETHODS, METHODS
c.Write([]byte{5, 1, 0}) c.Write([]byte{5, 1, 0})

4
proxy/ss/ss.go
View File

@ -255,10 +255,6 @@ func (s *SS) Dial(network, addr string) (net.Conn, error) {
return nil, err return nil, err
} }
if c, ok := c.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
c = s.StreamConn(c) c = s.StreamConn(c)
if _, err = c.Write(target); err != nil { if _, err = c.Write(target); err != nil {
c.Close() c.Close()

4
proxy/ssr/ssr.go
View File

@ -98,10 +98,6 @@ func (s *SSR) Dial(network, addr string) (net.Conn, error) {
return nil, err return nil, err
} }
if c, ok := c.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
ssrconn := shadowsocksr.NewSSTCPConn(c, cipher) ssrconn := shadowsocksr.NewSSTCPConn(c, cipher)
if ssrconn.Conn == nil || ssrconn.RemoteAddr() == nil { if ssrconn.Conn == nil || ssrconn.RemoteAddr() == nil {
return nil, errors.New("[ssr] nil connection") return nil, errors.New("[ssr] nil connection")