Skip to content

fix(lobby): Re-pull the lobby after a websocket reconnect #672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bill-rich wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −2
Open

fix(lobby): Re-pull the lobby after a websocket reconnect #672

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ...alsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_RoomsInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ class WebSocketMessage_Social_FriendChatMessage_Incoming : public WebSocketMessa
int64_t source_user_id;
int64_t target_user_id;
std::string message;

NLOHMANN_DEFINE_TYPE_INTRUSIVE(WebSocketMessage_Social_FriendChatMessage_Incoming, msg_id, source_user_id, target_user_id, message)
};

Expand Down Expand Up @@ -837,6 +837,13 @@ void WebSocket::Tick()
if (m_bReconnecting)
{
NetworkLog(ELogVerbosity::LOG_RELEASE, "[WebSocket] Re-Connected");

NGMP_OnlineServices_LobbyInterface* pLobbyInterface = NGMP_OnlineServicesManager::GetInterface<NGMP_OnlineServices_LobbyInterface>();
if (pLobbyInterface != nullptr && pLobbyInterface->IsInLobby())
{
NetworkLog(ELogVerbosity::LOG_RELEASE, "[WebSocket] Reconnected while in a lobby, refreshing it");
pLobbyInterface->UpdateRoomDataCache(nullptr);
}
}
else
{
Expand Down Expand Up @@ -927,7 +934,7 @@ void WebSocket::Tick()
m_vecWSPartialBuffer.clear();
return;
}

// SECURITY FIX: Store old size BEFORE resize to avoid off-by-one error in memcpy
size_t oldSize = m_vecWSPartialBuffer.size();
m_vecWSPartialBuffer.resize(oldSize + rlen);
Expand Down
Loading