From f0e78f8970a1f6640d9ca9c680db0a6aa83d0521 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 23 Mar 2024 15:23:02 +0800
Subject: [PATCH] 1

---
 server/imserver_new/constant/constant.go    | 4 +---
 server/imserver_new/global/global.go        | 9 ---------
 server/imserver_new/listener/handlermgr.go  | 4 ++--
 server/imserver_new/listener/wsplistener.go | 8 ++++++--
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/server/imserver_new/constant/constant.go b/server/imserver_new/constant/constant.go
index f2533b85..1658d156 100644
--- a/server/imserver_new/constant/constant.go
+++ b/server/imserver_new/constant/constant.go
@@ -5,11 +5,9 @@ import (
 )
 
 const (
-	ROOMMGR_MODULE_IDX = iota
-	APP_MODULE_IDX
+	APP_MODULE_IDX = iota
 	WSPLISTENER_MODULE_IDX
 	HANDLER_MGR_MODULE_IDX
-	HTTP_LISTENER_MODULE_IDX
 	PLAYER_MGR_MODULE_IDX
 	MAX_MODULE_IDX
 )
diff --git a/server/imserver_new/global/global.go b/server/imserver_new/global/global.go
index 12f0b922..a4bfee0c 100644
--- a/server/imserver_new/global/global.go
+++ b/server/imserver_new/global/global.go
@@ -10,9 +10,7 @@ import (
 var modules [constant.MAX_MODULE_IDX]q5.Module
 var initOrders = []int32 {
 	constant.HANDLER_MGR_MODULE_IDX,
-	constant.HTTP_LISTENER_MODULE_IDX,
 	constant.PLAYER_MGR_MODULE_IDX,
-	constant.ROOMMGR_MODULE_IDX,
 	constant.WSPLISTENER_MODULE_IDX,
 }
 
@@ -68,17 +66,10 @@ func RegModule(idx int32, m q5.Module) {
 		{
 			//wspListener = m.(.common.H)
 		}
-	case constant.HTTP_LISTENER_MODULE_IDX:
-		{
-			//wspListener = m.(.common.H)
-		}
 	case constant.PLAYER_MGR_MODULE_IDX:
 		{
 			playerMgr = m.(common.PlayerMgr)
 		}
-	case constant.ROOMMGR_MODULE_IDX:
-		{
-		}
 	default:
 		{
 			panic("unknow module")
diff --git a/server/imserver_new/listener/handlermgr.go b/server/imserver_new/listener/handlermgr.go
index 1a74de55..730df999 100644
--- a/server/imserver_new/listener/handlermgr.go
+++ b/server/imserver_new/listener/handlermgr.go
@@ -9,7 +9,7 @@ import (
 type HandlerMgr struct {
 }
 
-func (this *HandlerMgr) init() {
+func (this *HandlerMgr) Init() {
 	ss.RegHandlerId(int(ss.SSMessageIdE__SS_Ping), constant.WSP_LISTENER_HANDLER_ID)
 	ss.RegHandlerId(int(ss.SSMessageIdE__SS_WSP_SocketDisconnect), constant.WSP_LISTENER_HANDLER_ID)
 
@@ -54,5 +54,5 @@ func (this *HandlerMgr) init() {
 	cs.RegHandlerId(int(cs.CMMessageIdE__CMCloseChatNotify), constant.PLAYER_HANDLER_ID)
 }
 
-func (this *HandlerMgr) unInit() {
+func (this *HandlerMgr) UnInit() {
 }
diff --git a/server/imserver_new/listener/wsplistener.go b/server/imserver_new/listener/wsplistener.go
index e7cba2c5..a461252b 100644
--- a/server/imserver_new/listener/wsplistener.go
+++ b/server/imserver_new/listener/wsplistener.go
@@ -22,7 +22,7 @@ type WSPListener struct {
 	msgList q5.ListHead
 }
 
-func (this *WSPListener) init() {
+func (this *WSPListener) Init() {
 	this.ch = make(chan *f5.MsgHdr)
 	listener, err := net.Listen("tcp", "0.0.0.0:"+
 		q5.ToString(mt.Table.IMCluster.GetListenPort()))
@@ -35,7 +35,7 @@ func (this *WSPListener) init() {
 	}
 }
 
-func (this *WSPListener) unInit() {
+func (this *WSPListener) UnInit() {
 }
 
 func (this *WSPListener) SS_ping(hdr *f5.MsgHdr, msg *ss.SS_Ping) {
@@ -180,3 +180,7 @@ func (this *WSPListener) SendProxyMsg(conn net.Conn, socketHandle uint16, msg pr
 	copy(buff[f5.WSPROXYPACKHEAD_S_SIZE:], msgData[:])
 	conn.Write(buff)
 }
+
+func (this* WSPListener) ProcessSSMMsg(handler *ss.SsNetMsgHandler, hdr *f5.MsgHdr) {
+	ss.DispatchMsg(handler, hdr, this)
+}