NewLife
/
SmartOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

不能以size是否为0 判断数据包内是否有size

This commit is contained in:
WangQiang 2016-09-20 07:00:54 +00:00
parent ac6fc26e3a
commit 381fa60de0
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
TokenNet/TokenDataMessage.cpp
View File

@ -7,6 +7,7 @@ TokenDataMessage::TokenDataMessage() :Data(0)
ID = 0;
Start = 0;
Size = 0;
HasSize = true;
}
TokenDataMessage::TokenDataMessage(const TokenDataMessage& msg)
@ -27,7 +28,11 @@ bool TokenDataMessage::Read(Stream& ms)
bp.Get("Data", Data);
// 自动设置长度，方便业务层使用
if(Size == 0) Size = Data.Length();
if (Size == 0)
{
HasSize = false;
Size = Data.Length();
}
return true;
}
@ -38,7 +43,7 @@ void TokenDataMessage::Write(Stream& ms) const
BinaryPair bp(ms);
if(ID) bp.Set("ID", ID);
bp.Set("Start", Start);
if(Size) bp.Set("Size", Size);
if(HasSize && Size) bp.Set("Size", Size);
if(Data.Length()) bp.Set("Data", Data);
}
@ -105,7 +110,7 @@ String& TokenDataMessage::ToStr(String& str) const
if (Reply) str += '#';
if(ID) str = str + " ID:" + ID;
str = str + " Start:" + Start;
if(Size) str = str + " Size:" + Size;
if(HasSize && Size) str = str + " Size:" + Size;
if(Data)
{

1
TokenNet/TokenDataMessage.h
View File

@ -14,6 +14,7 @@ public:
byte ID;
uint Start;
uint Size;
bool HasSize;
ByteArray Data;
TokenDataMessage();