eaecf67d33
update the handshake phase to call the new method after activating the cipher, ensuring buffered data (likely from a second login attempt, GC_PHASE) is properly decrypted, and fix a logging format issue.
118 lines
2.7 KiB
C++
118 lines
2.7 KiB
C++
#pragma once
|
|
|
|
#ifdef _IMPROVED_PACKET_ENCRYPTION_
|
|
#include "EterBase/cipher.h"
|
|
#endif
|
|
#include "EterBase/tea.h"
|
|
#include "NetAddress.h"
|
|
|
|
#include <pcg_random.hpp>
|
|
|
|
#define SEQUENCE_SEED 0
|
|
|
|
class CNetworkStream
|
|
{
|
|
public:
|
|
CNetworkStream();
|
|
virtual ~CNetworkStream();
|
|
|
|
void SetRecvBufferSize(int recvBufSize);
|
|
void SetSendBufferSize(int sendBufSize);
|
|
|
|
#ifndef _IMPROVED_PACKET_ENCRYPTION_
|
|
void SetSecurityMode(bool isSecurityMode, const char* c_szTeaKey);
|
|
void SetSecurityMode(bool isSecurityMode, const char* c_szTeaEncryptKey, const char* c_szTeaDecryptKey);
|
|
#endif
|
|
bool IsSecurityMode();
|
|
|
|
int GetRecvBufferSize();
|
|
|
|
void Clear();
|
|
void ClearRecvBuffer();
|
|
|
|
void Process();
|
|
|
|
bool Connect(const CNetworkAddress& c_rkNetAddr, int limitSec = 3);
|
|
bool Connect(const char* c_szAddr, int port, int limitSec = 3);
|
|
bool Connect(DWORD dwAddr, int port, int limitSec = 3);
|
|
void Disconnect();
|
|
|
|
bool Peek(int len);
|
|
bool Peek(int len, char* pDestBuf);
|
|
bool Recv(int len);
|
|
bool Recv(int len, char* pDestBuf);
|
|
bool Send(int len, const char* pSrcBuf);
|
|
|
|
bool Peek(int len, void* pDestBuf);
|
|
bool Recv(int len, void* pDestBuf);
|
|
|
|
bool Send(int len, const void* pSrcBuf);
|
|
bool SendFlush(int len, const void* pSrcBuf);
|
|
|
|
bool IsOnline();
|
|
|
|
void SetPacketSequenceMode(bool isOn);
|
|
bool SendSequence();
|
|
|
|
protected:
|
|
virtual void OnConnectSuccess();
|
|
virtual void OnConnectFailure();
|
|
virtual void OnRemoteDisconnect();
|
|
virtual void OnDisconnect();
|
|
virtual bool OnProcess();
|
|
|
|
bool __SendInternalBuffer();
|
|
bool __RecvInternalBuffer();
|
|
|
|
void __PopSendBuffer();
|
|
|
|
int __GetSendBufferSize();
|
|
|
|
#ifdef _IMPROVED_PACKET_ENCRYPTION_
|
|
size_t Prepare(void* buffer, size_t* length);
|
|
bool Activate(size_t agreed_length, const void* buffer, size_t length);
|
|
void ActivateCipher();
|
|
void DecryptAlreadyReceivedData();
|
|
#endif
|
|
|
|
private:
|
|
time_t m_connectLimitTime;
|
|
|
|
char* m_recvTEABuf;
|
|
int m_recvTEABufInputPos;
|
|
int m_recvTEABufSize;
|
|
|
|
char* m_recvBuf;
|
|
int m_recvBufSize;
|
|
int m_recvBufInputPos;
|
|
int m_recvBufOutputPos;
|
|
|
|
char* m_sendBuf;
|
|
int m_sendBufSize;
|
|
int m_sendBufInputPos;
|
|
int m_sendBufOutputPos;
|
|
|
|
char* m_sendTEABuf;
|
|
int m_sendTEABufSize;
|
|
int m_sendTEABufInputPos;
|
|
|
|
bool m_isOnline;
|
|
|
|
#ifdef _IMPROVED_PACKET_ENCRYPTION_
|
|
Cipher m_cipher;
|
|
#else
|
|
// Obsolete encryption stuff here
|
|
bool m_isSecurityMode;
|
|
char m_szEncryptKey[TEA_KEY_LENGTH]; // Client 에서 보낼 패킷을 Encrypt 할때 사용하는 Key
|
|
char m_szDecryptKey[TEA_KEY_LENGTH]; // Server 에서 전송된 패킷을 Decrypt 할때 사용하는 Key
|
|
#endif
|
|
|
|
SOCKET m_sock;
|
|
|
|
CNetworkAddress m_addr;
|
|
|
|
// Sequence
|
|
pcg32 m_SequenceGenerator;
|
|
bool m_bUseSequence;
|
|
};
|