Merge pull request #13 from Berkaykrdl/blockcountry-cleanup

chore: blockcountry, blockexception removed

Author: d1str4ught

src/common/tables.h

@@ -118,8 +118,6 @@ enum
 	HEADER_GD_DEC_MONARCH_MONEY = 125,
 
 	HEADER_GD_CHANGE_MONARCH_LORD = 126,
-	HEADER_GD_BLOCK_COUNTRY_IP		= 127,		// 광대역 IP-Block
-	HEADER_GD_BLOCK_EXCEPTION		= 128,		// 광대역 IP-Block 예외
 
 	HEADER_GD_REQ_CHANGE_GUILD_MASTER	= 129,
 
@@ -249,8 +247,6 @@ enum
 
 	HEADER_DG_CHANGE_MONARCH_LORD_ACK = 169,
 	HEADER_DG_UPDATE_MONARCH_INFO	= 170,
-	HEADER_DG_BLOCK_COUNTRY_IP		= 171,		// 광대역 IP-Block
-	HEADER_DG_BLOCK_EXCEPTION		= 172,		// 광대역 IP-Block 예외 account
 
 	HEADER_DG_ACK_CHANGE_GUILD_MASTER = 173,
 
@@ -1322,26 +1318,6 @@ typedef struct tChangeMonarchLordACK
 	char szDate[32];
 } TPacketChangeMonarchLordACK;
 
-// Block Country Ip
-typedef struct tBlockCountryIp
-{
-	uint32_t	ip_from;
-	uint32_t	ip_to;
-} TPacketBlockCountryIp;
-
-enum EBlockExceptionCommand
-{
-	BLOCK_EXCEPTION_CMD_ADD = 1,
-	BLOCK_EXCEPTION_CMD_DEL = 2,
-};
-
-// Block Exception Account
-typedef struct tBlockException
-{
-	uint8_t	cmd;	// 1 == add, 2 == delete
-	char	login[LOGIN_MAX_LEN + 1];
-}TPacketBlockException;
-
 typedef struct tChangeGuildMaster
 {
 	uint32_t dwGuildID;

src/db/BlockCountry.cpp

@@ -16,7 +16,6 @@
 #include "ItemAwardManager.h"
 #include "Marriage.h"
 #include "Monarch.h"
-#include "BlockCountry.h"
 #include "ItemIDRangeManager.h"
 #include "Cache.h"
 
@@ -2103,13 +2102,6 @@ void CClientManager::ProcessPackets(CPeer * peer)
 				sys_log(0, " ProcessPacket Header [%d] Handle[%d] Length[%d] iCount[%d]", header, dwHandle, dwLength, iCount);
 		}
 
-
-		// test log by mhh
-		{
-			if (HEADER_GD_BLOCK_COUNTRY_IP == header)
-				sys_log(0, "recved : HEADER_GD_BLOCK_COUNTRY_IP");
-		}
-
 		switch (header)
 		{
 			case HEADER_GD_BOOT:
@@ -2446,17 +2438,6 @@ void CClientManager::ProcessPackets(CPeer * peer)
 				ChangeMonarchLord(peer, dwHandle, (TPacketChangeMonarchLord*)data);
 				break;
 
-			case HEADER_GD_BLOCK_COUNTRY_IP:
-				sys_log(0, "HEADER_GD_BLOCK_COUNTRY_IP received");
-				CBlockCountry::instance().SendBlockedCountryIp(peer);
-				CBlockCountry::instance().SendBlockException(peer);
-				break;
-
-			case HEADER_GD_BLOCK_EXCEPTION:
-				sys_log(0, "HEADER_GD_BLOCK_EXCEPTION received");
-				BlockException((TPacketBlockException*) data);
-				break;
-
 			case HEADER_GD_REQ_SPARE_ITEM_ID_RANGE :
 				SendSpareItemIDRange(peer);
 				break;
@@ -3963,43 +3944,6 @@ void CClientManager::ChangeMonarchLord(CPeer * peer, DWORD dwHandle, TPacketChan
 	delete pMsg;
 }
 
-void CClientManager::BlockException(TPacketBlockException *data)
-{
-	sys_log(0, "[BLOCK_EXCEPTION] CMD(%d) login(%s)", data->cmd, data->login);
-
-	// save sql
-	{
-		char buf[1024];
-
-		switch (data->cmd)
-		{
-			case BLOCK_EXCEPTION_CMD_ADD:
-				snprintf(buf, sizeof(buf), "INSERT INTO block_exception VALUES('%s')", data->login);
-				CDBManager::instance().AsyncQuery(buf, SQL_ACCOUNT);
-				CBlockCountry::instance().AddBlockException(data->login);
-				break;
-			case BLOCK_EXCEPTION_CMD_DEL:
-				snprintf(buf, sizeof(buf), "DELETE FROM block_exception VALUES('%s')", data->login);
-				CDBManager::instance().AsyncQuery(buf, SQL_ACCOUNT);
-				CBlockCountry::instance().DelBlockException(data->login);
-				break;
-			default:
-				return;
-		}
-
-	}
-	
-	for (itertype(m_peerList) it = m_peerList.begin(); it != m_peerList.end(); ++it)
-	{
-		CPeer	*peer = *it;
-
-		if (!peer->GetChannel())
-			continue;
-
-		CBlockCountry::instance().SendBlockExceptionOne(peer, data->login, data->cmd);
-	}
-}
-
 void CClientManager::SendSpareItemIDRange(CPeer* peer)
 {
 	peer->SendSpareItemIDRange();

src/db/BlockCountry.h

@@ -522,7 +522,6 @@ class CClientManager : public CNetBase, public singleton<CClientManager>
 	//END_MONARCH
 
 	void ChangeMonarchLord(CPeer* peer, DWORD dwHandle, TPacketChangeMonarchLord* info);
-	void BlockException(TPacketBlockException *data);
 
 	void SendSpareItemIDRange(CPeer* peer);