mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-22 05:40:01 -06:00
Merge pull request #6579 from lioncash/socket
IOS/Socket: Minor changes to WiiSocket
This commit is contained in:
@ -173,6 +173,15 @@ struct WiiSockAddrIn
|
|||||||
|
|
||||||
class WiiSocket
|
class WiiSocket
|
||||||
{
|
{
|
||||||
|
public:
|
||||||
|
WiiSocket() = default;
|
||||||
|
WiiSocket(const WiiSocket&) = delete;
|
||||||
|
WiiSocket(WiiSocket&&) = default;
|
||||||
|
~WiiSocket();
|
||||||
|
WiiSocket& operator=(const WiiSocket&) = delete;
|
||||||
|
WiiSocket& operator=(WiiSocket&&) = default;
|
||||||
|
|
||||||
|
private:
|
||||||
struct sockop
|
struct sockop
|
||||||
{
|
{
|
||||||
Request request;
|
Request request;
|
||||||
@ -184,12 +193,6 @@ class WiiSocket
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
private:
|
|
||||||
s32 fd;
|
|
||||||
s32 wii_fd;
|
|
||||||
bool nonBlock;
|
|
||||||
std::list<sockop> pending_sockops;
|
|
||||||
|
|
||||||
friend class WiiSockMan;
|
friend class WiiSockMan;
|
||||||
void SetFd(s32 s);
|
void SetFd(s32 s);
|
||||||
void SetWiiFd(s32 s);
|
void SetWiiFd(s32 s);
|
||||||
@ -200,10 +203,10 @@ private:
|
|||||||
void DoSock(Request request, SSL_IOCTL type);
|
void DoSock(Request request, SSL_IOCTL type);
|
||||||
void Update(bool read, bool write, bool except);
|
void Update(bool read, bool write, bool except);
|
||||||
bool IsValid() const { return fd >= 0; }
|
bool IsValid() const { return fd >= 0; }
|
||||||
public:
|
s32 fd = -1;
|
||||||
WiiSocket() : fd(-1), nonBlock(false) {}
|
s32 wii_fd = -1;
|
||||||
~WiiSocket();
|
bool nonBlock = false;
|
||||||
void operator=(WiiSocket const&) = delete;
|
std::list<sockop> pending_sockops;
|
||||||
};
|
};
|
||||||
|
|
||||||
class WiiSockMan
|
class WiiSockMan
|
||||||
|
Reference in New Issue
Block a user