Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-05-22 09:37:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

新增原始数据打包

Browse Source
This commit is contained in:
duanhf2012
2020-04-02 17:54:48 +08:00
parent b333d67c47
commit 6498851e78
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
network/processor/pbprocessor.go
View File

@@ -32,6 +32,7 @@ func (p *PBProcessor) SetByteOrder(littleEndian bool) {
type PBPackInfo struct { type PBPackInfo struct {
typ uint16 typ uint16
msg proto.Message msg proto.Message
rawMsg []byte
} }
func (slf *PBPackInfo) GetPackType() uint16 { func (slf *PBPackInfo) GetPackType() uint16 {
@@ -82,19 +83,22 @@ func (slf *PBProcessor ) Unmarshal(data []byte) (interface{}, error) {
func (slf *PBProcessor ) Marshal(msg interface{}) ([]byte, error){ func (slf *PBProcessor ) Marshal(msg interface{}) ([]byte, error){
pMsg := msg.(*PBPackInfo) pMsg := msg.(*PBPackInfo)
bytes,err := proto.Marshal(pMsg.msg.(proto.Message)) var err error
if err != nil { if pMsg.msg!=nil {
return nil,err pMsg.rawMsg,err = proto.Marshal(pMsg.msg.(proto.Message))
if err != nil {
return nil,err
}
} }
buff := make([]byte, 2, len(bytes)+MsgTypeSize) buff := make([]byte, 2, len(pMsg.rawMsg)+MsgTypeSize)
if slf.LittleEndian == true { if slf.LittleEndian == true {
binary.LittleEndian.PutUint16(buff[:2],pMsg.typ) binary.LittleEndian.PutUint16(buff[:2],pMsg.typ)
}else{ }else{
binary.BigEndian.PutUint16(buff[:2],pMsg.typ) binary.BigEndian.PutUint16(buff[:2],pMsg.typ)
} }
buff = append(buff,bytes...) buff = append(buff,pMsg.rawMsg...)
return buff,nil return buff,nil
} }
@@ -109,3 +113,7 @@ func (slf *PBProcessor) Register(msgtype uint16,msg proto.Message,handle Message
func (slf *PBProcessor) MakeMsg(msgType uint16,protoMsg proto.Message) *PBPackInfo { func (slf *PBProcessor) MakeMsg(msgType uint16,protoMsg proto.Message) *PBPackInfo {
return &PBPackInfo{typ:msgType,msg:protoMsg} return &PBPackInfo{typ:msgType,msg:protoMsg}
} }
func (slf *PBProcessor) MakeRawMsg(msgType uint16,msg []byte) *PBPackInfo {
return &PBPackInfo{typ:msgType,rawMsg:msg}
}