From 252df678714e450b389bcab980af34606eb3f51a Mon Sep 17 00:00:00 2001
From: savis <106487343+savisxss@users.noreply.github.com>
Date: Mon, 1 Sep 2025 21:36:42 +0200
Subject: [PATCH] removed passpod

---
 src/UserInterface/AccountConnector.cpp        | 27 ------------
 src/UserInterface/AccountConnector.h          |  2 -
 src/UserInterface/Packet.h                    | 22 ----------
 src/UserInterface/PythonNetworkStream.cpp     |  2 -
 src/UserInterface/PythonNetworkStream.h       |  3 --
 .../PythonNetworkStreamModule.cpp             | 12 -----
 .../PythonNetworkStreamPhaseLogin.cpp         | 44 -------------------
 7 files changed, 112 deletions(-)

diff --git a/src/UserInterface/AccountConnector.cpp b/src/UserInterface/AccountConnector.cpp
index 390cea7..2949bef 100644
--- a/src/UserInterface/AccountConnector.cpp
+++ b/src/UserInterface/AccountConnector.cpp
@@ -57,20 +57,6 @@ void CAccountConnector::Disconnect()
 	__OfflineState_Set();
 }
 
-bool CAccountConnector::SendNEWCIBNPasspodAnswerPacket(const char * answer)
-{
-	TPacketCGNEWCIBNPasspodAnswer answerPacket;
-	answerPacket.bHeader = HEADER_CG_NEWCIBN_PASSPOD_ANSWER;
-	strncpy(answerPacket.szAnswer, answer, NEWCIBN_PASSPOD_ANSWER_MAX_LEN);
-	answerPacket.szAnswer[NEWCIBN_PASSPOD_ANSWER_MAX_LEN] = '\0';	
-	if (!Send(sizeof(answerPacket), &answerPacket))
-	{
-		TraceError("SendNEWCIBNPasspodAnswerPacket");
-		return false;
-	}
-	return SendSequence();
-}
-
 bool CAccountConnector::SendRunupMatrixCardPacket(const char * c_szMatrixCardString)
 {
 	TPacketCGRunupMatrixAnswer answerPacket;
@@ -182,9 +168,6 @@ bool CAccountConnector::__AuthState_Process()
 	if (!__AnalyzePacket(HEADER_GC_RUNUP_MATRIX_QUIZ, sizeof(TPacketGCRunupMatrixQuiz), &CAccountConnector::__AuthState_RecvRunupMatrixQuiz))
 		return true;
 
-	if (!__AnalyzePacket(HEADER_GC_NEWCIBN_PASSPOD_REQUEST, sizeof(TPacketGCNEWCIBNPasspodRequest), &CAccountConnector::__AuthState_RecvNEWCIBNPasspodRequest))
-		return true;
-
 	if (!__AnalyzePacket(HEADER_GC_HANDSHAKE, sizeof(TPacketGCHandshake), &CAccountConnector::__AuthState_RecvHandshake))
 		return false;
 
@@ -417,16 +400,6 @@ bool CAccountConnector::__AuthState_RecvRunupMatrixQuiz()
 	return true;
 }
 
-bool CAccountConnector::__AuthState_RecvNEWCIBNPasspodRequest()
-{
-	TPacketGCNEWCIBNPasspodRequest kRequestPacket;
-	if (!Recv(sizeof(kRequestPacket), &kRequestPacket))
-		return false;
-
-	PyCallClassMemberFunc(m_poHandler, "BINARY_OnNEWCIBNPasspodRequest", Py_BuildValue("()"));	
-	return true;
-}
-
 #define ROW(rows, i) ((rows >> ((4 - i - 1) * 8)) & 0x000000FF)
 #define COL(cols, i) ((cols >> ((4 - i - 1) * 8)) & 0x000000FF)
 
