CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-22 10:49:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Actually report the host port as the Netplay port, not the discovery port

Browse Source
This commit is contained in:
Gregor Richards 2016-12-02 20:38:55 -05:00
parent 3446cf09d6
commit ba0985de37
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
network/netplay/netplay_discovery.c
View File

@ -240,6 +240,22 @@ bool netplay_lan_ad_server(netplay_t *netplay)
return true; return true;
} }
#ifdef HAVE_SOCKET_LEGACY
/* The fact that I need to write this is deeply depressing */
static int16_t htons_for_morons(int16_t value)
{
union {
int32_t l;
int16_t s[2];
} val;
val.l = htonl(value);
return val.s[2];
}
#ifndef htons
#define htons htons_for_morons
#endif
#endif
bool netplay_lan_ad_client(void) bool netplay_lan_ad_client(void)
{ {
fd_set fds; fd_set fds;
@ -278,6 +294,23 @@ bool netplay_lan_ad_client(void)
if (ntohl(ad_packet_buffer.protocol_version) != NETPLAY_PROTOCOL_VERSION) if (ntohl(ad_packet_buffer.protocol_version) != NETPLAY_PROTOCOL_VERSION)
continue; continue;
/* And that we know how to handle it */
if (their_addr.sa_family == AF_INET)
{
struct sockaddr_in *sin = (struct sockaddr_in *) &their_addr;
sin->sin_port = htons(ad_packet_buffer.port);
}
#ifdef AF_INET6
else if (their_addr.sa_family == AF_INET6)
{
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) &their_addr;
sin6->sin6_port = htons(ad_packet_buffer.port);
}
#endif
else continue;
/* Allocate space for it */ /* Allocate space for it */
if (discovered_hosts.size >= discovered_hosts_allocated) if (discovered_hosts.size >= discovered_hosts_allocated)
{ {