Skip to content

Commit b5b2df8

Browse files
committed
Another update.
1 parent fe3a78f commit b5b2df8

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/messagereader.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,15 @@ ssize_t MessageReader::receiveMessage(const int sd,
218218
#endif
219219
socket->MessageSize = ntohs(header->Length);
220220
if(socket->MessageSize < sizeof(TLVHeader)) {
221+
printTimeStamp(std::cerr);
221222
std::cerr << "ERROR: Message size < TLV size in message from ";
222223
printAddress(std::cout, from, true);
223224
std::cerr << " on socket " << socket->SocketDescriptor << "!\n";
224225
socket->Status = Socket::MRS_StreamError;
225226
return(MRRM_STREAM_ERROR);
226227
}
227228
else if(socket->MessageSize > socket->MessageBufferSize) {
229+
printTimeStamp(std::cerr);
228230
std::cerr << "ERROR: Message too large to fit buffer for message from ";
229231
printAddress(std::cout, from, true);
230232
std::cerr << " on socket " << socket->SocketDescriptor << "!\n";
@@ -258,6 +260,7 @@ ssize_t MessageReader::receiveMessage(const int sd,
258260
if(socket->Protocol == IPPROTO_SCTP) {
259261
if(*msgFlags & MSG_EOR) { // end of SCTP message
260262
if(!(*msgFlags & MSG_NOTIFICATION)) { // data message
263+
printTimeStamp(std::cerr);
261264
std::cerr << "ERROR: SCTP message end before TLV message end (\n"
262265
<< "read " << socket->BytesRead
263266
<< ", expected " << socket->MessageSize << ") in message from ";
@@ -281,13 +284,15 @@ ssize_t MessageReader::receiveMessage(const int sd,
281284

282285
// ====== Completed reading =====================================
283286
if(socket->MessageSize > bufferSize) {
287+
printTimeStamp(std::cerr);
284288
std::cerr << "ERROR: Buffer size for MessageReader::receiveMessage() is too small in message from ";
285289
printAddress(std::cout, from, true);
286290
std::cerr << " on socket " << socket->SocketDescriptor << "!\n";
287291
socket->Status = Socket::MRS_StreamError;
288292
return(MRRM_STREAM_ERROR);
289293
}
290294
if((socket->Protocol == IPPROTO_SCTP) && (!(*msgFlags & MSG_EOR))) {
295+
printTimeStamp(std::cerr);
291296
std::cerr << "ERROR: TLV message end does not match with SCTP message end in message from ";
292297
printAddress(std::cout, from, true);
293298
std::cerr << " on socket " << socket->SocketDescriptor << "!\n";
@@ -312,6 +317,7 @@ ssize_t MessageReader::receiveMessage(const int sd,
312317
}
313318
}
314319
else {
320+
printTimeStamp(std::cerr);
315321
std::cerr << "ERROR: Unknown socket " << sd
316322
<< " given in call of MessageReader::receiveMessage()!\n";
317323
return(MRRM_BAD_SOCKET);

0 commit comments

Comments
 (0)