diff --git a/src/UserInterface/AccountConnector.h b/src/UserInterface/AccountConnector.h
index d222221..f9a03fb 100644
--- a/src/UserInterface/AccountConnector.h
+++ b/src/UserInterface/AccountConnector.h
@@ -23,7 +23,6 @@ class CAccountConnector : public CNetworkStream, public CSingleton<CAccountConne
 
 		bool SendChinaMatrixCardPacket(const char * c_szMatrixCardString);
 		bool SendRunupMatrixCardPacket(const char * c_szMatrixCardString);
-		bool SendNEWCIBNPasspodAnswerPacket(const char * answer);
 
 		bool Connect(const char * c_szAddr, int iPort, const char * c_szAccountAddr, int iAccountPort);
 		void Disconnect();
@@ -55,7 +54,6 @@ class CAccountConnector : public CNetworkStream, public CSingleton<CAccountConne
 		bool __AuthState_RecvAuthFailure();
 		bool __AuthState_RecvChinaMatrixCard();
 		bool __AuthState_RecvRunupMatrixQuiz();
-		bool __AuthState_RecvNEWCIBNPasspodRequest();
 		bool __AuthState_RecvPanamaPack();
 #ifdef _IMPROVED_PACKET_ENCRYPTION_
 		bool __AuthState_RecvKeyAgreement();
diff --git a/src/UserInterface/Packet.h b/src/UserInterface/Packet.h
index 3c22b19..ed5dce4 100644
--- a/src/UserInterface/Packet.h
+++ b/src/UserInterface/Packet.h
@@ -127,7 +127,6 @@ enum
 	HEADER_CG_LOGIN4							= 115,
 
 	HEADER_CG_RUNUP_MATRIX_ANSWER               = 201,
-	HEADER_CG_NEWCIBN_PASSPOD_ANSWER			= 202,
 
 	HEADER_CG_DRAGON_SOUL_REFINE			= 205,
 	HEADER_CG_STATE_CHECKER					= 206,
@@ -297,8 +296,6 @@ enum
 	//HYBRID CRYPT
 
 	HEADER_GC_RUNUP_MATRIX_QUIZ                 = 201,
-	HEADER_GC_NEWCIBN_PASSPOD_REQUEST			= 202,
-	HEADER_GC_NEWCIBN_PASSPOD_FAILURE			= 203,
 
 	HEADER_GC_SPECIFIC_EFFECT					= 208,
 	HEADER_GC_DRAGON_SOUL_REFINE						= 209,
@@ -366,8 +363,6 @@ enum
 
 	RUNUP_MATRIX_QUIZ_MAX_LEN	= 8,
 	RUNUP_MATRIX_ANSWER_MAX_LEN = 4,
-	NEWCIBN_PASSPOD_ANSWER_MAX_LEN = 8,
-	NEWCIBN_PASSPOD_FAILURE_MAX_LEN = 128,
 
 	WEAR_MAX_NUM = 11,
 
@@ -1015,12 +1010,6 @@ typedef struct command_runup_matrix_answer
 	char	szAnswer[RUNUP_MATRIX_ANSWER_MAX_LEN + 1];
 } TPacketCGRunupMatrixAnswer;
 
-typedef struct command_newcibn_passpod_answer
-{
-	uint8_t	bHeader;
-	char	szAnswer[NEWCIBN_PASSPOD_ANSWER_MAX_LEN + 1];
-} TPacketCGNEWCIBNPasspodAnswer;
-
 enum EPartyExpDistributionType
 {
     PARTY_EXP_DISTRIBUTION_NON_PARITY,
@@ -2339,17 +2328,6 @@ typedef struct packet_runup_matrixd_quiz
 	char	szQuiz[RUNUP_MATRIX_QUIZ_MAX_LEN + 1];	
 } TPacketGCRunupMatrixQuiz;
 
