Implementing packet validation for new packets and client side game removal for admin players.

src/net/common/clientthread.cpp

@@ -376,6 +376,16 @@ ClientThread::SendReportGameName(unsigned reportedGameId)
 	m_ioService->post(boost::bind(&ClientThread::SendSessionPacket, shared_from_this(), packet));
 }
 
+void
+ClientThread::SendAdminRemoveGame(unsigned removeGameId)
+{
+	boost::shared_ptr<NetPacket> packet(new NetPacket);
+	packet->GetMsg()->set_messagetype(PokerTHMessage::Type_AdminRemoveGameMessage);
+	AdminRemoveGameMessage *netRemove = packet->GetMsg()->mutable_adminremovegamemessage();
+	netRemove->set_removegameid(removeGameId);
+	m_ioService->post(boost::bind(&ClientThread::SendSessionPacket, shared_from_this(), packet));
+}
+
 void
 ClientThread::StartAsyncRead()
 {

src/net/common/netpacketvalidator.cpp

@@ -128,6 +128,8 @@ NetPacketValidator::NetPacketValidator()
 	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_ReportGameMessage, ValidateReportGameMessage));
 	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_ReportGameAckMessage, ValidateReportGameAckMessage));
 	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_ErrorMessage, ValidateErrorMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AdminRemoveGameMessage, ValidateAdminRemoveGameMessage));
+	m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AdminBanPlayerMessage, ValidateAdminBanPlayerMessage));
 }
 
 bool
@@ -1145,6 +1147,32 @@ NetPacketValidator::ValidateErrorMessage(const NetPacket &packet)
 	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::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::ValidateGameInfo(const NetGameInfo &gameInfo)
 {

src/net/common/serverbanmanager.cpp

@@ -45,7 +45,7 @@ ServerBanManager::~ServerBanManager()
 }
 
 void
-ServerBanManager::SetAdminPlayerIds(const std::list<DB_id> adminList)
+ServerBanManager::SetAdminPlayerIds(const std::list<DB_id> &adminList)
 {
 	boost::mutex::scoped_lock lock(m_banMutex);
 	m_adminPlayers.resize(adminList.size());