metin-server/m2dev-server-src
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more packets using fixed size integers

Browse Source
This commit is contained in:
d1str4ught
2025-08-23 14:00:40 +02:00
parent 240f4f24c3
commit 08043416c5
16 changed files with 440 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/db/ClientManagerLogin.cpp
View File

@@ -129,9 +129,9 @@ void CClientManager::QUERY_LOGIN_BY_KEY(CPeer * pkPeer, DWORD dwHandle, TPacketG
return;
}
if (memcmp(pkLoginData->GetClientKey(), p->adwClientKey, sizeof(DWORD) * 4))
if (memcmp(pkLoginData->GetClientKey(), p->adwClientKey, sizeof(uint32_t) * 4))
{
const DWORD * pdwClientKey = pkLoginData->GetClientKey();
const uint32_t * pdwClientKey = pkLoginData->GetClientKey();
sys_log(0, "LOGIN_BY_KEY client key differ %s %lu %lu %lu %lu, %lu %lu %lu %lu",
r.login,

2
src/db/DBManager.h
View File

@@ -40,7 +40,7 @@ class CDBManager : public singleton<CDBManager>
int Connect(int iSlot, const char * host, int port, const char* dbname, const char* user, const char* pass);
void ReturnQuery(const char * c_pszQuery, int iType, DWORD dwIdent, void * pvData, int iSlot = SQL_PLAYER);
void ReturnQuery(const char * c_pszQuery, int iType, IDENT dwIdent, void * pvData, int iSlot = SQL_PLAYER);
void AsyncQuery(const char * c_pszQuery, int iSlot = SQL_PLAYER);
SQLMsg * DirectQuery(const char * c_pszQuery, int iSlot = SQL_PLAYER);

6
src/db/LoginData.cpp
View File

@@ -24,12 +24,12 @@ TAccountTable & CLoginData::GetAccountRef()
return m_data;
}
void CLoginData::SetClientKey(const DWORD * c_pdwClientKey)
void CLoginData::SetClientKey(const uint32_t* c_pdwClientKey)
{
thecore_memcpy(&m_adwClientKey, c_pdwClientKey, sizeof(DWORD) * 4);
thecore_memcpy(&m_adwClientKey, c_pdwClientKey, sizeof(uint32_t) * 4);
}
const DWORD * CLoginData::GetClientKey()
const uint32_t * CLoginData::GetClientKey()
{
return &m_adwClientKey[0];
}

6
src/db/LoginData.h
View File

@@ -8,9 +8,9 @@ class CLoginData
CLoginData();
TAccountTable & GetAccountRef();
void SetClientKey(const DWORD * c_pdwClientKey);
void SetClientKey(const uint32_t * c_pdwClientKey);
const DWORD * GetClientKey();
const uint32_t* GetClientKey();
void SetKey(DWORD dwKey);
DWORD GetKey();
@@ -46,7 +46,7 @@ class CLoginData
private:
DWORD m_dwKey;
DWORD m_adwClientKey[4];
uint32_t m_adwClientKey[4];
DWORD m_dwConnectedPeerHandle;
DWORD m_dwLogonTime;
char m_szIP[MAX_HOST_LENGTH+1];

2
src/db/Peer.cpp
View File

@@ -127,7 +127,7 @@ void CPeer::SetP2PPort(WORD wPort)
m_wP2PPort = wPort;
}
void CPeer::SetMaps(long * pl)
void CPeer::SetMaps(int32_t * pl)
{
thecore_memcpy(m_alMaps, pl, sizeof(m_alMaps));
}

6
src/db/Peer.h
View File

@@ -52,8 +52,8 @@ class CPeer : public CPeerBase
void SetP2PPort(WORD wPort);
WORD GetP2PPort() { return m_wP2PPort; }
void SetMaps(long* pl);
long * GetMaps() { return &m_alMaps[0]; }
void SetMaps(int32_t* pl);
int32_t* GetMaps() { return &m_alMaps[0]; }
bool SetItemIDRange(TItemIDRangeTable itemRange);
bool SetSpareItemIDRange(TItemIDRangeTable itemRange);
@@ -68,7 +68,7 @@ class CPeer : public CPeerBase
DWORD m_dwUserCount;
WORD m_wListenPort; // 게임서버가 클라이언트를 위해 listen 하는 포트
WORD m_wP2PPort; // 게임서버가 게임서버 P2P 접속을 위해 listen 하는 포트
long m_alMaps[32]; // 어떤 맵을 관장하고 있는가?
int32_t m_alMaps[32]; // 어떤 맵을 관장하고 있는가?
TItemIDRangeTable m_itemRange;
TItemIDRangeTable m_itemSpareRange;