etc
/
SuperMarioOdysseyOnline
mirror of https://github.com/CraftyBoss/SuperMarioOdysseyOnline.git
0
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Merge pull request #58 from Istador/auto-reconnect-again 

fix: add auto reconnect again
This commit is contained in:
Jack Garrard 2023-09-11 16:10:11 -07:00 committed by GitHub
parent f27875f65f b4d90d1d85
commit 6b81465197
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/server/SocketClient.cpp
View File

@ -217,8 +217,7 @@ bool SocketClient::send(Packet *packet) {
} else {
Logger::log("Failed to Fully Send Packet! Result: %d Type: %s Packet Size: %d\n", valread, packetNames[packet->mType], packet->mPacketSize);
this->socket_errno = nn::socket::GetLastErrno();
this->closeSocket();
return false;
return this->tryReconnect();
}
return true;
}
@ -228,8 +227,7 @@ bool SocketClient::recv() {
if (this->socket_log_state != SOCKET_LOG_CONNECTED) {
Logger::log("Unable To Receive! Socket Not Connected.\n");
this->socket_errno = nn::socket::GetLastErrno();
this->closeSocket();
return false;
return this->tryReconnect();
}
const int fd_count = 2;
@ -253,8 +251,7 @@ bool SocketClient::recv() {
} else if (result < 0) {
Logger::log("Error occurred when polling for packets\n");
this->socket_errno = nn::socket::GetLastErrno();
this->closeSocket();
return false;
return this->tryReconnect();
}
s32 index = -1;
@ -297,8 +294,7 @@ bool SocketClient::recvTcp() {
return true;
} else {
Logger::log("Header Read Failed! Value: %d Total Read: %d\n", result, valread);
this->closeSocket();
return false;
return this->tryReconnect();
}
}
}
@ -306,8 +302,7 @@ bool SocketClient::recvTcp() {
if(valread <= 0) { // if we error'd, close the socket
Logger::log("valread was zero! Disconnecting.\n");
this->socket_errno = nn::socket::GetLastErrno();
this->closeSocket();
return false;
return this->tryReconnect();
}
Packet* header = reinterpret_cast<Packet*>(recvBuf);
@ -350,8 +345,7 @@ bool SocketClient::recvTcp() {
} else {
mHeap->free(packetBuf);
Logger::log("Packet Read Failed! Value: %d\nPacket Size: %d\nPacket Type: %s\n", result, header->mPacketSize, packetNames[header->mType]);
this->closeSocket();
return false;
return this->tryReconnect();
}
}
@ -380,8 +374,7 @@ bool SocketClient::recvUdp() {
if (valread == 0) {
Logger::log("Udp connection valread was zero. Disconnecting.\n");
this->closeSocket();
return false;
return this->tryReconnect();
}
if (valread < headerSize){