From a5dd1cf42be3424fa1473ded3e0fac6fdd674830 Mon Sep 17 00:00:00 2001 From: flswld Date: Tue, 14 Feb 2023 01:42:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=BA=E5=99=A8=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 +- go.sum | 4 ++-- robot/cmd/main.go | 6 +++--- robot/net/session.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 875246a5..0ed6b171 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require github.com/yuin/gopher-lua v1.0.0 require github.com/pierrec/lz4/v4 v4.1.17 // dpdk-go -require github.com/FlourishingWorld/dpdk-go v1.0.1 +require github.com/FlourishingWorld/dpdk-go v0.0.0-20230213165129-6c5bc55b1f63 require ( github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 7fe8a13f..ea0d6579 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/FlourishingWorld/dpdk-go v1.0.1 h1:6PGyJ5dE8y7J/GlculPEGLrWlMVCfeThIUzfgaHse0c= -github.com/FlourishingWorld/dpdk-go v1.0.1/go.mod h1:dmizWx3DB1EK9Tu1/x4o6VpeGdp9YSpRhFPqYoLlNE0= +github.com/FlourishingWorld/dpdk-go v0.0.0-20230213165129-6c5bc55b1f63 h1:nh8fkskGiHdx7C5Tb+Cn6O1L7gddnK9lDl1r2wvLxWk= +github.com/FlourishingWorld/dpdk-go v0.0.0-20230213165129-6c5bc55b1f63/go.mod h1:dmizWx3DB1EK9Tu1/x4o6VpeGdp9YSpRhFPqYoLlNE0= github.com/arl/statsviz v0.5.1 h1:3HY0ZEB738JtguWsD1Tf1pFJZiCcWUmYRq/3OTYKaSI= github.com/arl/statsviz v0.5.1/go.mod h1:zDnjgRblGm1Dyd7J5YlbH7gM1/+HRC+SfkhZhQb5AnM= github.com/byebyebruce/natsrpc v0.5.5-0.20221125150611-56cd29a4e335 h1:V5qahA5kDL/TBnlwvYjemR5du/uQ7q75qkBBlTc4rXI= diff --git a/robot/cmd/main.go b/robot/cmd/main.go index 3c53577c..e3d1529e 100644 --- a/robot/cmd/main.go +++ b/robot/cmd/main.go @@ -24,14 +24,14 @@ func main() { if err != nil { panic(err) } - engine.RunEngine([]int{0, 1, 2, 3}, 1, "0.0.0.0") + engine.RunEngine([]int{0, 1, 2, 3}, 4, 1, "0.0.0.0") time.Sleep(time.Second * 30) - session := net.NewSession("192.168.199.233:22222", []byte{0x00}) + session := net.NewSession("192.168.199.233:22222", make([]byte, 4096)) go func() { protoMsg := <-session.RecvChan - logger.Debug("%v", protoMsg) + logger.Debug("protoMsg: %v", protoMsg) }() go func() { session.SendChan <- &hk4egatenet.ProtoMsg{ diff --git a/robot/net/session.go b/robot/net/session.go index c7320981..c598a324 100644 --- a/robot/net/session.go +++ b/robot/net/session.go @@ -63,7 +63,7 @@ func (s *Session) recvHandle() { kcpMsgList := make([]*hk4egatenet.KcpMsg, 0) hk4egatenet.DecodeBinToPayload(recvData, &dataBuf, convId, &kcpMsgList, s.xorKey) for _, v := range kcpMsgList { - protoMsgList := hk4egatenet.ProtoDecode(v, nil, nil) + protoMsgList := hk4egatenet.ProtoDecode(v, cmd.NewCmdProtoMap(), nil) for _, vv := range protoMsgList { s.RecvChan <- vv if s.changeXorKeyFin == false && vv.CmdId == cmd.GetPlayerTokenRsp {