@ -3450,7 +3450,7 @@ void static ProcessGetData(CNode* pfrom)
@@ -3450,7 +3450,7 @@ void static ProcessGetData(CNode* pfrom)
bool static ProcessMessage ( CNode * pfrom , string strCommand , CDataStream & vRecv , int64_t nTimeReceived )
{
RandAddSeedPerfmon ( ) ;
LogPrint ( " net " , " received: %s (%u bytes) peer=%d \n " , strCommand , vRecv . size ( ) , pfrom - > id ) ;
LogPrint ( " net " , " received: %s (%u bytes) peer=%d \n " , SanitizeString ( strCommand ) , vRecv . size ( ) , pfrom - > id ) ;
if ( mapArgs . count ( " -dropmessagestest " ) & & GetRand ( atoi ( mapArgs [ " -dropmessagestest " ] ) ) = = 0 )
{
LogPrintf ( " dropmessagestest DROPPING RECV MESSAGE \n " ) ;
@ -4285,7 +4285,7 @@ bool ProcessMessages(CNode* pfrom)
@@ -4285,7 +4285,7 @@ bool ProcessMessages(CNode* pfrom)
// Scan for message start
if ( memcmp ( msg . hdr . pchMessageStart , Params ( ) . MessageStart ( ) , MESSAGE_START_SIZE ) ! = 0 ) {
LogPrintf ( " PROCESSMESSAGE: INVALID MESSAGESTART %s peer=%d \n " , msg . hdr . GetCommand ( ) , pfrom - > id ) ;
LogPrintf ( " PROCESSMESSAGE: INVALID MESSAGESTART %s peer=%d \n " , SanitizeString ( msg . hdr . GetCommand ( ) ) , pfrom - > id ) ;
fOk = false ;
break ;
}
@ -4294,7 +4294,7 @@ bool ProcessMessages(CNode* pfrom)
@@ -4294,7 +4294,7 @@ bool ProcessMessages(CNode* pfrom)
CMessageHeader & hdr = msg . hdr ;
if ( ! hdr . IsValid ( ) )
{
LogPrintf ( " PROCESSMESSAGE: ERRORS IN HEADER %s peer=%d \n " , hdr . GetCommand ( ) , pfrom - > id ) ;
LogPrintf ( " PROCESSMESSAGE: ERRORS IN HEADER %s peer=%d \n " , SanitizeString ( hdr . GetCommand ( ) ) , pfrom - > id ) ;
continue ;
}
string strCommand = hdr . GetCommand ( ) ;
@ -4310,7 +4310,7 @@ bool ProcessMessages(CNode* pfrom)
@@ -4310,7 +4310,7 @@ bool ProcessMessages(CNode* pfrom)
if ( nChecksum ! = hdr . nChecksum )
{
LogPrintf ( " ProcessMessages(%s, %u bytes): CHECKSUM ERROR nChecksum=%08x hdr.nChecksum=%08x \n " ,
strCommand , nMessageSize , nChecksum , hdr . nChecksum ) ;
SanitizeString ( strCommand ) , nMessageSize , nChecksum , hdr . nChecksum ) ;
continue ;
}
@ -4327,12 +4327,12 @@ bool ProcessMessages(CNode* pfrom)
@@ -4327,12 +4327,12 @@ bool ProcessMessages(CNode* pfrom)
if ( strstr ( e . what ( ) , " end of data " ) )
{
// Allow exceptions from under-length message on vRecv
LogPrintf ( " ProcessMessages(%s, %u bytes): Exception '%s' caught, normally caused by a message being shorter than its stated length \n " , strCommand , nMessageSize , e . what ( ) ) ;
LogPrintf ( " ProcessMessages(%s, %u bytes): Exception '%s' caught, normally caused by a message being shorter than its stated length \n " , SanitizeString ( strCommand ) , nMessageSize , e . what ( ) ) ;
}
else if ( strstr ( e . what ( ) , " size too large " ) )
{
// Allow exceptions from over-long size
LogPrintf ( " ProcessMessages(%s, %u bytes): Exception '%s' caught \n " , strCommand , nMessageSize , e . what ( ) ) ;
LogPrintf ( " ProcessMessages(%s, %u bytes): Exception '%s' caught \n " , SanitizeString ( strCommand ) , nMessageSize , e . what ( ) ) ;
}
else
{
@ -4349,7 +4349,7 @@ bool ProcessMessages(CNode* pfrom)
@@ -4349,7 +4349,7 @@ bool ProcessMessages(CNode* pfrom)
}
if ( ! fRet )
LogPrintf ( " ProcessMessage(%s, %u bytes) FAILED peer=%d \n " , strCommand , nMessageSize , pfrom - > id ) ;
LogPrintf ( " ProcessMessage(%s, %u bytes) FAILED peer=%d \n " , SanitizeString ( strCommand ) , nMessageSize , pfrom - > id ) ;
break ;
}