From bbd1c7a7f2c25b69a0d041e4792964e14c71a018 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sun, 24 Sep 2023 15:50:56 +0800 Subject: [PATCH] 1 --- server/hallserver/constant/constant.go | 8 ++++++++ server/hallserver/listener/wsplistener.go | 8 +++++++- third_party/f5 | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/server/hallserver/constant/constant.go b/server/hallserver/constant/constant.go index 37f27595..ce613f3b 100644 --- a/server/hallserver/constant/constant.go +++ b/server/hallserver/constant/constant.go @@ -1,5 +1,9 @@ package constant +import ( + "f5" +) + const ( PLAYER_MGR_HANDLER_ID = iota PLAYER_HANDLER_ID @@ -8,6 +12,10 @@ const ( WSP_LISTENER_HANDLER_ID ) +const ( + IM_WSP_CLOSE = f5.IM_CUSTOM_MSG_BEGIN + 1 +) + const ( MAX_PACKET_LEN = 1024 * 64 ) diff --git a/server/hallserver/listener/wsplistener.go b/server/hallserver/listener/wsplistener.go index 38dcae23..439a8a6f 100644 --- a/server/hallserver/listener/wsplistener.go +++ b/server/hallserver/listener/wsplistener.go @@ -60,7 +60,13 @@ func (this *WSPListener) socketRead(conn net.Conn) { recvBuf := make([]byte, 1024*64*2) for { bufLen, err := conn.Read(buf) - if err == nil && bufLen > 0 { + if err != nil { + f5.GetApp().AddIMMsg(constant.IM_WSP_CLOSE, []interface{} { + conn, + }) + return + } + if bufLen > 0 { alreadyReadBytes := 0 for { { diff --git a/third_party/f5 b/third_party/f5 index 194793c1..f7961841 160000 --- a/third_party/f5 +++ b/third_party/f5 @@ -1 +1 @@ -Subproject commit 194793c17868a2ecc9ada927a8cfecf628152812 +Subproject commit f79618418ed89343a56ca53b8acc9a3cbd07ac30