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

SQC-15_online #1

Merged
memartel merged 349 commits from SQC-15_online into master 2023-12-10 17:41:26 -05:00
Conversation 0 Commits 349 Files Changed 181 +245 -214
4 changed files with 245 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 54307b7c17 - Show all commits

2
SQCSim-common/define.h
View File

@@ -7,7 +7,7 @@
#define SRV_PORT 10000 #define SRV_PORT 10000
#define CLI_PORT 10001 #define CLI_PORT 10001
#define BUFFER_LENGTH 150 #define BUFFER_LENGTH 1500
#define CHUNK_SIZE_X 4 #define CHUNK_SIZE_X 4
#define CHUNK_SIZE_Y 64 #define CHUNK_SIZE_Y 64

111
SQCSim-common/netprotocol.cpp
View File

@@ -366,8 +366,8 @@ void netprot::Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen) {
bool netprot::Deserialize(Input* in, char* buf, const uint32_t buflen) { bool netprot::Deserialize(Input* in, char* buf, uint32_t *buflen) {
if (buflen <= sizeof(Input)) if (*buflen <= sizeof(Input))
return false; return false;
uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 }; uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
@@ -421,15 +421,17 @@ bool netprot::Deserialize(Input* in, char* buf, const uint32_t buflen) {
memcpy(&in->direction, vec, sizeof(uint32_t) * 3); memcpy(&in->direction, vec, sizeof(uint32_t) * 3);
*buflen = sizeof(uint64_t) * 2 + 2 + sizeof(uint32_t) * 3;
return true; return true;
} }
bool netprot::Deserialize(Output* out, char* buf, const uint32_t buflen) { bool netprot::Deserialize(Output* out, char* buf, uint32_t *buflen) {
return false; return false;
} }
bool netprot::Deserialize(Sync* sync, char* buf, const uint32_t buflen) { bool netprot::Deserialize(Sync* sync, char* buf, uint32_t *buflen) {
if (buflen <= sizeof(Sync)) if (*buflen <= sizeof(Sync))
return false; return false;
uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 }; uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
@@ -487,11 +489,13 @@ bool netprot::Deserialize(Sync* sync, char* buf, const uint32_t buflen) {
memcpy(&sync->position, vec, sizeof(uint32_t) * 3); memcpy(&sync->position, vec, sizeof(uint32_t) * 3);
*buflen = sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t) + 2;
return true; return true;
} }
bool netprot::Deserialize(TeamInfo* tinfo, char* buf, const uint32_t buflen) { bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t *buflen) {
if (buflen <= sizeof(LoginInfo)) if (*buflen <= sizeof(LoginInfo))
return false; return false;
size_t namesize = std::strlen(buf) + 1; size_t namesize = std::strlen(buf) + 1;
@@ -513,11 +517,13 @@ bool netprot::Deserialize(TeamInfo* tinfo, char* buf, const uint32_t buflen) {
(uint64_t)diff[6] << 8 | (uint64_t)diff[6] << 8 |
(uint64_t)diff[7]; (uint64_t)diff[7];
*buflen = namesize + sizeof(uint64_t) + 2;
return true; return true;
} }
bool netprot::Deserialize(LoginInfo* linfo, char* buf, const uint32_t buflen) { bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t *buflen) {
if (buflen <= sizeof(LoginInfo)) if (*buflen <= sizeof(LoginInfo))
return false; return false;
size_t namesize = std::strlen(buf) + 1; size_t namesize = std::strlen(buf) + 1;
@@ -550,11 +556,13 @@ bool netprot::Deserialize(LoginInfo* linfo, char* buf, const uint32_t buflen) {
(uint64_t)diff[6] << 8 | (uint64_t)diff[6] << 8 |
(uint64_t)diff[7]; (uint64_t)diff[7];
*buflen = namesize + sizeof(uint64_t) * 2 + 2;
return true; return true;
} }
bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, const uint32_t buflen) { bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t *buflen) {
if (buflen <= sizeof(PlayerInfo)) if (*buflen <= sizeof(PlayerInfo))
return false; return false;
size_t namesize = std::strlen(buf) + 1; size_t namesize = std::strlen(buf) + 1;
@@ -587,11 +595,13 @@ bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, const uint32_t buflen) {
(uint64_t)diff[6] << 8 | (uint64_t)diff[6] << 8 |
(uint64_t)diff[7]; (uint64_t)diff[7];
*buflen = namesize + sizeof(uint64_t) * 2 + 2;
return true; return true;
} }
bool netprot::Deserialize(GameInfo* ginfo, char* buf, const uint32_t buflen) { bool netprot::Deserialize(GameInfo* ginfo, char* buf, uint32_t *buflen) {
if (buflen <= sizeof(GameInfo)) if (*buflen <= sizeof(GameInfo))
return false; return false;
uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 }; uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
@@ -628,11 +638,13 @@ bool netprot::Deserialize(GameInfo* ginfo, char* buf, const uint32_t buflen) {
(uint64_t)diff[6] << 8 | (uint64_t)diff[6] << 8 |
(uint64_t)diff[7]; (uint64_t)diff[7];
*buflen = sizeof(uint64_t) * 3 + 1;
return true; return true;
} }
bool netprot::Deserialize(Chat* chat, char* buf, const uint32_t buflen) { bool netprot::Deserialize(Chat* chat, char* buf, uint32_t *buflen) {
if (buflen <= sizeof(Chat)) if (*buflen <= sizeof(Chat))
return false; return false;
uint8_t src[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 }; uint8_t src[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
@@ -677,11 +689,14 @@ bool netprot::Deserialize(Chat* chat, char* buf, const uint32_t buflen) {
return false; return false;
memcpy(&chat->mess, &buf[1 + sizeof(uint64_t) * 3], messsize); memcpy(&chat->mess, &buf[1 + sizeof(uint64_t) * 3], messsize);
*buflen = messsize + sizeof(uint64_t) * 3 + 2;
return true; return true;
} }
bool netprot::Deserialize(ErrorLog* errlog, char* buf, const uint32_t buflen) { bool netprot::Deserialize(ErrorLog* errlog, char* buf, uint32_t *buflen) {
if (buflen <= sizeof(ErrorLog)) if (*buflen <= sizeof(ErrorLog))
return false; return false;
size_t messsize = std::strlen(buf) + 1; size_t messsize = std::strlen(buf) + 1;
@@ -692,6 +707,8 @@ bool netprot::Deserialize(ErrorLog* errlog, char* buf, const uint32_t buflen) {
memcpy(&errlog->mess, &buf[1], messsize); memcpy(&errlog->mess, &buf[1], messsize);
memcpy(&errlog->is_fatal, &buf[1 + messsize], sizeof(bool)); memcpy(&errlog->is_fatal, &buf[1 + messsize], sizeof(bool));
*buflen = messsize + sizeof(uint64_t) * 3 + 2;
return true; return true;
} }
@@ -703,7 +720,7 @@ netprot::PACKET_TYPE netprot::getType(char* buf, const uint32_t buflen) {
return (netprot::PACKET_TYPE)buf[0]; return (netprot::PACKET_TYPE)buf[0];
} }
netprot::Packet netprot::getPack(char* buf, uint32_t buflen) { netprot::Packet netprot::getPack(char* buf, uint32_t *buflen) {
Packet pck = { nullptr, PACKET_TYPE::ERR }; Packet pck = { nullptr, PACKET_TYPE::ERR };
Input* in = nullptr; Input* in = nullptr;
Output* out = nullptr; Output* out = nullptr;
@@ -713,7 +730,7 @@ netprot::Packet netprot::getPack(char* buf, uint32_t buflen) {
ErrorLog* errlog = nullptr; ErrorLog* errlog = nullptr;
LoginInfo* loginf = nullptr; LoginInfo* loginf = nullptr;
switch (getType(buf, buflen)) { switch (getType(buf, *buflen)) {
case PACKET_TYPE::INPUT: case PACKET_TYPE::INPUT:
in = new Input(); in = new Input();
if (netprot::Deserialize(in, buf, buflen)) { if (netprot::Deserialize(in, buf, buflen)) {
@@ -770,7 +787,7 @@ netprot::Packet netprot::getPack(char* buf, uint32_t buflen) {
} }
netprot::Packet netprot::getPack(netprot::Buffer* buf) { netprot::Packet netprot::getPack(netprot::Buffer* buf) {
return netprot::getPack(buf->ptr, buf->len); return netprot::getPack(buf->ptr, &buf->len);
} }
bool netprot::emptyPack(netprot::Packet pck) { bool netprot::emptyPack(netprot::Packet pck) {
@@ -808,43 +825,53 @@ netprot::Packet netprot::makePack(void* ptr, PACKET_TYPE type) {
return pck; return pck;
} }
std::vector<netprot::Packet> netprot::recvPacks(SOCKET sock, Buffer* buf) { std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf) {
std::vector<Packet> lsPck; std::vector<char*> lsPck;
int len = 0, end = 0; int len = 0, end = 0;
bool pck_received = false; bool pck_received = false;
char * cursor = nullptr, * next = buf->ptr, * last = buf->ptr;
const char footer[sizeof(uint64_t) + sizeof(uint8_t)] = { '\0', '\0', '\0', '\0', '\0' };
while (true) { while (true) {
while (!pck_received) {
int bytes = recv(sock, &buf->ptr[len], buf->len - len, 0); int bytes = recv(sock, &buf->ptr[len], buf->len - len, 0);
if (bytes < 0) // si recv() retourne -1; ça veut dire qu'il y a plus rien a lire. if (bytes <= 0) // si recv() retourne -1 ou 0; ça veut dire qu'il y a plus rien a lire qui n'a pas déjà été traité.
return lsPck; return lsPck;
len += bytes; len += bytes;
// TODO: Voir si on trouve un footer (5 '\0' d'affilee). end = len;
// Si oui, mettre l'index du debut du footer dans
// la variable "end" et mettre pck_received a true.
for (int x = 0; x < len; ++x)
std::putchar(buf->ptr[x]);
std::puts("");
while (true) {
int cmp = 0;
//buf->ptr if (cursor)
end -= (cursor - buf->ptr);
//end = len; if (end < 0)
//pck_received = true; break;
}
char* cursor = nullptr;
cursor = &buf->ptr[end]; cursor = (char*)memchr(next, '\0', end);
next = cursor + 1;
lsPck.push_back(getPack(buf)); if (cursor) {
cmp = memcmp(cursor, &footer, sizeof(uint64_t) + sizeof(uint8_t));
while (*cursor == '\0') if (cmp == 0) {
cursor++, end++; lsPck.push_back(last);
cursor += sizeof(uint64_t) + sizeof(uint8_t) + 1;
if (cursor) { // mettre le début du prochain paquet au début du buffer. last = cursor;
memcpy(buf->ptr, cursor, buf->len - end); // et voir s'il y a en un autre next = cursor + 1;
len = 0;
pck_received = false;
} }
} }
else {
cursor = &buf->ptr[len];
next = cursor + 1;
break;
};
}
}
} }
template <> template <>

22
SQCSim-common/netprotocol.h
View File

@@ -135,19 +135,19 @@ namespace netprot {
void Serialize(Chat* chat, char* buf[], uint32_t* buflen); // cli/srv void Serialize(Chat* chat, char* buf[], uint32_t* buflen); // cli/srv
void Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen); // srv void Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen); // srv
bool Deserialize(Input* in, char* buf, const uint32_t buflen); // srv bool Deserialize(Input* in, char* buf, uint32_t* buflen); // srv
bool Deserialize(Output* out, char* buf, const uint32_t buflen); // cli bool Deserialize(Output* out, char* buf, uint32_t* buflen); // cli
bool Deserialize(Sync* sync, char* buf, const uint32_t buflen); // cli bool Deserialize(Sync* sync, char* buf, uint32_t* buflen); // cli
bool Deserialize(TeamInfo* tinfo, char* buf, const uint32_t buflen); // cli/srv bool Deserialize(TeamInfo* tinfo, char* buf, uint32_t* buflen); // cli/srv
bool Deserialize(LoginInfo* linfo, char* buf, const uint32_t buflen); // cli/srv bool Deserialize(LoginInfo* linfo, char* buf, uint32_t* buflen); // cli/srv
bool Deserialize(PlayerInfo* pinfo, char* buf, const uint32_t buflen); // cli bool Deserialize(PlayerInfo* pinfo, char* buf, uint32_t* buflen); // cli
bool Deserialize(GameInfo* ginfo, char* buf, const uint32_t buflen); // cli bool Deserialize(GameInfo* ginfo, char* buf, uint32_t* buflen); // cli
bool Deserialize(Chat* chat, char* buf, const uint32_t buflen); // srv/cli bool Deserialize(Chat* chat, char* buf, uint32_t* buflen); // srv/cli
bool Deserialize(ErrorLog* errlog, char* buf, const uint32_t buflen); // srv bool Deserialize(ErrorLog* errlog, char* buf, uint32_t* buflen); // srv
PACKET_TYPE getType(char* buf, uint32_t buflen); PACKET_TYPE getType(char* buf, uint32_t buflen);
Packet getPack(char* buf, uint32_t buflen); Packet getPack(char* buf, uint32_t *buflen);
Packet getPack(Buffer* buf); Packet getPack(Buffer* buf);
bool emptyPack(Packet pck); bool emptyPack(Packet pck);
@@ -160,7 +160,7 @@ namespace netprot {
template <class T> void sendPack(SOCKET sock, T* pack, Buffer* buf); template <class T> void sendPack(SOCKET sock, T* pack, Buffer* buf);
template <class T> void sendPackTo(SOCKET sock, T* pack, Buffer* buf, sockaddr_in* sockad); template <class T> void sendPackTo(SOCKET sock, T* pack, Buffer* buf, sockaddr_in* sockad);
std::vector<Packet> recvPacks(SOCKET sock, Buffer* buf); std::vector<char*> recvPacks(SOCKET sock, Buffer* buf);
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) {

28
SQCSim2021/connector.cpp
View File

@@ -71,42 +71,46 @@ int Connector::Connect(const char* srv_addr, std::string name) {
bool ready = false; bool ready = false;
int errors = 0; int errors = 0;
std::vector<netprot::Packet> lsPck; std::vector<char*> lsPck;
while (!ready) { while (!ready) {
lsPck = netprot::recvPacks(m_sock_tcp, &bf); lsPck = netprot::recvPacks(m_sock_tcp, &bf);
for (auto& pck : lsPck) { for (auto& pck : lsPck) {
bool bypass_delete = false; uint32_t bsize = bf.len - (pck - bf.ptr);
netprot::PlayerInfo* pl = nullptr; netprot::PlayerInfo* pl = nullptr;
switch (pck.type) { switch (netprot::getType(pck, 1)) {
using enum netprot::PACKET_TYPE; using enum netprot::PACKET_TYPE;
case LOGINF: case LOGINF:
m_loginfo = netprot::LoginInfo((netprot::LoginInfo*)pck.ptr); if (!netprot::Deserialize(&m_loginfo, pck, &bsize))
++errors;
break; break;
case GAMEINFO: case GAMEINFO:
m_gameinfo = netprot::GameInfo((netprot::GameInfo*)pck.ptr); if (!netprot::Deserialize(&m_gameinfo, pck, &bsize))
++errors;
break; break;
case PLAYINF: case PLAYINF:
pl = (netprot::PlayerInfo*)pck.ptr; pl = new netprot::PlayerInfo();
m_players[pl->id] = pl; if (!netprot::Deserialize(pl, pck, &bsize))
bypass_delete = true; ++errors;
else m_players[pl->id] = pl;
break; break;
case TEAMINF: case TEAMINF:
// TODO: Faire dequoi avec TeamInfo si on fini par avoir des teams. // TODO: Faire dequoi avec TeamInfo si on fini par avoir des teams.
break; break;
case SYNC: case SYNC:
m_origin = netprot::Sync((netprot::Sync*)pck.ptr); if (!netprot::Deserialize(&m_origin, pck, &bsize))
++errors;
ready = true; ready = true;
break; break;
default: default:
errors++; errors++;
break; break;
} }
if (!bypass_delete)
netprot::emptyPack(pck);
} }
if (lsPck.empty())
errors++;
lsPck.clear(); lsPck.clear();
if (errors > 100) if (errors > 1000000)
return 4; return 4;
} }
return 0; return 0;