oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

net/ServerSocket: pass UniqueSocketDescriptor&& to OnAccept()

Browse Source
This commit is contained in:
Max Kellermann
2017-08-10 19:13:18 +02:00
parent 492b20a89d
commit 9a5bcc6db0
9 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/event/ServerSocket.cxx
View File

@@ -150,7 +150,7 @@ inline void
OneServerSocket::Accept() noexcept
{
StaticSocketAddress peer_address;
auto peer_fd = Get().AcceptNonBlock(peer_address);
UniqueSocketDescriptor peer_fd(Get().AcceptNonBlock(peer_address));
if (!peer_fd.IsDefined()) {
const SocketErrorMessage msg;
FormatError(server_socket_domain,
@@ -165,7 +165,7 @@ OneServerSocket::Accept() noexcept
(const char *)msg);
}
parent.OnAccept(peer_fd.Get(), peer_address,
parent.OnAccept(std::move(peer_fd), peer_address,
get_remote_uid(peer_fd.Get()));
}

4
src/event/ServerSocket.hxx
View File

@@ -24,6 +24,7 @@
class SocketAddress;
class AllocatedSocketAddress;
class UniqueSocketDescriptor;
class EventLoop;
class AllocatedPath;
class OneServerSocket;
@@ -116,7 +117,8 @@ public:
void Close();
protected:
virtual void OnAccept(int fd, SocketAddress address, int uid) = 0;
virtual void OnAccept(UniqueSocketDescriptor &&fd,
SocketAddress address, int uid) = 0;
};
#endif