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

à tester

Browse Source
This commit is contained in:
MarcEricMartel 2023-10-27 15:44:33 -04:00
parent f0bf7d94ce
commit e2e66f3b6c
2 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SQCSim-srv/server.cpp
View File

@ -189,7 +189,7 @@ void Server::Run() {
sync.ammo = 0; sync.ammo = 0;
sync.timestamp = 0; sync.timestamp = 0;
sync.timer = m_game.countdown; sync.timer = m_game.countdown;
sendPackTo<Sync>(conn->getSock(), &sync, &m_buf, conn->getAddr()); sendPack<Sync>(conn->getSock(), &sync, &m_buf);
} }
while (true) { while (true) {

26
SQCSim2021/connector.cpp
View File

@ -56,8 +56,8 @@ int Connector::Connect(const char* srv_addr, std::string name) {
std::cout << "Échec de la connexion." << std::endl; std::cout << "Échec de la connexion." << std::endl;
} }
char* buf = new char[150]; char* buf = new char[1500];
uint32_t buflen = 150; uint32_t buflen = 1500;
netprot::LoginInfo log; netprot::LoginInfo log;
memcpy(&log.name, name.c_str(), name.size() + 1); memcpy(&log.name, name.c_str(), name.size() + 1);
@ -72,33 +72,40 @@ int Connector::Connect(const char* srv_addr, std::string name) {
int errors = 0; int errors = 0;
netprot::PlayerInfo pinfo{}; netprot::PlayerInfo pinfo{};
while (!ready) { while (!ready) {
recv(m_sock_tcp, buf, buflen, 0); uint32_t bytes = recv(m_sock_tcp, buf, buflen, 0);
uint32_t curr = 0;
char* currbuf = buf;
switch (netprot::getType(buf, buflen)) { while (bytes > 0) {
switch (netprot::getType(currbuf, buflen)) {
case netprot::PACKET_TYPE::LOGINF: case netprot::PACKET_TYPE::LOGINF:
if (!netprot::Deserialize(&m_loginfo, buf, buflen)) { if (!netprot::Deserialize(&m_loginfo, currbuf, buflen)) {
std::cout << "Packet LoginInfo invalide." << std::endl; std::cout << "Packet LoginInfo invalide." << std::endl;
return 2; return 2;
} }
curr = sizeof(netprot::LoginInfo);
break; break;
case netprot::PACKET_TYPE::GAMEINFO: case netprot::PACKET_TYPE::GAMEINFO:
if (!netprot::Deserialize(&m_gameinfo, buf, buflen)) { if (!netprot::Deserialize(&m_gameinfo, currbuf, buflen)) {
std::cout << "Packet GameInfo invalide." << std::endl; std::cout << "Packet GameInfo invalide." << std::endl;
return 3; return 3;
} }
curr = sizeof(netprot::GameInfo);
break; break;
case netprot::PACKET_TYPE::PLAYINF: case netprot::PACKET_TYPE::PLAYINF:
if (!netprot::Deserialize(&pinfo, buf, buflen)) { if (!netprot::Deserialize(&pinfo, currbuf, buflen)) {
std::cout << "Packet PlayerInfo invalide." << std::endl; std::cout << "Packet PlayerInfo invalide." << std::endl;
return 3; return 3;
} }
m_players[pinfo.id] = pinfo; m_players[pinfo.id] = pinfo;
curr = sizeof(netprot::PlayerInfo);
break; break;
case netprot::PACKET_TYPE::SYNC: case netprot::PACKET_TYPE::SYNC:
if (!netprot::Deserialize(&m_origin, buf, buflen)) { if (!netprot::Deserialize(&m_origin, currbuf, buflen)) {
std::cout << "Packet Sync invalide." << std::endl; std::cout << "Packet Sync invalide." << std::endl;
return 3; return 3;
} }
curr = sizeof(netprot::Sync);
ready = true; ready = true;
break; break;
default: default:
@ -106,9 +113,12 @@ int Connector::Connect(const char* srv_addr, std::string name) {
//std::cout << "Packet invalide." << std::endl; //std::cout << "Packet invalide." << std::endl;
break; break;
} }
currbuf = &currbuf[curr];
bytes -= curr;
if (errors > 100) if (errors > 100)
return 1; return 1;
} }
}
return 0; return 0;
} }