About a lucky man who made the grade

This commit is contained in:
MarcEricMartel
2023-10-28 12:03:22 -04:00
parent 42d612ad33
commit 3f8d860b93
2 changed files with 56 additions and 75 deletions

View File

@@ -62,87 +62,54 @@ int Connector::Connect(const char* srv_addr, std::string name) {
return 3;
}
char* buf = new char[1500];
uint32_t buflen = 1500;
netprot::Buffer bf;
netprot::LoginInfo log;
memcpy(&log.name, name.c_str(), name.size() + 1);
strcpy_s(log.name, name.c_str());
netprot::Serialize(&log, &buf, &buflen);
netprot::sendPack(m_sock_tcp, &log, &bf);
int se = send(m_sock_tcp, buf, buflen, 0);
delete[] buf;
buf = new char[150] {0};
buflen = 150;
bool ready = false;
int errors = 0;
int bytes = 0, ptrbuf = 0;
char* currbuf = new char[150];
netprot::PlayerInfo pinfo{};
std::vector<netprot::Packet> lsPck;
while (!ready) {
int len = 0;
bool is_fullpack = false;
lsPck = netprot::recvPacks(m_sock_tcp, &bf);
do {
len = recv(m_sock_tcp, &buf[bytes], buflen, 0);
bytes += len;
buflen -= bytes;
if (lsPck.empty())
errors++;
for (int i = 0; i < buflen; ++i) {
// TODOTODOTODOSAINT-TROPEZ
}
} while (!is_fullpack);
switch (netprot::getType(currbuf, buflen)) {
case netprot::PACKET_TYPE::LOGINF:
if (bytes < sizeof(netprot::LoginInfo))
break;
if (!netprot::Deserialize(&m_loginfo, currbuf, buflen)) {
std::cout << "Packet LoginInfo invalide." << std::endl;
return 2;
}
currbuf = buf + sizeof(netprot::LoginInfo) + 2;
//ptrbuf += sizeof(netprot::LoginInfo) + 2;
for (auto& pck : lsPck) {
bool bypass_delete = false;
netprot::PlayerInfo* pl = nullptr;
switch (pck.type) {
using enum netprot::PACKET_TYPE;
case LOGINF:
m_loginfo = netprot::LoginInfo((netprot::LoginInfo*)pck.ptr);
break;
case netprot::PACKET_TYPE::GAMEINFO:
if (bytes < sizeof(netprot::GameInfo))
break;
if (!netprot::Deserialize(&m_gameinfo, currbuf, buflen)) {
std::cout << "Packet GameInfo invalide." << std::endl;
return 4;
}
currbuf = buf + sizeof(netprot::GameInfo) + 2;
//ptrbuf += sizeof(netprot::GameInfo) + 2;
case GAMEINFO:
m_gameinfo = netprot::GameInfo((netprot::GameInfo*)pck.ptr);
break;
case netprot::PACKET_TYPE::PLAYINF:
if (bytes < sizeof(netprot::PlayerInfo))
break;
if (!netprot::Deserialize(&pinfo, currbuf, buflen)) {
std::cout << "Packet PlayerInfo invalide." << std::endl;
return 4;
}
m_players[pinfo.id] = pinfo;
currbuf = buf + sizeof(netprot::PlayerInfo) + 2;
//ptrbuf += sizeof(netprot::PlayerInfo) + 2;
case PLAYINF:
pl = (netprot::PlayerInfo*)pck.ptr;
m_players[pl->id] = pl;
bypass_delete = true;
break;
case netprot::PACKET_TYPE::SYNC:
if (bytes < sizeof(netprot::Sync))
break;
if (!netprot::Deserialize(&m_origin, currbuf, buflen)) {
std::cout << "Packet Sync invalide." << std::endl;
return 4;
}
case TEAMINF:
// TODO: Faire dequoi avec TeamInfo si on fini par avoir des teams.
break;
case SYNC:
m_origin = netprot::Sync((netprot::Sync*)pck.ptr);
ready = true;
break;
default:
++errors;
//std::cout << "Packet invalide." << std::endl;
errors++;
break;
}
if (errors > 100)
return 5;
if (!bypass_delete)
netprot::emptyPack(pck);
}
lsPck.clear();
if (errors > 100)
return 4;
}
return 0;
}