mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 22:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4161 from GregorR/netplay-checks

Browse Source 
Bugfixes
This commit is contained in:
Twinaphex 2016-12-05 07:07:19 +01:00 committed by GitHub
commit 8e9d1d781f
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
network/netplay/netplay.c
View File

@ -100,6 +100,15 @@ static int init_tcp_connection(const struct addrinfo *res,
} }
else else
{ {
#if defined(AF_INET6) && defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
/* Make sure we accept connections on both IPv6 and IPv4 */
int on = 0;
if (res->ai_family == AF_INET6)
{
if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0)
RARCH_WARN("Failed to listen on both IPv6 and IPv4\n");
}
#endif
if ( !socket_bind(fd, (void*)res) || if ( !socket_bind(fd, (void*)res) ||
listen(fd, spectate ? MAX_SPECTATORS : 1) < 0) listen(fd, spectate ? MAX_SPECTATORS : 1) < 0)
{ {
@ -132,6 +141,7 @@ static bool init_tcp_socket(netplay_t *netplay, void *direct_host,
if (!direct_host) if (!direct_host)
{ {
#ifdef AF_INET6 #ifdef AF_INET6
/* Default to hosting on IPv6 and IPv4 */
if (!server) if (!server)
hints.ai_family = AF_INET6; hints.ai_family = AF_INET6;
#endif #endif
@ -141,7 +151,19 @@ static bool init_tcp_socket(netplay_t *netplay, void *direct_host,
snprintf(port_buf, sizeof(port_buf), "%hu", (unsigned short)port); snprintf(port_buf, sizeof(port_buf), "%hu", (unsigned short)port);
if (getaddrinfo_retro(server, port_buf, &hints, &res) < 0) if (getaddrinfo_retro(server, port_buf, &hints, &res) < 0)
{
#ifdef AF_INET6
if (!server)
{
/* Didn't work with IPv6, try wildcard */
hints.ai_family = 0;
if (getaddrinfo_retro(server, port_buf, &hints, &res) < 0)
return false;
}
else
#endif
return false; return false;
}
if (!res) if (!res)
return false; return false;

28
network/netplay/netplay_discovery.c
View File

@ -34,6 +34,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <compat/strl.h>
#include <net/net_compat.h> #include <net/net_compat.h>
#include "../../runloop.h" #include "../../runloop.h"
@ -125,7 +126,8 @@ bool netplay_discovery_driver_ctl(enum rarch_netplay_discovery_ctl_state state,
/* Make it broadcastable */ /* Make it broadcastable */
#if defined(SOL_SOCKET) && defined(SO_BROADCAST) #if defined(SOL_SOCKET) && defined(SO_BROADCAST)
setsockopt(lan_ad_client_fd, SOL_SOCKET, SO_BROADCAST, (const char *) &canBroadcast, sizeof(canBroadcast)); if (setsockopt(lan_ad_client_fd, SOL_SOCKET, SO_BROADCAST, (const char *) &canBroadcast, sizeof(canBroadcast)) < 0)
RARCH_WARN("Failed to set netplay discovery port to broadcast.\n");
#endif #endif
/* Put together the request */ /* Put together the request */
@ -133,8 +135,12 @@ bool netplay_discovery_driver_ctl(enum rarch_netplay_discovery_ctl_state state,
ad_packet_buffer.protocol_version = htonl(NETPLAY_PROTOCOL_VERSION); ad_packet_buffer.protocol_version = htonl(NETPLAY_PROTOCOL_VERSION);
/* And send it off */ /* And send it off */
sendto(lan_ad_client_fd, (const char *) &ad_packet_buffer, if (sendto(lan_ad_client_fd, (const char *) &ad_packet_buffer,
2*sizeof(uint32_t), 0, addr->ai_addr, addr->ai_addrlen); 2*sizeof(uint32_t), 0, addr->ai_addr, addr->ai_addrlen) <
2*sizeof(uint32_t))
RARCH_WARN("Failed to send netplay discovery response.\n");
freeaddrinfo_retro(addr);
break; break;
} }
@ -225,14 +231,14 @@ bool netplay_lan_ad_server(netplay_t *netplay)
ad_packet_buffer.protocol_version = ad_packet_buffer.protocol_version =
htonl(NETPLAY_PROTOCOL_VERSION); htonl(NETPLAY_PROTOCOL_VERSION);
ad_packet_buffer.port = htonl(netplay->tcp_port); ad_packet_buffer.port = htonl(netplay->tcp_port);
strncpy(ad_packet_buffer.retroarch_version, PACKAGE_VERSION, strlcpy(ad_packet_buffer.retroarch_version, PACKAGE_VERSION,
NETPLAY_HOST_STR_LEN); NETPLAY_HOST_STR_LEN);
strncpy(ad_packet_buffer.nick, netplay->nick, NETPLAY_HOST_STR_LEN); strlcpy(ad_packet_buffer.nick, netplay->nick, NETPLAY_HOST_STR_LEN);
if (info) if (info)
{ {
strncpy(ad_packet_buffer.core, info->info.library_name, strlcpy(ad_packet_buffer.core, info->info.library_name,
NETPLAY_HOST_STR_LEN); NETPLAY_HOST_STR_LEN);
strncpy(ad_packet_buffer.core_version, info->info.library_version, strlcpy(ad_packet_buffer.core_version, info->info.library_version,
NETPLAY_HOST_STR_LEN); NETPLAY_HOST_STR_LEN);
} }
@ -346,11 +352,11 @@ bool netplay_lan_ad_client(void)
memset(host, 0, sizeof(struct netplay_host)); memset(host, 0, sizeof(struct netplay_host));
host->addr = their_addr; host->addr = their_addr;
host->addrlen = addr_size; host->addrlen = addr_size;
strncpy(host->nick, ad_packet_buffer.nick, NETPLAY_HOST_STR_LEN); strlcpy(host->nick, ad_packet_buffer.nick, NETPLAY_HOST_STR_LEN);
strncpy(host->core, ad_packet_buffer.core, NETPLAY_HOST_STR_LEN); strlcpy(host->core, ad_packet_buffer.core, NETPLAY_HOST_STR_LEN);
strncpy(host->core_version, ad_packet_buffer.core_version, strlcpy(host->core_version, ad_packet_buffer.core_version,
NETPLAY_HOST_STR_LEN); NETPLAY_HOST_STR_LEN);
strncpy(host->content, ad_packet_buffer.content, strlcpy(host->content, ad_packet_buffer.content,
NETPLAY_HOST_STR_LEN); NETPLAY_HOST_STR_LEN);
host->nick[NETPLAY_HOST_STR_LEN-1] = host->nick[NETPLAY_HOST_STR_LEN-1] =
host->core[NETPLAY_HOST_STR_LEN-1] = host->core[NETPLAY_HOST_STR_LEN-1] =