diff --git a/src/net/common/validation/authmessagevalidator.cpp b/src/net/common/validation/authmessagevalidator.cpp
new file mode 100644
index 00000000..c690a8af
--- /dev/null
+++ b/src/net/common/validation/authmessagevalidator.cpp
@@ -0,0 +1,1286 @@
+/*****************************************************************************
+ * PokerTH - The open source texas holdem engine                             *
+ * Copyright (C) 2006-2012 Felix Hammer, Florian Thauer, Lothar May          *
+ *                                                                           *
+ * This program is free software: you can redistribute it and/or modify      *
+ * it under the terms of the GNU Affero General Public License as            *
+ * published by the Free Software Foundation, either version 3 of the        *
+ * License, or (at your option) any later version.                           *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU Affero General Public License for more details.                       *
+ *                                                                           *
+ * You should have received a copy of the GNU Affero General Public License  *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ *                                                                           *
+ * Additional permission under GNU AGPL version 3 section 7                  *
+ *                                                                           *
+ * If you modify this program, or any covered work, by linking or            *
+ * combining it with the OpenSSL project's OpenSSL library (or a             *
+ * modified version of that library), containing parts covered by the        *
+ * terms of the OpenSSL or SSLeay licenses, the authors of PokerTH           *
+ * (Felix Hammer, Florian Thauer, Lothar May) grant you additional           *
+ * permission to convey the resulting work.                                  *
+ * Corresponding Source for a non-source form of such a combination          *
+ * shall include the source code for the parts of OpenSSL used as well       *
+ * as that of the covered work.                                              *
+ *****************************************************************************/
+
+#include <net/netpacketvalidator.h>
+#include <net/netpacket.h>
+
+using namespace std;
+
+#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535)
+#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize))
+#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval))
+#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval))
+#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize))
+
+static bool
+ValidateListIntRange(const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > &l, ::google::protobuf::uint32 minval, ::google::protobuf::uint32 maxval)
+{
+	bool retVal = true;
+	for (int i = 0; i < l.size(); i++) {
+		if (!VALIDATE_UINT_RANGE(l.Get(i), minval, maxval)) {
+			retVal = false;
+			break;
+		}
+	}
+	return retVal;
+}
+
+NetPacketValidator::NetPacketValidator()
+{
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AnnounceMessage, ValidateAnnounceMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthMessage, ValidateAuthMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_LobbyMessage, ValidateLobbyMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameMessage, ValidateGameMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameManagementMessage, ValidateGameManagementMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameEngineMessage, ValidateGameEngineMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitMessage, ValidateInitMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerChallengeMessage, ValidateAuthServerChallengeMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthClientResponseMessage, ValidateAuthClientResponseMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerVerificationMessage, ValidateAuthServerVerificationMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitAckMessage, ValidateInitAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarRequestMessage, ValidateAvatarRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarHeaderMessage, ValidateAvatarHeaderMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarDataMessage, ValidateAvatarDataMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarEndMessage, ValidateAvatarEndMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_UnknownAvatarMessage, ValidateUnknownAvatarMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerListMessage, ValidatePlayerListMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListNewMessage, ValidateGameListNewMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListUpdateMessage, ValidateGameListUpdateMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerJoinedMessage, ValidateGameListPlayerJoinedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerLeftMessage, ValidateGameListPlayerLeftMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListAdminChangedMessage, ValidateGameListAdminChangedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoRequestMessage, ValidatePlayerInfoRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoReplyMessage, ValidatePlayerInfoReplyMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_SubscriptionRequestMessage, ValidateSubscriptionRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_CreateGameMessage, ValidateCreateGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameMessage, ValidateJoinGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RejoinGameMessage, ValidateRejoinGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameAckMessage, ValidateJoinGameAckMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameFailedMessage, ValidateJoinGameFailedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage, ValidateGamePlayerJoinedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerLeftMessage, ValidateGamePlayerLeftMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameAdminChangedMessage, ValidateGameAdminChangedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RemovedFromGameMessage, ValidateRemovedFromGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPlayerRequestMessage, ValidateKickPlayerRequestMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_LeaveGameRequestMessage, ValidateLeaveGameRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InvitePlayerToGameMessage, ValidateInvitePlayerToGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InviteNotifyMessage, ValidateInviteNotifyMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectGameInvitationMessage, ValidateRejectGameInvitationMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectInvNotifyMessage, ValidateRejectInvNotifyMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventMessage, ValidateStartEventMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventAckMessage, ValidateStartEventAckMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartInitialMessage, ValidateGameStartInitialMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartRejoinMessage, ValidateGameStartRejoinMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_HandStartMessage, ValidateHandStartMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersTurnMessage, ValidatePlayersTurnMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_MyActionRequestMessage, ValidateMyActionRequestMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_YourActionRejectedMessage, ValidateYourActionRejectedMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersActionDoneMessage, ValidatePlayersActionDoneMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealFlopCardsMessage, ValidateDealFlopCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealTurnCardMessage, ValidateDealTurnCardMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealRiverCardMessage, ValidateDealRiverCardMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AllInShowCardsMessage, ValidateAllInShowCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandShowCardsMessage, ValidateEndOfHandShowCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandHideCardsMessage, ValidateEndOfHandHideCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_ShowMyCardsRequestMessage, ValidateShowMyCardsRequestMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AfterHandShowCardsMessage, ValidateAfterHandShowCardsMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndOfGameMessage, ValidateEndOfGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_PlayerIdChangedMessage, ValidatePlayerIdChangedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickPlayerMessage, ValidateAskKickPlayerMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickDeniedMessage, ValidateAskKickDeniedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartKickPetitionMessage, ValidateStartKickPetitionMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickRequestMessage, ValidateVoteKickRequestMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickReplyMessage, ValidateVoteKickReplyMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPetitionUpdateMessage, ValidateKickPetitionUpdateMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndKickPetitionMessage, ValidateEndKickPetitionMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_StatisticsMessage, ValidateStatisticsMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRequestMessage, ValidateChatRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatMessage, ValidateChatMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRejectMessage, ValidateChatRejectMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_DialogMessage, ValidateDialogMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_TimeoutWarningMessage, ValidateTimeoutWarningMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ResetTimeoutMessage, ValidateResetTimeoutMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarMessage, ValidateReportAvatarMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarAckMessage, ValidateReportAvatarAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameMessage, ValidateReportGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameAckMessage, ValidateReportGameAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ErrorMessage, ValidateErrorMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameMessage, ValidateAdminRemoveGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameAckMessage, ValidateAdminRemoveGameAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerMessage, ValidateAdminBanPlayerMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerAckMessage, ValidateAdminBanPlayerAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorJoinedMessage, ValidateGameListSpectatorJoinedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorLeftMessage, ValidateGameListSpectatorLeftMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage, ValidateGameSpectatorJoinedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorLeftMessage, ValidateGameSpectatorLeftMessage));
+}
+
+bool
+NetPacketValidator::IsValidPacket(const NetPacket &packet) const
+{
+	// Default: Invalid packet.
+	bool retVal = false;
+	ValidateFunctorMap::const_iterator pos = m_validationMap.find(packet.GetMsg()->messagetype());
+	if (pos != m_validationMap.end()) {
+		// Call validation functor.
+		retVal = pos->second(packet);
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_announcemessage()) {
+		const AnnounceMessage &msg = packet.GetMsg()->announcemessage();
+		if (VALIDATE_IS_UINT16(msg.protocolversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.protocolversion().minorversion())
+				&& VALIDATE_IS_UINT16(msg.latestgameversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.latestgameversion().minorversion())
+				&& VALIDATE_IS_UINT16(msg.latestbetarevision())
+				&& VALIDATE_IS_UINT16(msg.numplayersonserver())) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInitMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_initmessage()) {
+		const InitMessage &msg = packet.GetMsg()->initmessage();
+		if (VALIDATE_IS_UINT16(msg.requestedversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.requestedversion().minorversion())
+				&& (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16)
+				&& (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64))
+				&& (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64))
+				&& (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256))
+				&& (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthServerChallengeMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authserverchallengemessage()) {
+		const AuthServerChallengeMessage &msg = packet.GetMsg()->authserverchallengemessage();
+		if (VALIDATE_STRING_SIZE(msg.serverchallenge(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthClientResponseMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authclientresponsemessage()) {
+		const AuthClientResponseMessage &msg = packet.GetMsg()->authclientresponsemessage();
+		if (VALIDATE_STRING_SIZE(msg.clientresponse(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthServerVerificationMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authserververificationmessage()) {
+		const AuthServerVerificationMessage &msg = packet.GetMsg()->authserververificationmessage();
+		if (VALIDATE_STRING_SIZE(msg.serververification(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_initackmessage()) {
+		const InitAckMessage &msg = packet.GetMsg()->initackmessage();
+		if (msg.yoursessionid().size() == 16
+				&& msg.yourplayerid() != 0
+				&& (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16)
+				&& (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarrequestmessage()) {
+		const AvatarRequestMessage &msg = packet.GetMsg()->avatarrequestmessage();
+		if (msg.requestid() != 0
+				&& msg.avatarhash().size() == 16) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarheadermessage()) {
+		const AvatarHeaderMessage &msg = packet.GetMsg()->avatarheadermessage();
+		if (msg.requestid() != 0
+				&& VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatardatamessage()) {
+		const AvatarDataMessage &msg = packet.GetMsg()->avatardatamessage();
+		if (msg.requestid() != 0
+				&& VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarEndMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarendmessage()) {
+		const AvatarEndMessage &msg = packet.GetMsg()->avatarendmessage();
+		if (msg.requestid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateUnknownAvatarMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_unknownavatarmessage()) {
+		const UnknownAvatarMessage &msg = packet.GetMsg()->unknownavatarmessage();
+		if (msg.requestid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerListMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerlistmessage()) {
+		const PlayerListMessage &msg = packet.GetMsg()->playerlistmessage();
+		if (msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistnewmessage()) {
+		const GameListNewMessage &msg = packet.GetMsg()->gamelistnewmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerids(), 0, 10)
+				&& msg.adminplayerid() != 0
+				&& ValidateGameInfo(msg.gameinfo())) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListUpdateMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistupdatemessage()) {
+		const GameListUpdateMessage &msg = packet.GetMsg()->gamelistupdatemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListPlayerJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistplayerjoinedmessage()) {
+		const GameListPlayerJoinedMessage &msg = packet.GetMsg()->gamelistplayerjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListPlayerLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistplayerleftmessage()) {
+		const GameListPlayerLeftMessage &msg = packet.GetMsg()->gamelistplayerleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListAdminChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistadminchangedmessage()) {
+		const GameListAdminChangedMessage &msg = packet.GetMsg()->gamelistadminchangedmessage();
+		if (msg.gameid() != 0 && msg.newadminplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerInfoRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerinforequestmessage()) {
+		const PlayerInfoRequestMessage &msg = packet.GetMsg()->playerinforequestmessage();
+		if (VALIDATE_LIST_SIZE(msg.playerid(), 1, 10)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerInfoReplyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerinforeplymessage()) {
+		const PlayerInfoReplyMessage &msg = packet.GetMsg()->playerinforeplymessage();
+		if (msg.playerid() != 0) {
+			// TODO maybe additional checks.
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateSubscriptionRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_subscriptionrequestmessage()) {
+		//const SubscriptionRequestMessage &msg = packet.GetMsg()->subscriptionrequestmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateCreateGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joinnewgamemessage()) {
+		const JoinNewGameMessage &msg = packet.GetMsg()->joinnewgamemessage();
+		if (ValidateGameInfo(msg.gameinfo())
+				&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joinexistinggamemessage()) {
+		const JoinExistingGameMessage &msg = packet.GetMsg()->joinexistinggamemessage();
+		if (msg.gameid() != 0
+				&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejoinGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejoinexistinggamemessage()) {
+		const RejoinExistingGameMessage &msg = packet.GetMsg()->rejoinexistinggamemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joingameackmessage()) {
+		const JoinGameAckMessage &msg = packet.GetMsg()->joingameackmessage();
+		if (msg.gameid() != 0 && ValidateGameInfo(msg.gameinfo())) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameFailedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joingamefailedmessage()) {
+		const JoinGameFailedMessage &msg = packet.GetMsg()->joingamefailedmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGamePlayerJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameplayerjoinedmessage()) {
+		const GamePlayerJoinedMessage &msg = packet.GetMsg()->gameplayerjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGamePlayerLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameplayerleftmessage()) {
+		const GamePlayerLeftMessage &msg = packet.GetMsg()->gameplayerleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameAdminChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameadminchangedmessage()) {
+		const GameAdminChangedMessage &msg = packet.GetMsg()->gameadminchangedmessage();
+		if (msg.gameid() != 0 && msg.newadminplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRemovedFromGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_removedfromgamemessage()) {
+		const RemovedFromGameMessage &msg = packet.GetMsg()->removedfromgamemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateKickPlayerRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_kickplayerrequestmessage()) {
+		const KickPlayerRequestMessage &msg = packet.GetMsg()->kickplayerrequestmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateLeaveGameRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_leavegamerequestmessage()) {
+		const LeaveGameRequestMessage &msg = packet.GetMsg()->leavegamerequestmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInvitePlayerToGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_inviteplayertogamemessage()) {
+		const InvitePlayerToGameMessage &msg = packet.GetMsg()->inviteplayertogamemessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInviteNotifyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_invitenotifymessage()) {
+		const InviteNotifyMessage &msg = packet.GetMsg()->invitenotifymessage();
+		if (msg.gameid() != 0 && msg.playeridwho() != 0 && msg.playeridbywhom() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejectGameInvitationMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejectgameinvitationmessage()) {
+		const RejectGameInvitationMessage &msg = packet.GetMsg()->rejectgameinvitationmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejectInvNotifyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejectinvnotifymessage()) {
+		const RejectInvNotifyMessage &msg = packet.GetMsg()->rejectinvnotifymessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartEventMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_starteventmessage()) {
+		const StartEventMessage &msg = packet.GetMsg()->starteventmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartEventAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_starteventackmessage()) {
+		const StartEventAckMessage &msg = packet.GetMsg()->starteventackmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameStartInitialMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamestartinitialmessage()) {
+		const GameStartInitialMessage &msg = packet.GetMsg()->gamestartinitialmessage();
+		if (msg.gameid() != 0
+				&& msg.startdealerplayerid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameStartRejoinMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamestartrejoinmessage()) {
+		const GameStartRejoinMessage &msg = packet.GetMsg()->gamestartrejoinmessage();
+		if (msg.gameid() != 0
+				&& msg.startdealerplayerid() != 0
+				&& msg.handnum() != 0
+				&& VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateHandStartMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_handstartmessage()) {
+		const HandStartMessage &msg = packet.GetMsg()->handstartmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000)
+				&& VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayersTurnMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playersturnmessage()) {
+		const PlayersTurnMessage &msg = packet.GetMsg()->playersturnmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0 ) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateMyActionRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_myactionrequestmessage()) {
+		const MyActionRequestMessage &msg = packet.GetMsg()->myactionrequestmessage();
+		if (msg.gameid() != 0
+				&& msg.handnum() != 0
+				&& VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateYourActionRejectedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_youractionrejectedmessage()) {
+		const YourActionRejectedMessage &msg = packet.GetMsg()->youractionrejectedmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayersActionDoneMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playersactiondonemessage()) {
+		const PlayersActionDoneMessage &msg = packet.GetMsg()->playersactiondonemessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealFlopCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealflopcardsmessage()) {
+		const DealFlopCardsMessage &msg = packet.GetMsg()->dealflopcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.flopcard1(), 51)
+				&& VALIDATE_UINT_UPPER(msg.flopcard2(), 51)
+				&& VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealTurnCardMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealturncardmessage()) {
+		const DealTurnCardMessage &msg = packet.GetMsg()->dealturncardmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.turncard(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealRiverCardMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealrivercardmessage()) {
+		const DealRiverCardMessage &msg = packet.GetMsg()->dealrivercardmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.rivercard(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAllInShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_allinshowcardsmessage()) {
+		const AllInShowCardsMessage &msg = packet.GetMsg()->allinshowcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfHandShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofhandshowcardsmessage()) {
+		const EndOfHandShowCardsMessage &msg = packet.GetMsg()->endofhandshowcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfHandHideCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofhandhidecardsmessage()) {
+		const EndOfHandHideCardsMessage &msg = packet.GetMsg()->endofhandhidecardsmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet*/)
+{
+	//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
+NetPacketValidator::ValidateAfterHandShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_afterhandshowcardsmessage()) {
+		//const AfterHandShowCardsMessage &msg = packet.GetMsg()->afterhandshowcardsmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofgamemessage()) {
+		const EndOfGameMessage &msg = packet.GetMsg()->endofgamemessage();
+		if (msg.gameid() != 0 && msg.winnerplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerIdChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playeridchangedmessage()) {
+		const PlayerIdChangedMessage &msg = packet.GetMsg()->playeridchangedmessage();
+		if (msg.oldplayerid() != 0 && msg.newplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAskKickPlayerMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_askkickplayermessage()) {
+		const AskKickPlayerMessage &msg = packet.GetMsg()->askkickplayermessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAskKickDeniedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_askkickdeniedmessage()) {
+		const AskKickDeniedMessage &msg = packet.GetMsg()->askkickdeniedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartKickPetitionMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_startkickpetitionmessage()) {
+		const StartKickPetitionMessage &msg = packet.GetMsg()->startkickpetitionmessage();
+		if (msg.gameid() != 0
+				&& msg.petitionid() != 0
+				&& msg.proposingplayerid() != 0
+				&& msg.kickplayerid() != 0
+				&& msg.kicktimeoutsec() > 0
+				&& msg.numvotesneededtokick() > 0) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateVoteKickRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_votekickrequestmessage()) {
+		const VoteKickRequestMessage &msg = packet.GetMsg()->votekickrequestmessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateVoteKickReplyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_votekickreplymessage()) {
+		const VoteKickReplyMessage &msg = packet.GetMsg()->votekickreplymessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateKickPetitionUpdateMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_kickpetitionupdatemessage()) {
+		const KickPetitionUpdateMessage &msg = packet.GetMsg()->kickpetitionupdatemessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndKickPetitionMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endkickpetitionmessage()) {
+		const EndKickPetitionMessage &msg = packet.GetMsg()->endkickpetitionmessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStatisticsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_statisticsmessage()) {
+		//const StatisticsMessage &msg = packet.GetMsg()->statisticsmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatrequestmessage()) {
+		const ChatRequestMessage &msg = packet.GetMsg()->chatrequestmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatmessage()) {
+		const ChatMessage &msg = packet.GetMsg()->chatmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatRejectMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatrejectmessage()) {
+		const ChatRejectMessage &msg = packet.GetMsg()->chatrejectmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDialogMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dialogmessage()) {
+		const DialogMessage &msg = packet.GetMsg()->dialogmessage();
+		if (VALIDATE_STRING_SIZE(msg.notificationtext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateTimeoutWarningMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_timeoutwarningmessage()) {
+		//const TimeoutWarningMessage &msg = packet.GetMsg()->timeoutwarningmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateResetTimeoutMessage(const NetPacket &/*packet*/)
+{
+	//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
+NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportavatarmessage()) {
+		const ReportAvatarMessage &msg = packet.GetMsg()->reportavatarmessage();
+		if (msg.reportedplayerid() != 0
+				&& msg.reportedavatarhash().size() == 16) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportAvatarAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportavatarackmessage()) {
+		const ReportAvatarAckMessage &msg = packet.GetMsg()->reportavatarackmessage();
+		if (msg.reportedplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportgamemessage()) {
+		const ReportGameMessage &msg = packet.GetMsg()->reportgamemessage();
+		if (msg.reportedgameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportgameackmessage()) {
+		const ReportGameAckMessage &msg = packet.GetMsg()->reportgameackmessage();
+		if (msg.reportedgameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateErrorMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_errormessage()) {
+		//const ErrorMessage &msg = packet.GetMsg()->errormessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminRemoveGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminremovegamemessage()) {
+		const AdminRemoveGameMessage &msg = packet.GetMsg()->adminremovegamemessage();
+		if (msg.removegameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminRemoveGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminremovegameackmessage()) {
+		const AdminRemoveGameAckMessage &msg = packet.GetMsg()->adminremovegameackmessage();
+		if (msg.removegameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminBanPlayerMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminbanplayermessage()) {
+		const AdminBanPlayerMessage &msg = packet.GetMsg()->adminbanplayermessage();
+		if (msg.banplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminBanPlayerAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminbanplayerackmessage()) {
+		const AdminBanPlayerAckMessage &msg = packet.GetMsg()->adminbanplayerackmessage();
+		if (msg.banplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo)
+{
+	bool retVal = false;
+	if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64)
+			&& VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10)
+			&& (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000))
+			&& (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000))
+			&& (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000))
+			&& VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11)
+			&& VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20)
+			&& VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60)
+			&& VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000)
+			&& VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000)
+			&& VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30)
+			&& ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) {
+
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListSpectatorJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistspectatorjoinedmessage()) {
+		const GameListSpectatorJoinedMessage &msg = packet.GetMsg()->gamelistspectatorjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListSpectatorLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistspectatorleftmessage()) {
+		const GameListSpectatorLeftMessage &msg = packet.GetMsg()->gamelistspectatorleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameSpectatorJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamespectatorjoinedmessage()) {
+		const GameSpectatorJoinedMessage &msg = packet.GetMsg()->gamespectatorjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameSpectatorLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamespectatorleftmessage()) {
+		const GameSpectatorLeftMessage &msg = packet.GetMsg()->gamespectatorleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
diff --git a/src/net/common/validation/gameenginemessagevalidator.cpp b/src/net/common/validation/gameenginemessagevalidator.cpp
new file mode 100644
index 00000000..c690a8af
--- /dev/null
+++ b/src/net/common/validation/gameenginemessagevalidator.cpp
@@ -0,0 +1,1286 @@
+/*****************************************************************************
+ * PokerTH - The open source texas holdem engine                             *
+ * Copyright (C) 2006-2012 Felix Hammer, Florian Thauer, Lothar May          *
+ *                                                                           *
+ * This program is free software: you can redistribute it and/or modify      *
+ * it under the terms of the GNU Affero General Public License as            *
+ * published by the Free Software Foundation, either version 3 of the        *
+ * License, or (at your option) any later version.                           *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU Affero General Public License for more details.                       *
+ *                                                                           *
+ * You should have received a copy of the GNU Affero General Public License  *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ *                                                                           *
+ * Additional permission under GNU AGPL version 3 section 7                  *
+ *                                                                           *
+ * If you modify this program, or any covered work, by linking or            *
+ * combining it with the OpenSSL project's OpenSSL library (or a             *
+ * modified version of that library), containing parts covered by the        *
+ * terms of the OpenSSL or SSLeay licenses, the authors of PokerTH           *
+ * (Felix Hammer, Florian Thauer, Lothar May) grant you additional           *
+ * permission to convey the resulting work.                                  *
+ * Corresponding Source for a non-source form of such a combination          *
+ * shall include the source code for the parts of OpenSSL used as well       *
+ * as that of the covered work.                                              *
+ *****************************************************************************/
+
+#include <net/netpacketvalidator.h>
+#include <net/netpacket.h>
+
+using namespace std;
+
+#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535)
+#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize))
+#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval))
+#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval))
+#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize))
+
+static bool
+ValidateListIntRange(const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > &l, ::google::protobuf::uint32 minval, ::google::protobuf::uint32 maxval)
+{
+	bool retVal = true;
+	for (int i = 0; i < l.size(); i++) {
+		if (!VALIDATE_UINT_RANGE(l.Get(i), minval, maxval)) {
+			retVal = false;
+			break;
+		}
+	}
+	return retVal;
+}
+
+NetPacketValidator::NetPacketValidator()
+{
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AnnounceMessage, ValidateAnnounceMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthMessage, ValidateAuthMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_LobbyMessage, ValidateLobbyMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameMessage, ValidateGameMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameManagementMessage, ValidateGameManagementMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameEngineMessage, ValidateGameEngineMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitMessage, ValidateInitMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerChallengeMessage, ValidateAuthServerChallengeMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthClientResponseMessage, ValidateAuthClientResponseMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerVerificationMessage, ValidateAuthServerVerificationMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitAckMessage, ValidateInitAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarRequestMessage, ValidateAvatarRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarHeaderMessage, ValidateAvatarHeaderMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarDataMessage, ValidateAvatarDataMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarEndMessage, ValidateAvatarEndMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_UnknownAvatarMessage, ValidateUnknownAvatarMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerListMessage, ValidatePlayerListMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListNewMessage, ValidateGameListNewMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListUpdateMessage, ValidateGameListUpdateMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerJoinedMessage, ValidateGameListPlayerJoinedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerLeftMessage, ValidateGameListPlayerLeftMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListAdminChangedMessage, ValidateGameListAdminChangedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoRequestMessage, ValidatePlayerInfoRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoReplyMessage, ValidatePlayerInfoReplyMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_SubscriptionRequestMessage, ValidateSubscriptionRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_CreateGameMessage, ValidateCreateGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameMessage, ValidateJoinGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RejoinGameMessage, ValidateRejoinGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameAckMessage, ValidateJoinGameAckMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameFailedMessage, ValidateJoinGameFailedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage, ValidateGamePlayerJoinedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerLeftMessage, ValidateGamePlayerLeftMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameAdminChangedMessage, ValidateGameAdminChangedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RemovedFromGameMessage, ValidateRemovedFromGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPlayerRequestMessage, ValidateKickPlayerRequestMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_LeaveGameRequestMessage, ValidateLeaveGameRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InvitePlayerToGameMessage, ValidateInvitePlayerToGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InviteNotifyMessage, ValidateInviteNotifyMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectGameInvitationMessage, ValidateRejectGameInvitationMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectInvNotifyMessage, ValidateRejectInvNotifyMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventMessage, ValidateStartEventMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventAckMessage, ValidateStartEventAckMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartInitialMessage, ValidateGameStartInitialMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartRejoinMessage, ValidateGameStartRejoinMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_HandStartMessage, ValidateHandStartMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersTurnMessage, ValidatePlayersTurnMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_MyActionRequestMessage, ValidateMyActionRequestMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_YourActionRejectedMessage, ValidateYourActionRejectedMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersActionDoneMessage, ValidatePlayersActionDoneMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealFlopCardsMessage, ValidateDealFlopCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealTurnCardMessage, ValidateDealTurnCardMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealRiverCardMessage, ValidateDealRiverCardMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AllInShowCardsMessage, ValidateAllInShowCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandShowCardsMessage, ValidateEndOfHandShowCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandHideCardsMessage, ValidateEndOfHandHideCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_ShowMyCardsRequestMessage, ValidateShowMyCardsRequestMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AfterHandShowCardsMessage, ValidateAfterHandShowCardsMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndOfGameMessage, ValidateEndOfGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_PlayerIdChangedMessage, ValidatePlayerIdChangedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickPlayerMessage, ValidateAskKickPlayerMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickDeniedMessage, ValidateAskKickDeniedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartKickPetitionMessage, ValidateStartKickPetitionMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickRequestMessage, ValidateVoteKickRequestMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickReplyMessage, ValidateVoteKickReplyMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPetitionUpdateMessage, ValidateKickPetitionUpdateMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndKickPetitionMessage, ValidateEndKickPetitionMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_StatisticsMessage, ValidateStatisticsMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRequestMessage, ValidateChatRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatMessage, ValidateChatMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRejectMessage, ValidateChatRejectMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_DialogMessage, ValidateDialogMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_TimeoutWarningMessage, ValidateTimeoutWarningMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ResetTimeoutMessage, ValidateResetTimeoutMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarMessage, ValidateReportAvatarMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarAckMessage, ValidateReportAvatarAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameMessage, ValidateReportGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameAckMessage, ValidateReportGameAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ErrorMessage, ValidateErrorMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameMessage, ValidateAdminRemoveGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameAckMessage, ValidateAdminRemoveGameAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerMessage, ValidateAdminBanPlayerMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerAckMessage, ValidateAdminBanPlayerAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorJoinedMessage, ValidateGameListSpectatorJoinedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorLeftMessage, ValidateGameListSpectatorLeftMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage, ValidateGameSpectatorJoinedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorLeftMessage, ValidateGameSpectatorLeftMessage));
+}
+
+bool
+NetPacketValidator::IsValidPacket(const NetPacket &packet) const
+{
+	// Default: Invalid packet.
+	bool retVal = false;
+	ValidateFunctorMap::const_iterator pos = m_validationMap.find(packet.GetMsg()->messagetype());
+	if (pos != m_validationMap.end()) {
+		// Call validation functor.
+		retVal = pos->second(packet);
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_announcemessage()) {
+		const AnnounceMessage &msg = packet.GetMsg()->announcemessage();
+		if (VALIDATE_IS_UINT16(msg.protocolversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.protocolversion().minorversion())
+				&& VALIDATE_IS_UINT16(msg.latestgameversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.latestgameversion().minorversion())
+				&& VALIDATE_IS_UINT16(msg.latestbetarevision())
+				&& VALIDATE_IS_UINT16(msg.numplayersonserver())) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInitMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_initmessage()) {
+		const InitMessage &msg = packet.GetMsg()->initmessage();
+		if (VALIDATE_IS_UINT16(msg.requestedversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.requestedversion().minorversion())
+				&& (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16)
+				&& (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64))
+				&& (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64))
+				&& (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256))
+				&& (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthServerChallengeMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authserverchallengemessage()) {
+		const AuthServerChallengeMessage &msg = packet.GetMsg()->authserverchallengemessage();
+		if (VALIDATE_STRING_SIZE(msg.serverchallenge(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthClientResponseMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authclientresponsemessage()) {
+		const AuthClientResponseMessage &msg = packet.GetMsg()->authclientresponsemessage();
+		if (VALIDATE_STRING_SIZE(msg.clientresponse(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthServerVerificationMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authserververificationmessage()) {
+		const AuthServerVerificationMessage &msg = packet.GetMsg()->authserververificationmessage();
+		if (VALIDATE_STRING_SIZE(msg.serververification(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_initackmessage()) {
+		const InitAckMessage &msg = packet.GetMsg()->initackmessage();
+		if (msg.yoursessionid().size() == 16
+				&& msg.yourplayerid() != 0
+				&& (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16)
+				&& (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarrequestmessage()) {
+		const AvatarRequestMessage &msg = packet.GetMsg()->avatarrequestmessage();
+		if (msg.requestid() != 0
+				&& msg.avatarhash().size() == 16) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarheadermessage()) {
+		const AvatarHeaderMessage &msg = packet.GetMsg()->avatarheadermessage();
+		if (msg.requestid() != 0
+				&& VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatardatamessage()) {
+		const AvatarDataMessage &msg = packet.GetMsg()->avatardatamessage();
+		if (msg.requestid() != 0
+				&& VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarEndMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarendmessage()) {
+		const AvatarEndMessage &msg = packet.GetMsg()->avatarendmessage();
+		if (msg.requestid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateUnknownAvatarMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_unknownavatarmessage()) {
+		const UnknownAvatarMessage &msg = packet.GetMsg()->unknownavatarmessage();
+		if (msg.requestid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerListMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerlistmessage()) {
+		const PlayerListMessage &msg = packet.GetMsg()->playerlistmessage();
+		if (msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistnewmessage()) {
+		const GameListNewMessage &msg = packet.GetMsg()->gamelistnewmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerids(), 0, 10)
+				&& msg.adminplayerid() != 0
+				&& ValidateGameInfo(msg.gameinfo())) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListUpdateMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistupdatemessage()) {
+		const GameListUpdateMessage &msg = packet.GetMsg()->gamelistupdatemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListPlayerJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistplayerjoinedmessage()) {
+		const GameListPlayerJoinedMessage &msg = packet.GetMsg()->gamelistplayerjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListPlayerLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistplayerleftmessage()) {
+		const GameListPlayerLeftMessage &msg = packet.GetMsg()->gamelistplayerleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListAdminChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistadminchangedmessage()) {
+		const GameListAdminChangedMessage &msg = packet.GetMsg()->gamelistadminchangedmessage();
+		if (msg.gameid() != 0 && msg.newadminplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerInfoRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerinforequestmessage()) {
+		const PlayerInfoRequestMessage &msg = packet.GetMsg()->playerinforequestmessage();
+		if (VALIDATE_LIST_SIZE(msg.playerid(), 1, 10)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerInfoReplyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerinforeplymessage()) {
+		const PlayerInfoReplyMessage &msg = packet.GetMsg()->playerinforeplymessage();
+		if (msg.playerid() != 0) {
+			// TODO maybe additional checks.
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateSubscriptionRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_subscriptionrequestmessage()) {
+		//const SubscriptionRequestMessage &msg = packet.GetMsg()->subscriptionrequestmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateCreateGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joinnewgamemessage()) {
+		const JoinNewGameMessage &msg = packet.GetMsg()->joinnewgamemessage();
+		if (ValidateGameInfo(msg.gameinfo())
+				&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joinexistinggamemessage()) {
+		const JoinExistingGameMessage &msg = packet.GetMsg()->joinexistinggamemessage();
+		if (msg.gameid() != 0
+				&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejoinGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejoinexistinggamemessage()) {
+		const RejoinExistingGameMessage &msg = packet.GetMsg()->rejoinexistinggamemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joingameackmessage()) {
+		const JoinGameAckMessage &msg = packet.GetMsg()->joingameackmessage();
+		if (msg.gameid() != 0 && ValidateGameInfo(msg.gameinfo())) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameFailedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joingamefailedmessage()) {
+		const JoinGameFailedMessage &msg = packet.GetMsg()->joingamefailedmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGamePlayerJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameplayerjoinedmessage()) {
+		const GamePlayerJoinedMessage &msg = packet.GetMsg()->gameplayerjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGamePlayerLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameplayerleftmessage()) {
+		const GamePlayerLeftMessage &msg = packet.GetMsg()->gameplayerleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameAdminChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameadminchangedmessage()) {
+		const GameAdminChangedMessage &msg = packet.GetMsg()->gameadminchangedmessage();
+		if (msg.gameid() != 0 && msg.newadminplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRemovedFromGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_removedfromgamemessage()) {
+		const RemovedFromGameMessage &msg = packet.GetMsg()->removedfromgamemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateKickPlayerRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_kickplayerrequestmessage()) {
+		const KickPlayerRequestMessage &msg = packet.GetMsg()->kickplayerrequestmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateLeaveGameRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_leavegamerequestmessage()) {
+		const LeaveGameRequestMessage &msg = packet.GetMsg()->leavegamerequestmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInvitePlayerToGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_inviteplayertogamemessage()) {
+		const InvitePlayerToGameMessage &msg = packet.GetMsg()->inviteplayertogamemessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInviteNotifyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_invitenotifymessage()) {
+		const InviteNotifyMessage &msg = packet.GetMsg()->invitenotifymessage();
+		if (msg.gameid() != 0 && msg.playeridwho() != 0 && msg.playeridbywhom() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejectGameInvitationMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejectgameinvitationmessage()) {
+		const RejectGameInvitationMessage &msg = packet.GetMsg()->rejectgameinvitationmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejectInvNotifyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejectinvnotifymessage()) {
+		const RejectInvNotifyMessage &msg = packet.GetMsg()->rejectinvnotifymessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartEventMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_starteventmessage()) {
+		const StartEventMessage &msg = packet.GetMsg()->starteventmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartEventAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_starteventackmessage()) {
+		const StartEventAckMessage &msg = packet.GetMsg()->starteventackmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameStartInitialMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamestartinitialmessage()) {
+		const GameStartInitialMessage &msg = packet.GetMsg()->gamestartinitialmessage();
+		if (msg.gameid() != 0
+				&& msg.startdealerplayerid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameStartRejoinMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamestartrejoinmessage()) {
+		const GameStartRejoinMessage &msg = packet.GetMsg()->gamestartrejoinmessage();
+		if (msg.gameid() != 0
+				&& msg.startdealerplayerid() != 0
+				&& msg.handnum() != 0
+				&& VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateHandStartMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_handstartmessage()) {
+		const HandStartMessage &msg = packet.GetMsg()->handstartmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000)
+				&& VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayersTurnMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playersturnmessage()) {
+		const PlayersTurnMessage &msg = packet.GetMsg()->playersturnmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0 ) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateMyActionRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_myactionrequestmessage()) {
+		const MyActionRequestMessage &msg = packet.GetMsg()->myactionrequestmessage();
+		if (msg.gameid() != 0
+				&& msg.handnum() != 0
+				&& VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateYourActionRejectedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_youractionrejectedmessage()) {
+		const YourActionRejectedMessage &msg = packet.GetMsg()->youractionrejectedmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayersActionDoneMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playersactiondonemessage()) {
+		const PlayersActionDoneMessage &msg = packet.GetMsg()->playersactiondonemessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealFlopCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealflopcardsmessage()) {
+		const DealFlopCardsMessage &msg = packet.GetMsg()->dealflopcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.flopcard1(), 51)
+				&& VALIDATE_UINT_UPPER(msg.flopcard2(), 51)
+				&& VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealTurnCardMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealturncardmessage()) {
+		const DealTurnCardMessage &msg = packet.GetMsg()->dealturncardmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.turncard(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealRiverCardMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealrivercardmessage()) {
+		const DealRiverCardMessage &msg = packet.GetMsg()->dealrivercardmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.rivercard(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAllInShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_allinshowcardsmessage()) {
+		const AllInShowCardsMessage &msg = packet.GetMsg()->allinshowcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfHandShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofhandshowcardsmessage()) {
+		const EndOfHandShowCardsMessage &msg = packet.GetMsg()->endofhandshowcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfHandHideCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofhandhidecardsmessage()) {
+		const EndOfHandHideCardsMessage &msg = packet.GetMsg()->endofhandhidecardsmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet*/)
+{
+	//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
+NetPacketValidator::ValidateAfterHandShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_afterhandshowcardsmessage()) {
+		//const AfterHandShowCardsMessage &msg = packet.GetMsg()->afterhandshowcardsmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofgamemessage()) {
+		const EndOfGameMessage &msg = packet.GetMsg()->endofgamemessage();
+		if (msg.gameid() != 0 && msg.winnerplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerIdChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playeridchangedmessage()) {
+		const PlayerIdChangedMessage &msg = packet.GetMsg()->playeridchangedmessage();
+		if (msg.oldplayerid() != 0 && msg.newplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAskKickPlayerMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_askkickplayermessage()) {
+		const AskKickPlayerMessage &msg = packet.GetMsg()->askkickplayermessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAskKickDeniedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_askkickdeniedmessage()) {
+		const AskKickDeniedMessage &msg = packet.GetMsg()->askkickdeniedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartKickPetitionMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_startkickpetitionmessage()) {
+		const StartKickPetitionMessage &msg = packet.GetMsg()->startkickpetitionmessage();
+		if (msg.gameid() != 0
+				&& msg.petitionid() != 0
+				&& msg.proposingplayerid() != 0
+				&& msg.kickplayerid() != 0
+				&& msg.kicktimeoutsec() > 0
+				&& msg.numvotesneededtokick() > 0) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateVoteKickRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_votekickrequestmessage()) {
+		const VoteKickRequestMessage &msg = packet.GetMsg()->votekickrequestmessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateVoteKickReplyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_votekickreplymessage()) {
+		const VoteKickReplyMessage &msg = packet.GetMsg()->votekickreplymessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateKickPetitionUpdateMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_kickpetitionupdatemessage()) {
+		const KickPetitionUpdateMessage &msg = packet.GetMsg()->kickpetitionupdatemessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndKickPetitionMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endkickpetitionmessage()) {
+		const EndKickPetitionMessage &msg = packet.GetMsg()->endkickpetitionmessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStatisticsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_statisticsmessage()) {
+		//const StatisticsMessage &msg = packet.GetMsg()->statisticsmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatrequestmessage()) {
+		const ChatRequestMessage &msg = packet.GetMsg()->chatrequestmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatmessage()) {
+		const ChatMessage &msg = packet.GetMsg()->chatmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatRejectMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatrejectmessage()) {
+		const ChatRejectMessage &msg = packet.GetMsg()->chatrejectmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDialogMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dialogmessage()) {
+		const DialogMessage &msg = packet.GetMsg()->dialogmessage();
+		if (VALIDATE_STRING_SIZE(msg.notificationtext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateTimeoutWarningMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_timeoutwarningmessage()) {
+		//const TimeoutWarningMessage &msg = packet.GetMsg()->timeoutwarningmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateResetTimeoutMessage(const NetPacket &/*packet*/)
+{
+	//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
+NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportavatarmessage()) {
+		const ReportAvatarMessage &msg = packet.GetMsg()->reportavatarmessage();
+		if (msg.reportedplayerid() != 0
+				&& msg.reportedavatarhash().size() == 16) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportAvatarAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportavatarackmessage()) {
+		const ReportAvatarAckMessage &msg = packet.GetMsg()->reportavatarackmessage();
+		if (msg.reportedplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportgamemessage()) {
+		const ReportGameMessage &msg = packet.GetMsg()->reportgamemessage();
+		if (msg.reportedgameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportgameackmessage()) {
+		const ReportGameAckMessage &msg = packet.GetMsg()->reportgameackmessage();
+		if (msg.reportedgameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateErrorMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_errormessage()) {
+		//const ErrorMessage &msg = packet.GetMsg()->errormessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminRemoveGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminremovegamemessage()) {
+		const AdminRemoveGameMessage &msg = packet.GetMsg()->adminremovegamemessage();
+		if (msg.removegameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminRemoveGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminremovegameackmessage()) {
+		const AdminRemoveGameAckMessage &msg = packet.GetMsg()->adminremovegameackmessage();
+		if (msg.removegameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminBanPlayerMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminbanplayermessage()) {
+		const AdminBanPlayerMessage &msg = packet.GetMsg()->adminbanplayermessage();
+		if (msg.banplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminBanPlayerAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminbanplayerackmessage()) {
+		const AdminBanPlayerAckMessage &msg = packet.GetMsg()->adminbanplayerackmessage();
+		if (msg.banplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo)
+{
+	bool retVal = false;
+	if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64)
+			&& VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10)
+			&& (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000))
+			&& (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000))
+			&& (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000))
+			&& VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11)
+			&& VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20)
+			&& VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60)
+			&& VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000)
+			&& VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000)
+			&& VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30)
+			&& ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) {
+
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListSpectatorJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistspectatorjoinedmessage()) {
+		const GameListSpectatorJoinedMessage &msg = packet.GetMsg()->gamelistspectatorjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListSpectatorLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistspectatorleftmessage()) {
+		const GameListSpectatorLeftMessage &msg = packet.GetMsg()->gamelistspectatorleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameSpectatorJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamespectatorjoinedmessage()) {
+		const GameSpectatorJoinedMessage &msg = packet.GetMsg()->gamespectatorjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameSpectatorLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamespectatorleftmessage()) {
+		const GameSpectatorLeftMessage &msg = packet.GetMsg()->gamespectatorleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
diff --git a/src/net/common/validation/gamemanagementmessagevalidator.cpp b/src/net/common/validation/gamemanagementmessagevalidator.cpp
new file mode 100644
index 00000000..c690a8af
--- /dev/null
+++ b/src/net/common/validation/gamemanagementmessagevalidator.cpp
@@ -0,0 +1,1286 @@
+/*****************************************************************************
+ * PokerTH - The open source texas holdem engine                             *
+ * Copyright (C) 2006-2012 Felix Hammer, Florian Thauer, Lothar May          *
+ *                                                                           *
+ * This program is free software: you can redistribute it and/or modify      *
+ * it under the terms of the GNU Affero General Public License as            *
+ * published by the Free Software Foundation, either version 3 of the        *
+ * License, or (at your option) any later version.                           *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU Affero General Public License for more details.                       *
+ *                                                                           *
+ * You should have received a copy of the GNU Affero General Public License  *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ *                                                                           *
+ * Additional permission under GNU AGPL version 3 section 7                  *
+ *                                                                           *
+ * If you modify this program, or any covered work, by linking or            *
+ * combining it with the OpenSSL project's OpenSSL library (or a             *
+ * modified version of that library), containing parts covered by the        *
+ * terms of the OpenSSL or SSLeay licenses, the authors of PokerTH           *
+ * (Felix Hammer, Florian Thauer, Lothar May) grant you additional           *
+ * permission to convey the resulting work.                                  *
+ * Corresponding Source for a non-source form of such a combination          *
+ * shall include the source code for the parts of OpenSSL used as well       *
+ * as that of the covered work.                                              *
+ *****************************************************************************/
+
+#include <net/netpacketvalidator.h>
+#include <net/netpacket.h>
+
+using namespace std;
+
+#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535)
+#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize))
+#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval))
+#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval))
+#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize))
+
+static bool
+ValidateListIntRange(const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > &l, ::google::protobuf::uint32 minval, ::google::protobuf::uint32 maxval)
+{
+	bool retVal = true;
+	for (int i = 0; i < l.size(); i++) {
+		if (!VALIDATE_UINT_RANGE(l.Get(i), minval, maxval)) {
+			retVal = false;
+			break;
+		}
+	}
+	return retVal;
+}
+
+NetPacketValidator::NetPacketValidator()
+{
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AnnounceMessage, ValidateAnnounceMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthMessage, ValidateAuthMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_LobbyMessage, ValidateLobbyMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameMessage, ValidateGameMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameManagementMessage, ValidateGameManagementMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameEngineMessage, ValidateGameEngineMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitMessage, ValidateInitMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerChallengeMessage, ValidateAuthServerChallengeMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthClientResponseMessage, ValidateAuthClientResponseMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerVerificationMessage, ValidateAuthServerVerificationMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitAckMessage, ValidateInitAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarRequestMessage, ValidateAvatarRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarHeaderMessage, ValidateAvatarHeaderMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarDataMessage, ValidateAvatarDataMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarEndMessage, ValidateAvatarEndMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_UnknownAvatarMessage, ValidateUnknownAvatarMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerListMessage, ValidatePlayerListMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListNewMessage, ValidateGameListNewMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListUpdateMessage, ValidateGameListUpdateMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerJoinedMessage, ValidateGameListPlayerJoinedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerLeftMessage, ValidateGameListPlayerLeftMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListAdminChangedMessage, ValidateGameListAdminChangedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoRequestMessage, ValidatePlayerInfoRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoReplyMessage, ValidatePlayerInfoReplyMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_SubscriptionRequestMessage, ValidateSubscriptionRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_CreateGameMessage, ValidateCreateGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameMessage, ValidateJoinGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RejoinGameMessage, ValidateRejoinGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameAckMessage, ValidateJoinGameAckMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameFailedMessage, ValidateJoinGameFailedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage, ValidateGamePlayerJoinedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerLeftMessage, ValidateGamePlayerLeftMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameAdminChangedMessage, ValidateGameAdminChangedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RemovedFromGameMessage, ValidateRemovedFromGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPlayerRequestMessage, ValidateKickPlayerRequestMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_LeaveGameRequestMessage, ValidateLeaveGameRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InvitePlayerToGameMessage, ValidateInvitePlayerToGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InviteNotifyMessage, ValidateInviteNotifyMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectGameInvitationMessage, ValidateRejectGameInvitationMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectInvNotifyMessage, ValidateRejectInvNotifyMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventMessage, ValidateStartEventMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventAckMessage, ValidateStartEventAckMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartInitialMessage, ValidateGameStartInitialMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartRejoinMessage, ValidateGameStartRejoinMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_HandStartMessage, ValidateHandStartMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersTurnMessage, ValidatePlayersTurnMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_MyActionRequestMessage, ValidateMyActionRequestMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_YourActionRejectedMessage, ValidateYourActionRejectedMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersActionDoneMessage, ValidatePlayersActionDoneMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealFlopCardsMessage, ValidateDealFlopCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealTurnCardMessage, ValidateDealTurnCardMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealRiverCardMessage, ValidateDealRiverCardMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AllInShowCardsMessage, ValidateAllInShowCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandShowCardsMessage, ValidateEndOfHandShowCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandHideCardsMessage, ValidateEndOfHandHideCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_ShowMyCardsRequestMessage, ValidateShowMyCardsRequestMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AfterHandShowCardsMessage, ValidateAfterHandShowCardsMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndOfGameMessage, ValidateEndOfGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_PlayerIdChangedMessage, ValidatePlayerIdChangedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickPlayerMessage, ValidateAskKickPlayerMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickDeniedMessage, ValidateAskKickDeniedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartKickPetitionMessage, ValidateStartKickPetitionMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickRequestMessage, ValidateVoteKickRequestMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickReplyMessage, ValidateVoteKickReplyMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPetitionUpdateMessage, ValidateKickPetitionUpdateMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndKickPetitionMessage, ValidateEndKickPetitionMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_StatisticsMessage, ValidateStatisticsMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRequestMessage, ValidateChatRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatMessage, ValidateChatMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRejectMessage, ValidateChatRejectMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_DialogMessage, ValidateDialogMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_TimeoutWarningMessage, ValidateTimeoutWarningMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ResetTimeoutMessage, ValidateResetTimeoutMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarMessage, ValidateReportAvatarMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarAckMessage, ValidateReportAvatarAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameMessage, ValidateReportGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameAckMessage, ValidateReportGameAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ErrorMessage, ValidateErrorMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameMessage, ValidateAdminRemoveGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameAckMessage, ValidateAdminRemoveGameAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerMessage, ValidateAdminBanPlayerMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerAckMessage, ValidateAdminBanPlayerAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorJoinedMessage, ValidateGameListSpectatorJoinedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorLeftMessage, ValidateGameListSpectatorLeftMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage, ValidateGameSpectatorJoinedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorLeftMessage, ValidateGameSpectatorLeftMessage));
+}
+
+bool
+NetPacketValidator::IsValidPacket(const NetPacket &packet) const
+{
+	// Default: Invalid packet.
+	bool retVal = false;
+	ValidateFunctorMap::const_iterator pos = m_validationMap.find(packet.GetMsg()->messagetype());
+	if (pos != m_validationMap.end()) {
+		// Call validation functor.
+		retVal = pos->second(packet);
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_announcemessage()) {
+		const AnnounceMessage &msg = packet.GetMsg()->announcemessage();
+		if (VALIDATE_IS_UINT16(msg.protocolversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.protocolversion().minorversion())
+				&& VALIDATE_IS_UINT16(msg.latestgameversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.latestgameversion().minorversion())
+				&& VALIDATE_IS_UINT16(msg.latestbetarevision())
+				&& VALIDATE_IS_UINT16(msg.numplayersonserver())) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInitMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_initmessage()) {
+		const InitMessage &msg = packet.GetMsg()->initmessage();
+		if (VALIDATE_IS_UINT16(msg.requestedversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.requestedversion().minorversion())
+				&& (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16)
+				&& (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64))
+				&& (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64))
+				&& (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256))
+				&& (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthServerChallengeMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authserverchallengemessage()) {
+		const AuthServerChallengeMessage &msg = packet.GetMsg()->authserverchallengemessage();
+		if (VALIDATE_STRING_SIZE(msg.serverchallenge(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthClientResponseMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authclientresponsemessage()) {
+		const AuthClientResponseMessage &msg = packet.GetMsg()->authclientresponsemessage();
+		if (VALIDATE_STRING_SIZE(msg.clientresponse(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthServerVerificationMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authserververificationmessage()) {
+		const AuthServerVerificationMessage &msg = packet.GetMsg()->authserververificationmessage();
+		if (VALIDATE_STRING_SIZE(msg.serververification(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_initackmessage()) {
+		const InitAckMessage &msg = packet.GetMsg()->initackmessage();
+		if (msg.yoursessionid().size() == 16
+				&& msg.yourplayerid() != 0
+				&& (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16)
+				&& (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarrequestmessage()) {
+		const AvatarRequestMessage &msg = packet.GetMsg()->avatarrequestmessage();
+		if (msg.requestid() != 0
+				&& msg.avatarhash().size() == 16) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarheadermessage()) {
+		const AvatarHeaderMessage &msg = packet.GetMsg()->avatarheadermessage();
+		if (msg.requestid() != 0
+				&& VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatardatamessage()) {
+		const AvatarDataMessage &msg = packet.GetMsg()->avatardatamessage();
+		if (msg.requestid() != 0
+				&& VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarEndMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarendmessage()) {
+		const AvatarEndMessage &msg = packet.GetMsg()->avatarendmessage();
+		if (msg.requestid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateUnknownAvatarMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_unknownavatarmessage()) {
+		const UnknownAvatarMessage &msg = packet.GetMsg()->unknownavatarmessage();
+		if (msg.requestid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerListMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerlistmessage()) {
+		const PlayerListMessage &msg = packet.GetMsg()->playerlistmessage();
+		if (msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistnewmessage()) {
+		const GameListNewMessage &msg = packet.GetMsg()->gamelistnewmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerids(), 0, 10)
+				&& msg.adminplayerid() != 0
+				&& ValidateGameInfo(msg.gameinfo())) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListUpdateMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistupdatemessage()) {
+		const GameListUpdateMessage &msg = packet.GetMsg()->gamelistupdatemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListPlayerJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistplayerjoinedmessage()) {
+		const GameListPlayerJoinedMessage &msg = packet.GetMsg()->gamelistplayerjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListPlayerLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistplayerleftmessage()) {
+		const GameListPlayerLeftMessage &msg = packet.GetMsg()->gamelistplayerleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListAdminChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistadminchangedmessage()) {
+		const GameListAdminChangedMessage &msg = packet.GetMsg()->gamelistadminchangedmessage();
+		if (msg.gameid() != 0 && msg.newadminplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerInfoRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerinforequestmessage()) {
+		const PlayerInfoRequestMessage &msg = packet.GetMsg()->playerinforequestmessage();
+		if (VALIDATE_LIST_SIZE(msg.playerid(), 1, 10)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerInfoReplyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerinforeplymessage()) {
+		const PlayerInfoReplyMessage &msg = packet.GetMsg()->playerinforeplymessage();
+		if (msg.playerid() != 0) {
+			// TODO maybe additional checks.
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateSubscriptionRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_subscriptionrequestmessage()) {
+		//const SubscriptionRequestMessage &msg = packet.GetMsg()->subscriptionrequestmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateCreateGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joinnewgamemessage()) {
+		const JoinNewGameMessage &msg = packet.GetMsg()->joinnewgamemessage();
+		if (ValidateGameInfo(msg.gameinfo())
+				&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joinexistinggamemessage()) {
+		const JoinExistingGameMessage &msg = packet.GetMsg()->joinexistinggamemessage();
+		if (msg.gameid() != 0
+				&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejoinGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejoinexistinggamemessage()) {
+		const RejoinExistingGameMessage &msg = packet.GetMsg()->rejoinexistinggamemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joingameackmessage()) {
+		const JoinGameAckMessage &msg = packet.GetMsg()->joingameackmessage();
+		if (msg.gameid() != 0 && ValidateGameInfo(msg.gameinfo())) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameFailedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joingamefailedmessage()) {
+		const JoinGameFailedMessage &msg = packet.GetMsg()->joingamefailedmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGamePlayerJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameplayerjoinedmessage()) {
+		const GamePlayerJoinedMessage &msg = packet.GetMsg()->gameplayerjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGamePlayerLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameplayerleftmessage()) {
+		const GamePlayerLeftMessage &msg = packet.GetMsg()->gameplayerleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameAdminChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameadminchangedmessage()) {
+		const GameAdminChangedMessage &msg = packet.GetMsg()->gameadminchangedmessage();
+		if (msg.gameid() != 0 && msg.newadminplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRemovedFromGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_removedfromgamemessage()) {
+		const RemovedFromGameMessage &msg = packet.GetMsg()->removedfromgamemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateKickPlayerRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_kickplayerrequestmessage()) {
+		const KickPlayerRequestMessage &msg = packet.GetMsg()->kickplayerrequestmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateLeaveGameRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_leavegamerequestmessage()) {
+		const LeaveGameRequestMessage &msg = packet.GetMsg()->leavegamerequestmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInvitePlayerToGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_inviteplayertogamemessage()) {
+		const InvitePlayerToGameMessage &msg = packet.GetMsg()->inviteplayertogamemessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInviteNotifyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_invitenotifymessage()) {
+		const InviteNotifyMessage &msg = packet.GetMsg()->invitenotifymessage();
+		if (msg.gameid() != 0 && msg.playeridwho() != 0 && msg.playeridbywhom() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejectGameInvitationMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejectgameinvitationmessage()) {
+		const RejectGameInvitationMessage &msg = packet.GetMsg()->rejectgameinvitationmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejectInvNotifyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejectinvnotifymessage()) {
+		const RejectInvNotifyMessage &msg = packet.GetMsg()->rejectinvnotifymessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartEventMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_starteventmessage()) {
+		const StartEventMessage &msg = packet.GetMsg()->starteventmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartEventAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_starteventackmessage()) {
+		const StartEventAckMessage &msg = packet.GetMsg()->starteventackmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameStartInitialMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamestartinitialmessage()) {
+		const GameStartInitialMessage &msg = packet.GetMsg()->gamestartinitialmessage();
+		if (msg.gameid() != 0
+				&& msg.startdealerplayerid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameStartRejoinMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamestartrejoinmessage()) {
+		const GameStartRejoinMessage &msg = packet.GetMsg()->gamestartrejoinmessage();
+		if (msg.gameid() != 0
+				&& msg.startdealerplayerid() != 0
+				&& msg.handnum() != 0
+				&& VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateHandStartMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_handstartmessage()) {
+		const HandStartMessage &msg = packet.GetMsg()->handstartmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000)
+				&& VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayersTurnMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playersturnmessage()) {
+		const PlayersTurnMessage &msg = packet.GetMsg()->playersturnmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0 ) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateMyActionRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_myactionrequestmessage()) {
+		const MyActionRequestMessage &msg = packet.GetMsg()->myactionrequestmessage();
+		if (msg.gameid() != 0
+				&& msg.handnum() != 0
+				&& VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateYourActionRejectedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_youractionrejectedmessage()) {
+		const YourActionRejectedMessage &msg = packet.GetMsg()->youractionrejectedmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayersActionDoneMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playersactiondonemessage()) {
+		const PlayersActionDoneMessage &msg = packet.GetMsg()->playersactiondonemessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealFlopCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealflopcardsmessage()) {
+		const DealFlopCardsMessage &msg = packet.GetMsg()->dealflopcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.flopcard1(), 51)
+				&& VALIDATE_UINT_UPPER(msg.flopcard2(), 51)
+				&& VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealTurnCardMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealturncardmessage()) {
+		const DealTurnCardMessage &msg = packet.GetMsg()->dealturncardmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.turncard(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealRiverCardMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealrivercardmessage()) {
+		const DealRiverCardMessage &msg = packet.GetMsg()->dealrivercardmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.rivercard(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAllInShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_allinshowcardsmessage()) {
+		const AllInShowCardsMessage &msg = packet.GetMsg()->allinshowcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfHandShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofhandshowcardsmessage()) {
+		const EndOfHandShowCardsMessage &msg = packet.GetMsg()->endofhandshowcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfHandHideCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofhandhidecardsmessage()) {
+		const EndOfHandHideCardsMessage &msg = packet.GetMsg()->endofhandhidecardsmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet*/)
+{
+	//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
+NetPacketValidator::ValidateAfterHandShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_afterhandshowcardsmessage()) {
+		//const AfterHandShowCardsMessage &msg = packet.GetMsg()->afterhandshowcardsmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofgamemessage()) {
+		const EndOfGameMessage &msg = packet.GetMsg()->endofgamemessage();
+		if (msg.gameid() != 0 && msg.winnerplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerIdChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playeridchangedmessage()) {
+		const PlayerIdChangedMessage &msg = packet.GetMsg()->playeridchangedmessage();
+		if (msg.oldplayerid() != 0 && msg.newplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAskKickPlayerMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_askkickplayermessage()) {
+		const AskKickPlayerMessage &msg = packet.GetMsg()->askkickplayermessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAskKickDeniedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_askkickdeniedmessage()) {
+		const AskKickDeniedMessage &msg = packet.GetMsg()->askkickdeniedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartKickPetitionMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_startkickpetitionmessage()) {
+		const StartKickPetitionMessage &msg = packet.GetMsg()->startkickpetitionmessage();
+		if (msg.gameid() != 0
+				&& msg.petitionid() != 0
+				&& msg.proposingplayerid() != 0
+				&& msg.kickplayerid() != 0
+				&& msg.kicktimeoutsec() > 0
+				&& msg.numvotesneededtokick() > 0) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateVoteKickRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_votekickrequestmessage()) {
+		const VoteKickRequestMessage &msg = packet.GetMsg()->votekickrequestmessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateVoteKickReplyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_votekickreplymessage()) {
+		const VoteKickReplyMessage &msg = packet.GetMsg()->votekickreplymessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateKickPetitionUpdateMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_kickpetitionupdatemessage()) {
+		const KickPetitionUpdateMessage &msg = packet.GetMsg()->kickpetitionupdatemessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndKickPetitionMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endkickpetitionmessage()) {
+		const EndKickPetitionMessage &msg = packet.GetMsg()->endkickpetitionmessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStatisticsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_statisticsmessage()) {
+		//const StatisticsMessage &msg = packet.GetMsg()->statisticsmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatrequestmessage()) {
+		const ChatRequestMessage &msg = packet.GetMsg()->chatrequestmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatmessage()) {
+		const ChatMessage &msg = packet.GetMsg()->chatmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatRejectMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatrejectmessage()) {
+		const ChatRejectMessage &msg = packet.GetMsg()->chatrejectmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDialogMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dialogmessage()) {
+		const DialogMessage &msg = packet.GetMsg()->dialogmessage();
+		if (VALIDATE_STRING_SIZE(msg.notificationtext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateTimeoutWarningMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_timeoutwarningmessage()) {
+		//const TimeoutWarningMessage &msg = packet.GetMsg()->timeoutwarningmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateResetTimeoutMessage(const NetPacket &/*packet*/)
+{
+	//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
+NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportavatarmessage()) {
+		const ReportAvatarMessage &msg = packet.GetMsg()->reportavatarmessage();
+		if (msg.reportedplayerid() != 0
+				&& msg.reportedavatarhash().size() == 16) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportAvatarAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportavatarackmessage()) {
+		const ReportAvatarAckMessage &msg = packet.GetMsg()->reportavatarackmessage();
+		if (msg.reportedplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportgamemessage()) {
+		const ReportGameMessage &msg = packet.GetMsg()->reportgamemessage();
+		if (msg.reportedgameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportgameackmessage()) {
+		const ReportGameAckMessage &msg = packet.GetMsg()->reportgameackmessage();
+		if (msg.reportedgameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateErrorMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_errormessage()) {
+		//const ErrorMessage &msg = packet.GetMsg()->errormessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminRemoveGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminremovegamemessage()) {
+		const AdminRemoveGameMessage &msg = packet.GetMsg()->adminremovegamemessage();
+		if (msg.removegameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminRemoveGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminremovegameackmessage()) {
+		const AdminRemoveGameAckMessage &msg = packet.GetMsg()->adminremovegameackmessage();
+		if (msg.removegameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminBanPlayerMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminbanplayermessage()) {
+		const AdminBanPlayerMessage &msg = packet.GetMsg()->adminbanplayermessage();
+		if (msg.banplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminBanPlayerAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminbanplayerackmessage()) {
+		const AdminBanPlayerAckMessage &msg = packet.GetMsg()->adminbanplayerackmessage();
+		if (msg.banplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo)
+{
+	bool retVal = false;
+	if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64)
+			&& VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10)
+			&& (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000))
+			&& (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000))
+			&& (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000))
+			&& VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11)
+			&& VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20)
+			&& VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60)
+			&& VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000)
+			&& VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000)
+			&& VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30)
+			&& ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) {
+
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListSpectatorJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistspectatorjoinedmessage()) {
+		const GameListSpectatorJoinedMessage &msg = packet.GetMsg()->gamelistspectatorjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListSpectatorLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistspectatorleftmessage()) {
+		const GameListSpectatorLeftMessage &msg = packet.GetMsg()->gamelistspectatorleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameSpectatorJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamespectatorjoinedmessage()) {
+		const GameSpectatorJoinedMessage &msg = packet.GetMsg()->gamespectatorjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameSpectatorLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamespectatorleftmessage()) {
+		const GameSpectatorLeftMessage &msg = packet.GetMsg()->gamespectatorleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
diff --git a/src/net/common/validation/gamemessagevalidator.cpp b/src/net/common/validation/gamemessagevalidator.cpp
new file mode 100644
index 00000000..c690a8af
--- /dev/null
+++ b/src/net/common/validation/gamemessagevalidator.cpp
@@ -0,0 +1,1286 @@
+/*****************************************************************************
+ * PokerTH - The open source texas holdem engine                             *
+ * Copyright (C) 2006-2012 Felix Hammer, Florian Thauer, Lothar May          *
+ *                                                                           *
+ * This program is free software: you can redistribute it and/or modify      *
+ * it under the terms of the GNU Affero General Public License as            *
+ * published by the Free Software Foundation, either version 3 of the        *
+ * License, or (at your option) any later version.                           *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU Affero General Public License for more details.                       *
+ *                                                                           *
+ * You should have received a copy of the GNU Affero General Public License  *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ *                                                                           *
+ * Additional permission under GNU AGPL version 3 section 7                  *
+ *                                                                           *
+ * If you modify this program, or any covered work, by linking or            *
+ * combining it with the OpenSSL project's OpenSSL library (or a             *
+ * modified version of that library), containing parts covered by the        *
+ * terms of the OpenSSL or SSLeay licenses, the authors of PokerTH           *
+ * (Felix Hammer, Florian Thauer, Lothar May) grant you additional           *
+ * permission to convey the resulting work.                                  *
+ * Corresponding Source for a non-source form of such a combination          *
+ * shall include the source code for the parts of OpenSSL used as well       *
+ * as that of the covered work.                                              *
+ *****************************************************************************/
+
+#include <net/netpacketvalidator.h>
+#include <net/netpacket.h>
+
+using namespace std;
+
+#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535)
+#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize))
+#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval))
+#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval))
+#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize))
+
+static bool
+ValidateListIntRange(const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > &l, ::google::protobuf::uint32 minval, ::google::protobuf::uint32 maxval)
+{
+	bool retVal = true;
+	for (int i = 0; i < l.size(); i++) {
+		if (!VALIDATE_UINT_RANGE(l.Get(i), minval, maxval)) {
+			retVal = false;
+			break;
+		}
+	}
+	return retVal;
+}
+
+NetPacketValidator::NetPacketValidator()
+{
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AnnounceMessage, ValidateAnnounceMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthMessage, ValidateAuthMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_LobbyMessage, ValidateLobbyMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameMessage, ValidateGameMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameManagementMessage, ValidateGameManagementMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameEngineMessage, ValidateGameEngineMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitMessage, ValidateInitMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerChallengeMessage, ValidateAuthServerChallengeMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthClientResponseMessage, ValidateAuthClientResponseMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerVerificationMessage, ValidateAuthServerVerificationMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitAckMessage, ValidateInitAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarRequestMessage, ValidateAvatarRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarHeaderMessage, ValidateAvatarHeaderMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarDataMessage, ValidateAvatarDataMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarEndMessage, ValidateAvatarEndMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_UnknownAvatarMessage, ValidateUnknownAvatarMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerListMessage, ValidatePlayerListMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListNewMessage, ValidateGameListNewMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListUpdateMessage, ValidateGameListUpdateMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerJoinedMessage, ValidateGameListPlayerJoinedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerLeftMessage, ValidateGameListPlayerLeftMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListAdminChangedMessage, ValidateGameListAdminChangedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoRequestMessage, ValidatePlayerInfoRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoReplyMessage, ValidatePlayerInfoReplyMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_SubscriptionRequestMessage, ValidateSubscriptionRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_CreateGameMessage, ValidateCreateGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameMessage, ValidateJoinGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RejoinGameMessage, ValidateRejoinGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameAckMessage, ValidateJoinGameAckMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameFailedMessage, ValidateJoinGameFailedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage, ValidateGamePlayerJoinedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerLeftMessage, ValidateGamePlayerLeftMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameAdminChangedMessage, ValidateGameAdminChangedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RemovedFromGameMessage, ValidateRemovedFromGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPlayerRequestMessage, ValidateKickPlayerRequestMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_LeaveGameRequestMessage, ValidateLeaveGameRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InvitePlayerToGameMessage, ValidateInvitePlayerToGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InviteNotifyMessage, ValidateInviteNotifyMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectGameInvitationMessage, ValidateRejectGameInvitationMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectInvNotifyMessage, ValidateRejectInvNotifyMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventMessage, ValidateStartEventMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventAckMessage, ValidateStartEventAckMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartInitialMessage, ValidateGameStartInitialMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartRejoinMessage, ValidateGameStartRejoinMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_HandStartMessage, ValidateHandStartMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersTurnMessage, ValidatePlayersTurnMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_MyActionRequestMessage, ValidateMyActionRequestMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_YourActionRejectedMessage, ValidateYourActionRejectedMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersActionDoneMessage, ValidatePlayersActionDoneMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealFlopCardsMessage, ValidateDealFlopCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealTurnCardMessage, ValidateDealTurnCardMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealRiverCardMessage, ValidateDealRiverCardMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AllInShowCardsMessage, ValidateAllInShowCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandShowCardsMessage, ValidateEndOfHandShowCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandHideCardsMessage, ValidateEndOfHandHideCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_ShowMyCardsRequestMessage, ValidateShowMyCardsRequestMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AfterHandShowCardsMessage, ValidateAfterHandShowCardsMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndOfGameMessage, ValidateEndOfGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_PlayerIdChangedMessage, ValidatePlayerIdChangedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickPlayerMessage, ValidateAskKickPlayerMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickDeniedMessage, ValidateAskKickDeniedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartKickPetitionMessage, ValidateStartKickPetitionMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickRequestMessage, ValidateVoteKickRequestMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickReplyMessage, ValidateVoteKickReplyMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPetitionUpdateMessage, ValidateKickPetitionUpdateMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndKickPetitionMessage, ValidateEndKickPetitionMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_StatisticsMessage, ValidateStatisticsMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRequestMessage, ValidateChatRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatMessage, ValidateChatMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRejectMessage, ValidateChatRejectMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_DialogMessage, ValidateDialogMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_TimeoutWarningMessage, ValidateTimeoutWarningMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ResetTimeoutMessage, ValidateResetTimeoutMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarMessage, ValidateReportAvatarMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarAckMessage, ValidateReportAvatarAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameMessage, ValidateReportGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameAckMessage, ValidateReportGameAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ErrorMessage, ValidateErrorMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameMessage, ValidateAdminRemoveGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameAckMessage, ValidateAdminRemoveGameAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerMessage, ValidateAdminBanPlayerMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerAckMessage, ValidateAdminBanPlayerAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorJoinedMessage, ValidateGameListSpectatorJoinedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorLeftMessage, ValidateGameListSpectatorLeftMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage, ValidateGameSpectatorJoinedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorLeftMessage, ValidateGameSpectatorLeftMessage));
+}
+
+bool
+NetPacketValidator::IsValidPacket(const NetPacket &packet) const
+{
+	// Default: Invalid packet.
+	bool retVal = false;
+	ValidateFunctorMap::const_iterator pos = m_validationMap.find(packet.GetMsg()->messagetype());
+	if (pos != m_validationMap.end()) {
+		// Call validation functor.
+		retVal = pos->second(packet);
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_announcemessage()) {
+		const AnnounceMessage &msg = packet.GetMsg()->announcemessage();
+		if (VALIDATE_IS_UINT16(msg.protocolversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.protocolversion().minorversion())
+				&& VALIDATE_IS_UINT16(msg.latestgameversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.latestgameversion().minorversion())
+				&& VALIDATE_IS_UINT16(msg.latestbetarevision())
+				&& VALIDATE_IS_UINT16(msg.numplayersonserver())) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInitMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_initmessage()) {
+		const InitMessage &msg = packet.GetMsg()->initmessage();
+		if (VALIDATE_IS_UINT16(msg.requestedversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.requestedversion().minorversion())
+				&& (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16)
+				&& (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64))
+				&& (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64))
+				&& (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256))
+				&& (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthServerChallengeMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authserverchallengemessage()) {
+		const AuthServerChallengeMessage &msg = packet.GetMsg()->authserverchallengemessage();
+		if (VALIDATE_STRING_SIZE(msg.serverchallenge(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthClientResponseMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authclientresponsemessage()) {
+		const AuthClientResponseMessage &msg = packet.GetMsg()->authclientresponsemessage();
+		if (VALIDATE_STRING_SIZE(msg.clientresponse(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthServerVerificationMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authserververificationmessage()) {
+		const AuthServerVerificationMessage &msg = packet.GetMsg()->authserververificationmessage();
+		if (VALIDATE_STRING_SIZE(msg.serververification(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_initackmessage()) {
+		const InitAckMessage &msg = packet.GetMsg()->initackmessage();
+		if (msg.yoursessionid().size() == 16
+				&& msg.yourplayerid() != 0
+				&& (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16)
+				&& (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarrequestmessage()) {
+		const AvatarRequestMessage &msg = packet.GetMsg()->avatarrequestmessage();
+		if (msg.requestid() != 0
+				&& msg.avatarhash().size() == 16) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarheadermessage()) {
+		const AvatarHeaderMessage &msg = packet.GetMsg()->avatarheadermessage();
+		if (msg.requestid() != 0
+				&& VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatardatamessage()) {
+		const AvatarDataMessage &msg = packet.GetMsg()->avatardatamessage();
+		if (msg.requestid() != 0
+				&& VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarEndMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarendmessage()) {
+		const AvatarEndMessage &msg = packet.GetMsg()->avatarendmessage();
+		if (msg.requestid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateUnknownAvatarMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_unknownavatarmessage()) {
+		const UnknownAvatarMessage &msg = packet.GetMsg()->unknownavatarmessage();
+		if (msg.requestid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerListMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerlistmessage()) {
+		const PlayerListMessage &msg = packet.GetMsg()->playerlistmessage();
+		if (msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistnewmessage()) {
+		const GameListNewMessage &msg = packet.GetMsg()->gamelistnewmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerids(), 0, 10)
+				&& msg.adminplayerid() != 0
+				&& ValidateGameInfo(msg.gameinfo())) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListUpdateMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistupdatemessage()) {
+		const GameListUpdateMessage &msg = packet.GetMsg()->gamelistupdatemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListPlayerJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistplayerjoinedmessage()) {
+		const GameListPlayerJoinedMessage &msg = packet.GetMsg()->gamelistplayerjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListPlayerLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistplayerleftmessage()) {
+		const GameListPlayerLeftMessage &msg = packet.GetMsg()->gamelistplayerleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListAdminChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistadminchangedmessage()) {
+		const GameListAdminChangedMessage &msg = packet.GetMsg()->gamelistadminchangedmessage();
+		if (msg.gameid() != 0 && msg.newadminplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerInfoRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerinforequestmessage()) {
+		const PlayerInfoRequestMessage &msg = packet.GetMsg()->playerinforequestmessage();
+		if (VALIDATE_LIST_SIZE(msg.playerid(), 1, 10)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerInfoReplyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerinforeplymessage()) {
+		const PlayerInfoReplyMessage &msg = packet.GetMsg()->playerinforeplymessage();
+		if (msg.playerid() != 0) {
+			// TODO maybe additional checks.
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateSubscriptionRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_subscriptionrequestmessage()) {
+		//const SubscriptionRequestMessage &msg = packet.GetMsg()->subscriptionrequestmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateCreateGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joinnewgamemessage()) {
+		const JoinNewGameMessage &msg = packet.GetMsg()->joinnewgamemessage();
+		if (ValidateGameInfo(msg.gameinfo())
+				&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joinexistinggamemessage()) {
+		const JoinExistingGameMessage &msg = packet.GetMsg()->joinexistinggamemessage();
+		if (msg.gameid() != 0
+				&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejoinGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejoinexistinggamemessage()) {
+		const RejoinExistingGameMessage &msg = packet.GetMsg()->rejoinexistinggamemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joingameackmessage()) {
+		const JoinGameAckMessage &msg = packet.GetMsg()->joingameackmessage();
+		if (msg.gameid() != 0 && ValidateGameInfo(msg.gameinfo())) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameFailedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joingamefailedmessage()) {
+		const JoinGameFailedMessage &msg = packet.GetMsg()->joingamefailedmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGamePlayerJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameplayerjoinedmessage()) {
+		const GamePlayerJoinedMessage &msg = packet.GetMsg()->gameplayerjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGamePlayerLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameplayerleftmessage()) {
+		const GamePlayerLeftMessage &msg = packet.GetMsg()->gameplayerleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameAdminChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameadminchangedmessage()) {
+		const GameAdminChangedMessage &msg = packet.GetMsg()->gameadminchangedmessage();
+		if (msg.gameid() != 0 && msg.newadminplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRemovedFromGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_removedfromgamemessage()) {
+		const RemovedFromGameMessage &msg = packet.GetMsg()->removedfromgamemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateKickPlayerRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_kickplayerrequestmessage()) {
+		const KickPlayerRequestMessage &msg = packet.GetMsg()->kickplayerrequestmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateLeaveGameRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_leavegamerequestmessage()) {
+		const LeaveGameRequestMessage &msg = packet.GetMsg()->leavegamerequestmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInvitePlayerToGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_inviteplayertogamemessage()) {
+		const InvitePlayerToGameMessage &msg = packet.GetMsg()->inviteplayertogamemessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInviteNotifyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_invitenotifymessage()) {
+		const InviteNotifyMessage &msg = packet.GetMsg()->invitenotifymessage();
+		if (msg.gameid() != 0 && msg.playeridwho() != 0 && msg.playeridbywhom() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejectGameInvitationMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejectgameinvitationmessage()) {
+		const RejectGameInvitationMessage &msg = packet.GetMsg()->rejectgameinvitationmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejectInvNotifyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejectinvnotifymessage()) {
+		const RejectInvNotifyMessage &msg = packet.GetMsg()->rejectinvnotifymessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartEventMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_starteventmessage()) {
+		const StartEventMessage &msg = packet.GetMsg()->starteventmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartEventAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_starteventackmessage()) {
+		const StartEventAckMessage &msg = packet.GetMsg()->starteventackmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameStartInitialMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamestartinitialmessage()) {
+		const GameStartInitialMessage &msg = packet.GetMsg()->gamestartinitialmessage();
+		if (msg.gameid() != 0
+				&& msg.startdealerplayerid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameStartRejoinMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamestartrejoinmessage()) {
+		const GameStartRejoinMessage &msg = packet.GetMsg()->gamestartrejoinmessage();
+		if (msg.gameid() != 0
+				&& msg.startdealerplayerid() != 0
+				&& msg.handnum() != 0
+				&& VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateHandStartMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_handstartmessage()) {
+		const HandStartMessage &msg = packet.GetMsg()->handstartmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000)
+				&& VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayersTurnMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playersturnmessage()) {
+		const PlayersTurnMessage &msg = packet.GetMsg()->playersturnmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0 ) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateMyActionRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_myactionrequestmessage()) {
+		const MyActionRequestMessage &msg = packet.GetMsg()->myactionrequestmessage();
+		if (msg.gameid() != 0
+				&& msg.handnum() != 0
+				&& VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateYourActionRejectedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_youractionrejectedmessage()) {
+		const YourActionRejectedMessage &msg = packet.GetMsg()->youractionrejectedmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayersActionDoneMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playersactiondonemessage()) {
+		const PlayersActionDoneMessage &msg = packet.GetMsg()->playersactiondonemessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealFlopCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealflopcardsmessage()) {
+		const DealFlopCardsMessage &msg = packet.GetMsg()->dealflopcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.flopcard1(), 51)
+				&& VALIDATE_UINT_UPPER(msg.flopcard2(), 51)
+				&& VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealTurnCardMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealturncardmessage()) {
+		const DealTurnCardMessage &msg = packet.GetMsg()->dealturncardmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.turncard(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealRiverCardMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealrivercardmessage()) {
+		const DealRiverCardMessage &msg = packet.GetMsg()->dealrivercardmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.rivercard(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAllInShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_allinshowcardsmessage()) {
+		const AllInShowCardsMessage &msg = packet.GetMsg()->allinshowcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfHandShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofhandshowcardsmessage()) {
+		const EndOfHandShowCardsMessage &msg = packet.GetMsg()->endofhandshowcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfHandHideCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofhandhidecardsmessage()) {
+		const EndOfHandHideCardsMessage &msg = packet.GetMsg()->endofhandhidecardsmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet*/)
+{
+	//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
+NetPacketValidator::ValidateAfterHandShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_afterhandshowcardsmessage()) {
+		//const AfterHandShowCardsMessage &msg = packet.GetMsg()->afterhandshowcardsmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofgamemessage()) {
+		const EndOfGameMessage &msg = packet.GetMsg()->endofgamemessage();
+		if (msg.gameid() != 0 && msg.winnerplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerIdChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playeridchangedmessage()) {
+		const PlayerIdChangedMessage &msg = packet.GetMsg()->playeridchangedmessage();
+		if (msg.oldplayerid() != 0 && msg.newplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAskKickPlayerMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_askkickplayermessage()) {
+		const AskKickPlayerMessage &msg = packet.GetMsg()->askkickplayermessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAskKickDeniedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_askkickdeniedmessage()) {
+		const AskKickDeniedMessage &msg = packet.GetMsg()->askkickdeniedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartKickPetitionMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_startkickpetitionmessage()) {
+		const StartKickPetitionMessage &msg = packet.GetMsg()->startkickpetitionmessage();
+		if (msg.gameid() != 0
+				&& msg.petitionid() != 0
+				&& msg.proposingplayerid() != 0
+				&& msg.kickplayerid() != 0
+				&& msg.kicktimeoutsec() > 0
+				&& msg.numvotesneededtokick() > 0) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateVoteKickRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_votekickrequestmessage()) {
+		const VoteKickRequestMessage &msg = packet.GetMsg()->votekickrequestmessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateVoteKickReplyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_votekickreplymessage()) {
+		const VoteKickReplyMessage &msg = packet.GetMsg()->votekickreplymessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateKickPetitionUpdateMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_kickpetitionupdatemessage()) {
+		const KickPetitionUpdateMessage &msg = packet.GetMsg()->kickpetitionupdatemessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndKickPetitionMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endkickpetitionmessage()) {
+		const EndKickPetitionMessage &msg = packet.GetMsg()->endkickpetitionmessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStatisticsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_statisticsmessage()) {
+		//const StatisticsMessage &msg = packet.GetMsg()->statisticsmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatrequestmessage()) {
+		const ChatRequestMessage &msg = packet.GetMsg()->chatrequestmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatmessage()) {
+		const ChatMessage &msg = packet.GetMsg()->chatmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatRejectMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatrejectmessage()) {
+		const ChatRejectMessage &msg = packet.GetMsg()->chatrejectmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDialogMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dialogmessage()) {
+		const DialogMessage &msg = packet.GetMsg()->dialogmessage();
+		if (VALIDATE_STRING_SIZE(msg.notificationtext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateTimeoutWarningMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_timeoutwarningmessage()) {
+		//const TimeoutWarningMessage &msg = packet.GetMsg()->timeoutwarningmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateResetTimeoutMessage(const NetPacket &/*packet*/)
+{
+	//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
+NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportavatarmessage()) {
+		const ReportAvatarMessage &msg = packet.GetMsg()->reportavatarmessage();
+		if (msg.reportedplayerid() != 0
+				&& msg.reportedavatarhash().size() == 16) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportAvatarAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportavatarackmessage()) {
+		const ReportAvatarAckMessage &msg = packet.GetMsg()->reportavatarackmessage();
+		if (msg.reportedplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportgamemessage()) {
+		const ReportGameMessage &msg = packet.GetMsg()->reportgamemessage();
+		if (msg.reportedgameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportgameackmessage()) {
+		const ReportGameAckMessage &msg = packet.GetMsg()->reportgameackmessage();
+		if (msg.reportedgameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateErrorMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_errormessage()) {
+		//const ErrorMessage &msg = packet.GetMsg()->errormessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminRemoveGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminremovegamemessage()) {
+		const AdminRemoveGameMessage &msg = packet.GetMsg()->adminremovegamemessage();
+		if (msg.removegameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminRemoveGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminremovegameackmessage()) {
+		const AdminRemoveGameAckMessage &msg = packet.GetMsg()->adminremovegameackmessage();
+		if (msg.removegameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminBanPlayerMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminbanplayermessage()) {
+		const AdminBanPlayerMessage &msg = packet.GetMsg()->adminbanplayermessage();
+		if (msg.banplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminBanPlayerAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminbanplayerackmessage()) {
+		const AdminBanPlayerAckMessage &msg = packet.GetMsg()->adminbanplayerackmessage();
+		if (msg.banplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo)
+{
+	bool retVal = false;
+	if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64)
+			&& VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10)
+			&& (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000))
+			&& (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000))
+			&& (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000))
+			&& VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11)
+			&& VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20)
+			&& VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60)
+			&& VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000)
+			&& VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000)
+			&& VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30)
+			&& ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) {
+
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListSpectatorJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistspectatorjoinedmessage()) {
+		const GameListSpectatorJoinedMessage &msg = packet.GetMsg()->gamelistspectatorjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListSpectatorLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistspectatorleftmessage()) {
+		const GameListSpectatorLeftMessage &msg = packet.GetMsg()->gamelistspectatorleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameSpectatorJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamespectatorjoinedmessage()) {
+		const GameSpectatorJoinedMessage &msg = packet.GetMsg()->gamespectatorjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameSpectatorLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamespectatorleftmessage()) {
+		const GameSpectatorLeftMessage &msg = packet.GetMsg()->gamespectatorleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
diff --git a/src/net/common/validation/lobbymessagevalidator.cpp b/src/net/common/validation/lobbymessagevalidator.cpp
new file mode 100644
index 00000000..c690a8af
--- /dev/null
+++ b/src/net/common/validation/lobbymessagevalidator.cpp
@@ -0,0 +1,1286 @@
+/*****************************************************************************
+ * PokerTH - The open source texas holdem engine                             *
+ * Copyright (C) 2006-2012 Felix Hammer, Florian Thauer, Lothar May          *
+ *                                                                           *
+ * This program is free software: you can redistribute it and/or modify      *
+ * it under the terms of the GNU Affero General Public License as            *
+ * published by the Free Software Foundation, either version 3 of the        *
+ * License, or (at your option) any later version.                           *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU Affero General Public License for more details.                       *
+ *                                                                           *
+ * You should have received a copy of the GNU Affero General Public License  *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ *                                                                           *
+ * Additional permission under GNU AGPL version 3 section 7                  *
+ *                                                                           *
+ * If you modify this program, or any covered work, by linking or            *
+ * combining it with the OpenSSL project's OpenSSL library (or a             *
+ * modified version of that library), containing parts covered by the        *
+ * terms of the OpenSSL or SSLeay licenses, the authors of PokerTH           *
+ * (Felix Hammer, Florian Thauer, Lothar May) grant you additional           *
+ * permission to convey the resulting work.                                  *
+ * Corresponding Source for a non-source form of such a combination          *
+ * shall include the source code for the parts of OpenSSL used as well       *
+ * as that of the covered work.                                              *
+ *****************************************************************************/
+
+#include <net/netpacketvalidator.h>
+#include <net/netpacket.h>
+
+using namespace std;
+
+#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535)
+#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize))
+#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval))
+#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval))
+#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize))
+
+static bool
+ValidateListIntRange(const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > &l, ::google::protobuf::uint32 minval, ::google::protobuf::uint32 maxval)
+{
+	bool retVal = true;
+	for (int i = 0; i < l.size(); i++) {
+		if (!VALIDATE_UINT_RANGE(l.Get(i), minval, maxval)) {
+			retVal = false;
+			break;
+		}
+	}
+	return retVal;
+}
+
+NetPacketValidator::NetPacketValidator()
+{
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AnnounceMessage, ValidateAnnounceMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthMessage, ValidateAuthMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_LobbyMessage, ValidateLobbyMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameMessage, ValidateGameMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameManagementMessage, ValidateGameManagementMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameEngineMessage, ValidateGameEngineMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitMessage, ValidateInitMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerChallengeMessage, ValidateAuthServerChallengeMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthClientResponseMessage, ValidateAuthClientResponseMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerVerificationMessage, ValidateAuthServerVerificationMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitAckMessage, ValidateInitAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarRequestMessage, ValidateAvatarRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarHeaderMessage, ValidateAvatarHeaderMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarDataMessage, ValidateAvatarDataMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarEndMessage, ValidateAvatarEndMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_UnknownAvatarMessage, ValidateUnknownAvatarMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerListMessage, ValidatePlayerListMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListNewMessage, ValidateGameListNewMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListUpdateMessage, ValidateGameListUpdateMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerJoinedMessage, ValidateGameListPlayerJoinedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerLeftMessage, ValidateGameListPlayerLeftMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListAdminChangedMessage, ValidateGameListAdminChangedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoRequestMessage, ValidatePlayerInfoRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoReplyMessage, ValidatePlayerInfoReplyMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_SubscriptionRequestMessage, ValidateSubscriptionRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_CreateGameMessage, ValidateCreateGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameMessage, ValidateJoinGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RejoinGameMessage, ValidateRejoinGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameAckMessage, ValidateJoinGameAckMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameFailedMessage, ValidateJoinGameFailedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage, ValidateGamePlayerJoinedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerLeftMessage, ValidateGamePlayerLeftMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameAdminChangedMessage, ValidateGameAdminChangedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RemovedFromGameMessage, ValidateRemovedFromGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPlayerRequestMessage, ValidateKickPlayerRequestMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_LeaveGameRequestMessage, ValidateLeaveGameRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InvitePlayerToGameMessage, ValidateInvitePlayerToGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InviteNotifyMessage, ValidateInviteNotifyMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectGameInvitationMessage, ValidateRejectGameInvitationMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectInvNotifyMessage, ValidateRejectInvNotifyMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventMessage, ValidateStartEventMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventAckMessage, ValidateStartEventAckMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartInitialMessage, ValidateGameStartInitialMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartRejoinMessage, ValidateGameStartRejoinMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_HandStartMessage, ValidateHandStartMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersTurnMessage, ValidatePlayersTurnMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_MyActionRequestMessage, ValidateMyActionRequestMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_YourActionRejectedMessage, ValidateYourActionRejectedMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersActionDoneMessage, ValidatePlayersActionDoneMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealFlopCardsMessage, ValidateDealFlopCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealTurnCardMessage, ValidateDealTurnCardMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealRiverCardMessage, ValidateDealRiverCardMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AllInShowCardsMessage, ValidateAllInShowCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandShowCardsMessage, ValidateEndOfHandShowCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandHideCardsMessage, ValidateEndOfHandHideCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_ShowMyCardsRequestMessage, ValidateShowMyCardsRequestMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AfterHandShowCardsMessage, ValidateAfterHandShowCardsMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndOfGameMessage, ValidateEndOfGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_PlayerIdChangedMessage, ValidatePlayerIdChangedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickPlayerMessage, ValidateAskKickPlayerMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickDeniedMessage, ValidateAskKickDeniedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartKickPetitionMessage, ValidateStartKickPetitionMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickRequestMessage, ValidateVoteKickRequestMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickReplyMessage, ValidateVoteKickReplyMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPetitionUpdateMessage, ValidateKickPetitionUpdateMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndKickPetitionMessage, ValidateEndKickPetitionMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_StatisticsMessage, ValidateStatisticsMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRequestMessage, ValidateChatRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatMessage, ValidateChatMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRejectMessage, ValidateChatRejectMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_DialogMessage, ValidateDialogMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_TimeoutWarningMessage, ValidateTimeoutWarningMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ResetTimeoutMessage, ValidateResetTimeoutMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarMessage, ValidateReportAvatarMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarAckMessage, ValidateReportAvatarAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameMessage, ValidateReportGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameAckMessage, ValidateReportGameAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ErrorMessage, ValidateErrorMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameMessage, ValidateAdminRemoveGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameAckMessage, ValidateAdminRemoveGameAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerMessage, ValidateAdminBanPlayerMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerAckMessage, ValidateAdminBanPlayerAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorJoinedMessage, ValidateGameListSpectatorJoinedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorLeftMessage, ValidateGameListSpectatorLeftMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage, ValidateGameSpectatorJoinedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorLeftMessage, ValidateGameSpectatorLeftMessage));
+}
+
+bool
+NetPacketValidator::IsValidPacket(const NetPacket &packet) const
+{
+	// Default: Invalid packet.
+	bool retVal = false;
+	ValidateFunctorMap::const_iterator pos = m_validationMap.find(packet.GetMsg()->messagetype());
+	if (pos != m_validationMap.end()) {
+		// Call validation functor.
+		retVal = pos->second(packet);
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_announcemessage()) {
+		const AnnounceMessage &msg = packet.GetMsg()->announcemessage();
+		if (VALIDATE_IS_UINT16(msg.protocolversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.protocolversion().minorversion())
+				&& VALIDATE_IS_UINT16(msg.latestgameversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.latestgameversion().minorversion())
+				&& VALIDATE_IS_UINT16(msg.latestbetarevision())
+				&& VALIDATE_IS_UINT16(msg.numplayersonserver())) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInitMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_initmessage()) {
+		const InitMessage &msg = packet.GetMsg()->initmessage();
+		if (VALIDATE_IS_UINT16(msg.requestedversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.requestedversion().minorversion())
+				&& (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16)
+				&& (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64))
+				&& (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64))
+				&& (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256))
+				&& (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthServerChallengeMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authserverchallengemessage()) {
+		const AuthServerChallengeMessage &msg = packet.GetMsg()->authserverchallengemessage();
+		if (VALIDATE_STRING_SIZE(msg.serverchallenge(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthClientResponseMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authclientresponsemessage()) {
+		const AuthClientResponseMessage &msg = packet.GetMsg()->authclientresponsemessage();
+		if (VALIDATE_STRING_SIZE(msg.clientresponse(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthServerVerificationMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authserververificationmessage()) {
+		const AuthServerVerificationMessage &msg = packet.GetMsg()->authserververificationmessage();
+		if (VALIDATE_STRING_SIZE(msg.serververification(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_initackmessage()) {
+		const InitAckMessage &msg = packet.GetMsg()->initackmessage();
+		if (msg.yoursessionid().size() == 16
+				&& msg.yourplayerid() != 0
+				&& (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16)
+				&& (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarrequestmessage()) {
+		const AvatarRequestMessage &msg = packet.GetMsg()->avatarrequestmessage();
+		if (msg.requestid() != 0
+				&& msg.avatarhash().size() == 16) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarheadermessage()) {
+		const AvatarHeaderMessage &msg = packet.GetMsg()->avatarheadermessage();
+		if (msg.requestid() != 0
+				&& VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatardatamessage()) {
+		const AvatarDataMessage &msg = packet.GetMsg()->avatardatamessage();
+		if (msg.requestid() != 0
+				&& VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarEndMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarendmessage()) {
+		const AvatarEndMessage &msg = packet.GetMsg()->avatarendmessage();
+		if (msg.requestid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateUnknownAvatarMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_unknownavatarmessage()) {
+		const UnknownAvatarMessage &msg = packet.GetMsg()->unknownavatarmessage();
+		if (msg.requestid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerListMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerlistmessage()) {
+		const PlayerListMessage &msg = packet.GetMsg()->playerlistmessage();
+		if (msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistnewmessage()) {
+		const GameListNewMessage &msg = packet.GetMsg()->gamelistnewmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerids(), 0, 10)
+				&& msg.adminplayerid() != 0
+				&& ValidateGameInfo(msg.gameinfo())) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListUpdateMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistupdatemessage()) {
+		const GameListUpdateMessage &msg = packet.GetMsg()->gamelistupdatemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListPlayerJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistplayerjoinedmessage()) {
+		const GameListPlayerJoinedMessage &msg = packet.GetMsg()->gamelistplayerjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListPlayerLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistplayerleftmessage()) {
+		const GameListPlayerLeftMessage &msg = packet.GetMsg()->gamelistplayerleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListAdminChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistadminchangedmessage()) {
+		const GameListAdminChangedMessage &msg = packet.GetMsg()->gamelistadminchangedmessage();
+		if (msg.gameid() != 0 && msg.newadminplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerInfoRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerinforequestmessage()) {
+		const PlayerInfoRequestMessage &msg = packet.GetMsg()->playerinforequestmessage();
+		if (VALIDATE_LIST_SIZE(msg.playerid(), 1, 10)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerInfoReplyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerinforeplymessage()) {
+		const PlayerInfoReplyMessage &msg = packet.GetMsg()->playerinforeplymessage();
+		if (msg.playerid() != 0) {
+			// TODO maybe additional checks.
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateSubscriptionRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_subscriptionrequestmessage()) {
+		//const SubscriptionRequestMessage &msg = packet.GetMsg()->subscriptionrequestmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateCreateGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joinnewgamemessage()) {
+		const JoinNewGameMessage &msg = packet.GetMsg()->joinnewgamemessage();
+		if (ValidateGameInfo(msg.gameinfo())
+				&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joinexistinggamemessage()) {
+		const JoinExistingGameMessage &msg = packet.GetMsg()->joinexistinggamemessage();
+		if (msg.gameid() != 0
+				&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejoinGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejoinexistinggamemessage()) {
+		const RejoinExistingGameMessage &msg = packet.GetMsg()->rejoinexistinggamemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joingameackmessage()) {
+		const JoinGameAckMessage &msg = packet.GetMsg()->joingameackmessage();
+		if (msg.gameid() != 0 && ValidateGameInfo(msg.gameinfo())) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameFailedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joingamefailedmessage()) {
+		const JoinGameFailedMessage &msg = packet.GetMsg()->joingamefailedmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGamePlayerJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameplayerjoinedmessage()) {
+		const GamePlayerJoinedMessage &msg = packet.GetMsg()->gameplayerjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGamePlayerLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameplayerleftmessage()) {
+		const GamePlayerLeftMessage &msg = packet.GetMsg()->gameplayerleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameAdminChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameadminchangedmessage()) {
+		const GameAdminChangedMessage &msg = packet.GetMsg()->gameadminchangedmessage();
+		if (msg.gameid() != 0 && msg.newadminplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRemovedFromGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_removedfromgamemessage()) {
+		const RemovedFromGameMessage &msg = packet.GetMsg()->removedfromgamemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateKickPlayerRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_kickplayerrequestmessage()) {
+		const KickPlayerRequestMessage &msg = packet.GetMsg()->kickplayerrequestmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateLeaveGameRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_leavegamerequestmessage()) {
+		const LeaveGameRequestMessage &msg = packet.GetMsg()->leavegamerequestmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInvitePlayerToGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_inviteplayertogamemessage()) {
+		const InvitePlayerToGameMessage &msg = packet.GetMsg()->inviteplayertogamemessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInviteNotifyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_invitenotifymessage()) {
+		const InviteNotifyMessage &msg = packet.GetMsg()->invitenotifymessage();
+		if (msg.gameid() != 0 && msg.playeridwho() != 0 && msg.playeridbywhom() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejectGameInvitationMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejectgameinvitationmessage()) {
+		const RejectGameInvitationMessage &msg = packet.GetMsg()->rejectgameinvitationmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejectInvNotifyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejectinvnotifymessage()) {
+		const RejectInvNotifyMessage &msg = packet.GetMsg()->rejectinvnotifymessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartEventMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_starteventmessage()) {
+		const StartEventMessage &msg = packet.GetMsg()->starteventmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartEventAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_starteventackmessage()) {
+		const StartEventAckMessage &msg = packet.GetMsg()->starteventackmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameStartInitialMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamestartinitialmessage()) {
+		const GameStartInitialMessage &msg = packet.GetMsg()->gamestartinitialmessage();
+		if (msg.gameid() != 0
+				&& msg.startdealerplayerid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameStartRejoinMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamestartrejoinmessage()) {
+		const GameStartRejoinMessage &msg = packet.GetMsg()->gamestartrejoinmessage();
+		if (msg.gameid() != 0
+				&& msg.startdealerplayerid() != 0
+				&& msg.handnum() != 0
+				&& VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateHandStartMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_handstartmessage()) {
+		const HandStartMessage &msg = packet.GetMsg()->handstartmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000)
+				&& VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayersTurnMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playersturnmessage()) {
+		const PlayersTurnMessage &msg = packet.GetMsg()->playersturnmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0 ) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateMyActionRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_myactionrequestmessage()) {
+		const MyActionRequestMessage &msg = packet.GetMsg()->myactionrequestmessage();
+		if (msg.gameid() != 0
+				&& msg.handnum() != 0
+				&& VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateYourActionRejectedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_youractionrejectedmessage()) {
+		const YourActionRejectedMessage &msg = packet.GetMsg()->youractionrejectedmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayersActionDoneMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playersactiondonemessage()) {
+		const PlayersActionDoneMessage &msg = packet.GetMsg()->playersactiondonemessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealFlopCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealflopcardsmessage()) {
+		const DealFlopCardsMessage &msg = packet.GetMsg()->dealflopcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.flopcard1(), 51)
+				&& VALIDATE_UINT_UPPER(msg.flopcard2(), 51)
+				&& VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealTurnCardMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealturncardmessage()) {
+		const DealTurnCardMessage &msg = packet.GetMsg()->dealturncardmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.turncard(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealRiverCardMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealrivercardmessage()) {
+		const DealRiverCardMessage &msg = packet.GetMsg()->dealrivercardmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.rivercard(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAllInShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_allinshowcardsmessage()) {
+		const AllInShowCardsMessage &msg = packet.GetMsg()->allinshowcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfHandShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofhandshowcardsmessage()) {
+		const EndOfHandShowCardsMessage &msg = packet.GetMsg()->endofhandshowcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfHandHideCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofhandhidecardsmessage()) {
+		const EndOfHandHideCardsMessage &msg = packet.GetMsg()->endofhandhidecardsmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet*/)
+{
+	//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
+NetPacketValidator::ValidateAfterHandShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_afterhandshowcardsmessage()) {
+		//const AfterHandShowCardsMessage &msg = packet.GetMsg()->afterhandshowcardsmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofgamemessage()) {
+		const EndOfGameMessage &msg = packet.GetMsg()->endofgamemessage();
+		if (msg.gameid() != 0 && msg.winnerplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerIdChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playeridchangedmessage()) {
+		const PlayerIdChangedMessage &msg = packet.GetMsg()->playeridchangedmessage();
+		if (msg.oldplayerid() != 0 && msg.newplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAskKickPlayerMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_askkickplayermessage()) {
+		const AskKickPlayerMessage &msg = packet.GetMsg()->askkickplayermessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAskKickDeniedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_askkickdeniedmessage()) {
+		const AskKickDeniedMessage &msg = packet.GetMsg()->askkickdeniedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartKickPetitionMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_startkickpetitionmessage()) {
+		const StartKickPetitionMessage &msg = packet.GetMsg()->startkickpetitionmessage();
+		if (msg.gameid() != 0
+				&& msg.petitionid() != 0
+				&& msg.proposingplayerid() != 0
+				&& msg.kickplayerid() != 0
+				&& msg.kicktimeoutsec() > 0
+				&& msg.numvotesneededtokick() > 0) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateVoteKickRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_votekickrequestmessage()) {
+		const VoteKickRequestMessage &msg = packet.GetMsg()->votekickrequestmessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateVoteKickReplyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_votekickreplymessage()) {
+		const VoteKickReplyMessage &msg = packet.GetMsg()->votekickreplymessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateKickPetitionUpdateMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_kickpetitionupdatemessage()) {
+		const KickPetitionUpdateMessage &msg = packet.GetMsg()->kickpetitionupdatemessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndKickPetitionMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endkickpetitionmessage()) {
+		const EndKickPetitionMessage &msg = packet.GetMsg()->endkickpetitionmessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStatisticsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_statisticsmessage()) {
+		//const StatisticsMessage &msg = packet.GetMsg()->statisticsmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatrequestmessage()) {
+		const ChatRequestMessage &msg = packet.GetMsg()->chatrequestmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatmessage()) {
+		const ChatMessage &msg = packet.GetMsg()->chatmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatRejectMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatrejectmessage()) {
+		const ChatRejectMessage &msg = packet.GetMsg()->chatrejectmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDialogMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dialogmessage()) {
+		const DialogMessage &msg = packet.GetMsg()->dialogmessage();
+		if (VALIDATE_STRING_SIZE(msg.notificationtext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateTimeoutWarningMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_timeoutwarningmessage()) {
+		//const TimeoutWarningMessage &msg = packet.GetMsg()->timeoutwarningmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateResetTimeoutMessage(const NetPacket &/*packet*/)
+{
+	//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
+NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportavatarmessage()) {
+		const ReportAvatarMessage &msg = packet.GetMsg()->reportavatarmessage();
+		if (msg.reportedplayerid() != 0
+				&& msg.reportedavatarhash().size() == 16) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportAvatarAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportavatarackmessage()) {
+		const ReportAvatarAckMessage &msg = packet.GetMsg()->reportavatarackmessage();
+		if (msg.reportedplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportgamemessage()) {
+		const ReportGameMessage &msg = packet.GetMsg()->reportgamemessage();
+		if (msg.reportedgameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportgameackmessage()) {
+		const ReportGameAckMessage &msg = packet.GetMsg()->reportgameackmessage();
+		if (msg.reportedgameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateErrorMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_errormessage()) {
+		//const ErrorMessage &msg = packet.GetMsg()->errormessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminRemoveGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminremovegamemessage()) {
+		const AdminRemoveGameMessage &msg = packet.GetMsg()->adminremovegamemessage();
+		if (msg.removegameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminRemoveGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminremovegameackmessage()) {
+		const AdminRemoveGameAckMessage &msg = packet.GetMsg()->adminremovegameackmessage();
+		if (msg.removegameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminBanPlayerMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminbanplayermessage()) {
+		const AdminBanPlayerMessage &msg = packet.GetMsg()->adminbanplayermessage();
+		if (msg.banplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminBanPlayerAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminbanplayerackmessage()) {
+		const AdminBanPlayerAckMessage &msg = packet.GetMsg()->adminbanplayerackmessage();
+		if (msg.banplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo)
+{
+	bool retVal = false;
+	if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64)
+			&& VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10)
+			&& (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000))
+			&& (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000))
+			&& (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000))
+			&& VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11)
+			&& VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20)
+			&& VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60)
+			&& VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000)
+			&& VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000)
+			&& VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30)
+			&& ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) {
+
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListSpectatorJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistspectatorjoinedmessage()) {
+		const GameListSpectatorJoinedMessage &msg = packet.GetMsg()->gamelistspectatorjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListSpectatorLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistspectatorleftmessage()) {
+		const GameListSpectatorLeftMessage &msg = packet.GetMsg()->gamelistspectatorleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameSpectatorJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamespectatorjoinedmessage()) {
+		const GameSpectatorJoinedMessage &msg = packet.GetMsg()->gamespectatorjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameSpectatorLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamespectatorleftmessage()) {
+		const GameSpectatorLeftMessage &msg = packet.GetMsg()->gamespectatorleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
diff --git a/src/net/common/validation/pokerthmessagevalidator.cpp b/src/net/common/validation/pokerthmessagevalidator.cpp
new file mode 100644
index 00000000..c690a8af
--- /dev/null
+++ b/src/net/common/validation/pokerthmessagevalidator.cpp
@@ -0,0 +1,1286 @@
+/*****************************************************************************
+ * PokerTH - The open source texas holdem engine                             *
+ * Copyright (C) 2006-2012 Felix Hammer, Florian Thauer, Lothar May          *
+ *                                                                           *
+ * This program is free software: you can redistribute it and/or modify      *
+ * it under the terms of the GNU Affero General Public License as            *
+ * published by the Free Software Foundation, either version 3 of the        *
+ * License, or (at your option) any later version.                           *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU Affero General Public License for more details.                       *
+ *                                                                           *
+ * You should have received a copy of the GNU Affero General Public License  *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ *                                                                           *
+ * Additional permission under GNU AGPL version 3 section 7                  *
+ *                                                                           *
+ * If you modify this program, or any covered work, by linking or            *
+ * combining it with the OpenSSL project's OpenSSL library (or a             *
+ * modified version of that library), containing parts covered by the        *
+ * terms of the OpenSSL or SSLeay licenses, the authors of PokerTH           *
+ * (Felix Hammer, Florian Thauer, Lothar May) grant you additional           *
+ * permission to convey the resulting work.                                  *
+ * Corresponding Source for a non-source form of such a combination          *
+ * shall include the source code for the parts of OpenSSL used as well       *
+ * as that of the covered work.                                              *
+ *****************************************************************************/
+
+#include <net/netpacketvalidator.h>
+#include <net/netpacket.h>
+
+using namespace std;
+
+#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535)
+#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize))
+#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval))
+#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval))
+#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize))
+
+static bool
+ValidateListIntRange(const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > &l, ::google::protobuf::uint32 minval, ::google::protobuf::uint32 maxval)
+{
+	bool retVal = true;
+	for (int i = 0; i < l.size(); i++) {
+		if (!VALIDATE_UINT_RANGE(l.Get(i), minval, maxval)) {
+			retVal = false;
+			break;
+		}
+	}
+	return retVal;
+}
+
+NetPacketValidator::NetPacketValidator()
+{
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AnnounceMessage, ValidateAnnounceMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthMessage, ValidateAuthMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_LobbyMessage, ValidateLobbyMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameMessage, ValidateGameMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameManagementMessage, ValidateGameManagementMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameEngineMessage, ValidateGameEngineMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitMessage, ValidateInitMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerChallengeMessage, ValidateAuthServerChallengeMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthClientResponseMessage, ValidateAuthClientResponseMessage));
+	m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerVerificationMessage, ValidateAuthServerVerificationMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitAckMessage, ValidateInitAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarRequestMessage, ValidateAvatarRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarHeaderMessage, ValidateAvatarHeaderMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarDataMessage, ValidateAvatarDataMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarEndMessage, ValidateAvatarEndMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_UnknownAvatarMessage, ValidateUnknownAvatarMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerListMessage, ValidatePlayerListMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListNewMessage, ValidateGameListNewMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListUpdateMessage, ValidateGameListUpdateMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerJoinedMessage, ValidateGameListPlayerJoinedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerLeftMessage, ValidateGameListPlayerLeftMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListAdminChangedMessage, ValidateGameListAdminChangedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoRequestMessage, ValidatePlayerInfoRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoReplyMessage, ValidatePlayerInfoReplyMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_SubscriptionRequestMessage, ValidateSubscriptionRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_CreateGameMessage, ValidateCreateGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameMessage, ValidateJoinGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RejoinGameMessage, ValidateRejoinGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameAckMessage, ValidateJoinGameAckMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameFailedMessage, ValidateJoinGameFailedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage, ValidateGamePlayerJoinedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerLeftMessage, ValidateGamePlayerLeftMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameAdminChangedMessage, ValidateGameAdminChangedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RemovedFromGameMessage, ValidateRemovedFromGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPlayerRequestMessage, ValidateKickPlayerRequestMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_LeaveGameRequestMessage, ValidateLeaveGameRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InvitePlayerToGameMessage, ValidateInvitePlayerToGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InviteNotifyMessage, ValidateInviteNotifyMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectGameInvitationMessage, ValidateRejectGameInvitationMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectInvNotifyMessage, ValidateRejectInvNotifyMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventMessage, ValidateStartEventMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventAckMessage, ValidateStartEventAckMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartInitialMessage, ValidateGameStartInitialMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartRejoinMessage, ValidateGameStartRejoinMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_HandStartMessage, ValidateHandStartMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersTurnMessage, ValidatePlayersTurnMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_MyActionRequestMessage, ValidateMyActionRequestMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_YourActionRejectedMessage, ValidateYourActionRejectedMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersActionDoneMessage, ValidatePlayersActionDoneMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealFlopCardsMessage, ValidateDealFlopCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealTurnCardMessage, ValidateDealTurnCardMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealRiverCardMessage, ValidateDealRiverCardMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AllInShowCardsMessage, ValidateAllInShowCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandShowCardsMessage, ValidateEndOfHandShowCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandHideCardsMessage, ValidateEndOfHandHideCardsMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_ShowMyCardsRequestMessage, ValidateShowMyCardsRequestMessage));
+	m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AfterHandShowCardsMessage, ValidateAfterHandShowCardsMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndOfGameMessage, ValidateEndOfGameMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_PlayerIdChangedMessage, ValidatePlayerIdChangedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickPlayerMessage, ValidateAskKickPlayerMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickDeniedMessage, ValidateAskKickDeniedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartKickPetitionMessage, ValidateStartKickPetitionMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickRequestMessage, ValidateVoteKickRequestMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickReplyMessage, ValidateVoteKickReplyMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPetitionUpdateMessage, ValidateKickPetitionUpdateMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndKickPetitionMessage, ValidateEndKickPetitionMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_StatisticsMessage, ValidateStatisticsMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRequestMessage, ValidateChatRequestMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatMessage, ValidateChatMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRejectMessage, ValidateChatRejectMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_DialogMessage, ValidateDialogMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_TimeoutWarningMessage, ValidateTimeoutWarningMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ResetTimeoutMessage, ValidateResetTimeoutMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarMessage, ValidateReportAvatarMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarAckMessage, ValidateReportAvatarAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameMessage, ValidateReportGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameAckMessage, ValidateReportGameAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ErrorMessage, ValidateErrorMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameMessage, ValidateAdminRemoveGameMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameAckMessage, ValidateAdminRemoveGameAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerMessage, ValidateAdminBanPlayerMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerAckMessage, ValidateAdminBanPlayerAckMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorJoinedMessage, ValidateGameListSpectatorJoinedMessage));
+	m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorLeftMessage, ValidateGameListSpectatorLeftMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage, ValidateGameSpectatorJoinedMessage));
+	m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorLeftMessage, ValidateGameSpectatorLeftMessage));
+}
+
+bool
+NetPacketValidator::IsValidPacket(const NetPacket &packet) const
+{
+	// Default: Invalid packet.
+	bool retVal = false;
+	ValidateFunctorMap::const_iterator pos = m_validationMap.find(packet.GetMsg()->messagetype());
+	if (pos != m_validationMap.end()) {
+		// Call validation functor.
+		retVal = pos->second(packet);
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_announcemessage()) {
+		const AnnounceMessage &msg = packet.GetMsg()->announcemessage();
+		if (VALIDATE_IS_UINT16(msg.protocolversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.protocolversion().minorversion())
+				&& VALIDATE_IS_UINT16(msg.latestgameversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.latestgameversion().minorversion())
+				&& VALIDATE_IS_UINT16(msg.latestbetarevision())
+				&& VALIDATE_IS_UINT16(msg.numplayersonserver())) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInitMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_initmessage()) {
+		const InitMessage &msg = packet.GetMsg()->initmessage();
+		if (VALIDATE_IS_UINT16(msg.requestedversion().majorversion())
+				&& VALIDATE_IS_UINT16(msg.requestedversion().minorversion())
+				&& (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16)
+				&& (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64))
+				&& (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64))
+				&& (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256))
+				&& (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthServerChallengeMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authserverchallengemessage()) {
+		const AuthServerChallengeMessage &msg = packet.GetMsg()->authserverchallengemessage();
+		if (VALIDATE_STRING_SIZE(msg.serverchallenge(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthClientResponseMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authclientresponsemessage()) {
+		const AuthClientResponseMessage &msg = packet.GetMsg()->authclientresponsemessage();
+		if (VALIDATE_STRING_SIZE(msg.clientresponse(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAuthServerVerificationMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_authserververificationmessage()) {
+		const AuthServerVerificationMessage &msg = packet.GetMsg()->authserververificationmessage();
+		if (VALIDATE_STRING_SIZE(msg.serververification(), 1, 256)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_initackmessage()) {
+		const InitAckMessage &msg = packet.GetMsg()->initackmessage();
+		if (msg.yoursessionid().size() == 16
+				&& msg.yourplayerid() != 0
+				&& (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16)
+				&& (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarrequestmessage()) {
+		const AvatarRequestMessage &msg = packet.GetMsg()->avatarrequestmessage();
+		if (msg.requestid() != 0
+				&& msg.avatarhash().size() == 16) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarheadermessage()) {
+		const AvatarHeaderMessage &msg = packet.GetMsg()->avatarheadermessage();
+		if (msg.requestid() != 0
+				&& VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatardatamessage()) {
+		const AvatarDataMessage &msg = packet.GetMsg()->avatardatamessage();
+		if (msg.requestid() != 0
+				&& VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAvatarEndMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_avatarendmessage()) {
+		const AvatarEndMessage &msg = packet.GetMsg()->avatarendmessage();
+		if (msg.requestid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateUnknownAvatarMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_unknownavatarmessage()) {
+		const UnknownAvatarMessage &msg = packet.GetMsg()->unknownavatarmessage();
+		if (msg.requestid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerListMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerlistmessage()) {
+		const PlayerListMessage &msg = packet.GetMsg()->playerlistmessage();
+		if (msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistnewmessage()) {
+		const GameListNewMessage &msg = packet.GetMsg()->gamelistnewmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerids(), 0, 10)
+				&& msg.adminplayerid() != 0
+				&& ValidateGameInfo(msg.gameinfo())) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListUpdateMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistupdatemessage()) {
+		const GameListUpdateMessage &msg = packet.GetMsg()->gamelistupdatemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListPlayerJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistplayerjoinedmessage()) {
+		const GameListPlayerJoinedMessage &msg = packet.GetMsg()->gamelistplayerjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListPlayerLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistplayerleftmessage()) {
+		const GameListPlayerLeftMessage &msg = packet.GetMsg()->gamelistplayerleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListAdminChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistadminchangedmessage()) {
+		const GameListAdminChangedMessage &msg = packet.GetMsg()->gamelistadminchangedmessage();
+		if (msg.gameid() != 0 && msg.newadminplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerInfoRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerinforequestmessage()) {
+		const PlayerInfoRequestMessage &msg = packet.GetMsg()->playerinforequestmessage();
+		if (VALIDATE_LIST_SIZE(msg.playerid(), 1, 10)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerInfoReplyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playerinforeplymessage()) {
+		const PlayerInfoReplyMessage &msg = packet.GetMsg()->playerinforeplymessage();
+		if (msg.playerid() != 0) {
+			// TODO maybe additional checks.
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateSubscriptionRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_subscriptionrequestmessage()) {
+		//const SubscriptionRequestMessage &msg = packet.GetMsg()->subscriptionrequestmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateCreateGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joinnewgamemessage()) {
+		const JoinNewGameMessage &msg = packet.GetMsg()->joinnewgamemessage();
+		if (ValidateGameInfo(msg.gameinfo())
+				&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joinexistinggamemessage()) {
+		const JoinExistingGameMessage &msg = packet.GetMsg()->joinexistinggamemessage();
+		if (msg.gameid() != 0
+				&& (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejoinGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejoinexistinggamemessage()) {
+		const RejoinExistingGameMessage &msg = packet.GetMsg()->rejoinexistinggamemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joingameackmessage()) {
+		const JoinGameAckMessage &msg = packet.GetMsg()->joingameackmessage();
+		if (msg.gameid() != 0 && ValidateGameInfo(msg.gameinfo())) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateJoinGameFailedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_joingamefailedmessage()) {
+		const JoinGameFailedMessage &msg = packet.GetMsg()->joingamefailedmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGamePlayerJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameplayerjoinedmessage()) {
+		const GamePlayerJoinedMessage &msg = packet.GetMsg()->gameplayerjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGamePlayerLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameplayerleftmessage()) {
+		const GamePlayerLeftMessage &msg = packet.GetMsg()->gameplayerleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameAdminChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gameadminchangedmessage()) {
+		const GameAdminChangedMessage &msg = packet.GetMsg()->gameadminchangedmessage();
+		if (msg.gameid() != 0 && msg.newadminplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRemovedFromGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_removedfromgamemessage()) {
+		const RemovedFromGameMessage &msg = packet.GetMsg()->removedfromgamemessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateKickPlayerRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_kickplayerrequestmessage()) {
+		const KickPlayerRequestMessage &msg = packet.GetMsg()->kickplayerrequestmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateLeaveGameRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_leavegamerequestmessage()) {
+		const LeaveGameRequestMessage &msg = packet.GetMsg()->leavegamerequestmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInvitePlayerToGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_inviteplayertogamemessage()) {
+		const InvitePlayerToGameMessage &msg = packet.GetMsg()->inviteplayertogamemessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateInviteNotifyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_invitenotifymessage()) {
+		const InviteNotifyMessage &msg = packet.GetMsg()->invitenotifymessage();
+		if (msg.gameid() != 0 && msg.playeridwho() != 0 && msg.playeridbywhom() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejectGameInvitationMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejectgameinvitationmessage()) {
+		const RejectGameInvitationMessage &msg = packet.GetMsg()->rejectgameinvitationmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateRejectInvNotifyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_rejectinvnotifymessage()) {
+		const RejectInvNotifyMessage &msg = packet.GetMsg()->rejectinvnotifymessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartEventMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_starteventmessage()) {
+		const StartEventMessage &msg = packet.GetMsg()->starteventmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartEventAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_starteventackmessage()) {
+		const StartEventAckMessage &msg = packet.GetMsg()->starteventackmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameStartInitialMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamestartinitialmessage()) {
+		const GameStartInitialMessage &msg = packet.GetMsg()->gamestartinitialmessage();
+		if (msg.gameid() != 0
+				&& msg.startdealerplayerid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameStartRejoinMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamestartrejoinmessage()) {
+		const GameStartRejoinMessage &msg = packet.GetMsg()->gamestartrejoinmessage();
+		if (msg.gameid() != 0
+				&& msg.startdealerplayerid() != 0
+				&& msg.handnum() != 0
+				&& VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateHandStartMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_handstartmessage()) {
+		const HandStartMessage &msg = packet.GetMsg()->handstartmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000)
+				&& VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayersTurnMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playersturnmessage()) {
+		const PlayersTurnMessage &msg = packet.GetMsg()->playersturnmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0 ) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateMyActionRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_myactionrequestmessage()) {
+		const MyActionRequestMessage &msg = packet.GetMsg()->myactionrequestmessage();
+		if (msg.gameid() != 0
+				&& msg.handnum() != 0
+				&& VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateYourActionRejectedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_youractionrejectedmessage()) {
+		const YourActionRejectedMessage &msg = packet.GetMsg()->youractionrejectedmessage();
+		if (msg.gameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayersActionDoneMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playersactiondonemessage()) {
+		const PlayersActionDoneMessage &msg = packet.GetMsg()->playersactiondonemessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealFlopCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealflopcardsmessage()) {
+		const DealFlopCardsMessage &msg = packet.GetMsg()->dealflopcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.flopcard1(), 51)
+				&& VALIDATE_UINT_UPPER(msg.flopcard2(), 51)
+				&& VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealTurnCardMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealturncardmessage()) {
+		const DealTurnCardMessage &msg = packet.GetMsg()->dealturncardmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.turncard(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDealRiverCardMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dealrivercardmessage()) {
+		const DealRiverCardMessage &msg = packet.GetMsg()->dealrivercardmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_UINT_UPPER(msg.rivercard(), 51)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAllInShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_allinshowcardsmessage()) {
+		const AllInShowCardsMessage &msg = packet.GetMsg()->allinshowcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfHandShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofhandshowcardsmessage()) {
+		const EndOfHandShowCardsMessage &msg = packet.GetMsg()->endofhandshowcardsmessage();
+		if (msg.gameid() != 0
+				&& VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfHandHideCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofhandhidecardsmessage()) {
+		const EndOfHandHideCardsMessage &msg = packet.GetMsg()->endofhandhidecardsmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet*/)
+{
+	//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
+NetPacketValidator::ValidateAfterHandShowCardsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_afterhandshowcardsmessage()) {
+		//const AfterHandShowCardsMessage &msg = packet.GetMsg()->afterhandshowcardsmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndOfGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endofgamemessage()) {
+		const EndOfGameMessage &msg = packet.GetMsg()->endofgamemessage();
+		if (msg.gameid() != 0 && msg.winnerplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidatePlayerIdChangedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_playeridchangedmessage()) {
+		const PlayerIdChangedMessage &msg = packet.GetMsg()->playeridchangedmessage();
+		if (msg.oldplayerid() != 0 && msg.newplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAskKickPlayerMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_askkickplayermessage()) {
+		const AskKickPlayerMessage &msg = packet.GetMsg()->askkickplayermessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAskKickDeniedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_askkickdeniedmessage()) {
+		const AskKickDeniedMessage &msg = packet.GetMsg()->askkickdeniedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStartKickPetitionMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_startkickpetitionmessage()) {
+		const StartKickPetitionMessage &msg = packet.GetMsg()->startkickpetitionmessage();
+		if (msg.gameid() != 0
+				&& msg.petitionid() != 0
+				&& msg.proposingplayerid() != 0
+				&& msg.kickplayerid() != 0
+				&& msg.kicktimeoutsec() > 0
+				&& msg.numvotesneededtokick() > 0) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateVoteKickRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_votekickrequestmessage()) {
+		const VoteKickRequestMessage &msg = packet.GetMsg()->votekickrequestmessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateVoteKickReplyMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_votekickreplymessage()) {
+		const VoteKickReplyMessage &msg = packet.GetMsg()->votekickreplymessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateKickPetitionUpdateMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_kickpetitionupdatemessage()) {
+		const KickPetitionUpdateMessage &msg = packet.GetMsg()->kickpetitionupdatemessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateEndKickPetitionMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_endkickpetitionmessage()) {
+		const EndKickPetitionMessage &msg = packet.GetMsg()->endkickpetitionmessage();
+		if (msg.gameid() != 0 && msg.petitionid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateStatisticsMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_statisticsmessage()) {
+		//const StatisticsMessage &msg = packet.GetMsg()->statisticsmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatRequestMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatrequestmessage()) {
+		const ChatRequestMessage &msg = packet.GetMsg()->chatrequestmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatmessage()) {
+		const ChatMessage &msg = packet.GetMsg()->chatmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateChatRejectMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_chatrejectmessage()) {
+		const ChatRejectMessage &msg = packet.GetMsg()->chatrejectmessage();
+		if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateDialogMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_dialogmessage()) {
+		const DialogMessage &msg = packet.GetMsg()->dialogmessage();
+		if (VALIDATE_STRING_SIZE(msg.notificationtext(), 1, 128)) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateTimeoutWarningMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_timeoutwarningmessage()) {
+		//const TimeoutWarningMessage &msg = packet.GetMsg()->timeoutwarningmessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateResetTimeoutMessage(const NetPacket &/*packet*/)
+{
+	//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
+NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportavatarmessage()) {
+		const ReportAvatarMessage &msg = packet.GetMsg()->reportavatarmessage();
+		if (msg.reportedplayerid() != 0
+				&& msg.reportedavatarhash().size() == 16) {
+
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportAvatarAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportavatarackmessage()) {
+		const ReportAvatarAckMessage &msg = packet.GetMsg()->reportavatarackmessage();
+		if (msg.reportedplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportgamemessage()) {
+		const ReportGameMessage &msg = packet.GetMsg()->reportgamemessage();
+		if (msg.reportedgameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateReportGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_reportgameackmessage()) {
+		const ReportGameAckMessage &msg = packet.GetMsg()->reportgameackmessage();
+		if (msg.reportedgameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateErrorMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_errormessage()) {
+		//const ErrorMessage &msg = packet.GetMsg()->errormessage();
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminRemoveGameMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminremovegamemessage()) {
+		const AdminRemoveGameMessage &msg = packet.GetMsg()->adminremovegamemessage();
+		if (msg.removegameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminRemoveGameAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminremovegameackmessage()) {
+		const AdminRemoveGameAckMessage &msg = packet.GetMsg()->adminremovegameackmessage();
+		if (msg.removegameid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminBanPlayerMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminbanplayermessage()) {
+		const AdminBanPlayerMessage &msg = packet.GetMsg()->adminbanplayermessage();
+		if (msg.banplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateAdminBanPlayerAckMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_adminbanplayerackmessage()) {
+		const AdminBanPlayerAckMessage &msg = packet.GetMsg()->adminbanplayerackmessage();
+		if (msg.banplayerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo)
+{
+	bool retVal = false;
+	if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64)
+			&& VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10)
+			&& (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000))
+			&& (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000))
+			&& (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000))
+			&& VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11)
+			&& VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20)
+			&& VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60)
+			&& VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000)
+			&& VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000)
+			&& VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30)
+			&& ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) {
+
+		retVal = true;
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListSpectatorJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistspectatorjoinedmessage()) {
+		const GameListSpectatorJoinedMessage &msg = packet.GetMsg()->gamelistspectatorjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameListSpectatorLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamelistspectatorleftmessage()) {
+		const GameListSpectatorLeftMessage &msg = packet.GetMsg()->gamelistspectatorleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameSpectatorJoinedMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamespectatorjoinedmessage()) {
+		const GameSpectatorJoinedMessage &msg = packet.GetMsg()->gamespectatorjoinedmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
+bool
+NetPacketValidator::ValidateGameSpectatorLeftMessage(const NetPacket &packet)
+{
+	bool retVal = false;
+	if (packet.GetMsg()->has_gamespectatorleftmessage()) {
+		const GameSpectatorLeftMessage &msg = packet.GetMsg()->gamespectatorleftmessage();
+		if (msg.gameid() != 0 && msg.playerid() != 0) {
+			retVal = true;
+		}
+	}
+	return retVal;
+}
+
diff --git a/src/net/netpacketvalidator.h b/src/net/validation/authmessagevalidator.h
similarity index 94%
rename from src/net/netpacketvalidator.h
rename to src/net/validation/authmessagevalidator.h
index f6afaaaa..3ae047e2 100644
--- a/src/net/netpacketvalidator.h
+++ b/src/net/validation/authmessagevalidator.h
@@ -47,6 +47,11 @@ public:
 
 protected:
 	static bool ValidateAnnounceMessage(const NetPacket &packet);
+	static bool ValidateAuthMessage(const NetPacket &packet);
+	static bool ValidateLobbyMessage(const NetPacket &packet);
+	static bool ValidateGameMessage(const NetPacket &packet);
+	static bool ValidateGameManagementMessage(const NetPacket &packet);
+	static bool ValidateGameEngineMessage(const NetPacket &packet);
 	static bool ValidateInitMessage(const NetPacket &packet);
 	static bool ValidateAuthServerChallengeMessage(const NetPacket &packet);
 	static bool ValidateAuthClientResponseMessage(const NetPacket &packet);
@@ -66,9 +71,9 @@ protected:
 	static bool ValidatePlayerInfoRequestMessage(const NetPacket &packet);
 	static bool ValidatePlayerInfoReplyMessage(const NetPacket &packet);
 	static bool ValidateSubscriptionRequestMessage(const NetPacket &packet);
-	static bool ValidateJoinExistingGameMessage(const NetPacket &packet);
-	static bool ValidateJoinNewGameMessage(const NetPacket &packet);
-	static bool ValidateRejoinExistingGameMessage(const NetPacket &packet);
+	static bool ValidateCreateGameMessage(const NetPacket &packet);
+	static bool ValidateJoinGameMessage(const NetPacket &packet);
+	static bool ValidateRejoinGameMessage(const NetPacket &packet);
 	static bool ValidateJoinGameAckMessage(const NetPacket &packet);
 	static bool ValidateJoinGameFailedMessage(const NetPacket &packet);
 	static bool ValidateGamePlayerJoinedMessage(const NetPacket &packet);
diff --git a/src/net/validation/gameenginemessagevalidator.h b/src/net/validation/gameenginemessagevalidator.h
new file mode 100644
index 00000000..3ae047e2
--- /dev/null
+++ b/src/net/validation/gameenginemessagevalidator.h
@@ -0,0 +1,146 @@
+/*****************************************************************************
+ * PokerTH - The open source texas holdem engine                             *
+ * Copyright (C) 2006-2012 Felix Hammer, Florian Thauer, Lothar May          *
+ *                                                                           *
+ * This program is free software: you can redistribute it and/or modify      *
+ * it under the terms of the GNU Affero General Public License as            *
+ * published by the Free Software Foundation, either version 3 of the        *
+ * License, or (at your option) any later version.                           *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU Affero General Public License for more details.                       *
+ *                                                                           *
+ * You should have received a copy of the GNU Affero General Public License  *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ *                                                                           *
+ * Additional permission under GNU AGPL version 3 section 7                  *
+ *                                                                           *
+ * If you modify this program, or any covered work, by linking or            *
+ * combining it with the OpenSSL project's OpenSSL library (or a             *
+ * modified version of that library), containing parts covered by the        *
+ * terms of the OpenSSL or SSLeay licenses, the authors of PokerTH           *
+ * (Felix Hammer, Florian Thauer, Lothar May) grant you additional           *
+ * permission to convey the resulting work.                                  *
+ * Corresponding Source for a non-source form of such a combination          *
+ * shall include the source code for the parts of OpenSSL used as well       *
+ * as that of the covered work.                                              *
+ *****************************************************************************/
+/* PokerTH network packet validation. */
+
+#ifndef _NETPACKETVALIDATOR_H_
+#define _NETPACKETVALIDATOR_H_
+
+#include <map>
+
+class NetPacket;
+class NetGameInfo;
+
+class NetPacketValidator
+{
+public:
+	NetPacketValidator();
+
+	bool IsValidPacket(const NetPacket &packet) const;
+
+protected:
+	static bool ValidateAnnounceMessage(const NetPacket &packet);
+	static bool ValidateAuthMessage(const NetPacket &packet);
+	static bool ValidateLobbyMessage(const NetPacket &packet);
+	static bool ValidateGameMessage(const NetPacket &packet);
+	static bool ValidateGameManagementMessage(const NetPacket &packet);
+	static bool ValidateGameEngineMessage(const NetPacket &packet);
+	static bool ValidateInitMessage(const NetPacket &packet);
+	static bool ValidateAuthServerChallengeMessage(const NetPacket &packet);
+	static bool ValidateAuthClientResponseMessage(const NetPacket &packet);
+	static bool ValidateAuthServerVerificationMessage(const NetPacket &packet);
+	static bool ValidateInitAckMessage(const NetPacket &packet);
+	static bool ValidateAvatarRequestMessage(const NetPacket &packet);
+	static bool ValidateAvatarHeaderMessage(const NetPacket &packet);
+	static bool ValidateAvatarDataMessage(const NetPacket &packet);
+	static bool ValidateAvatarEndMessage(const NetPacket &packet);
+	static bool ValidateUnknownAvatarMessage(const NetPacket &packet);
+	static bool ValidatePlayerListMessage(const NetPacket &packet);
+	static bool ValidateGameListNewMessage(const NetPacket &packet);
+	static bool ValidateGameListUpdateMessage(const NetPacket &packet);
+	static bool ValidateGameListPlayerJoinedMessage(const NetPacket &packet);
+	static bool ValidateGameListPlayerLeftMessage(const NetPacket &packet);
+	static bool ValidateGameListAdminChangedMessage(const NetPacket &packet);
+	static bool ValidatePlayerInfoRequestMessage(const NetPacket &packet);
+	static bool ValidatePlayerInfoReplyMessage(const NetPacket &packet);
+	static bool ValidateSubscriptionRequestMessage(const NetPacket &packet);
+	static bool ValidateCreateGameMessage(const NetPacket &packet);
+	static bool ValidateJoinGameMessage(const NetPacket &packet);
+	static bool ValidateRejoinGameMessage(const NetPacket &packet);
+	static bool ValidateJoinGameAckMessage(const NetPacket &packet);
+	static bool ValidateJoinGameFailedMessage(const NetPacket &packet);
+	static bool ValidateGamePlayerJoinedMessage(const NetPacket &packet);
+	static bool ValidateGamePlayerLeftMessage(const NetPacket &packet);
+	static bool ValidateGameAdminChangedMessage(const NetPacket &packet);
+	static bool ValidateRemovedFromGameMessage(const NetPacket &packet);
+	static bool ValidateKickPlayerRequestMessage(const NetPacket &packet);
+	static bool ValidateLeaveGameRequestMessage(const NetPacket &packet);
+	static bool ValidateInvitePlayerToGameMessage(const NetPacket &packet);
+	static bool ValidateInviteNotifyMessage(const NetPacket &packet);
+	static bool ValidateRejectGameInvitationMessage(const NetPacket &packet);
+	static bool ValidateRejectInvNotifyMessage(const NetPacket &packet);
+	static bool ValidateStartEventMessage(const NetPacket &packet);
+	static bool ValidateStartEventAckMessage(const NetPacket &packet);
+	static bool ValidateGameStartInitialMessage(const NetPacket &packet);
+	static bool ValidateGameStartRejoinMessage(const NetPacket &packet);
+	static bool ValidateHandStartMessage(const NetPacket &packet);
+	static bool ValidatePlayersTurnMessage(const NetPacket &packet);
+	static bool ValidateMyActionRequestMessage(const NetPacket &packet);
+	static bool ValidateYourActionRejectedMessage(const NetPacket &packet);
+	static bool ValidatePlayersActionDoneMessage(const NetPacket &packet);
+	static bool ValidateDealFlopCardsMessage(const NetPacket &packet);
+	static bool ValidateDealTurnCardMessage(const NetPacket &packet);
+	static bool ValidateDealRiverCardMessage(const NetPacket &packet);
+	static bool ValidateAllInShowCardsMessage(const NetPacket &packet);
+	static bool ValidateEndOfHandShowCardsMessage(const NetPacket &packet);
+	static bool ValidateEndOfHandHideCardsMessage(const NetPacket &packet);
+	static bool ValidateShowMyCardsRequestMessage(const NetPacket &packet);
+	static bool ValidateAfterHandShowCardsMessage(const NetPacket &packet);
+	static bool ValidateEndOfGameMessage(const NetPacket &packet);
+	static bool ValidatePlayerIdChangedMessage(const NetPacket &packet);
+	static bool ValidateAskKickPlayerMessage(const NetPacket &packet);
+	static bool ValidateAskKickDeniedMessage(const NetPacket &packet);
+	static bool ValidateStartKickPetitionMessage(const NetPacket &packet);
+	static bool ValidateVoteKickRequestMessage(const NetPacket &packet);
+	static bool ValidateVoteKickReplyMessage(const NetPacket &packet);
+	static bool ValidateKickPetitionUpdateMessage(const NetPacket &packet);
+	static bool ValidateEndKickPetitionMessage(const NetPacket &packet);
+	static bool ValidateStatisticsMessage(const NetPacket &packet);
+	static bool ValidateChatRequestMessage(const NetPacket &packet);
+	static bool ValidateChatMessage(const NetPacket &packet);
+	static bool ValidateChatRejectMessage(const NetPacket &packet);
+	static bool ValidateDialogMessage(const NetPacket &packet);
+	static bool ValidateTimeoutWarningMessage(const NetPacket &packet);
+	static bool ValidateResetTimeoutMessage(const NetPacket &packet);
+	static bool ValidateReportAvatarMessage(const NetPacket &packet);
+	static bool ValidateReportAvatarAckMessage(const NetPacket &packet);
+	static bool ValidateReportGameMessage(const NetPacket &packet);
+	static bool ValidateReportGameAckMessage(const NetPacket &packet);
+	static bool ValidateErrorMessage(const NetPacket &packet);
+	static bool ValidateAdminRemoveGameMessage(const NetPacket &packet);
+	static bool ValidateAdminRemoveGameAckMessage(const NetPacket &packet);
+	static bool ValidateAdminBanPlayerMessage(const NetPacket &packet);
+	static bool ValidateAdminBanPlayerAckMessage(const NetPacket &packet);
+	static bool ValidateGameListSpectatorJoinedMessage(const NetPacket &packet);
+	static bool ValidateGameListSpectatorLeftMessage(const NetPacket &packet);
+	static bool ValidateGameSpectatorJoinedMessage(const NetPacket &packet);
+	static bool ValidateGameSpectatorLeftMessage(const NetPacket &packet);
+
+	static bool ValidateGameInfo(const NetGameInfo &gameInfo);
+
+	typedef bool (*ValidateFunctor)(const NetPacket &);
+	typedef std::map<int, ValidateFunctor> ValidateFunctorMap;
+private:
+
+	ValidateFunctorMap m_validationMap;
+};
+
+#endif
+
diff --git a/src/net/validation/gamemanagementmessagevalidator.h b/src/net/validation/gamemanagementmessagevalidator.h
new file mode 100644
index 00000000..3ae047e2
--- /dev/null
+++ b/src/net/validation/gamemanagementmessagevalidator.h
@@ -0,0 +1,146 @@
+/*****************************************************************************
+ * PokerTH - The open source texas holdem engine                             *
+ * Copyright (C) 2006-2012 Felix Hammer, Florian Thauer, Lothar May          *
+ *                                                                           *
+ * This program is free software: you can redistribute it and/or modify      *
+ * it under the terms of the GNU Affero General Public License as            *
+ * published by the Free Software Foundation, either version 3 of the        *
+ * License, or (at your option) any later version.                           *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU Affero General Public License for more details.                       *
+ *                                                                           *
+ * You should have received a copy of the GNU Affero General Public License  *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ *                                                                           *
+ * Additional permission under GNU AGPL version 3 section 7                  *
+ *                                                                           *
+ * If you modify this program, or any covered work, by linking or            *
+ * combining it with the OpenSSL project's OpenSSL library (or a             *
+ * modified version of that library), containing parts covered by the        *
+ * terms of the OpenSSL or SSLeay licenses, the authors of PokerTH           *
+ * (Felix Hammer, Florian Thauer, Lothar May) grant you additional           *
+ * permission to convey the resulting work.                                  *
+ * Corresponding Source for a non-source form of such a combination          *
+ * shall include the source code for the parts of OpenSSL used as well       *
+ * as that of the covered work.                                              *
+ *****************************************************************************/
+/* PokerTH network packet validation. */
+
+#ifndef _NETPACKETVALIDATOR_H_
+#define _NETPACKETVALIDATOR_H_
+
+#include <map>
+
+class NetPacket;
+class NetGameInfo;
+
+class NetPacketValidator
+{
+public:
+	NetPacketValidator();
+
+	bool IsValidPacket(const NetPacket &packet) const;
+
+protected:
+	static bool ValidateAnnounceMessage(const NetPacket &packet);
+	static bool ValidateAuthMessage(const NetPacket &packet);
+	static bool ValidateLobbyMessage(const NetPacket &packet);
+	static bool ValidateGameMessage(const NetPacket &packet);
+	static bool ValidateGameManagementMessage(const NetPacket &packet);
+	static bool ValidateGameEngineMessage(const NetPacket &packet);
+	static bool ValidateInitMessage(const NetPacket &packet);
+	static bool ValidateAuthServerChallengeMessage(const NetPacket &packet);
+	static bool ValidateAuthClientResponseMessage(const NetPacket &packet);
+	static bool ValidateAuthServerVerificationMessage(const NetPacket &packet);
+	static bool ValidateInitAckMessage(const NetPacket &packet);
+	static bool ValidateAvatarRequestMessage(const NetPacket &packet);
+	static bool ValidateAvatarHeaderMessage(const NetPacket &packet);
+	static bool ValidateAvatarDataMessage(const NetPacket &packet);
+	static bool ValidateAvatarEndMessage(const NetPacket &packet);
+	static bool ValidateUnknownAvatarMessage(const NetPacket &packet);
+	static bool ValidatePlayerListMessage(const NetPacket &packet);
+	static bool ValidateGameListNewMessage(const NetPacket &packet);
+	static bool ValidateGameListUpdateMessage(const NetPacket &packet);
+	static bool ValidateGameListPlayerJoinedMessage(const NetPacket &packet);
+	static bool ValidateGameListPlayerLeftMessage(const NetPacket &packet);
+	static bool ValidateGameListAdminChangedMessage(const NetPacket &packet);
+	static bool ValidatePlayerInfoRequestMessage(const NetPacket &packet);
+	static bool ValidatePlayerInfoReplyMessage(const NetPacket &packet);
+	static bool ValidateSubscriptionRequestMessage(const NetPacket &packet);
+	static bool ValidateCreateGameMessage(const NetPacket &packet);
+	static bool ValidateJoinGameMessage(const NetPacket &packet);
+	static bool ValidateRejoinGameMessage(const NetPacket &packet);
+	static bool ValidateJoinGameAckMessage(const NetPacket &packet);
+	static bool ValidateJoinGameFailedMessage(const NetPacket &packet);
+	static bool ValidateGamePlayerJoinedMessage(const NetPacket &packet);
+	static bool ValidateGamePlayerLeftMessage(const NetPacket &packet);
+	static bool ValidateGameAdminChangedMessage(const NetPacket &packet);
+	static bool ValidateRemovedFromGameMessage(const NetPacket &packet);
+	static bool ValidateKickPlayerRequestMessage(const NetPacket &packet);
+	static bool ValidateLeaveGameRequestMessage(const NetPacket &packet);
+	static bool ValidateInvitePlayerToGameMessage(const NetPacket &packet);
+	static bool ValidateInviteNotifyMessage(const NetPacket &packet);
+	static bool ValidateRejectGameInvitationMessage(const NetPacket &packet);
+	static bool ValidateRejectInvNotifyMessage(const NetPacket &packet);
+	static bool ValidateStartEventMessage(const NetPacket &packet);
+	static bool ValidateStartEventAckMessage(const NetPacket &packet);
+	static bool ValidateGameStartInitialMessage(const NetPacket &packet);
+	static bool ValidateGameStartRejoinMessage(const NetPacket &packet);
+	static bool ValidateHandStartMessage(const NetPacket &packet);
+	static bool ValidatePlayersTurnMessage(const NetPacket &packet);
+	static bool ValidateMyActionRequestMessage(const NetPacket &packet);
+	static bool ValidateYourActionRejectedMessage(const NetPacket &packet);
+	static bool ValidatePlayersActionDoneMessage(const NetPacket &packet);
+	static bool ValidateDealFlopCardsMessage(const NetPacket &packet);
+	static bool ValidateDealTurnCardMessage(const NetPacket &packet);
+	static bool ValidateDealRiverCardMessage(const NetPacket &packet);
+	static bool ValidateAllInShowCardsMessage(const NetPacket &packet);
+	static bool ValidateEndOfHandShowCardsMessage(const NetPacket &packet);
+	static bool ValidateEndOfHandHideCardsMessage(const NetPacket &packet);
+	static bool ValidateShowMyCardsRequestMessage(const NetPacket &packet);
+	static bool ValidateAfterHandShowCardsMessage(const NetPacket &packet);
+	static bool ValidateEndOfGameMessage(const NetPacket &packet);
+	static bool ValidatePlayerIdChangedMessage(const NetPacket &packet);
+	static bool ValidateAskKickPlayerMessage(const NetPacket &packet);
+	static bool ValidateAskKickDeniedMessage(const NetPacket &packet);
+	static bool ValidateStartKickPetitionMessage(const NetPacket &packet);
+	static bool ValidateVoteKickRequestMessage(const NetPacket &packet);
+	static bool ValidateVoteKickReplyMessage(const NetPacket &packet);
+	static bool ValidateKickPetitionUpdateMessage(const NetPacket &packet);
+	static bool ValidateEndKickPetitionMessage(const NetPacket &packet);
+	static bool ValidateStatisticsMessage(const NetPacket &packet);
+	static bool ValidateChatRequestMessage(const NetPacket &packet);
+	static bool ValidateChatMessage(const NetPacket &packet);
+	static bool ValidateChatRejectMessage(const NetPacket &packet);
+	static bool ValidateDialogMessage(const NetPacket &packet);
+	static bool ValidateTimeoutWarningMessage(const NetPacket &packet);
+	static bool ValidateResetTimeoutMessage(const NetPacket &packet);
+	static bool ValidateReportAvatarMessage(const NetPacket &packet);
+	static bool ValidateReportAvatarAckMessage(const NetPacket &packet);
+	static bool ValidateReportGameMessage(const NetPacket &packet);
+	static bool ValidateReportGameAckMessage(const NetPacket &packet);
+	static bool ValidateErrorMessage(const NetPacket &packet);
+	static bool ValidateAdminRemoveGameMessage(const NetPacket &packet);
+	static bool ValidateAdminRemoveGameAckMessage(const NetPacket &packet);
+	static bool ValidateAdminBanPlayerMessage(const NetPacket &packet);
+	static bool ValidateAdminBanPlayerAckMessage(const NetPacket &packet);
+	static bool ValidateGameListSpectatorJoinedMessage(const NetPacket &packet);
+	static bool ValidateGameListSpectatorLeftMessage(const NetPacket &packet);
+	static bool ValidateGameSpectatorJoinedMessage(const NetPacket &packet);
+	static bool ValidateGameSpectatorLeftMessage(const NetPacket &packet);
+
+	static bool ValidateGameInfo(const NetGameInfo &gameInfo);
+
+	typedef bool (*ValidateFunctor)(const NetPacket &);
+	typedef std::map<int, ValidateFunctor> ValidateFunctorMap;
+private:
+
+	ValidateFunctorMap m_validationMap;
+};
+
+#endif
+
diff --git a/src/net/validation/gamemessagevalidator.h b/src/net/validation/gamemessagevalidator.h
new file mode 100644
index 00000000..3ae047e2
--- /dev/null
+++ b/src/net/validation/gamemessagevalidator.h
@@ -0,0 +1,146 @@
+/*****************************************************************************
+ * PokerTH - The open source texas holdem engine                             *
+ * Copyright (C) 2006-2012 Felix Hammer, Florian Thauer, Lothar May          *
+ *                                                                           *
+ * This program is free software: you can redistribute it and/or modify      *
+ * it under the terms of the GNU Affero General Public License as            *
+ * published by the Free Software Foundation, either version 3 of the        *
+ * License, or (at your option) any later version.                           *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU Affero General Public License for more details.                       *
+ *                                                                           *
+ * You should have received a copy of the GNU Affero General Public License  *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ *                                                                           *
+ * Additional permission under GNU AGPL version 3 section 7                  *
+ *                                                                           *
+ * If you modify this program, or any covered work, by linking or            *
+ * combining it with the OpenSSL project's OpenSSL library (or a             *
+ * modified version of that library), containing parts covered by the        *
+ * terms of the OpenSSL or SSLeay licenses, the authors of PokerTH           *
+ * (Felix Hammer, Florian Thauer, Lothar May) grant you additional           *
+ * permission to convey the resulting work.                                  *
+ * Corresponding Source for a non-source form of such a combination          *
+ * shall include the source code for the parts of OpenSSL used as well       *
+ * as that of the covered work.                                              *
+ *****************************************************************************/
+/* PokerTH network packet validation. */
+
+#ifndef _NETPACKETVALIDATOR_H_
+#define _NETPACKETVALIDATOR_H_
+
+#include <map>
+
+class NetPacket;
+class NetGameInfo;
+
+class NetPacketValidator
+{
+public:
+	NetPacketValidator();
+
+	bool IsValidPacket(const NetPacket &packet) const;
+
+protected:
+	static bool ValidateAnnounceMessage(const NetPacket &packet);
+	static bool ValidateAuthMessage(const NetPacket &packet);
+	static bool ValidateLobbyMessage(const NetPacket &packet);
+	static bool ValidateGameMessage(const NetPacket &packet);
+	static bool ValidateGameManagementMessage(const NetPacket &packet);
+	static bool ValidateGameEngineMessage(const NetPacket &packet);
+	static bool ValidateInitMessage(const NetPacket &packet);
+	static bool ValidateAuthServerChallengeMessage(const NetPacket &packet);
+	static bool ValidateAuthClientResponseMessage(const NetPacket &packet);
+	static bool ValidateAuthServerVerificationMessage(const NetPacket &packet);
+	static bool ValidateInitAckMessage(const NetPacket &packet);
+	static bool ValidateAvatarRequestMessage(const NetPacket &packet);
+	static bool ValidateAvatarHeaderMessage(const NetPacket &packet);
+	static bool ValidateAvatarDataMessage(const NetPacket &packet);
+	static bool ValidateAvatarEndMessage(const NetPacket &packet);
+	static bool ValidateUnknownAvatarMessage(const NetPacket &packet);
+	static bool ValidatePlayerListMessage(const NetPacket &packet);
+	static bool ValidateGameListNewMessage(const NetPacket &packet);
+	static bool ValidateGameListUpdateMessage(const NetPacket &packet);
+	static bool ValidateGameListPlayerJoinedMessage(const NetPacket &packet);
+	static bool ValidateGameListPlayerLeftMessage(const NetPacket &packet);
+	static bool ValidateGameListAdminChangedMessage(const NetPacket &packet);
+	static bool ValidatePlayerInfoRequestMessage(const NetPacket &packet);
+	static bool ValidatePlayerInfoReplyMessage(const NetPacket &packet);
+	static bool ValidateSubscriptionRequestMessage(const NetPacket &packet);
+	static bool ValidateCreateGameMessage(const NetPacket &packet);
+	static bool ValidateJoinGameMessage(const NetPacket &packet);
+	static bool ValidateRejoinGameMessage(const NetPacket &packet);
+	static bool ValidateJoinGameAckMessage(const NetPacket &packet);
+	static bool ValidateJoinGameFailedMessage(const NetPacket &packet);
+	static bool ValidateGamePlayerJoinedMessage(const NetPacket &packet);
+	static bool ValidateGamePlayerLeftMessage(const NetPacket &packet);
+	static bool ValidateGameAdminChangedMessage(const NetPacket &packet);
+	static bool ValidateRemovedFromGameMessage(const NetPacket &packet);
+	static bool ValidateKickPlayerRequestMessage(const NetPacket &packet);
+	static bool ValidateLeaveGameRequestMessage(const NetPacket &packet);
+	static bool ValidateInvitePlayerToGameMessage(const NetPacket &packet);
+	static bool ValidateInviteNotifyMessage(const NetPacket &packet);
+	static bool ValidateRejectGameInvitationMessage(const NetPacket &packet);
+	static bool ValidateRejectInvNotifyMessage(const NetPacket &packet);
+	static bool ValidateStartEventMessage(const NetPacket &packet);
+	static bool ValidateStartEventAckMessage(const NetPacket &packet);
+	static bool ValidateGameStartInitialMessage(const NetPacket &packet);
+	static bool ValidateGameStartRejoinMessage(const NetPacket &packet);
+	static bool ValidateHandStartMessage(const NetPacket &packet);
+	static bool ValidatePlayersTurnMessage(const NetPacket &packet);
+	static bool ValidateMyActionRequestMessage(const NetPacket &packet);
+	static bool ValidateYourActionRejectedMessage(const NetPacket &packet);
+	static bool ValidatePlayersActionDoneMessage(const NetPacket &packet);
+	static bool ValidateDealFlopCardsMessage(const NetPacket &packet);
+	static bool ValidateDealTurnCardMessage(const NetPacket &packet);
+	static bool ValidateDealRiverCardMessage(const NetPacket &packet);
+	static bool ValidateAllInShowCardsMessage(const NetPacket &packet);
+	static bool ValidateEndOfHandShowCardsMessage(const NetPacket &packet);
+	static bool ValidateEndOfHandHideCardsMessage(const NetPacket &packet);
+	static bool ValidateShowMyCardsRequestMessage(const NetPacket &packet);
+	static bool ValidateAfterHandShowCardsMessage(const NetPacket &packet);
+	static bool ValidateEndOfGameMessage(const NetPacket &packet);
+	static bool ValidatePlayerIdChangedMessage(const NetPacket &packet);
+	static bool ValidateAskKickPlayerMessage(const NetPacket &packet);
+	static bool ValidateAskKickDeniedMessage(const NetPacket &packet);
+	static bool ValidateStartKickPetitionMessage(const NetPacket &packet);
+	static bool ValidateVoteKickRequestMessage(const NetPacket &packet);
+	static bool ValidateVoteKickReplyMessage(const NetPacket &packet);
+	static bool ValidateKickPetitionUpdateMessage(const NetPacket &packet);
+	static bool ValidateEndKickPetitionMessage(const NetPacket &packet);
+	static bool ValidateStatisticsMessage(const NetPacket &packet);
+	static bool ValidateChatRequestMessage(const NetPacket &packet);
+	static bool ValidateChatMessage(const NetPacket &packet);
+	static bool ValidateChatRejectMessage(const NetPacket &packet);
+	static bool ValidateDialogMessage(const NetPacket &packet);
+	static bool ValidateTimeoutWarningMessage(const NetPacket &packet);
+	static bool ValidateResetTimeoutMessage(const NetPacket &packet);
+	static bool ValidateReportAvatarMessage(const NetPacket &packet);
+	static bool ValidateReportAvatarAckMessage(const NetPacket &packet);
+	static bool ValidateReportGameMessage(const NetPacket &packet);
+	static bool ValidateReportGameAckMessage(const NetPacket &packet);
+	static bool ValidateErrorMessage(const NetPacket &packet);
+	static bool ValidateAdminRemoveGameMessage(const NetPacket &packet);
+	static bool ValidateAdminRemoveGameAckMessage(const NetPacket &packet);
+	static bool ValidateAdminBanPlayerMessage(const NetPacket &packet);
+	static bool ValidateAdminBanPlayerAckMessage(const NetPacket &packet);
+	static bool ValidateGameListSpectatorJoinedMessage(const NetPacket &packet);
+	static bool ValidateGameListSpectatorLeftMessage(const NetPacket &packet);
+	static bool ValidateGameSpectatorJoinedMessage(const NetPacket &packet);
+	static bool ValidateGameSpectatorLeftMessage(const NetPacket &packet);
+
+	static bool ValidateGameInfo(const NetGameInfo &gameInfo);
+
+	typedef bool (*ValidateFunctor)(const NetPacket &);
+	typedef std::map<int, ValidateFunctor> ValidateFunctorMap;
+private:
+
+	ValidateFunctorMap m_validationMap;
+};
+
+#endif
+
diff --git a/src/net/validation/lobbymessagevalidator.h b/src/net/validation/lobbymessagevalidator.h
new file mode 100644
index 00000000..3ae047e2
--- /dev/null
+++ b/src/net/validation/lobbymessagevalidator.h
@@ -0,0 +1,146 @@
+/*****************************************************************************
+ * PokerTH - The open source texas holdem engine                             *
+ * Copyright (C) 2006-2012 Felix Hammer, Florian Thauer, Lothar May          *
+ *                                                                           *
+ * This program is free software: you can redistribute it and/or modify      *
+ * it under the terms of the GNU Affero General Public License as            *
+ * published by the Free Software Foundation, either version 3 of the        *
+ * License, or (at your option) any later version.                           *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU Affero General Public License for more details.                       *
+ *                                                                           *
+ * You should have received a copy of the GNU Affero General Public License  *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ *                                                                           *
+ * Additional permission under GNU AGPL version 3 section 7                  *
+ *                                                                           *
+ * If you modify this program, or any covered work, by linking or            *
+ * combining it with the OpenSSL project's OpenSSL library (or a             *
+ * modified version of that library), containing parts covered by the        *
+ * terms of the OpenSSL or SSLeay licenses, the authors of PokerTH           *
+ * (Felix Hammer, Florian Thauer, Lothar May) grant you additional           *
+ * permission to convey the resulting work.                                  *
+ * Corresponding Source for a non-source form of such a combination          *
+ * shall include the source code for the parts of OpenSSL used as well       *
+ * as that of the covered work.                                              *
+ *****************************************************************************/
+/* PokerTH network packet validation. */
+
+#ifndef _NETPACKETVALIDATOR_H_
+#define _NETPACKETVALIDATOR_H_
+
+#include <map>
+
+class NetPacket;
+class NetGameInfo;
+
+class NetPacketValidator
+{
+public:
+	NetPacketValidator();
+
+	bool IsValidPacket(const NetPacket &packet) const;
+
+protected:
+	static bool ValidateAnnounceMessage(const NetPacket &packet);
+	static bool ValidateAuthMessage(const NetPacket &packet);
+	static bool ValidateLobbyMessage(const NetPacket &packet);
+	static bool ValidateGameMessage(const NetPacket &packet);
+	static bool ValidateGameManagementMessage(const NetPacket &packet);
+	static bool ValidateGameEngineMessage(const NetPacket &packet);
+	static bool ValidateInitMessage(const NetPacket &packet);
+	static bool ValidateAuthServerChallengeMessage(const NetPacket &packet);
+	static bool ValidateAuthClientResponseMessage(const NetPacket &packet);
+	static bool ValidateAuthServerVerificationMessage(const NetPacket &packet);
+	static bool ValidateInitAckMessage(const NetPacket &packet);
+	static bool ValidateAvatarRequestMessage(const NetPacket &packet);
+	static bool ValidateAvatarHeaderMessage(const NetPacket &packet);
+	static bool ValidateAvatarDataMessage(const NetPacket &packet);
+	static bool ValidateAvatarEndMessage(const NetPacket &packet);
+	static bool ValidateUnknownAvatarMessage(const NetPacket &packet);
+	static bool ValidatePlayerListMessage(const NetPacket &packet);
+	static bool ValidateGameListNewMessage(const NetPacket &packet);
+	static bool ValidateGameListUpdateMessage(const NetPacket &packet);
+	static bool ValidateGameListPlayerJoinedMessage(const NetPacket &packet);
+	static bool ValidateGameListPlayerLeftMessage(const NetPacket &packet);
+	static bool ValidateGameListAdminChangedMessage(const NetPacket &packet);
+	static bool ValidatePlayerInfoRequestMessage(const NetPacket &packet);
+	static bool ValidatePlayerInfoReplyMessage(const NetPacket &packet);
+	static bool ValidateSubscriptionRequestMessage(const NetPacket &packet);
+	static bool ValidateCreateGameMessage(const NetPacket &packet);
+	static bool ValidateJoinGameMessage(const NetPacket &packet);
+	static bool ValidateRejoinGameMessage(const NetPacket &packet);
+	static bool ValidateJoinGameAckMessage(const NetPacket &packet);
+	static bool ValidateJoinGameFailedMessage(const NetPacket &packet);
+	static bool ValidateGamePlayerJoinedMessage(const NetPacket &packet);
+	static bool ValidateGamePlayerLeftMessage(const NetPacket &packet);
+	static bool ValidateGameAdminChangedMessage(const NetPacket &packet);
+	static bool ValidateRemovedFromGameMessage(const NetPacket &packet);
+	static bool ValidateKickPlayerRequestMessage(const NetPacket &packet);
+	static bool ValidateLeaveGameRequestMessage(const NetPacket &packet);
+	static bool ValidateInvitePlayerToGameMessage(const NetPacket &packet);
+	static bool ValidateInviteNotifyMessage(const NetPacket &packet);
+	static bool ValidateRejectGameInvitationMessage(const NetPacket &packet);
+	static bool ValidateRejectInvNotifyMessage(const NetPacket &packet);
+	static bool ValidateStartEventMessage(const NetPacket &packet);
+	static bool ValidateStartEventAckMessage(const NetPacket &packet);
+	static bool ValidateGameStartInitialMessage(const NetPacket &packet);
+	static bool ValidateGameStartRejoinMessage(const NetPacket &packet);
+	static bool ValidateHandStartMessage(const NetPacket &packet);
+	static bool ValidatePlayersTurnMessage(const NetPacket &packet);
+	static bool ValidateMyActionRequestMessage(const NetPacket &packet);
+	static bool ValidateYourActionRejectedMessage(const NetPacket &packet);
+	static bool ValidatePlayersActionDoneMessage(const NetPacket &packet);
+	static bool ValidateDealFlopCardsMessage(const NetPacket &packet);
+	static bool ValidateDealTurnCardMessage(const NetPacket &packet);
+	static bool ValidateDealRiverCardMessage(const NetPacket &packet);
+	static bool ValidateAllInShowCardsMessage(const NetPacket &packet);
+	static bool ValidateEndOfHandShowCardsMessage(const NetPacket &packet);
+	static bool ValidateEndOfHandHideCardsMessage(const NetPacket &packet);
+	static bool ValidateShowMyCardsRequestMessage(const NetPacket &packet);
+	static bool ValidateAfterHandShowCardsMessage(const NetPacket &packet);
+	static bool ValidateEndOfGameMessage(const NetPacket &packet);
+	static bool ValidatePlayerIdChangedMessage(const NetPacket &packet);
+	static bool ValidateAskKickPlayerMessage(const NetPacket &packet);
+	static bool ValidateAskKickDeniedMessage(const NetPacket &packet);
+	static bool ValidateStartKickPetitionMessage(const NetPacket &packet);
+	static bool ValidateVoteKickRequestMessage(const NetPacket &packet);
+	static bool ValidateVoteKickReplyMessage(const NetPacket &packet);
+	static bool ValidateKickPetitionUpdateMessage(const NetPacket &packet);
+	static bool ValidateEndKickPetitionMessage(const NetPacket &packet);
+	static bool ValidateStatisticsMessage(const NetPacket &packet);
+	static bool ValidateChatRequestMessage(const NetPacket &packet);
+	static bool ValidateChatMessage(const NetPacket &packet);
+	static bool ValidateChatRejectMessage(const NetPacket &packet);
+	static bool ValidateDialogMessage(const NetPacket &packet);
+	static bool ValidateTimeoutWarningMessage(const NetPacket &packet);
+	static bool ValidateResetTimeoutMessage(const NetPacket &packet);
+	static bool ValidateReportAvatarMessage(const NetPacket &packet);
+	static bool ValidateReportAvatarAckMessage(const NetPacket &packet);
+	static bool ValidateReportGameMessage(const NetPacket &packet);
+	static bool ValidateReportGameAckMessage(const NetPacket &packet);
+	static bool ValidateErrorMessage(const NetPacket &packet);
+	static bool ValidateAdminRemoveGameMessage(const NetPacket &packet);
+	static bool ValidateAdminRemoveGameAckMessage(const NetPacket &packet);
+	static bool ValidateAdminBanPlayerMessage(const NetPacket &packet);
+	static bool ValidateAdminBanPlayerAckMessage(const NetPacket &packet);
+	static bool ValidateGameListSpectatorJoinedMessage(const NetPacket &packet);
+	static bool ValidateGameListSpectatorLeftMessage(const NetPacket &packet);
+	static bool ValidateGameSpectatorJoinedMessage(const NetPacket &packet);
+	static bool ValidateGameSpectatorLeftMessage(const NetPacket &packet);
+
+	static bool ValidateGameInfo(const NetGameInfo &gameInfo);
+
+	typedef bool (*ValidateFunctor)(const NetPacket &);
+	typedef std::map<int, ValidateFunctor> ValidateFunctorMap;
+private:
+
+	ValidateFunctorMap m_validationMap;
+};
+
+#endif
+
diff --git a/src/net/validation/pokerthmessagevalidator.h b/src/net/validation/pokerthmessagevalidator.h
new file mode 100644
index 00000000..3ae047e2
--- /dev/null
+++ b/src/net/validation/pokerthmessagevalidator.h
@@ -0,0 +1,146 @@
+/*****************************************************************************
+ * PokerTH - The open source texas holdem engine                             *
+ * Copyright (C) 2006-2012 Felix Hammer, Florian Thauer, Lothar May          *
+ *                                                                           *
+ * This program is free software: you can redistribute it and/or modify      *
+ * it under the terms of the GNU Affero General Public License as            *
+ * published by the Free Software Foundation, either version 3 of the        *
+ * License, or (at your option) any later version.                           *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU Affero General Public License for more details.                       *
+ *                                                                           *
+ * You should have received a copy of the GNU Affero General Public License  *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ *                                                                           *
+ * Additional permission under GNU AGPL version 3 section 7                  *
+ *                                                                           *
+ * If you modify this program, or any covered work, by linking or            *
+ * combining it with the OpenSSL project's OpenSSL library (or a             *
+ * modified version of that library), containing parts covered by the        *
+ * terms of the OpenSSL or SSLeay licenses, the authors of PokerTH           *
+ * (Felix Hammer, Florian Thauer, Lothar May) grant you additional           *
+ * permission to convey the resulting work.                                  *
+ * Corresponding Source for a non-source form of such a combination          *
+ * shall include the source code for the parts of OpenSSL used as well       *
+ * as that of the covered work.                                              *
+ *****************************************************************************/
+/* PokerTH network packet validation. */
+
+#ifndef _NETPACKETVALIDATOR_H_
+#define _NETPACKETVALIDATOR_H_
+
+#include <map>
+
+class NetPacket;
+class NetGameInfo;
+
+class NetPacketValidator
+{
+public:
+	NetPacketValidator();
+
+	bool IsValidPacket(const NetPacket &packet) const;
+
+protected:
+	static bool ValidateAnnounceMessage(const NetPacket &packet);
+	static bool ValidateAuthMessage(const NetPacket &packet);
+	static bool ValidateLobbyMessage(const NetPacket &packet);
+	static bool ValidateGameMessage(const NetPacket &packet);
+	static bool ValidateGameManagementMessage(const NetPacket &packet);
+	static bool ValidateGameEngineMessage(const NetPacket &packet);
+	static bool ValidateInitMessage(const NetPacket &packet);
+	static bool ValidateAuthServerChallengeMessage(const NetPacket &packet);
+	static bool ValidateAuthClientResponseMessage(const NetPacket &packet);
+	static bool ValidateAuthServerVerificationMessage(const NetPacket &packet);
+	static bool ValidateInitAckMessage(const NetPacket &packet);
+	static bool ValidateAvatarRequestMessage(const NetPacket &packet);
+	static bool ValidateAvatarHeaderMessage(const NetPacket &packet);
+	static bool ValidateAvatarDataMessage(const NetPacket &packet);
+	static bool ValidateAvatarEndMessage(const NetPacket &packet);
+	static bool ValidateUnknownAvatarMessage(const NetPacket &packet);
+	static bool ValidatePlayerListMessage(const NetPacket &packet);
+	static bool ValidateGameListNewMessage(const NetPacket &packet);
+	static bool ValidateGameListUpdateMessage(const NetPacket &packet);
+	static bool ValidateGameListPlayerJoinedMessage(const NetPacket &packet);
+	static bool ValidateGameListPlayerLeftMessage(const NetPacket &packet);
+	static bool ValidateGameListAdminChangedMessage(const NetPacket &packet);
+	static bool ValidatePlayerInfoRequestMessage(const NetPacket &packet);
+	static bool ValidatePlayerInfoReplyMessage(const NetPacket &packet);
+	static bool ValidateSubscriptionRequestMessage(const NetPacket &packet);
+	static bool ValidateCreateGameMessage(const NetPacket &packet);
+	static bool ValidateJoinGameMessage(const NetPacket &packet);
+	static bool ValidateRejoinGameMessage(const NetPacket &packet);
+	static bool ValidateJoinGameAckMessage(const NetPacket &packet);
+	static bool ValidateJoinGameFailedMessage(const NetPacket &packet);
+	static bool ValidateGamePlayerJoinedMessage(const NetPacket &packet);
+	static bool ValidateGamePlayerLeftMessage(const NetPacket &packet);
+	static bool ValidateGameAdminChangedMessage(const NetPacket &packet);
+	static bool ValidateRemovedFromGameMessage(const NetPacket &packet);
+	static bool ValidateKickPlayerRequestMessage(const NetPacket &packet);
+	static bool ValidateLeaveGameRequestMessage(const NetPacket &packet);
+	static bool ValidateInvitePlayerToGameMessage(const NetPacket &packet);
+	static bool ValidateInviteNotifyMessage(const NetPacket &packet);
+	static bool ValidateRejectGameInvitationMessage(const NetPacket &packet);
+	static bool ValidateRejectInvNotifyMessage(const NetPacket &packet);
+	static bool ValidateStartEventMessage(const NetPacket &packet);
+	static bool ValidateStartEventAckMessage(const NetPacket &packet);
+	static bool ValidateGameStartInitialMessage(const NetPacket &packet);
+	static bool ValidateGameStartRejoinMessage(const NetPacket &packet);
+	static bool ValidateHandStartMessage(const NetPacket &packet);
+	static bool ValidatePlayersTurnMessage(const NetPacket &packet);
+	static bool ValidateMyActionRequestMessage(const NetPacket &packet);
+	static bool ValidateYourActionRejectedMessage(const NetPacket &packet);
+	static bool ValidatePlayersActionDoneMessage(const NetPacket &packet);
+	static bool ValidateDealFlopCardsMessage(const NetPacket &packet);
+	static bool ValidateDealTurnCardMessage(const NetPacket &packet);
+	static bool ValidateDealRiverCardMessage(const NetPacket &packet);
+	static bool ValidateAllInShowCardsMessage(const NetPacket &packet);
+	static bool ValidateEndOfHandShowCardsMessage(const NetPacket &packet);
+	static bool ValidateEndOfHandHideCardsMessage(const NetPacket &packet);
+	static bool ValidateShowMyCardsRequestMessage(const NetPacket &packet);
+	static bool ValidateAfterHandShowCardsMessage(const NetPacket &packet);
+	static bool ValidateEndOfGameMessage(const NetPacket &packet);
+	static bool ValidatePlayerIdChangedMessage(const NetPacket &packet);
+	static bool ValidateAskKickPlayerMessage(const NetPacket &packet);
+	static bool ValidateAskKickDeniedMessage(const NetPacket &packet);
+	static bool ValidateStartKickPetitionMessage(const NetPacket &packet);
+	static bool ValidateVoteKickRequestMessage(const NetPacket &packet);
+	static bool ValidateVoteKickReplyMessage(const NetPacket &packet);
+	static bool ValidateKickPetitionUpdateMessage(const NetPacket &packet);
+	static bool ValidateEndKickPetitionMessage(const NetPacket &packet);
+	static bool ValidateStatisticsMessage(const NetPacket &packet);
+	static bool ValidateChatRequestMessage(const NetPacket &packet);
+	static bool ValidateChatMessage(const NetPacket &packet);
+	static bool ValidateChatRejectMessage(const NetPacket &packet);
+	static bool ValidateDialogMessage(const NetPacket &packet);
+	static bool ValidateTimeoutWarningMessage(const NetPacket &packet);
+	static bool ValidateResetTimeoutMessage(const NetPacket &packet);
+	static bool ValidateReportAvatarMessage(const NetPacket &packet);
+	static bool ValidateReportAvatarAckMessage(const NetPacket &packet);
+	static bool ValidateReportGameMessage(const NetPacket &packet);
+	static bool ValidateReportGameAckMessage(const NetPacket &packet);
+	static bool ValidateErrorMessage(const NetPacket &packet);
+	static bool ValidateAdminRemoveGameMessage(const NetPacket &packet);
+	static bool ValidateAdminRemoveGameAckMessage(const NetPacket &packet);
+	static bool ValidateAdminBanPlayerMessage(const NetPacket &packet);
+	static bool ValidateAdminBanPlayerAckMessage(const NetPacket &packet);
+	static bool ValidateGameListSpectatorJoinedMessage(const NetPacket &packet);
+	static bool ValidateGameListSpectatorLeftMessage(const NetPacket &packet);
+	static bool ValidateGameSpectatorJoinedMessage(const NetPacket &packet);
+	static bool ValidateGameSpectatorLeftMessage(const NetPacket &packet);
+
+	static bool ValidateGameInfo(const NetGameInfo &gameInfo);
+
+	typedef bool (*ValidateFunctor)(const NetPacket &);
+	typedef std::map<int, ValidateFunctor> ValidateFunctorMap;
+private:
+
+	ValidateFunctorMap m_validationMap;
+};
+
+#endif
+
diff --git a/src/net/validation/validationhelper.h b/src/net/validation/validationhelper.h
new file mode 100644
index 00000000..5df20252
--- /dev/null
+++ b/src/net/validation/validationhelper.h
@@ -0,0 +1,67 @@
+/*****************************************************************************
+ * PokerTH - The open source texas holdem engine                             *
+ * Copyright (C) 2006-2012 Felix Hammer, Florian Thauer, Lothar May          *
+ *                                                                           *
+ * This program is free software: you can redistribute it and/or modify      *
+ * it under the terms of the GNU Affero General Public License as            *
+ * published by the Free Software Foundation, either version 3 of the        *
+ * License, or (at your option) any later version.                           *
+ *                                                                           *
+ * This program is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU Affero General Public License for more details.                       *
+ *                                                                           *
+ * You should have received a copy of the GNU Affero General Public License  *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ *                                                                           *
+ * Additional permission under GNU AGPL version 3 section 7                  *
+ *                                                                           *
+ * If you modify this program, or any covered work, by linking or            *
+ * combining it with the OpenSSL project's OpenSSL library (or a             *
+ * modified version of that library), containing parts covered by the        *
+ * terms of the OpenSSL or SSLeay licenses, the authors of PokerTH           *
+ * (Felix Hammer, Florian Thauer, Lothar May) grant you additional           *
+ * permission to convey the resulting work.                                  *
+ * Corresponding Source for a non-source form of such a combination          *
+ * shall include the source code for the parts of OpenSSL used as well       *
+ * as that of the covered work.                                              *
+ *****************************************************************************/
+/* PokerTH network packet validation. */
+
+#ifndef _POKERTHMESSAGEVALIDATOR_H_
+#define _POKERTHMESSAGEVALIDATOR_H_
+
+#include <map>
+
+class PokerTHMessage;
+
+#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535)
+#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize))
+#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval))
+#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval))
+#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize))
+
+class PokerTHMessageValidator
+{
+public:
+	PokerTHMessageValidator();
+
+	bool IsValidMessage(const PokerTHMessage &msg) const;
+
+protected:
+	static bool ValidateAnnounceMessage(const PokerTHMessage &msg);
+	static bool ValidateAuthMessage(const PokerTHMessage &msg);
+	static bool ValidateLobbyMessage(const PokerTHMessage &msg);
+	static bool ValidateGameMessage(const PokerTHMessage &msg);
+
+	typedef bool (*ValidateFunctor)(const PokerTHMessage &msg);
+	typedef std::map<int, ValidateFunctor> ValidateFunctorMap;
+private:
+
+	ValidateFunctorMap m_validationMap;
+};
+
+#endif
+