From 1e0bd74db6cfa2796eca4a7d25fb919ea4940fec Mon Sep 17 00:00:00 2001 From: lotodore Date: Tue, 1 Jan 2013 15:06:09 +0100 Subject: [PATCH] Fixing validation of empty packets. --- src/net/common/netpacketvalidator.cpp | 30 ++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/net/common/netpacketvalidator.cpp b/src/net/common/netpacketvalidator.cpp index 4996e8b0..499aa24c 100644 --- a/src/net/common/netpacketvalidator.cpp +++ b/src/net/common/netpacketvalidator.cpp @@ -849,14 +849,15 @@ NetPacketValidator::ValidateEndOfHandHideCardsMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &packet) +NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet*/) { - bool retVal = false; - if (packet.GetMsg()->has_showmycardsrequestmessage()) { - //const ShowMyCardsRequestMessage &msg = packet.GetMsg()->showmycardsrequestmessage(); - retVal = true; - } - return retVal; + //bool retVal = false; + //if (packet.GetMsg()->has_showmycardsrequestmessage()) { + // const ShowMyCardsRequestMessage &msg = packet.GetMsg()->showmycardsrequestmessage(); + // retVal = true; + //} + //return retVal; + return true; // Empty packet, always valid. } bool @@ -1068,14 +1069,15 @@ NetPacketValidator::ValidateTimeoutWarningMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateResetTimeoutMessage(const NetPacket &packet) +NetPacketValidator::ValidateResetTimeoutMessage(const NetPacket &/*packet*/) { - bool retVal = false; - if (packet.GetMsg()->has_resettimeoutmessage()) { - //const ResetTimeoutMessage &msg = packet.GetMsg()->resettimeoutmessage(); - retVal = true; - } - return retVal; + //bool retVal = false; + //if (packet.GetMsg()->has_resettimeoutmessage()) { + // const ResetTimeoutMessage &msg = packet.GetMsg()->resettimeoutmessage(); + // retVal = true; + //} + //return retVal; + return true; // Empty packet, always valid. } bool