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

Protocol18: Fixed failure with invalig logfile names.

Browse Source
This commit is contained in:
Mattes D 2015-01-24 15:59:41 +01:00
parent f1f12495b2
commit 978fc6a988
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Protocol/Protocol18x.cpp
View File

@ -108,8 +108,15 @@ cProtocol180::cProtocol180(cClientHandle * a_Client, const AString & a_ServerAdd
{ {
static int sCounter = 0; static int sCounter = 0;
cFile::CreateFolder("CommLogs"); cFile::CreateFolder("CommLogs");
AString FileName = Printf("CommLogs/%x_%d__%s.log", (unsigned)time(nullptr), sCounter++, a_Client->GetIPString().c_str()); AString FileName = Printf("CommLogs/%x_%d__%s.log",
m_CommLogFile.Open(FileName, cFile::fmWrite); static_cast<unsigned>(time(nullptr)),
sCounter++,
cFile::ReplaceFileNameInvalidChars(a_Client->GetIPString()).c_str()
);
if (!m_CommLogFile.Open(FileName, cFile::fmWrite))
{
LOG("Cannot log communication to file, the log file \"%s\" cannot be opened for writing.", FileName.c_str());
}
} }
} }
@ -1659,7 +1666,7 @@ void cProtocol180::FixItemFramePositions(int a_ObjectData, double & a_PosX, doub
void cProtocol180::AddReceivedData(const char * a_Data, size_t a_Size) void cProtocol180::AddReceivedData(const char * a_Data, size_t a_Size)
{ {
// Write the incoming data into the comm log file: // Write the incoming data into the comm log file:
if (g_ShouldLogCommIn) if (g_ShouldLogCommIn && m_CommLogFile.IsOpen())
{ {
if (m_ReceivedData.GetReadableSpace() > 0) if (m_ReceivedData.GetReadableSpace() > 0)
{ {
@ -1764,7 +1771,7 @@ void cProtocol180::AddReceivedData(const char * a_Data, size_t a_Size)
bb.Write("\0", 1); bb.Write("\0", 1);
// Log the packet info into the comm log file: // Log the packet info into the comm log file:
if (g_ShouldLogCommIn) if (g_ShouldLogCommIn && m_CommLogFile.IsOpen())
{ {
AString PacketData; AString PacketData;
bb.ReadAll(PacketData); bb.ReadAll(PacketData);
@ -1796,7 +1803,7 @@ void cProtocol180::AddReceivedData(const char * a_Data, size_t a_Size)
#endif // _DEBUG #endif // _DEBUG
// Put a message in the comm log: // Put a message in the comm log:
if (g_ShouldLogCommIn) if (g_ShouldLogCommIn && m_CommLogFile.IsOpen())
{ {
m_CommLogFile.Printf("^^^^^^ Unhandled packet ^^^^^^\n\n\n"); m_CommLogFile.Printf("^^^^^^ Unhandled packet ^^^^^^\n\n\n");
} }
@ -1813,7 +1820,7 @@ void cProtocol180::AddReceivedData(const char * a_Data, size_t a_Size)
); );
// Put a message in the comm log: // Put a message in the comm log:
if (g_ShouldLogCommIn) if (g_ShouldLogCommIn && m_CommLogFile.IsOpen())
{ {
m_CommLogFile.Printf("^^^^^^ Wrong number of bytes read for this packet (exp %d left, got " SIZE_T_FMT " left) ^^^^^^\n\n\n", m_CommLogFile.Printf("^^^^^^ Wrong number of bytes read for this packet (exp %d left, got " SIZE_T_FMT " left) ^^^^^^\n\n\n",
1, bb.GetReadableSpace() 1, bb.GetReadableSpace()
@ -1827,7 +1834,7 @@ void cProtocol180::AddReceivedData(const char * a_Data, size_t a_Size)
} // for (ever) } // for (ever)
// Log any leftover bytes into the logfile: // Log any leftover bytes into the logfile:
if (g_ShouldLogCommIn && (m_ReceivedData.GetReadableSpace() > 0)) if (g_ShouldLogCommIn && (m_ReceivedData.GetReadableSpace() > 0) && m_CommLogFile.IsOpen())
{ {
AString AllData; AString AllData;
size_t OldReadableSpace = m_ReceivedData.GetReadableSpace(); size_t OldReadableSpace = m_ReceivedData.GetReadableSpace();
@ -2798,7 +2805,7 @@ cProtocol180::cPacketizer::~cPacketizer()
} }
// Log the comm into logfile: // Log the comm into logfile:
if (g_ShouldLogCommOut) if (g_ShouldLogCommOut && m_Protocol.m_CommLogFile.IsOpen())
{ {
AString Hex; AString Hex;
ASSERT(PacketData.size() > 0); ASSERT(PacketData.size() > 0);