From 0006ab049fafa8c0faf152befe0067daa7fe7e68 Mon Sep 17 00:00:00 2001 From: kercylan98 Date: Mon, 22 May 2023 11:48:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84wr?= =?UTF-8?q?ite=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/conn.go | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/server/conn.go b/server/conn.go index 8e512db..24e3707 100644 --- a/server/conn.go +++ b/server/conn.go @@ -18,11 +18,7 @@ func newKcpConn(server *Server, session *kcp.UDPSession) *Conn { remoteAddr: session.RemoteAddr(), ip: session.RemoteAddr().String(), kcp: session, - write: func(data []byte) error { - _, err := session.Write(data) - return err - }, - data: map[any]any{}, + data: map[any]any{}, } if index := strings.LastIndex(c.ip, ":"); index != -1 { c.ip = c.ip[0:index] @@ -38,10 +34,7 @@ func newGNetConn(server *Server, conn gnet.Conn) *Conn { remoteAddr: conn.RemoteAddr(), ip: conn.RemoteAddr().String(), gn: conn, - write: func(data []byte) error { - return conn.AsyncWrite(data) - }, - data: map[any]any{}, + data: map[any]any{}, } if index := strings.LastIndex(c.ip, ":"); index != -1 { c.ip = c.ip[0:index] @@ -57,10 +50,7 @@ func newWebsocketConn(server *Server, ws *websocket.Conn, ip string) *Conn { remoteAddr: ws.RemoteAddr(), ip: ip, ws: ws, - write: func(data []byte) error { - return ws.WriteMessage(websocket.BinaryMessage, data) - }, - data: map[any]any{}, + data: map[any]any{}, } go c.writeLoop() return c @@ -74,7 +64,6 @@ type Conn struct { ws *websocket.Conn gn gnet.Conn kcp *kcp.UDPSession - write func(data []byte) error data map[any]any mutex sync.Mutex packetPool *synchronization.Pool[*connPacket] @@ -104,7 +93,6 @@ func (slf *Conn) Close() { } else if slf.kcp != nil { _ = slf.kcp.Close() } - slf.write = nil if slf.packetPool != nil { slf.packetPool.Close() }