-typedef struct packet_newcibn_passpod_request
-{
-	uint8_t	bHeader;
-} TPacketGCNEWCIBNPasspodRequest;
-
-typedef struct packet_newcibn_passpod_failure
-{
-	uint8_t	bHeader;
-	char	szMessage[NEWCIBN_PASSPOD_FAILURE_MAX_LEN + 1];
-} TPacketGCNEWCIBNPasspodFailure;
-
 typedef struct packet_login_key
 {
 	uint8_t	bHeader;
diff --git a/src/UserInterface/PythonNetworkStream.cpp b/src/UserInterface/PythonNetworkStream.cpp
index ea8ed72..a15a905 100644
--- a/src/UserInterface/PythonNetworkStream.cpp
+++ b/src/UserInterface/PythonNetworkStream.cpp
@@ -149,8 +149,6 @@ class CMainPacketHeaderMap : public CNetworkPacketHeaderMap
 
 			Set(HEADER_GC_CHINA_MATRIX_CARD, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCChinaMatrixCard), STATIC_SIZE_PACKET));
 			Set(HEADER_GC_RUNUP_MATRIX_QUIZ, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCRunupMatrixQuiz), STATIC_SIZE_PACKET));
-			Set(HEADER_GC_NEWCIBN_PASSPOD_REQUEST, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCNEWCIBNPasspodRequest), STATIC_SIZE_PACKET));
-			Set(HEADER_GC_NEWCIBN_PASSPOD_FAILURE, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCNEWCIBNPasspodFailure), STATIC_SIZE_PACKET));
 			Set(HEADER_GC_LOGIN_KEY, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCLoginKey), STATIC_SIZE_PACKET));
 
 			Set(HEADER_GC_AUTH_SUCCESS, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCAuthSuccess), STATIC_SIZE_PACKET));
diff --git a/src/UserInterface/PythonNetworkStream.h b/src/UserInterface/PythonNetworkStream.h
index f7ef706..d95b901 100644
--- a/src/UserInterface/PythonNetworkStream.h
+++ b/src/UserInterface/PythonNetworkStream.h
@@ -302,7 +302,6 @@ class CPythonNetworkStream : public CNetworkStream, public CSingleton<CPythonNet
 		bool SendLoginPacketNew(const char * c_szName, const char * c_szPassword);
 		bool SendChinaMatrixCardPacket(const char * c_szMatrixCardString);
 		bool SendRunupMatrixAnswerPacket(const char * c_szMatrixCardString);
-		bool SendNEWCIBNPasspodAnswerPacket(const char * answer);
 		bool SendDirectEnterPacket(const char * c_szName, const char * c_szPassword, UINT uChrSlot);
 
 		bool SendEnterGame();
@@ -406,8 +405,6 @@ class CPythonNetworkStream : public CNetworkStream, public CSingleton<CPythonNet
 		bool __RecvEmpirePacket();
 		bool __RecvChinaMatrixCardPacket();
 		bool __RecvRunupMatrixQuizPacket();
-		bool __RecvNEWCIBNPasspodRequestPacket();
-		bool __RecvNEWCIBNPasspodFailurePacket();
 		bool __RecvLoginKeyPacket();
 
 		// Select Phase
diff --git a/src/UserInterface/PythonNetworkStreamModule.cpp b/src/UserInterface/PythonNetworkStreamModule.cpp
index b11e8e1..92d4694 100644
--- a/src/UserInterface/PythonNetworkStreamModule.cpp
+++ b/src/UserInterface/PythonNetworkStreamModule.cpp
@@ -440,17 +440,6 @@ PyObject* netSendRunupMatrixCardPacket(PyObject* poSelf, PyObject* poArgs)
 	return Py_BuildNone();
 }
 
