mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Netplay/LAN Discovery) Ensure fixed width ints on packet struct (#13901)

Browse Source
This commit is contained in:
Cthulhu-throwaway 2022-04-29 15:26:34 -03:00 committed by GitHub
parent 7a70b36c8b
commit 7c3dfa5e3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
network/netplay/netplay.h
View File

@ -118,8 +118,8 @@ typedef struct netplay netplay_t;
struct ad_packet struct ad_packet
{ {
uint32_t header; uint32_t header;
int content_crc; int32_t content_crc;
int port; int32_t port;
uint32_t has_password; uint32_t has_password;
char nick[NETPLAY_NICK_LEN]; char nick[NETPLAY_NICK_LEN];
char frontend[NETPLAY_HOST_STR_LEN]; char frontend[NETPLAY_HOST_STR_LEN];

29
network/netplay/netplay_frontend.c
View File

@ -358,7 +358,8 @@ static bool netplay_lan_ad_client_response(void)
&addr_size) == sizeof(net_st->ad_packet_buffer)) &addr_size) == sizeof(net_st->ad_packet_buffer))
{ {
char address[256]; char address[256];
struct netplay_host *host = NULL; struct netplay_host *host = NULL;
uint32_t has_password = 0;
/* Make sure it's a valid response */ /* Make sure it's a valid response */
if (ntohl(net_st->ad_packet_buffer.header) != if (ntohl(net_st->ad_packet_buffer.header) !=
@ -425,8 +426,8 @@ static bool netplay_lan_ad_client_response(void)
host = &net_st->discovered_hosts.hosts[net_st->discovered_hosts.size++]; host = &net_st->discovered_hosts.hosts[net_st->discovered_hosts.size++];
/* Copy in the response */ /* Copy in the response */
host->content_crc = ntohl(net_st->ad_packet_buffer.content_crc); host->content_crc = (int)ntohl(net_st->ad_packet_buffer.content_crc);
host->port = ntohl(net_st->ad_packet_buffer.port); host->port = (int)ntohl(net_st->ad_packet_buffer.port);
strlcpy(host->address, strlcpy(host->address,
address, address,
sizeof(host->address)); sizeof(host->address));
@ -451,14 +452,9 @@ static bool netplay_lan_ad_client_response(void)
strlcpy(host->subsystem_name, strlcpy(host->subsystem_name,
net_st->ad_packet_buffer.subsystem_name, net_st->ad_packet_buffer.subsystem_name,
sizeof(host->subsystem_name)); sizeof(host->subsystem_name));
if (net_st->ad_packet_buffer.has_password & 1) has_password = ntohl(net_st->ad_packet_buffer.has_password);
host->has_password = true; host->has_password = (has_password & 1) ? true : false;
else host->has_spectate_password = (has_password & 2) ? true : false;
host->has_password = false;
if (net_st->ad_packet_buffer.has_password & 2)
host->has_spectate_password = true;
else
host->has_spectate_password = false;
} }
} }
@ -574,6 +570,7 @@ static bool netplay_lan_ad_server(netplay_t *netplay)
const frontend_ctx_driver_t *frontend_drv; const frontend_ctx_driver_t *frontend_drv;
char frontend_architecture_tmp[24]; char frontend_architecture_tmp[24];
uint32_t content_crc = 0; uint32_t content_crc = 0;
uint32_t has_password = 0;
struct retro_system_info *system = &runloop_state_get_ptr()->system.info; struct retro_system_info *system = &runloop_state_get_ptr()->system.info;
struct string_list *subsystem = path_get_subsystem_list(); struct string_list *subsystem = path_get_subsystem_list();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -602,7 +599,7 @@ static bool netplay_lan_ad_server(netplay_t *netplay)
net_st->ad_packet_buffer.header = htonl(DISCOVERY_RESPONSE_MAGIC); net_st->ad_packet_buffer.header = htonl(DISCOVERY_RESPONSE_MAGIC);
net_st->ad_packet_buffer.port = htonl((int) netplay->tcp_port); net_st->ad_packet_buffer.port = (int32_t)htonl((uint32_t)netplay->tcp_port);
strlcpy(net_st->ad_packet_buffer.nick, netplay->nick, strlcpy(net_st->ad_packet_buffer.nick, netplay->nick,
sizeof(net_st->ad_packet_buffer.nick)); sizeof(net_st->ad_packet_buffer.nick));
@ -666,13 +663,13 @@ static bool netplay_lan_ad_server(netplay_t *netplay)
content_crc = content_get_crc(); content_crc = content_get_crc();
} }
net_st->ad_packet_buffer.content_crc = htonl(content_crc); net_st->ad_packet_buffer.content_crc = (int32_t)htonl(content_crc);
net_st->ad_packet_buffer.has_password = 0;
if (!string_is_empty(settings->paths.netplay_password)) if (!string_is_empty(settings->paths.netplay_password))
net_st->ad_packet_buffer.has_password |= 1; has_password |= 1;
if (!string_is_empty(settings->paths.netplay_spectate_password)) if (!string_is_empty(settings->paths.netplay_spectate_password))
net_st->ad_packet_buffer.has_password |= 2; has_password |= 2;
net_st->ad_packet_buffer.has_password = htonl(has_password);
/* Send our response */ /* Send our response */
sendto(net_st->lan_ad_server_fd, sendto(net_st->lan_ad_server_fd,