From 18e1ca85aac9cf1a41bdc79b6da414c900ada5e7 Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Fri, 27 Jan 2017 14:45:16 +0100
Subject: [PATCH] rename udp.Server

---
 app/dns/server/nameserver.go                         |  4 ++--
 proxy/shadowsocks/server.go                          |  2 +-
 proxy/socks/server.go                                |  4 ++--
 .../internet/udp/{udp_server.go => dispatcher.go}    | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename transport/internet/udp/{udp_server.go => dispatcher.go} (79%)

diff --git a/app/dns/server/nameserver.go b/app/dns/server/nameserver.go
index 561db73ce..2757c1904 100644
--- a/app/dns/server/nameserver.go
+++ b/app/dns/server/nameserver.go
@@ -43,7 +43,7 @@ type UDPNameServer struct {
 	sync.Mutex
 	address     v2net.Destination
 	requests    map[uint16]*PendingRequest
-	udpServer   *udp.Server
+	udpServer   *udp.Dispatcher
 	nextCleanup time.Time
 }
 
@@ -51,7 +51,7 @@ func NewUDPNameServer(address v2net.Destination, dispatcher dispatcher.Interface
 	s := &UDPNameServer{
 		address:   address,
 		requests:  make(map[uint16]*PendingRequest),
-		udpServer: udp.NewServer(dispatcher),
+		udpServer: udp.NewDispatcher(dispatcher),
 	}
 	return s
 }
diff --git a/proxy/shadowsocks/server.go b/proxy/shadowsocks/server.go
index 599e0f190..c99b08f86 100644
--- a/proxy/shadowsocks/server.go
+++ b/proxy/shadowsocks/server.go
@@ -23,7 +23,7 @@ type Server struct {
 	config           *ServerConfig
 	user             *protocol.User
 	account          *ShadowsocksAccount
-	udpServer        *udp.Server
+	udpServer        *udp.Dispatcher
 }
 
 func NewServer(ctx context.Context, config *ServerConfig) (*Server, error) {
diff --git a/proxy/socks/server.go b/proxy/socks/server.go
index bd1745441..907e8916e 100644
--- a/proxy/socks/server.go
+++ b/proxy/socks/server.go
@@ -24,7 +24,7 @@ import (
 type Server struct {
 	packetDispatcher dispatcher.Interface
 	config           *ServerConfig
-	udpServer        *udp.Server
+	udpServer        *udp.Dispatcher
 }
 
 // NewServer creates a new Server object.
@@ -41,7 +41,7 @@ func NewServer(ctx context.Context, config *ServerConfig) (*Server, error) {
 		if s.packetDispatcher == nil {
 			return errors.New("Socks|Server: Dispatcher is not found in the space.")
 		}
-		s.udpServer = udp.NewServer(s.packetDispatcher)
+		s.udpServer = udp.NewDispatcher(s.packetDispatcher)
 		return nil
 	})
 	return s, nil
diff --git a/transport/internet/udp/udp_server.go b/transport/internet/udp/dispatcher.go
similarity index 79%
rename from transport/internet/udp/udp_server.go
rename to transport/internet/udp/dispatcher.go
index 781d2fff8..ae16049f7 100644
--- a/transport/internet/udp/udp_server.go
+++ b/transport/internet/udp/dispatcher.go
@@ -14,20 +14,20 @@ import (
 
 type ResponseCallback func(payload *buf.Buffer)
 
-type Server struct {
+type Dispatcher struct {
 	sync.RWMutex
 	conns            map[string]ray.InboundRay
 	packetDispatcher dispatcher.Interface
 }
 
-func NewServer(packetDispatcher dispatcher.Interface) *Server {
-	return &Server{
+func NewDispatcher(packetDispatcher dispatcher.Interface) *Dispatcher {
+	return &Dispatcher{
 		conns:            make(map[string]ray.InboundRay),
 		packetDispatcher: packetDispatcher,
 	}
 }
 
-func (v *Server) RemoveRay(name string) {
+func (v *Dispatcher) RemoveRay(name string) {
 	v.Lock()
 	defer v.Unlock()
 	if conn, found := v.conns[name]; found {
@@ -37,7 +37,7 @@ func (v *Server) RemoveRay(name string) {
 	}
 }
 
-func (v *Server) getInboundRay(ctx context.Context, dest v2net.Destination) (ray.InboundRay, bool) {
+func (v *Dispatcher) getInboundRay(ctx context.Context, dest v2net.Destination) (ray.InboundRay, bool) {
 	destString := dest.String()
 	v.Lock()
 	defer v.Unlock()
@@ -51,7 +51,7 @@ func (v *Server) getInboundRay(ctx context.Context, dest v2net.Destination) (ray
 	return v.packetDispatcher.DispatchToOutbound(ctx), false
 }
 
-func (v *Server) Dispatch(ctx context.Context, destination v2net.Destination, payload *buf.Buffer, callback ResponseCallback) {
+func (v *Dispatcher) Dispatch(ctx context.Context, destination v2net.Destination, payload *buf.Buffer, callback ResponseCallback) {
 	// TODO: Add user to destString
 	destString := destination.String()
 	log.Debug("UDP|Server: Dispatch request: ", destString)