mirrors2/hk4e
1
0
Fork 0
mirror of https://github.com/FlourishingWorld/hk4e.git synced 2026-02-04 15:32:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化客户端协议代理

Browse Source
This commit is contained in:
flswld
2023-06-05 12:33:31 +08:00
parent baea3b1334
commit 8d039dee06
8 changed files with 85 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gate/net/kcp_connect_manager.go
View File

@@ -98,7 +98,7 @@ func (k *KcpConnectManager) run() {
regionEc2b := random.NewEc2b()
regionEc2b.SetSeed(ec2b.Seed())
// 3.7的时候修改了xor 首包无需使用加密密钥
if k.getGateMaxVersion() < 3.7 {
if k.getGateMaxVersion() < 370 {
k.dispatchKey = regionEc2b.XorKey()
} else {
// 全部填充为0 不然会出问题
@@ -125,10 +125,10 @@ func (k *KcpConnectManager) Close() {
}
// getGateMaxVersion 获取gate最大可兼容的版本
func (k *KcpConnectManager) getGateMaxVersion() (maxVersion float64) {
func (k *KcpConnectManager) getGateMaxVersion() (maxVersion int) {
versionSplit := strings.Split(config.GetConfig().Hk4e.Version, ",")
for _, verStr := range versionSplit {
version, err := strconv.ParseFloat(verStr, 64)
version, err := strconv.Atoi(verStr)
if err != nil {
logger.Error("version a to i error: %v", err)
return

19
gate/net/proto_endecode.go
View File

@@ -56,14 +56,11 @@ func ProtoDecode(kcpMsg *KcpMsg,
logger.Error("get server proto obj is nil, serverCmdId: %v", serverCmdId)
return protoMsgList
}
delList, err := object.CopyProtoBufSameField(serverProtoObj, clientProtoObj)
err = object.CopyProtoBufSameField(serverProtoObj, clientProtoObj)
if err != nil {
logger.Error("copy proto obj error: %v", err)
return protoMsgList
}
if len(delList) != 0 {
logger.Error("delete field name list: %v, cmdName: %v", delList, cmdName)
}
ConvClientPbDataToServer(serverProtoObj, clientCmdProtoMap)
serverProtoData, err := pb.Marshal(serverProtoObj)
if err != nil {
@@ -168,14 +165,11 @@ func ProtoDecodePayloadLoop(cmdId uint16, protoData []byte, protoMessageList *[]
logger.Error("get server proto obj is nil, serverCmdId: %v", serverCmdId)
continue
}
delList, err := object.CopyProtoBufSameField(serverProtoObj, clientProtoObj)
err = object.CopyProtoBufSameField(serverProtoObj, clientProtoObj)
if err != nil {
logger.Error("copy proto obj error: %v", err)
continue
}
if len(delList) != 0 {
logger.Error("delete field name list: %v, cmdName: %v", delList, cmdName)
}
ConvClientPbDataToServer(serverProtoObj, clientCmdProtoMap)
serverProtoData, err := pb.Marshal(serverProtoObj)
if err != nil {
@@ -251,14 +245,11 @@ func ProtoEncode(protoMsg *ProtoMsg,
logger.Error("get client proto obj is nil, cmdName: %v", cmdName)
return nil
}
delList, err := object.CopyProtoBufSameField(clientProtoObj, serverProtoObj)
err = object.CopyProtoBufSameField(clientProtoObj, serverProtoObj)
if err != nil {
logger.Error("copy proto obj error: %v", err)
return nil
}
if len(delList) != 0 {
logger.Error("delete field name list: %v, cmdName: %v", delList, cmdName)
}
ConvServerPbDataToClient(clientProtoObj, clientCmdProtoMap)
clientProtoData, err := pb.Marshal(clientProtoObj)
if err != nil {
@@ -327,7 +318,7 @@ func ConvClientPbDataToServerCore(protoObjName string, serverProtoObj pb.Message
if err != nil {
return
}
_, err = object.CopyProtoBufSameField(serverProtoObj, clientProtoObj)
err = object.CopyProtoBufSameField(serverProtoObj, clientProtoObj)
if err != nil {
return
}
@@ -347,7 +338,7 @@ func ConvServerPbDataToClientCore(protoObjName string, serverProtoObj pb.Message
if clientProtoObj == nil {
return
}
_, err = object.CopyProtoBufSameField(clientProtoObj, serverProtoObj)
err = object.CopyProtoBufSameField(clientProtoObj, serverProtoObj)
if err != nil {
return
}