HimbeerserverDE
/
mt-multiserver-proxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ev2-1-dev' into main

master
Riley 2022-05-02 19:07:48 +02:00 committed by GitHub
parent eed53c99c0 5def93ac2b
commit df6906b139
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
process.go
View File

@ -33,8 +33,8 @@ func (cc *ClientConn) process(pkt mt.Pkt) {
}
cc.setState(csInit)
if cmd.SerializeVer != latestSerializeVer {
cc.Log("<-", "invalid serializeVer")
if cmd.SerializeVer <= latestSerializeVer {
cc.Log("<-", "invalid serializeVer", cmd.SerializeVer)
ack, _ := cc.SendCmd(&mt.ToCltKick{Reason: mt.UnsupportedVer})
select {
@ -46,8 +46,8 @@ func (cc *ClientConn) process(pkt mt.Pkt) {
return
}
if cmd.MaxProtoVer < latestProtoVer {
cc.Log("<-", "invalid protoVer")
if cmd.MaxProtoVer <= latestProtoVer {
cc.Log("<-", "invalid protoVer", cmd.MaxProtoVer)
ack, _ := cc.SendCmd(&mt.ToCltKick{Reason: mt.UnsupportedVer})
select {
@ -445,6 +445,7 @@ func (cc *ClientConn) process(pkt mt.Pkt) {
done := make(chan struct{})
go func(done chan<- struct{}) {
result, isCmd := onChatMsg(cc, cmd)
if !isCmd {
forward(pkt)
@ -452,7 +453,7 @@ func (cc *ClientConn) process(pkt mt.Pkt) {
cc.SendChatMsg(result)
}
close(done)
close(done)
}(done)
go func(done <-chan struct{}) {