TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compute game version rejection buffer at compile time

Browse source 
All the fields are constant.  Compute them at compile time.  Move the
sending function to dcx, since it is not game-specific.
This commit is contained in:
Kp 2022-07-09 13:39:29 +00:00
parent c354f9a606
commit 1cd9d18127
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
similar/main/net_udp.cpp
View file

@ -637,6 +637,14 @@ public:
}
};
constexpr std::array<uint8_t, UPID_VERSION_DENY_SIZE> udp_response_version_deny{{
UPID_VERSION_DENY,
DXX_CONST_INIT_LE16(DXX_VERSION_MAJORi),
DXX_CONST_INIT_LE16(DXX_VERSION_MINORi),
DXX_CONST_INIT_LE16(DXX_VERSION_MICROi),
DXX_CONST_INIT_LE16(MULTI_PROTO_VERSION),
}};
static const char *dxx_ntop(const _sockaddr &sa, typename _sockaddr::presentation_buffer &dbuf)
{
#ifdef WIN32
@ -808,6 +816,11 @@ static game_info_request_result net_udp_check_game_info_request(const uint8_t *c
return net_udp_check_game_info_request(data);
}
static void net_udp_send_version_deny(const _sockaddr &sender_addr)
{
dxx_sendto(UDP_Socket[0], udp_response_version_deny, 0, sender_addr);
}
}
}
@ -2706,17 +2719,6 @@ void dispatch_table::send_endlevel_packet() const
namespace {
static void net_udp_send_version_deny(const _sockaddr &sender_addr)
{
std::array<uint8_t, UPID_VERSION_DENY_SIZE> buf;
buf[0] = UPID_VERSION_DENY;
PUT_INTEL_SHORT(&buf[1], DXX_VERSION_MAJORi);
PUT_INTEL_SHORT(&buf[3], DXX_VERSION_MINORi);
PUT_INTEL_SHORT(&buf[5], DXX_VERSION_MICROi);
PUT_INTEL_SHORT(&buf[7], MULTI_PROTO_VERSION);
dxx_sendto(UDP_Socket[0], buf, 0, sender_addr);
}
static void net_udp_process_version_deny(const uint8_t *const data, const _sockaddr &)
{
Netgame.protocol.udp.program_iver[0] = GET_INTEL_SHORT(&data[1]);