edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 18:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

show reason for closing a connection within a debug message. Closes #1061

Browse source
This commit is contained in:
oy 2013-02-20 16:49:21 +01:00
parent 07c97822bb
commit 118d2ac837
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/engine/shared/network_conn.cpp
View file

@ -214,27 +214,25 @@ int CNetConnection::Feed(CNetPacketConstruct *pPacket, NETADDR *pAddr)
m_State = NET_CONNSTATE_ERROR; m_State = NET_CONNSTATE_ERROR;
m_RemoteClosed = 1; m_RemoteClosed = 1;
char Str[128] = {0};
if(pPacket->m_DataSize > 1)
{
// make sure to sanitize the error string form the other party
if(pPacket->m_DataSize < 128)
str_copy(Str, (char *)&pPacket->m_aChunkData[1], pPacket->m_DataSize);
else
str_copy(Str, (char *)&pPacket->m_aChunkData[1], sizeof(Str));
str_sanitize_strong(Str);
}
if(!m_BlockCloseMsg) if(!m_BlockCloseMsg)
{ {
if(pPacket->m_DataSize) // set the error string
{ SetError(Str);
// make sure to sanitize the error string form the other party
char Str[128];
if(pPacket->m_DataSize < 128)
str_copy(Str, (char *)pPacket->m_aChunkData, pPacket->m_DataSize);
else
str_copy(Str, (char *)pPacket->m_aChunkData, sizeof(Str));
str_sanitize_strong(Str);
// set the error string
SetError(Str);
}
else
SetError("No reason given");
} }
if(g_Config.m_Debug) if(g_Config.m_Debug)
dbg_msg("conn", "closed reason='%s'", ErrorString()); dbg_msg("conn", "closed reason='%s'", Str);
} }
return 0; return 0;
} }