flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

ProtoProxy: Fixed metadata parsing.

Browse Source
This commit is contained in:
madmaxoft 2013-12-05 12:20:37 +01:00
parent 321b259213
commit 1373539bce
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Tools/ProtoProxy/Connection.cpp
View File

@ -260,6 +260,9 @@ void cConnection::Log(const char * a_Format, ...)
// Log to file: // Log to file:
cCSLock Lock(m_CSLog); cCSLock Lock(m_CSLog);
fputs(FullMsg.c_str(), m_LogFile); fputs(FullMsg.c_str(), m_LogFile);
#ifdef _DEBUG
fflush(m_LogFile);
#endif // _DEBUG
// Log to screen: // Log to screen:
// std::cout << FullMsg; // std::cout << FullMsg;
@ -2678,15 +2681,20 @@ bool cConnection::ParseMetadata(cByteBuffer & a_Buffer, AString & a_Metadata)
case 1: Length = 2; break; // short case 1: Length = 2; break; // short
case 2: Length = 4; break; // int case 2: Length = 4; break; // int
case 3: Length = 4; break; // float case 3: Length = 4; break; // float
case 4: // string16 case 4: // UTF-8 string with VarInt length
{ {
short Len = 0; UInt32 Len;
if (!a_Buffer.ReadBEShort(Len)) int rs = a_Buffer.GetReadableSpace();
if (!a_Buffer.ReadVarInt(Len))
{ {
return false; return false;
} }
short NetLen = htons(Len); rs = rs - a_Buffer.GetReadableSpace();
a_Metadata.append((char *)&NetLen, 2); cByteBuffer LenBuf(8);
LenBuf.WriteVarInt(Len);
AString VarLen;
LenBuf.ReadAll(VarLen);
a_Metadata.append(VarLen);
Length = Len; Length = Len;
break; break;
} }
@ -2766,11 +2774,21 @@ void cConnection::LogMetadata(const AString & a_Metadata, size_t a_IndentCount)
pos += 4; pos += 4;
break; break;
} }
case 4: // string16 case 4: // UTF-8 string with VarInt length
{ {
short Length = (a_Metadata[pos + 1] << 8) | a_Metadata[pos + 2]; cByteBuffer bb(10);
Log("%sstring[%d] = \"%*s\"", Indent.c_str(), Index, Length, a_Metadata.c_str() + pos + 3); int RestLen = (int)a_Metadata.size() - pos - 1;
pos += Length + 2; if (RestLen > 8)
{
RestLen = 8;
}
bb.Write(a_Metadata.data() + pos + 1, RestLen);
UInt32 Length;
int rs = bb.GetReadableSpace();
bb.ReadVarInt(Length);
rs = rs - bb.GetReadableSpace();
Log("%sstring[%d] = \"%*s\"", Indent.c_str(), Index, Length, a_Metadata.c_str() + pos + rs + 1);
pos += Length + rs + 2;
break; break;
} }
case 5: case 5: