From 65e3940bd65dc8f72c3aea60a28d2c678b2d6dc5 Mon Sep 17 00:00:00 2001
From: nadoo <287492+nadoo@users.noreply.github.com>
Date: Thu, 21 Sep 2017 23:07:04 +0800
Subject: [PATCH] rule: change receiver name

---
 mixed.go |  1 +
 rule.go  | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mixed.go b/mixed.go
index 7e2f6ac..4c44a7b 100644
--- a/mixed.go
+++ b/mixed.go
@@ -60,6 +60,7 @@ func (p *MixedProxy) ListenAndServe() {
 	}
 }
 
+// Serve .
 func (p *MixedProxy) Serve(conn net.Conn) {
 	defer conn.Close()
 
diff --git a/rule.go b/rule.go
index 920d486..475d63c 100644
--- a/rule.go
+++ b/rule.go
@@ -59,26 +59,26 @@ func NewRuleDialer(rules []*RuleConf, gDialer Dialer) *RuleDialer {
 func (rd *RuleDialer) Addr() string { return "RULES" }
 
 // NextDialer return next dialer according to rule
-func (p *RuleDialer) NextDialer(dstAddr string) Dialer {
+func (rd *RuleDialer) NextDialer(dstAddr string) Dialer {
 
 	// TODO: change to index finders
 	host, _, err := net.SplitHostPort(dstAddr)
 	if err != nil {
 		// TODO: check here
 		// logf("proxy-rule SplitHostPort ERROR: %s", err)
-		return p.gDialer
+		return rd.gDialer
 	}
 
 	// find ip
 	if ip := net.ParseIP(host); ip != nil {
 		// check ip
-		if d, ok := p.ipMap.Load(ip.String()); ok {
+		if d, ok := rd.ipMap.Load(ip.String()); ok {
 			return d.(Dialer)
 		}
 
 		var ret Dialer
 		// check cidr
-		p.cidrMap.Range(func(key, value interface{}) bool {
+		rd.cidrMap.Range(func(key, value interface{}) bool {
 			cidr := key.(*net.IPNet)
 			if cidr.Contains(ip) {
 				ret = value.(Dialer)
@@ -100,12 +100,12 @@ func (p *RuleDialer) NextDialer(dstAddr string) Dialer {
 		domain := strings.Join(domainParts[i:length], ".")
 
 		// find in domainMap
-		if d, ok := p.domainMap.Load(domain); ok {
+		if d, ok := rd.domainMap.Load(domain); ok {
 			return d.(Dialer)
 		}
 	}
 
-	return p.gDialer
+	return rd.gDialer
 }
 
 // Dial dials to targer addr and return a conn