memartel_loc/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

un tipeu de cleanup

Browse Source
This commit is contained in:
MarcEricMartel 2023-11-01 12:18:27 -04:00
parent 0ef437600d
commit ab84e42c72
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SQCSim-common/netprotocol.cpp
View File

@ -1017,6 +1017,7 @@ void netprot::sendPack<netprot::Packet>(SOCKET sock, Packet* pack, Buffer* buf)
return; return;
case PACKET_TYPE::CHUNKMOD: case PACKET_TYPE::CHUNKMOD:
//sendPack<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf); //sendPack<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf);
return;
case PACKET_TYPE::PLAYERMOD: case PACKET_TYPE::PLAYERMOD:
//sendPack<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf); //sendPack<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf);
return; return;

17
SQCSim-common/netprotocol.h
View File

@ -15,6 +15,8 @@ namespace netprot {
GAMEINFO, ENDINFO , CHAT, ERRLOG, GAMEINFO, ENDINFO , CHAT, ERRLOG,
LAST_PACK LAST_PACK
}; };
/* Structures */
struct Buffer { // Pour pouvoir rendre l'utilisation des buffers plus clean. struct Buffer { // Pour pouvoir rendre l'utilisation des buffers plus clean.
char* ptr = new char[BUFFER_LENGTH] { 1 }; char* ptr = new char[BUFFER_LENGTH] { 1 };
@ -29,8 +31,12 @@ namespace netprot {
PACKET_TYPE type = PACKET_TYPE::ERR; PACKET_TYPE type = PACKET_TYPE::ERR;
}; };
/* Constantes */
inline const char Footer[sizeof(uint32_t)] = { '\0', '\r', '\0', '\n' }; // constante de footer qui est ajoutée à chaque paquet envoyé. inline const char Footer[sizeof(uint32_t)] = { '\0', '\r', '\0', '\n' }; // constante de footer qui est ajoutée à chaque paquet envoyé.
/* Sous-structures */
struct Keys { struct Keys {
bool forward, bool forward,
backward, backward,
@ -52,6 +58,8 @@ namespace netprot {
running; running;
}; };
/* Structures de paquets */
struct Input { // cli -> srv UDP ~frame struct Input { // cli -> srv UDP ~frame
Timestamp timestamp; Timestamp timestamp;
uint64_t sid = 0; uint64_t sid = 0;
@ -125,6 +133,8 @@ namespace netprot {
ErrorLog(ErrorLog* err) : is_fatal(err->is_fatal) { strcpy(err->mess, mess); } ErrorLog(ErrorLog* err) : is_fatal(err->is_fatal) { strcpy(err->mess, mess); }
}; };
/* Fonctions */
void Serialize(Input* in, char* buf[], uint32_t* buflen); // cli void Serialize(Input* in, char* buf[], uint32_t* buflen); // cli
void Serialize(Output* out, char* buf[], uint32_t* buflen); // srv void Serialize(Output* out, char* buf[], uint32_t* buflen); // srv
void Serialize(Sync* sync, char* buf[], uint32_t* buflen); // srv void Serialize(Sync* sync, char* buf[], uint32_t* buflen); // srv
@ -153,6 +163,8 @@ namespace netprot {
bool emptyPack(Packet pck); bool emptyPack(Packet pck);
Packet makePack(void* ptr, PACKET_TYPE type); // Pour pouvoir faire une liste de stock a supprimer sans avoir a en faire une pour chaque type. Packet makePack(void* ptr, PACKET_TYPE type); // Pour pouvoir faire une liste de stock a supprimer sans avoir a en faire une pour chaque type.
template <class T> T copyPack(Packet* pck);
template <class T> void sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen); template <class T> void sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen);
template <class T> void sendPackTo(SOCKET sock, T* pack, char** buf, uint32_t* buflen, sockaddr_in* sockad); template <class T> void sendPackTo(SOCKET sock, T* pack, char** buf, uint32_t* buflen, sockaddr_in* sockad);
@ -162,6 +174,11 @@ namespace netprot {
std::vector<char*> recvPacks(SOCKET sock, Buffer* buf); std::vector<char*> recvPacks(SOCKET sock, Buffer* buf);
/* Templates */
template <class T>
T copyPack(Packet* pck) { return T((T*)pck->ptr); }
template <class T> template <class T>
void sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen) { void sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen) {
netprot::Serialize(pack, buf, buflen); netprot::Serialize(pack, buf, buflen);