diff options
| author | Lioncash <mathew1800@gmail.com> | 2022-09-22 08:10:43 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2022-09-22 08:20:54 -0400 |
| commit | c8da75b7ed467f42775eb0d507f2704516775ab2 (patch) | |
| tree | 0fda310e0c6c7da5799e504a9444907c6f9ad1a1 /src/core/internal_network/network.cpp | |
| parent | 8d4458ef24e473e57b9931d7a9d1442b51fb0b1a (diff) | |
sockets: Make fd member variable protected
Other things shouldn't be able to directly mess around with the
descriptor
Diffstat (limited to 'src/core/internal_network/network.cpp')
| -rw-r--r-- | src/core/internal_network/network.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index cdf38a2a4..447fbffaa 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -364,7 +364,7 @@ std::pair<s32, Errno> Poll(std::vector<PollFD>& pollfds, s32 timeout) { std::vector<WSAPOLLFD> host_pollfds(pollfds.size()); std::transform(pollfds.begin(), pollfds.end(), host_pollfds.begin(), [](PollFD fd) { WSAPOLLFD result; - result.fd = fd.socket->fd; + result.fd = fd.socket->GetFD(); result.events = TranslatePollEvents(fd.events); result.revents = 0; return result; @@ -430,12 +430,12 @@ std::pair<SocketBase::AcceptResult, Errno> Socket::Accept() { return {AcceptResult{}, GetAndLogLastError()}; } - AcceptResult result; - result.socket = std::make_unique<Socket>(); - result.socket->fd = new_socket; - ASSERT(addrlen == sizeof(sockaddr_in)); - result.sockaddr_in = TranslateToSockAddrIn(addr); + + AcceptResult result{ + .socket = std::make_unique<Socket>(new_socket), + .sockaddr_in = TranslateToSockAddrIn(addr), + }; return {std::move(result), Errno::SUCCESS}; } |
