optimize.

Author: Asutorufa

controller/proxy.go

@@ -33,7 +33,7 @@ var (
 		},
 		redir: func(host string) (proxyI.Server, error) {
 			if runtime.GOOS == "windows" {
-				return nil, fmt.Errorf("Redir not support windows")
+				return nil, fmt.Errorf("redir not support windows")
 			}
 			return proxyI.NewTCPServer(host, redirserver.RedirHandle())
 		},

net/match/cidr.go

@@ -17,16 +17,13 @@ type Cidr struct {
 }
 
 func ipv4toInt(ip net.IP) string {
-	return fmt.Sprintf("%032b", binary.BigEndian.Uint32(ip.To4()))
+	return fmt.Sprintf("%032b", binary.BigEndian.Uint32(ip)) // there ip is ip.To4()
 }
 
 func ipv6toInt(ip net.IP) string {
-	if ip == nil {
-		return ""
-	}
 	// from http://golang.org/pkg/net/#pkg-constants
 	// IPv6len = 16
-	return fmt.Sprintf("%0128b", big.NewInt(0).SetBytes(ip.To16()))
+	return fmt.Sprintf("%0128b", big.NewInt(0).SetBytes(ip)) // there ip is ip.To16()
 }
 
 // InsetOneCIDR Insert one CIDR to cidr matcher
@@ -36,11 +33,11 @@ func (c *Cidr) Insert(cidr string, mark interface{}) error {
 		return err
 	}
 	maskSize, _ := ipNet.Mask.Size()
-
-	if ipNet.IP.To4() != nil {
-		c.v4CidrTrie.Insert(ipv4toInt(ipNet.IP)[:maskSize], mark)
+	x := ipNet.IP.To4()
+	if x != nil {
+		c.v4CidrTrie.Insert(ipv4toInt(x)[:maskSize], mark)
 	} else {
-		c.v6CidrTrie.Insert(ipv6toInt(ipNet.IP)[:maskSize], mark)
+		c.v6CidrTrie.Insert(ipv6toInt(ipNet.IP.To16())[:maskSize], mark)
 	}
 	return nil
 }
@@ -64,14 +61,15 @@ func (c *Cidr) singleSearch(ip string) (ok bool, mark interface{}) {
 
 // MatchWithTrie match ip with trie
 func (c *Cidr) Search(ip string) (isMatch bool, mark interface{}) {
-	ip2 := net.ParseIP(ip)
-	if ip2 == nil {
+	iP := net.ParseIP(ip)
+	if iP == nil {
 		return false, nil
 	}
-	if ip2.To4() != nil {
-		return c.v4CidrTrie.Search(ipv4toInt(ip2))
+	x := iP.To4()
+	if iP.To4() != nil {
+		return c.v4CidrTrie.Search(ipv4toInt(x))
 	} else {
-		return c.v6CidrTrie.Search(ipv6toInt(ip2))
+		return c.v6CidrTrie.Search(ipv6toInt(iP.To16()))
 	}
 }
 
@@ -102,7 +100,7 @@ type cidrNode struct {
 // Insert insert node to tree
 func (t *Trie) Insert(str string, mark interface{}) {
 	nodeTemp := t.root
-	for i := 0; i < len(str); i++ {
+	for i := range str {
 		// 1 byte is 49
 		if str[i] == 49 {
 			if nodeTemp.right == nil {
@@ -128,8 +126,8 @@ func (t *Trie) Insert(str string, mark interface{}) {
 
 // Search search from trie tree
 func (t *Trie) Search(str string) (isMatch bool, mark interface{}) {
-	nodeTemp, l := t.root, len(str)
-	for i := 0; i < l; i++ {
+	nodeTemp := t.root
+	for i := range str {
 		if str[i] == 49 {
 			nodeTemp = nodeTemp.right
 		}

net/match/domain.go

@@ -53,11 +53,11 @@ func (d *Domain) insert(root *domainNode, mark interface{}, domain []string) {
 	}
 }
 
-func (d *Domain) SearchFlip(domain string) (isMatcher bool, mark interface{}) {
+func (d *Domain) SearchFlip(domain string) (ok bool, mark interface{}) {
 	domainDiv := strings.Split(domain, ".")
-	isMatcher, mark = d.search(d.root, domainDiv)
-	if isMatcher {
-		return isMatcher, mark
+	ok, mark = d.search(d.root, domainDiv)
+	if ok {
+		return ok, mark
 	}
 	return d.search(d.wildcardRoot, domainDiv)
 }

net/proxy/shadowsocks/client/shadowsocksclient.go

@@ -27,6 +27,7 @@ type shadowsocks struct {
 	pluginFunc func(conn net.Conn) net.Conn
 
 	cache []net.IP
+	ip    bool
 }
 
 func NewShadowsocks(cipherName string, password string, server, port string, plugin, pluginOpt string) (*shadowsocks, error) {
@@ -41,6 +42,7 @@ func NewShadowsocks(cipherName string, password string, server, port string, plu
 		plugin:    strings.ToUpper(plugin),
 		pluginOpt: pluginOpt,
 		cache:     []net.IP{},
+		ip:        net.ParseIP(server) != nil,
 	}
 	switch strings.ToLower(plugin) {
 	case OBFS:
@@ -82,6 +84,9 @@ func (s *shadowsocks) Conn(host string) (conn net.Conn, err error) {
 }
 
 func (s *shadowsocks) getTCPConn() (net.Conn, error) {
+	if s.ip {
+		return net.Dial("tcp", net.JoinHostPort(s.server, s.port))
+	}
 	conn, err := s.tcpDial()
 	if err == nil {
 		return conn, err

net/proxy/shadowsocksr/client/ssrclient.go

@@ -29,6 +29,7 @@ type Shadowsocksr struct {
 	protocolData    interface{}
 
 	cache []net.IP
+	ip    bool
 }
 
 func NewShadowsocksrClient(host, port, method, password, obfs, obfsParam, protocol, protocolParam string) (ssr *Shadowsocksr, err error) {
@@ -41,6 +42,9 @@ func NewShadowsocksrClient(host, port, method, password, obfs, obfsParam, protoc
 		obfsParam:       obfsParam,
 		protocol:        protocol,
 		protocolParam:   protocolParam,
+
+		cache: []net.IP{},
+		ip:    net.ParseIP(host) != nil,
 	}
 	s.protocolData = new(Protocol.AuthData)
 	return s, nil
@@ -113,6 +117,9 @@ func (s *Shadowsocksr) Conn(addr string) (net.Conn, error) {
 }
 
 func (s *Shadowsocksr) getTCPConn() (net.Conn, error) {
+	if s.ip {
+		return net.Dial("tcp", net.JoinHostPort(s.host, s.port))
+	}
 	conn, err := s.tcpDial()
 	if err == nil {
 		return conn, err