piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9705 from Leseratte10/master

Browse Source 
Socket: Fix AF_INET6 on non-Windows systems
This commit is contained in:
Mat M 2021-05-13 06:42:44 -04:00 committed by GitHub
commit 0ef88d4ecb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/Core/IOS/Network/Socket.cpp
View File

@ -750,12 +750,31 @@ bool WiiSockMan::IsSocketBlocking(s32 wii_fd) const
s32 WiiSockMan::NewSocket(s32 af, s32 type, s32 protocol)
{
if (af != 2 && af != 23) // AF_INET && AF_INET6
if (af == 2)
{
// AF_INET == 2 is true on all systems I've seen,
// but it's not guaranteed. Better set this again.
af = AF_INET;
}
else if (af == 23)
{
// AF_INET6 == 23 is only true on Wii and on Windows.
// On other OSes, AF_INET6 can have a different value.
// For example, on Linux it's 10 and on MacOS/iOS it's 30.
af = AF_INET6;
}
else
{
// Neither an AF_INET nor an AF_INET6 socket.
// Unsupported.
return -SO_EAFNOSUPPORT;
}
if (protocol != 0) // IPPROTO_IP
return -SO_EPROTONOSUPPORT;
if (type != 1 && type != 2) // SOCK_STREAM && SOCK_DGRAM
return -SO_EPROTOTYPE;
s32 fd = static_cast<s32>(socket(af, type, protocol));
return AddSocket(fd, false);
}