1

server/hallserver/app.go

@@ -5,6 +5,7 @@ import (
 	"mt"
 	"q5"
 	_ "main/initialize"
+	. "main/common"
 )
 
 type App struct {
@@ -22,17 +23,17 @@ func (this *App) Init() {
 
 	handlerMgr.init()
 	//playerMgr.init()
-	wspListener.init()
-	httpListener.init()
+	//wspListener.init()
+	//httpListener.init()
 	//roomMgr.init()
 }
 
 func (this *App) UnInit() {
 	//roomMgr.unInit()
-	httpListener.unInit()
+	//httpListener.unInit()
 	//playerMgr.unInit()
 	handlerMgr.unInit()
-	wspListener.unInit()
+	//wspListener.unInit()
 }
 
 func (this *App) Update() {

server/hallserver/common/constant.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 const (
 	PLAYER_MGR_HANDLER_ID   = 1

server/hallserver/common/types.go

@@ -1,5 +1,11 @@
 package common
 
+import (
+	"net"
+
+	proto "github.com/golang/protobuf/proto"
+)
+
 type Module interface {
 	Init()
 	UnInit()
@@ -16,3 +22,11 @@ type RoomMgr interface {
 type PlayerMgr interface {
 
 }
+
+type WspListener interface {
+	SendProxyMsg(net.Conn, uint16, proto.Message);
+}
+
+type HttpListener interface {
+
+}

server/hallserver/export.go

@@ -1,6 +1,4 @@
 package main
 
 var app = new(App)
-var wspListener = new(WSPListener)
 var handlerMgr = new(HandlerMgr)
-var httpListener = new(HttpListener)

server/hallserver/global/global.go

@@ -19,3 +19,11 @@ func GetPlayerMgr() common.PlayerMgr {
 func SetPlayerMgr(mgr common.PlayerMgr) {
 
 }
+
+func GetWspListener() common.WspListener {
+	return nil
+}
+
+func SetWspListener(common.WspListener) {
+
+}

server/hallserver/handlermgr.go

@@ -3,6 +3,8 @@ package main
 import (
 	"cs"
 	"ss"
+
+	. "main/common"
 )
 
 type HandlerMgr struct {

server/hallserver/initialize/enter.go

@@ -4,9 +4,11 @@ import (
 	"main/global"
 	"main/room"
 	"main/player"
+	"main/listener"
 )
 
 func init() {
 	global.SetRoomMgr(room.GetRoomMgr())
 	global.SetPlayerMgr(player.GetPlayerMgr())
+	global.SetWspListener(listener.GetWspListener())
 }

server/hallserver/listener/export.go

@@ -0,0 +1,5 @@
+package listener
+
+func GetWspListener() *WSPListener {
+	return nil
+}

server/hallserver/listener/httplistener.go

@@ -1,19 +1,19 @@
-package main
+package listener
 
 import (
 	"f5"
 	"mt"
 )
 
-type HttpListener struct {
+type httpListener struct {
 	httpServer *f5.HttpServer
 }
 
-func (this *HttpListener) init() {
+func (this *httpListener) init() {
 	this.httpServer = new (f5.HttpServer)
 	this.httpServer.Init("imserver.httplistener", 1000 * 10)
 	this.httpServer.Start(mt.Table.HallCluster.GetHttpListenPort())
 }
 
-func (this *HttpListener) unInit() {
+func (this *httpListener) unInit() {
 }

server/hallserver/listener/wsplistener.go

@@ -1,4 +1,4 @@
-package main
+package listener
 
 import (
 	"fmt"
@@ -11,6 +11,7 @@ import (
 	"ss"
 
 	proto "github.com/golang/protobuf/proto"
+	. "main/common"
 )
 
 type WSPListener struct {
@@ -138,20 +139,20 @@ func (this *WSPListener) parseNetPkt() {
 				hdr.Msg = ss.ParsePb(hdr.MsgId, hdr.Data)
 				if hdr.Msg != nil {
 					hdr.Entry.Init(hdr)
-					app.addNetMsg(hdr)
+					//app.addNetMsg(hdr)
 				}
 			} else {
 				hdr.Msg = cs.ParsePb(hdr.MsgId, hdr.Data)
 				if hdr.Msg != nil {
 					hdr.Entry.Init(hdr)
-					app.addNetMsg(hdr)
+					//app.addNetMsg(hdr)
 				}
 			}
 		}
 	}
 }
 
-func (this *WSPListener) sendProxyMsg(conn net.Conn, socketHandle uint16, msg proto.Message) {
+func (this *WSPListener) SendProxyMsg(conn net.Conn, socketHandle uint16, msg proto.Message) {
 	netMsg := msg.(f5.NetMsg)
 	msgData, err := proto.Marshal(msg)
 	if err != nil {

server/hallserver/types.go

@@ -1 +0,0 @@
-package main