simplify tcp connection

transport/hub/connection.go

@@ -1,36 +1,18 @@
 package hub
 
 import (
-	"crypto/tls"
 	"net"
 	"time"
-
-	"github.com/v2ray/v2ray-core/common"
 )
 
-type ConnectionHandler func(Connection)
+type ConnectionHandler func(*Connection)
 
-type Connection interface {
-	common.Releasable
-
-	Read([]byte) (int, error)
-	Write([]byte) (int, error)
-	Close() error
-	LocalAddr() net.Addr
-	RemoteAddr() net.Addr
-	SetDeadline(t time.Time) error
-	SetReadDeadline(t time.Time) error
-	SetWriteDeadline(t time.Time) error
-	CloseRead() error
-	CloseWrite() error
-}
-
-type TCPConnection struct {
-	conn     *net.TCPConn
+type Connection struct {
+	conn     net.Conn
 	listener *TCPHub
 }
 
-func (this *TCPConnection) Read(b []byte) (int, error) {
+func (this *Connection) Read(b []byte) (int, error) {
 	if this == nil || this.conn == nil {
 		return 0, ErrorClosedConnection
 	}
@@ -38,14 +20,14 @@ func (this *TCPConnection) Read(b []byte) (int, error) {
 	return this.conn.Read(b)
 }
 
-func (this *TCPConnection) Write(b []byte) (int, error) {
+func (this *Connection) Write(b []byte) (int, error) {
 	if this == nil || this.conn == nil {
 		return 0, ErrorClosedConnection
 	}
 	return this.conn.Write(b)
 }
 
-func (this *TCPConnection) Close() error {
+func (this *Connection) Close() error {
 	if this == nil || this.conn == nil {
 		return ErrorClosedConnection
 	}
@@ -53,7 +35,7 @@ func (this *TCPConnection) Close() error {
 	return err
 }
 
-func (this *TCPConnection) Release() {
+func (this *Connection) Release() {
 	if this == nil || this.listener == nil {
 		return
 	}
@@ -63,101 +45,22 @@ func (this *TCPConnection) Release() {
 	this.listener = nil
 }
 
-func (this *TCPConnection) LocalAddr() net.Addr {
+func (this *Connection) LocalAddr() net.Addr {
 	return this.conn.LocalAddr()
 }
 
-func (this *TCPConnection) RemoteAddr() net.Addr {
+func (this *Connection) RemoteAddr() net.Addr {
 	return this.conn.RemoteAddr()
 }
 
-func (this *TCPConnection) SetDeadline(t time.Time) error {
+func (this *Connection) SetDeadline(t time.Time) error {
 	return this.conn.SetDeadline(t)
 }
 
-func (this *TCPConnection) SetReadDeadline(t time.Time) error {
+func (this *Connection) SetReadDeadline(t time.Time) error {
 	return this.conn.SetReadDeadline(t)
 }
 
-func (this *TCPConnection) SetWriteDeadline(t time.Time) error {
+func (this *Connection) SetWriteDeadline(t time.Time) error {
 	return this.conn.SetWriteDeadline(t)
 }
-
-func (this *TCPConnection) CloseRead() error {
-	if this == nil || this.conn == nil {
-		return nil
-	}
-	return this.conn.CloseRead()
-}
-
-func (this *TCPConnection) CloseWrite() error {
-	if this == nil || this.conn == nil {
-		return nil
-	}
-	return this.conn.CloseWrite()
-}
-
-type TLSConnection struct {
-	conn     *tls.Conn
-	listener *TCPHub
-}
-
-func (this *TLSConnection) Read(b []byte) (int, error) {
-	if this == nil || this.conn == nil {
-		return 0, ErrorClosedConnection
-	}
-	return this.conn.Read(b)
-}
-
-func (this *TLSConnection) Write(b []byte) (int, error) {
-	if this == nil || this.conn == nil {
-		return this.conn.Write(b)
-	}
-	return this.conn.Write(b)
-}
-
-func (this *TLSConnection) Close() error {
-	if this == nil || this.conn == nil {
-		return ErrorClosedConnection
-	}
-	err := this.conn.Close()
-	return err
-}
-
-func (this *TLSConnection) Release() {
-	if this == nil || this.listener == nil {
-		return
-	}
-
-	this.Close()
-	this.conn = nil
-	this.listener = nil
-}
-
-func (this *TLSConnection) LocalAddr() net.Addr {
-	return this.conn.LocalAddr()
-}
-
-func (this *TLSConnection) RemoteAddr() net.Addr {
-	return this.conn.RemoteAddr()
-}
-
-func (this *TLSConnection) SetDeadline(t time.Time) error {
-	return this.conn.SetDeadline(t)
-}
-
-func (this *TLSConnection) SetReadDeadline(t time.Time) error {
-	return this.conn.SetReadDeadline(t)
-}
-
-func (this *TLSConnection) SetWriteDeadline(t time.Time) error {
-	return this.conn.SetWriteDeadline(t)
-}
-
-func (this *TLSConnection) CloseRead() error {
-	return nil
-}
-
-func (this *TLSConnection) CloseWrite() error {
-	return nil
-}

transport/hub/tcp.go

@@ -51,7 +51,7 @@ func (this *TCPHub) start() {
 			}
 			continue
 		}
-		go this.connCallback(&TCPConnection{
+		go this.connCallback(&Connection{
 			conn:     conn,
 			listener: this,
 		})