From d134645d1fc2109db17a19dd9964a00757ba1384 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 23 Oct 2022 23:00:24 +0000 Subject: [PATCH] Pass std::span to net_udp_process_dump --- similar/main/net_udp.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/similar/main/net_udp.cpp b/similar/main/net_udp.cpp index 272ac57e6..38b29f41d 100644 --- a/similar/main/net_udp.cpp +++ b/similar/main/net_udp.cpp @@ -3260,7 +3260,7 @@ static void net_udp_process_game_info_heavy(const uint8_t *data, uint_fast32_t, namespace { -static void net_udp_process_dump(const uint8_t *data, int, const _sockaddr &sender_addr) +static void net_udp_process_dump(const upid_rspan data, const _sockaddr &sender_addr) { // Our request for join was denied. Tell the user why. if (sender_addr != Netgame.players[0].protocol.udp.addr) @@ -3406,10 +3406,11 @@ static void net_udp_process_packet(const d_level_shared_robot_info_state &LevelS net_udp_process_game_info_light(data, length, sender_addr); break; case upid::dump: - if (multi_i_am_master() || Netgame.players[0].protocol.udp.addr != sender_addr || length != upid_length) + if (multi_i_am_master() || Netgame.players[0].protocol.udp.addr != sender_addr) break; - if (Network_status == network_state::waiting || Network_status == network_state::playing) - net_udp_process_dump(data, length, sender_addr); + if (const auto s = build_upid_rspan(buf)) + if (Network_status == network_state::waiting || Network_status == network_state::playing) + net_udp_process_dump(*s, sender_addr); break; case upid::addplayer: if (multi_i_am_master() || Netgame.players[0].protocol.udp.addr != sender_addr || length != upid_length)