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

src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp

@@ -2203,7 +2203,7 @@ void gameLobbyDialogImpl::adminActionCloseGame()
 										 tr("Are you sure you want to close the game:\n\"%1\"?").arg(QString::fromUtf8(info.name.c_str())), QMessageBox::Yes | QMessageBox::No);
 
 		if (ret == QMessageBox::Yes) {
-			//TODO mySession->adminActionCloseGame(gameId);
+			mySession->adminActionCloseGame(gameId);
 		}
 	}
 }

src/net/clientthread.h

@@ -98,6 +98,7 @@ public:
 	void SendRejectGameInvitation(unsigned gameId, DenyGameInvitationReason reason);
 	void SendReportAvatar(unsigned reportedPlayerId, const std::string &avatarHash);
 	void SendReportGameName(unsigned reportedGameId);
+	void SendAdminRemoveGame(unsigned removeGameId);
 
 	void StartAsyncRead();
 	virtual void CloseSession(boost::shared_ptr<SessionData> session);

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());

src/net/netpacketvalidator.h

@@ -119,6 +119,8 @@ protected:
 	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 ValidateAdminBanPlayerMessage(const NetPacket &packet);
 
 	static bool ValidateGameInfo(const NetGameInfo &gameInfo);
 

src/net/serverbanmanager.h

@@ -48,7 +48,7 @@ public:
 	ServerBanManager(boost::shared_ptr<boost::asio::io_service> ioService);
 	virtual ~ServerBanManager();
 
-	void SetAdminPlayerIds(const std::list<DB_id> adminList);
+	void SetAdminPlayerIds(const std::list<DB_id> &adminList);
 
 	void BanPlayerName(const std::string &playerName, unsigned durationHours = 0);
 	void BanPlayerRegex(const std::string &playerRegex, unsigned durationHours = 0);

src/session.cpp

@@ -420,6 +420,13 @@ void Session::resetNetworkTimeout()
 	myNetClient->SendResetTimeout();
 }
 
+void Session::adminActionCloseGame(unsigned gameId)
+{
+	if (!myNetClient)
+		return; // only act if client is running.
+	myNetClient->SendAdminRemoveGame(gameId);
+}
+
 void Session::kickPlayer(const string &playerName)
 {
 	if (!myNetClient)

src/session.h

@@ -116,6 +116,8 @@ public:
 
 	void resetNetworkTimeout();
 
+	void adminActionCloseGame(unsigned gameId);
+
 	bool isNetworkClientRunning() const; // TODO hack
 	bool isNetworkServerRunning() const; // TODO hack