From b968f528d6e15517b17c024fca442dc17e1f1a90 Mon Sep 17 00:00:00 2001
From: Jason <xjasonlyu@gmail.com>
Date: Fri, 16 Aug 2019 13:13:15 +0800
Subject: [PATCH] cleanup fakedns package

---
 cmd/main.go                                  | 2 +-
 cmd/main_fakedns.go                          | 2 +-
 component/{dns/dns.go => fakedns/fakedns.go} | 3 ++-
 component/{dns => }/fakedns/middleware.go    | 0
 component/{dns => }/fakedns/server.go        | 0
 component/{dns => }/fakedns/utils.go         | 0
 proxy/tcp.go                                 | 6 +++---
 proxy/udp.go                                 | 6 +++---
 proxy/utils.go                               | 4 ++--
 9 files changed, 12 insertions(+), 11 deletions(-)
 rename component/{dns/dns.go => fakedns/fakedns.go} (91%)
 rename component/{dns => }/fakedns/middleware.go (100%)
 rename component/{dns => }/fakedns/server.go (100%)
 rename component/{dns => }/fakedns/utils.go (100%)

diff --git a/cmd/main.go b/cmd/main.go
index 5af311e..1c6b574 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -19,7 +19,7 @@ import (
 	"github.com/xjasonlyu/tun2socks/proxy"
 	"github.com/xjasonlyu/tun2socks/tun"
 
-	D "github.com/xjasonlyu/tun2socks/component/dns"
+	D "github.com/xjasonlyu/tun2socks/component/fakedns"
 	S "github.com/xjasonlyu/tun2socks/component/stats"
 )
 
diff --git a/cmd/main_fakedns.go b/cmd/main_fakedns.go
index 7fdb932..dff4bab 100644
--- a/cmd/main_fakedns.go
+++ b/cmd/main_fakedns.go
@@ -5,7 +5,7 @@ package main
 import (
 	"flag"
 
-	"github.com/xjasonlyu/tun2socks/component/dns/fakedns"
+	"github.com/xjasonlyu/tun2socks/component/fakedns"
 	"github.com/xjasonlyu/tun2socks/log"
 )
 
diff --git a/component/dns/dns.go b/component/fakedns/fakedns.go
similarity index 91%
rename from component/dns/dns.go
rename to component/fakedns/fakedns.go
index 95cc045..ea57931 100644
--- a/component/dns/dns.go
+++ b/component/fakedns/fakedns.go
@@ -1,4 +1,4 @@
-package dns
+package fakedns
 
 import (
 	"net"
@@ -7,6 +7,7 @@ import (
 type FakeDNS interface {
 	Start() error
 	Stop() error
+
 	// IPToHost returns the corresponding domain for the given IP.
 	IPToHost(ip net.IP) (string, bool)
 }
diff --git a/component/dns/fakedns/middleware.go b/component/fakedns/middleware.go
similarity index 100%
rename from component/dns/fakedns/middleware.go
rename to component/fakedns/middleware.go
diff --git a/component/dns/fakedns/server.go b/component/fakedns/server.go
similarity index 100%
rename from component/dns/fakedns/server.go
rename to component/fakedns/server.go
diff --git a/component/dns/fakedns/utils.go b/component/fakedns/utils.go
similarity index 100%
rename from component/dns/fakedns/utils.go
rename to component/fakedns/utils.go
diff --git a/proxy/tcp.go b/proxy/tcp.go
index d19f1c8..494d4dc 100644
--- a/proxy/tcp.go
+++ b/proxy/tcp.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/xjasonlyu/tun2socks/common/lsof"
 	"github.com/xjasonlyu/tun2socks/common/pool"
-	"github.com/xjasonlyu/tun2socks/component/dns"
+	D "github.com/xjasonlyu/tun2socks/component/fakedns"
 	"github.com/xjasonlyu/tun2socks/component/stats"
 	C "github.com/xjasonlyu/tun2socks/constant"
 	"github.com/xjasonlyu/tun2socks/core"
@@ -20,11 +20,11 @@ type tcpHandler struct {
 	proxyHost string
 	proxyPort int
 
-	fakeDNS       dns.FakeDNS
+	fakeDNS       D.FakeDNS
 	sessionStater stats.SessionStater
 }
 
-func NewTCPHandler(proxyHost string, proxyPort int, fakeDNS dns.FakeDNS, sessionStater stats.SessionStater) core.TCPConnHandler {
+func NewTCPHandler(proxyHost string, proxyPort int, fakeDNS D.FakeDNS, sessionStater stats.SessionStater) core.TCPConnHandler {
 	return &tcpHandler{
 		proxyHost:     proxyHost,
 		proxyPort:     proxyPort,
diff --git a/proxy/udp.go b/proxy/udp.go
index 2382edd..1b5db10 100644
--- a/proxy/udp.go
+++ b/proxy/udp.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/xjasonlyu/tun2socks/common/lsof"
 	"github.com/xjasonlyu/tun2socks/common/pool"
-	"github.com/xjasonlyu/tun2socks/component/dns"
+	D "github.com/xjasonlyu/tun2socks/component/fakedns"
 	"github.com/xjasonlyu/tun2socks/component/stats"
 	C "github.com/xjasonlyu/tun2socks/constant"
 	"github.com/xjasonlyu/tun2socks/core"
@@ -24,11 +24,11 @@ type udpHandler struct {
 	remoteAddrMap sync.Map
 	remoteConnMap sync.Map
 
-	fakeDNS       dns.FakeDNS
+	fakeDNS       D.FakeDNS
 	sessionStater stats.SessionStater
 }
 
-func NewUDPHandler(proxyHost string, proxyPort int, timeout time.Duration, fakeDNS dns.FakeDNS, sessionStater stats.SessionStater) core.UDPConnHandler {
+func NewUDPHandler(proxyHost string, proxyPort int, timeout time.Duration, fakeDNS D.FakeDNS, sessionStater stats.SessionStater) core.UDPConnHandler {
 	return &udpHandler{
 		proxyHost:     proxyHost,
 		proxyPort:     proxyPort,
diff --git a/proxy/utils.go b/proxy/utils.go
index cbc6d51..4dd8060 100644
--- a/proxy/utils.go
+++ b/proxy/utils.go
@@ -8,12 +8,12 @@ import (
 	"net"
 	"time"
 
-	"github.com/xjasonlyu/tun2socks/component/dns"
+	D "github.com/xjasonlyu/tun2socks/component/fakedns"
 	"github.com/xjasonlyu/tun2socks/proxy/socks"
 )
 
 // DNS lookup
-func lookupHost(fakeDNS dns.FakeDNS, target net.Addr) (targetHost string, err error) {
+func lookupHost(fakeDNS D.FakeDNS, target net.Addr) (targetHost string, err error) {
 	var targetIP net.IP
 	switch addr := target.(type) {
 	case *net.TCPAddr: