Skip to content

Fix pre-emptive command validation in MP #2063

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
schombert merged 1 commit into from
Aug 25, 2025
Merged

Fix pre-emptive command validation in MP #2063

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
8 changes: 3 additions & 5 deletions src/network/network.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,13 +1381,12 @@ int server_process_handshake(sys::state& state, network::client_data& client) {
return r;
}

int server_process_commands(sys::state& state, network::client_data& client) {
int server_process_client_commands(sys::state& state, network::client_data& client) {
int r = socket_recv(client.socket_fd, &client.recv_buffer, sizeof(client.recv_buffer), &client.recv_count, [&]() {
switch(client.recv_buffer.type) {
// client can notify the host that they are loaded without needing to check the num of clients loading
case command::command_type::notify_player_fully_loaded:
if(client.recv_buffer.source == client.playing_as
&& command::can_perform_command(state, client.recv_buffer)) {
if(client.recv_buffer.source == client.playing_as) {
state.network_state.outgoing_commands.push(client.recv_buffer);
}
break;
Expand All @@ -1408,7 +1407,6 @@ int server_process_commands(sys::state& state, network::client_data& client) {
/* Has to be from the nation of the client proper - and early
discard invalid commands, and no clients must be currently loading */
if(client.recv_buffer.source == client.playing_as
&& command::can_perform_command(state, client.recv_buffer)
&& !network::check_any_players_loading(state)) {
state.network_state.outgoing_commands.push(client.recv_buffer);
}
Expand Down Expand Up @@ -1443,7 +1441,7 @@ static void receive_from_clients(sys::state& state) {

int commandspertick = 0;
while(r == 0 && commandspertick < 10) {
r = server_process_commands(state, client);
r = server_process_client_commands(state, client);
commandspertick++;
}

Expand Down
Loading