From 1e96dae60b9a26f1c584e08b42d9cd54ec233685 Mon Sep 17 00:00:00 2001 From: Exynox Date: Sun, 13 Apr 2025 09:05:07 +0300 Subject: [PATCH] Remove P2P UDP & Hackshield packets --- bin/pack/root/networkmodule.py | 3 - src/EterLib/NetStream.cpp | 1 - src/UserInterface/Packet.h | 24 -- src/UserInterface/PythonNetworkDatagram.cpp | 213 ------------------ src/UserInterface/PythonNetworkDatagram.h | 58 ----- .../PythonNetworkDatagramModule.cpp | 29 --- src/UserInterface/PythonNetworkStream.cpp | 5 - src/UserInterface/PythonNetworkStream.h | 4 - .../PythonNetworkStreamModule.cpp | 25 -- .../PythonNetworkStreamPhaseGame.cpp | 8 - .../PythonNetworkStreamPhaseHandShake.cpp | 48 ---- src/UserInterface/StdAfx.h | 1 - src/UserInterface/UserInterface.cpp | 1 - src/UserInterface/UserInterface.vcxproj | 3 - .../UserInterface.vcxproj.filters | 9 - 15 files changed, 432 deletions(-) delete mode 100644 src/UserInterface/PythonNetworkDatagram.cpp delete mode 100644 src/UserInterface/PythonNetworkDatagram.h delete mode 100644 src/UserInterface/PythonNetworkDatagramModule.cpp diff --git a/bin/pack/root/networkmodule.py b/bin/pack/root/networkmodule.py index ef1eb79f..1eac327e 100644 --- a/bin/pack/root/networkmodule.py +++ b/bin/pack/root/networkmodule.py @@ -85,7 +85,6 @@ class MainStream(object): net.SetHandler(self) net.SetTCPRecvBufferSize(128*1024) net.SetTCPSendBufferSize(4096) - net.SetUDPRecvBufferSize(4096) self.id="" self.pwd="" @@ -261,8 +260,6 @@ class MainStream(object): else: net.ConnectTCP(self.addr, self.port) - #net.ConnectUDP(IP, Port) - def SetConnectInfo(self, addr, port, account_addr=0, account_port=0): self.addr = addr self.port = port diff --git a/src/EterLib/NetStream.cpp b/src/EterLib/NetStream.cpp index 2969e39f..77bb20df 100644 --- a/src/EterLib/NetStream.cpp +++ b/src/EterLib/NetStream.cpp @@ -524,7 +524,6 @@ const char * GetRecvHeaderName(BYTE header) stringList[154] = "HEADER_GC_AUTH_SUCCESS_OPENID"; stringList[0xfc] = "HEADER_GC_HANDSHAKE_OK"; stringList[0xfd] = "HEADER_GC_PHASE"; - stringList[0xfe] = "HEADER_GC_BINDUDP"; stringList[0xff] = "HEADER_GC_HANDSHAKE"; } return stringList[header].c_str(); diff --git a/src/UserInterface/Packet.h b/src/UserInterface/Packet.h index baaaf9d7..3d802c86 100644 --- a/src/UserInterface/Packet.h +++ b/src/UserInterface/Packet.h @@ -339,9 +339,6 @@ enum // END_OF_AUTOBAN HEADER_GC_HS_REQUEST = 207, // Origially it's 204 on devel branch -#else - HEADER_GC_HS_REQUEST = 204, - HEADER_GC_XTRAP_CS1_REQUEST = 205, #endif #ifdef __AUCTION__ @@ -354,7 +351,6 @@ enum HEADER_GC_HANDSHAKE_OK = 0xfc, // 252 HEADER_GC_PHASE = 0xfd, // 253 - HEADER_GC_BINDUDP = 0xfe, // 254 HEADER_GC_HANDSHAKE = 0xff, // 255 ///////////////////////////////////////////////// @@ -1149,13 +1145,6 @@ typedef struct packet_header_handshake LONG lDelta; } TPacketGCHandshake; -typedef struct packet_header_bindudp -{ - BYTE header; - DWORD addr; - WORD port; -} TPacketGCBindUDP; - typedef struct packet_header_dynamic_size { BYTE header; @@ -2620,19 +2609,6 @@ typedef struct packet_state TPixelPosition kPPos; } TPacketCCState; -typedef struct packet_hs_check_req -{ - BYTE bHeader; - AHNHS_TRANS_BUFFER Req; -} TPacketHSCheck; - -//NOTE : recv/send에 공통으로 생김, bPacketData의 내용만 바뀐다. -typedef struct packet_xtrap_verify -{ - BYTE bHeader; - BYTE bPacketData[128]; - -} TPacketXTrapCSVerify; // AUTOBAN typedef struct packet_autoban_quiz { diff --git a/src/UserInterface/PythonNetworkDatagram.cpp b/src/UserInterface/PythonNetworkDatagram.cpp deleted file mode 100644 index 0ffdd21c..00000000 --- a/src/UserInterface/PythonNetworkDatagram.cpp +++ /dev/null @@ -1,213 +0,0 @@ -#include "StdAfx.h" - -/* -#include "PythonNetworkDatagram.h" -#include "PythonNetworkStream.h" - -class CDatagramPacketHeaderMap : public CNetworkPacketHeaderMap -{ - public: - CDatagramPacketHeaderMap() - { - Set(HEADER_CC_STATE_WALKING, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketCCState), false)); - } -}; - -void CPythonNetworkDatagram::Destroy() -{ - m_NetSenderPool.Clear(); -} - -BOOL CPythonNetworkDatagram::CheckPacket(TPacketHeader * piRetHeader) -{ - static CDatagramPacketHeaderMap s_packetHeaderMap; - - if (!m_NetReceiver.isBind()) - return FALSE; - - *piRetHeader = 0; - - TPacketHeader header; - - if (!m_NetReceiver.Peek(&header, sizeof(TPacketHeader))) - return false; - - CNetworkPacketHeaderMap::TPacketType PacketType; - - if (!s_packetHeaderMap.Get(header, &PacketType)) - { - Tracef("Unknown UDP packet header"); - assert(!"Unknown UDP packet header"); - return FALSE; - } - - if (!header) - return FALSE; - - *piRetHeader = header; - return TRUE; -} - -void CPythonNetworkDatagram::Process() -{ - while (m_NetReceiver.Process()) - { - TPacketHeader iHeader; - - if (!CheckPacket(&iHeader)) - continue; - - switch(iHeader) - { - case HEADER_CC_STATE_WALKING: - RecvStateWalkingPacket(); - break; - - case HEADER_CC_STATE_WAITING: - case HEADER_CC_STATE_GOING: - case HEADER_CC_EVENT_NORMAL_ATTACKING: - case HEADER_CC_EVENT_COMBO_ATTACKING: - case HEADER_CC_EVENT_HIT: - break; - } - } -} - -void CPythonNetworkDatagram::SetConnection(const char * c_szIP, WORD wPortIndex) -{ - m_NetSender.SetSocket(c_szIP, wPortIndex); -} - -void CPythonNetworkDatagram::SetRecvBufferSize(DWORD dwSize) -{ - m_NetReceiver.SetRecvBufferSize(dwSize); -} - -void CPythonNetworkDatagram::SendToServer(const void * c_pBuffer, DWORD dwSize) -{ - if (!m_NetSender.isSocket()) - { - assert(!"UDP Socket has not set!"); - return; - } - - m_NetSender.Send(c_pBuffer, dwSize); -} - -void CPythonNetworkDatagram::Bind(DWORD dwAddress, WORD wPortIndex) -{ - m_NetReceiver.Bind(dwAddress, wPortIndex); -} - -void CPythonNetworkDatagram::RegisterSender(DWORD dwID, DWORD dwAddress, WORD wPortIndex) -{ - CNetDatagramSender * pSender = m_NetSenderPool.Alloc(); - - pSender->SetSocket(dwAddress, wPortIndex); - - m_NetSenderMap.insert(TNetSenderMap::value_type(dwID, pSender)); -} -void CPythonNetworkDatagram::DeleteSender(DWORD dwID) -{ - CNetDatagramSender * pSender; - if (!GetSenderPointer(dwID, &pSender)) - return; - - m_NetSenderPool.Free(pSender); - - m_NetSenderMap.erase(dwID); -} - -void CPythonNetworkDatagram::Select(DWORD dwID) -{ - CNetDatagramSender * pSender; - if (!GetSenderPointer(dwID, &pSender)) - return; - - m_NetSenderList.push_back(pSender); -} -void CPythonNetworkDatagram::SendToSenders(const void * c_pBuffer, DWORD dwSize) -{ - // NOTE : Temporary Code - // Now, Send to every around client. - for (TNetSenderMapIterator itorMap = m_NetSenderMap.begin(); itorMap != m_NetSenderMap.end(); ++itorMap) - { - CNetDatagramSender * pSender = itorMap->second; - m_NetSenderList.push_back(pSender); - } - // NOTE : Temporary Code - - for (TNetSenderListIterator itor = m_NetSenderList.begin(); itor != m_NetSenderList.end(); ++itor) - { - CNetDatagramSender * pSender = *itor; - - pSender->Send(c_pBuffer, dwSize); - } - - m_NetSenderList.clear(); -} - -BOOL CPythonNetworkDatagram::GetSenderPointer(DWORD dwID, CNetDatagramSender ** ppSender) -{ - TNetSenderMapIterator itor = m_NetSenderMap.find(dwID); - - if (m_NetSenderMap.end() == itor) - return FALSE; - - *ppSender = itor->second; - - return TRUE; -} - -////////////////////////////////// -// Walking - -void CPythonNetworkDatagram::SendCharacterStatePacket(DWORD dwVID, DWORD dwCmdTime, const TPixelPosition& c_rkPPosDst, float fDstRot, UINT eFunc, UINT uArg) -{ - fDstRot=fmod(fDstRot, 360.0f); - - if (fDstRot<0) - fDstRot=360.0f-fDstRot; - - TPacketCCState kStatePacket; - kStatePacket.bHeader=HEADER_CC_STATE_WALKING; - kStatePacket.dwVID=dwVID; - kStatePacket.bFunc=eFunc; - kStatePacket.bArg=uArg; - kStatePacket.bRot=fDstRot/5.0f; - kStatePacket.dwTime=dwCmdTime; - kStatePacket.kPPos=c_rkPPosDst; - //SendToSenders(&kStatePacket, sizeof(kStatePacket)); -} - -BOOL CPythonNetworkDatagram::RecvStateWalkingPacket() -{ - TPacketCCState kStatePacket; - if (!m_NetReceiver.Recv(&kStatePacket, sizeof(kStatePacket))) - { - assert(!"CPythonNetworkDatagram::RecvStatePacket - PAKCET READ ERROR"); - Tracenf("CPythonNetworkDatagram::RecvStatePacket - PAKCET READ ERROR"); - return FALSE; - } - - CInstanceBase * pkChrInst = CPythonCharacterManager::Instance().GetInstancePtr(kStatePacket.dwVID); - - if (!pkChrInst) - { - //Tracenf("CPythonNetworkDatagram::RecvStatePacket - NOT EXIST VID(kStateWaitingPacket.vid = %d)", kStatePacket.m_dwVID); - return TRUE; - } - - pkChrInst->PushUDPState(kStatePacket.dwTime, kStatePacket.kPPos, kStatePacket.bRot*5.0f, kStatePacket.bFunc, kStatePacket.bArg); - return TRUE; -} - -CPythonNetworkDatagram::CPythonNetworkDatagram() -{ -} - -CPythonNetworkDatagram::~CPythonNetworkDatagram() -{ -} - - */ \ No newline at end of file diff --git a/src/UserInterface/PythonNetworkDatagram.h b/src/UserInterface/PythonNetworkDatagram.h deleted file mode 100644 index 4d4ac3e4..00000000 --- a/src/UserInterface/PythonNetworkDatagram.h +++ /dev/null @@ -1,58 +0,0 @@ -#pragma once - -/* -#include "../eterLib/NetDatagramReceiver.h" -#include "../eterLib/NetDatagramSender.h" -#include "Packet.h" - -class CPythonNetworkDatagram : public CSingleton -{ - public: - CPythonNetworkDatagram(); - virtual ~CPythonNetworkDatagram(); - - void Destroy(); - - // With Server - void SetRecvBufferSize(DWORD dwSize); - void SetConnection(const char * c_szIP, WORD wPortIndex); - void SendToServer(const void * c_pBuffer, DWORD dwSize); - void Bind(DWORD dwAddress, WORD wPortIndex); - - // With UDP Senders - void RegisterSender(DWORD dwID, DWORD dwAddress, WORD wPortIndex); - void DeleteSender(DWORD dwID); - - void Select(DWORD dwID); - void SendToSenders(const void * c_pBuffer, DWORD dwSize); - - // Regulary update function - void Process(); - void SendCharacterStatePacket(DWORD dwVID, DWORD dwCmdTime, const TPixelPosition& c_rkPPosDst, float fDstRot, UINT eFunc, UINT uArg); - - protected: - BOOL CheckPacket(TPacketHeader * piRetHeader); - BOOL GetSenderPointer(DWORD dwID, CNetDatagramSender ** ppSender); - BOOL RecvStateWalkingPacket(); - - protected: - // Sender Map - typedef std::map TNetSenderMap; - typedef TNetSenderMap::iterator TNetSenderMapIterator; - // Sender List - typedef std::list TNetSenderList; - typedef TNetSenderList::iterator TNetSenderListIterator; - - protected: - // Sender - TNetSenderMap m_NetSenderMap; - TNetSenderList m_NetSenderList; - - // Connection with server - CNetDatagramSender m_NetSender; - CNetDatagramReceiver m_NetReceiver; - - private: - CDynamicPool m_NetSenderPool; -}; -*/ \ No newline at end of file diff --git a/src/UserInterface/PythonNetworkDatagramModule.cpp b/src/UserInterface/PythonNetworkDatagramModule.cpp deleted file mode 100644 index 217d1083..00000000 --- a/src/UserInterface/PythonNetworkDatagramModule.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "StdAfx.h" -#include "PythonNetworkDatagram.h" -/* -PyObject * udpEnable(PyObject* poSelf, PyObject* poArgs) -{ - CPythonNetworkDatagram::Instance().Enable(); - return Py_BuildNone(); -} - -PyObject * udpDisable(PyObject* poSelf, PyObject* poArgs) -{ - CPythonNetworkDatagram::Instance().Disable(); - return Py_BuildNone(); -} -*/ -void initudp() -{ - /* - static PyMethodDef s_methods[] = - { - { "Enable", udpEnable, METH_VARARGS }, - { "Disable", udpDisable, METH_VARARGS }, - - { NULL, NULL, NULL } - }; - - PyObject * poModule = Py_InitModule("udp", s_methods); - */ -} diff --git a/src/UserInterface/PythonNetworkStream.cpp b/src/UserInterface/PythonNetworkStream.cpp index b18ce062..2c5f6e2c 100644 --- a/src/UserInterface/PythonNetworkStream.cpp +++ b/src/UserInterface/PythonNetworkStream.cpp @@ -104,7 +104,6 @@ class CMainPacketHeaderMap : public CNetworkPacketHeaderMap Set(HEADER_GC_HANDSHAKE, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCHandshake), STATIC_SIZE_PACKET)); Set(HEADER_GC_HANDSHAKE_OK, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCBlank), STATIC_SIZE_PACKET)); - Set(HEADER_GC_BINDUDP, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCBindUDP), STATIC_SIZE_PACKET)); Set(HEADER_GC_OWNERSHIP, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCOwnership), STATIC_SIZE_PACKET)); Set(HEADER_GC_CREATE_FLY, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCCreateFly), STATIC_SIZE_PACKET)); Set(HEADER_GC_ADD_FLY_TARGETING, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCFlyTargeting), STATIC_SIZE_PACKET)); @@ -173,12 +172,8 @@ class CMainPacketHeaderMap : public CNetworkPacketHeaderMap Set(HEADER_GC_DIG_MOTION, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCDigMotion), STATIC_SIZE_PACKET)); Set(HEADER_GC_DAMAGE_INFO, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCDamageInfo), STATIC_SIZE_PACKET)); - Set(HEADER_GC_HS_REQUEST, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketHSCheck), STATIC_SIZE_PACKET)); - Set(HEADER_GC_XTRAP_CS1_REQUEST, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketXTrapCSVerify), STATIC_SIZE_PACKET)); - Set(HEADER_GC_SPECIFIC_EFFECT, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCSpecificEffect), STATIC_SIZE_PACKET)); Set(HEADER_GC_DRAGON_SOUL_REFINE, CNetworkPacketHeaderMap::TPacketType(sizeof(TPacketGCDragonSoulRefine), STATIC_SIZE_PACKET)); - } }; diff --git a/src/UserInterface/PythonNetworkStream.h b/src/UserInterface/PythonNetworkStream.h index a55965fe..acb8df1d 100644 --- a/src/UserInterface/PythonNetworkStream.h +++ b/src/UserInterface/PythonNetworkStream.h @@ -546,10 +546,6 @@ class CPythonNetworkStream : public CNetworkStream, public CSingleton - - @@ -357,7 +355,6 @@ - diff --git a/src/UserInterface/UserInterface.vcxproj.filters b/src/UserInterface/UserInterface.vcxproj.filters index 1976b3b1..bc572ba8 100644 --- a/src/UserInterface/UserInterface.vcxproj.filters +++ b/src/UserInterface/UserInterface.vcxproj.filters @@ -250,12 +250,6 @@ Network - - Network - - - Network - Network @@ -424,9 +418,6 @@ Network - - Network - Network