diff --git a/proxy/dokodemo/dokodemo.go b/proxy/dokodemo/dokodemo.go index a238047f4..0b9be5e1d 100644 --- a/proxy/dokodemo/dokodemo.go +++ b/proxy/dokodemo/dokodemo.go @@ -20,7 +20,7 @@ type DokodemoDoor struct { address v2net.Address port v2net.Port space app.Space - tcpListener *hub.TCPListener + tcpListener *hub.TCPHub udpHub *hub.UDPHub listeningPort v2net.Port } diff --git a/proxy/http/http.go b/proxy/http/http.go index a99d66dd3..f9cb1bfe6 100644 --- a/proxy/http/http.go +++ b/proxy/http/http.go @@ -24,7 +24,7 @@ type HttpProxyServer struct { accepting bool space app.Space config *Config - tcpListener *hub.TCPListener + tcpListener *hub.TCPHub listeningPort v2net.Port } diff --git a/proxy/shadowsocks/shadowsocks.go b/proxy/shadowsocks/shadowsocks.go index 01280039e..c48546d1e 100644 --- a/proxy/shadowsocks/shadowsocks.go +++ b/proxy/shadowsocks/shadowsocks.go @@ -20,7 +20,7 @@ type Shadowsocks struct { config *Config port v2net.Port accepting bool - tcpListener *hub.TCPListener + tcpListener *hub.TCPHub } func (this *Shadowsocks) Port() v2net.Port { diff --git a/proxy/socks/socks.go b/proxy/socks/socks.go index 1cb621696..620667e33 100644 --- a/proxy/socks/socks.go +++ b/proxy/socks/socks.go @@ -28,7 +28,7 @@ type SocksServer struct { accepting bool space app.Space config *Config - tcpListener *hub.TCPListener + tcpListener *hub.TCPHub udpConn *net.UDPConn udpAddress v2net.Destination listeningPort v2net.Port diff --git a/proxy/vmess/inbound/inbound.go b/proxy/vmess/inbound/inbound.go index d4ec41fab..43ca5787e 100644 --- a/proxy/vmess/inbound/inbound.go +++ b/proxy/vmess/inbound/inbound.go @@ -25,7 +25,7 @@ type VMessInboundHandler struct { clients protocol.UserSet user *vmess.User accepting bool - listener *hub.TCPListener + listener *hub.TCPHub features *FeaturesConfig listeningPort v2net.Port } diff --git a/transport/hub/tcp.go b/transport/hub/tcp.go index 42a93fe14..d9baadc03 100644 --- a/transport/hub/tcp.go +++ b/transport/hub/tcp.go @@ -10,7 +10,7 @@ import ( type TCPConn struct { conn *net.TCPConn - listener *TCPListener + listener *TCPHub dirty bool } @@ -62,13 +62,13 @@ func (this *TCPConn) CloseWrite() error { return this.conn.CloseWrite() } -type TCPListener struct { +type TCPHub struct { listener *net.TCPListener connCallback func(*TCPConn) accepting bool } -func ListenTCP(port v2net.Port, callback func(*TCPConn)) (*TCPListener, error) { +func ListenTCP(port v2net.Port, callback func(*TCPConn)) (*TCPHub, error) { listener, err := net.ListenTCP("tcp", &net.TCPAddr{ IP: []byte{0, 0, 0, 0}, Port: int(port), @@ -77,7 +77,7 @@ func ListenTCP(port v2net.Port, callback func(*TCPConn)) (*TCPListener, error) { if err != nil { return nil, err } - tcpListener := &TCPListener{ + tcpListener := &TCPHub{ listener: listener, connCallback: callback, } @@ -85,12 +85,12 @@ func ListenTCP(port v2net.Port, callback func(*TCPConn)) (*TCPListener, error) { return tcpListener, nil } -func (this *TCPListener) Close() { +func (this *TCPHub) Close() { this.accepting = false this.listener.Close() } -func (this *TCPListener) start() { +func (this *TCPHub) start() { this.accepting = true for this.accepting { conn, err := this.listener.AcceptTCP() @@ -105,6 +105,6 @@ func (this *TCPListener) start() { } } -func (this *TCPListener) recycle(conn *net.TCPConn) { +func (this *TCPHub) recycle(conn *net.TCPConn) { }