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

net/SocketDescriptor: add AcceptNonBlock() overload without address

Browse Source
This commit is contained in:
Max Kellermann 2017-08-11 09:02:10 +02:00
parent b234f4307f
commit 614b3634d4
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/SocketDescriptor.cxx
View File

@ -68,6 +68,20 @@ SocketDescriptor::Accept()
: Undefined(); : Undefined();
} }
SocketDescriptor
SocketDescriptor::AcceptNonBlock() const
{
#ifdef HAVE_ACCEPT4
int connection_fd = ::accept4(Get(), nullptr, nullptr,
SOCK_CLOEXEC|SOCK_NONBLOCK);
#else
int connection_fd = ::accept(Get(), nullptr, nullptr);
if (connection_fd >= 0)
SocketDescriptor(connection_fd).SetNonBlocking();
#endif
return SocketDescriptor(connection_fd);
}
SocketDescriptor SocketDescriptor
SocketDescriptor::AcceptNonBlock(StaticSocketAddress &address) const SocketDescriptor::AcceptNonBlock(StaticSocketAddress &address) const
{ {

1
src/net/SocketDescriptor.hxx
View File

@ -173,6 +173,7 @@ public:
bool Listen(int backlog); bool Listen(int backlog);
SocketDescriptor Accept(); SocketDescriptor Accept();
SocketDescriptor AcceptNonBlock() const;
SocketDescriptor AcceptNonBlock(StaticSocketAddress &address) const; SocketDescriptor AcceptNonBlock(StaticSocketAddress &address) const;
bool Connect(SocketAddress address); bool Connect(SocketAddress address);

7
src/net/UniqueSocketDescriptor.hxx
View File

@ -76,6 +76,13 @@ public:
return fd == other.fd; return fd == other.fd;
} }
/**
* @return an "undefined" instance on error
*/
UniqueSocketDescriptor AcceptNonBlock() const {
return UniqueSocketDescriptor(SocketDescriptor::AcceptNonBlock());
}
/** /**
* @return an "undefined" instance on error * @return an "undefined" instance on error
*/ */