phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-03 00:03:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WorldSocket: parse buffered packets before handling FIN close

Browse source
This commit is contained in:
Kelsi 2026-02-13 01:47:56 -08:00
parent a9e2cee78c
commit 4a30b450fb
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/network/world_socket.cpp
View file

@ -250,6 +250,11 @@ void WorldSocket::send(const Packet& packet) {
void WorldSocket::update() { void WorldSocket::update() {
if (!connected) return; if (!connected) return;
// Drain the socket. Some servers send an auth response and immediately close; a single recv()
// may read the response, and a subsequent recv() can return 0 (FIN). If we disconnect right
// away we lose the buffered response and the UI ends up with a generic "no characters" symptom.
bool sawClose = false;
bool receivedAny = false;
size_t bytesReadThisTick = 0; size_t bytesReadThisTick = 0;
int readOps = 0; int readOps = 0;
while (connected) { while (connected) {
@ -257,6 +262,7 @@ void WorldSocket::update() {
ssize_t received = net::portableRecv(sockfd, buffer, sizeof(buffer)); ssize_t received = net::portableRecv(sockfd, buffer, sizeof(buffer));
if (received > 0) { if (received > 0) {
receivedAny = true;
++readOps; ++readOps;
bytesReadThisTick += static_cast<size_t>(received); bytesReadThisTick += static_cast<size_t>(received);
receiveBuffer.insert(receiveBuffer.end(), buffer, buffer + received); receiveBuffer.insert(receiveBuffer.end(), buffer, buffer + received);
@ -270,9 +276,8 @@ void WorldSocket::update() {
} }
if (received == 0) { if (received == 0) {
LOG_INFO("World server connection closed"); sawClose = true;
disconnect(); break;
return;
} }
int err = net::lastError(); int err = net::lastError();
@ -285,7 +290,7 @@ void WorldSocket::update() {
return; return;
} }
if (bytesReadThisTick > 0) { if (receivedAny) {
LOG_DEBUG("World socket read ", bytesReadThisTick, " bytes in ", readOps, LOG_DEBUG("World socket read ", bytesReadThisTick, " bytes in ", readOps,
" recv call(s), buffered=", receiveBuffer.size()); " recv call(s), buffered=", receiveBuffer.size());
tryParsePackets(); tryParsePackets();
@ -294,6 +299,12 @@ void WorldSocket::update() {
" bytes buffered (awaiting complete packet)"); " bytes buffered (awaiting complete packet)");
} }
} }
if (sawClose) {
LOG_INFO("World server connection closed");
disconnect();
return;
}
} }
void WorldSocket::tryParsePackets() { void WorldSocket::tryParsePackets() {