Skip to content

Prevent mission exit from disconnecting the next local session #589

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

Merged
corepunch merged 1 commit into from
Oct 6, 2026
Merged

Prevent mission exit from disconnecting the next local session #589

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
50 changes: 40 additions & 10 deletions client/cl_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,20 +184,23 @@ static void CL_MenuCommand(cstring_t command) {
Cbuf_AddText("\n");
}

static void CL_DisconnectInternal(cstring_t reason, bool notify, bool queue_menu) {
static void CL_SendDisconnect(bool send_disconnect) {
if (!send_disconnect || cls.state < ca_connected) return;
SZ_Clear(&cls.netchan.message);
MSG_WriteByte(&cls.netchan.message, clc_stringcmd);
MSG_WriteString(&cls.netchan.message, "disconnect");
Netchan_Transmit(NS_CLIENT, &cls.netchan);
}

static void CL_DisconnectInternal(cstring_t reason, bool notify, bool queue_menu, bool send_disconnect) {
Cbuf_ClearDefer();
if (cls.state == ca_disconnected) {
return;
}

fprintf(stderr, "CL_Disconnect: %s\n", reason && *reason ? reason : "disconnected");

if (cls.state >= ca_connected) {
SZ_Clear(&cls.netchan.message);
MSG_WriteByte(&cls.netchan.message, clc_stringcmd);
MSG_WriteString(&cls.netchan.message, "disconnect");
Netchan_Transmit(NS_CLIENT, &cls.netchan);
}
CL_SendDisconnect(send_disconnect);

if (cls.netchan.remote_address.type == NA_EOS) Online_Leave();
CL_ClearState();
Expand All @@ -218,7 +221,7 @@ static void CL_DisconnectInternal(cstring_t reason, bool notify, bool queue_menu
}

void CL_Disconnect(cstring_t reason, bool notify) {
CL_DisconnectInternal(reason, notify, true);
CL_DisconnectInternal(reason, notify, true, true);
}

/* UI library FS_ReadFile wrapper — tries engine filesystem first,
Expand Down Expand Up @@ -465,7 +468,7 @@ static bool CL_OnlineGame(uint32_t index, menuLanGame_t *out) {
static void CL_OnlineLeave(void) {
bool const host = Online_IsHost();
if (host || cls.netchan.remote_address.type == NA_EOS)
CL_DisconnectInternal("Left Internet room.", false, false);
CL_DisconnectInternal("Left Internet room.", false, false, !host);
if (host) SV_Shutdown();
Online_Leave();
}
Expand Down Expand Up @@ -727,7 +730,10 @@ static void CL_ProcessPendingMenuAction(void) {
* navigation. Shut the client/server world down first, then rebuild
* the menu after clearing the map asset scope so FDF/model state is
* valid again even after a runtime menu restart. */
CL_DisconnectInternal("Game ended.", false, false);
/* SV_Shutdown immediately follows. Its local peer needs no disconnect
* packet, which would survive the shutdown and drop the next session. */
CL_DisconnectInternal("Game ended.", false, false,
cls.netchan.remote_address.type != NA_LOOPBACK);
SV_Shutdown();
CL_RebuildMenu(pending.arg[0] ? pending.arg : "menu_main");
break;
Expand Down Expand Up @@ -823,6 +829,30 @@ TEST(client_session, menu_action_menu_is_deferred_until_client_frame) {
memset(&cl_pending_menu_action, 0, sizeof(cl_pending_menu_action));
}

TEST(client_session, shutdown_disconnect_does_not_leave_a_loopback_command_for_next_session) {
struct client_static old_cls = cls;
uint8_t packet_data[MAX_MSGLEN];
sizeBuf_t packet = { .data = packet_data, .maxsize = sizeof(packet_data) };
netadr_t from;

memset(&cls, 0, sizeof(cls));
while (NET_GetLoopPacket(NS_SERVER, &from, &packet)) {}
SZ_Init(&cls.netchan.message, cls.netchan.message_buf, MAX_MSGLEN);
cls.netchan.remote_address.type = NA_LOOPBACK;
cls.state = ca_connected;

CL_SendDisconnect(false);
T_EQ(NET_GetLoopPacket(NS_SERVER, &from, &packet), 0);

/* Ordinary client disconnects still tell their server to release the slot. */
CL_SendDisconnect(true);
T_ASSERT(NET_GetLoopPacket(NS_SERVER, &from, &packet) > 0);
T_EQ(MSG_ReadByte(&packet), clc_stringcmd);
T_STREQ(MSG_ReadString2(&packet), "disconnect");

cls = old_cls;
}

static uint32_t cl_test_menu_shutdown_count;
static uint32_t cl_test_menu_init_count;
static uint32_t cl_test_register_map_count;
Expand Down
Loading