I read the news today, oh boy.
This commit is contained in:
@@ -54,6 +54,12 @@ int Connector::Connect(const char* srv_addr, std::string name) {
|
||||
|
||||
if (connect(m_sock_tcp, (sockaddr*)&m_srvsockaddr, sizeof(m_srvsockaddr)) < 0) {
|
||||
std::cout << "<EFBFBD>chec de la connexion." << std::endl;
|
||||
return 2;
|
||||
}
|
||||
|
||||
if (ioctlsocket(m_sock_tcp, FIONBIO, NULL) < 0) {
|
||||
std::cout << "Impossible de mettre le socket en mode non-bloquant." << std::endl;
|
||||
return 3;
|
||||
}
|
||||
|
||||
char* buf = new char[1500];
|
||||
@@ -70,17 +76,24 @@ int Connector::Connect(const char* srv_addr, std::string name) {
|
||||
buflen = 150;
|
||||
bool ready = false;
|
||||
int errors = 0;
|
||||
int bytes = 0;
|
||||
char* currbuf = buf;
|
||||
int bytes = 0, ptrbuf = 0;
|
||||
char* currbuf = new char[150];
|
||||
netprot::PlayerInfo pinfo{};
|
||||
while (!ready) {
|
||||
int len = recv(m_sock_tcp, &buf[bytes], buflen, 0);
|
||||
int len = 0;
|
||||
bool is_fullpack = false;
|
||||
|
||||
if (len <= 0)
|
||||
return 8;
|
||||
do {
|
||||
len = recv(m_sock_tcp, &buf[bytes], buflen, 0);
|
||||
bytes += len;
|
||||
buflen -= bytes;
|
||||
|
||||
for (int i = 0; i < buflen; ++i) {
|
||||
// TODOTODOTODOSAINT-TROPEZ
|
||||
}
|
||||
|
||||
} while (!is_fullpack);
|
||||
|
||||
bytes += len;
|
||||
buflen -= bytes;
|
||||
|
||||
switch (netprot::getType(currbuf, buflen)) {
|
||||
case netprot::PACKET_TYPE::LOGINF:
|
||||
@@ -91,32 +104,35 @@ int Connector::Connect(const char* srv_addr, std::string name) {
|
||||
return 2;
|
||||
}
|
||||
currbuf = buf + sizeof(netprot::LoginInfo) + 2;
|
||||
//ptrbuf += sizeof(netprot::LoginInfo) + 2;
|
||||
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 3;
|
||||
return 4;
|
||||
}
|
||||
currbuf = buf + sizeof(netprot::GameInfo) + 2;
|
||||
//ptrbuf += sizeof(netprot::GameInfo) + 2;
|
||||
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 3;
|
||||
return 4;
|
||||
}
|
||||
m_players[pinfo.id] = pinfo;
|
||||
currbuf = buf + sizeof(netprot::PlayerInfo) + 2;
|
||||
//ptrbuf += sizeof(netprot::PlayerInfo) + 2;
|
||||
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 3;
|
||||
return 4;
|
||||
}
|
||||
ready = true;
|
||||
break;
|
||||
@@ -126,7 +142,7 @@ int Connector::Connect(const char* srv_addr, std::string name) {
|
||||
break;
|
||||
}
|
||||
if (errors > 100)
|
||||
return 1;
|
||||
return 5;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user