瀏覽代碼

remove unused code

Darien Raymond 8 年之前
父節點
當前提交
a8e274f4c4
共有 2 個文件被更改,包括 6 次插入15 次删除
  1. 4 0
      transport/internet/internal/pool.go
  2. 2 15
      transport/internet/udp/dialer.go

+ 4 - 0
transport/internet/internal/pool.go

@@ -14,6 +14,10 @@ type ConnectionRecyler interface {
 	Put(ConnectionID, net.Conn)
 }
 
+type NoOpConnectionRecyler struct{}
+
+func (NoOpConnectionRecyler) Put(ConnectionID, net.Conn) {}
+
 // ExpiringConnection is a connection that will expire in certain time.
 type ExpiringConnection struct {
 	conn   net.Conn

+ 2 - 15
transport/internet/udp/connection.go → transport/internet/udp/dialer.go

@@ -1,23 +1,12 @@
 package udp
 
 import (
-	"net"
-
 	"v2ray.com/core/common"
 	v2net "v2ray.com/core/common/net"
 	"v2ray.com/core/transport/internet"
+	"v2ray.com/core/transport/internet/internal"
 )
 
-type Connection struct {
-	net.UDPConn
-}
-
-func (v *Connection) Reusable() bool {
-	return false
-}
-
-func (v *Connection) SetReusable(b bool) {}
-
 func init() {
 	common.Must(internet.RegisterNetworkDialer(v2net.Network_UDP,
 		func(src v2net.Address, dest v2net.Destination, options internet.DialerOptions) (internet.Connection, error) {
@@ -26,8 +15,6 @@ func init() {
 				return nil, err
 			}
 			// TODO: handle dialer options
-			return &Connection{
-				UDPConn: *(conn.(*net.UDPConn)),
-			}, nil
+			return internal.NewConnection(internal.NewConnectionID(src, dest), conn, internal.NoOpConnectionRecyler{}, internal.ReuseConnection(false)), nil
 		}))
 }