-PyObject* netSendNEWCIBNPasspodAnswerPacket(PyObject* poSelf, PyObject* poArgs)
-{
-	char* szMatrixCardString;
-	if (!PyTuple_GetString(poArgs, 0, &szMatrixCardString))
-		return Py_BuildException();
-
-	CAccountConnector & rkAccountConnector = CAccountConnector::Instance();
-	rkAccountConnector.SendNEWCIBNPasspodAnswerPacket(szMatrixCardString);
-	return Py_BuildNone();
-}
-
 
 PyObject* netDirectEnter(PyObject* poSelf, PyObject* poArgs)
 {
@@ -1764,7 +1753,6 @@ void initnet()
 		{ "SendLoginPacket",					netSendLoginPacket,						METH_VARARGS },
 		{ "SendChinaMatrixCardPacket",			netSendChinaMatrixCardPacket,			METH_VARARGS },
 		{ "SendRunupMatrixCardPacket",			netSendRunupMatrixCardPacket,			METH_VARARGS },
-		{ "SendNEWCIBNPasspodAnswerPacket",		netSendNEWCIBNPasspodAnswerPacket,		METH_VARARGS },
 		{ "SendSelectEmpirePacket",				netSendSelectEmpirePacket,				METH_VARARGS },
 		{ "SendSelectCharacterPacket",			netSendSelectCharacterPacket,			METH_VARARGS },
 		{ "SendChangeNamePacket",				netSendChangeNamePacket,				METH_VARARGS },
diff --git a/src/UserInterface/PythonNetworkStreamPhaseLogin.cpp b/src/UserInterface/PythonNetworkStreamPhaseLogin.cpp
index 635169c..b13ace3 100644
--- a/src/UserInterface/PythonNetworkStreamPhaseLogin.cpp
+++ b/src/UserInterface/PythonNetworkStreamPhaseLogin.cpp
@@ -48,15 +48,6 @@ void CPythonNetworkStream::LoginPhase()
 				return;
 			break;
 
-		case HEADER_GC_NEWCIBN_PASSPOD_REQUEST:
-			if (__RecvNEWCIBNPasspodRequestPacket())
-				return;
-			break;
-		case HEADER_GC_NEWCIBN_PASSPOD_FAILURE:
-			if (__RecvNEWCIBNPasspodFailurePacket())
-				return;
-			break;
-
 
 		case HEADER_GC_LOGIN_KEY:
 			if (__RecvLoginKeyPacket())
@@ -326,41 +317,6 @@ bool CPythonNetworkStream::SendRunupMatrixAnswerPacket(const char * c_szMatrixCa
 	return SendSequence();
 }
 
-bool CPythonNetworkStream::__RecvNEWCIBNPasspodRequestPacket()
-{
-	TPacketGCNEWCIBNPasspodRequest kRequestPacket;
-	if (!Recv(sizeof(kRequestPacket), &kRequestPacket))
-		return false;
-
-	PyCallClassMemberFunc(m_apoPhaseWnd[PHASE_WINDOW_LOGIN], "BINARY_OnNEWCIBNPasspodRequest", Py_BuildValue("()"));	
-	return true;
-}
-
-bool CPythonNetworkStream::__RecvNEWCIBNPasspodFailurePacket()
-{
-	TPacketGCNEWCIBNPasspodFailure kFailurePacket;
-	if (!Recv(sizeof(kFailurePacket), &kFailurePacket))
-		return false;
-
-	PyCallClassMemberFunc(m_apoPhaseWnd[PHASE_WINDOW_LOGIN], "BINARY_OnNEWCIBNPasspodFailure", Py_BuildValue("()"));	
-	return true;
-}
-
-
-bool CPythonNetworkStream::SendNEWCIBNPasspodAnswerPacket(const char * answer)
-{
-	TPacketCGNEWCIBNPasspodAnswer answerPacket;
-	answerPacket.bHeader = HEADER_CG_NEWCIBN_PASSPOD_ANSWER;
-	strncpy(answerPacket.szAnswer, answer, NEWCIBN_PASSPOD_ANSWER_MAX_LEN);
-	answerPacket.szAnswer[NEWCIBN_PASSPOD_ANSWER_MAX_LEN] = '\0';	
-	if (!Send(sizeof(answerPacket), &answerPacket))
-	{
-		TraceError("SendNEWCIBNPasspodAnswerPacket");
-		return false;
-	}
-	return SendSequence();
-}
-
 bool CPythonNetworkStream::SendChinaMatrixCardPacket(const char * c_szMatrixCardString)
 {
 	TPacketCGChinaMatrixCard MatrixCardPacket;