From 000853b479a6e9b85b0f5d150baff9bcc06c41ae Mon Sep 17 00:00:00 2001 From: duanhf2012 <6549168@qq.com> Date: Mon, 25 Nov 2024 17:44:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E5=BA=93=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- network/conn.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/network/conn.go b/network/conn.go index 7d438a3..84d5320 100644 --- a/network/conn.go +++ b/network/conn.go @@ -111,15 +111,15 @@ func (netConn *NetConn) doWrite(b []byte) error { } // b must not be modified by the others goroutines -func (netConn *NetConn) Write(b []byte) error { +func (netConn *NetConn) Write(b []byte) (int,error) { netConn.Lock() defer netConn.Unlock() if atomic.LoadInt32(&netConn.closeFlag) == 1 || b == nil { netConn.ReleaseReadMsg(b) - return errors.New("conn is close") + return 0,errors.New("conn is close") } - return netConn.doWrite(b) + return len(b),netConn.doWrite(b) } func (netConn *NetConn) Read(b []byte) (int, error) { @@ -150,7 +150,7 @@ func (netConn *NetConn) WriteMsg(args ...[]byte) error { if atomic.LoadInt32(&netConn.closeFlag) == 1 { return errors.New("conn is close") } - return netConn.msgParser.Write(netConn.conn, args...) + return netConn.msgParser.Write(netConn, args...) } func (netConn *NetConn) WriteRawMsg(args []byte) error { @@ -158,7 +158,8 @@ func (netConn *NetConn) WriteRawMsg(args []byte) error { return errors.New("conn is close") } - return netConn.Write(args) + _,err:= netConn.Write(args) + return err } func (netConn *NetConn) IsConnected() bool {