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

5
src/client/Client.hxx
View File

@@ -38,6 +38,7 @@
#include <stddef.h>
class SocketAddress;
class UniqueSocketDescriptor;
class EventLoop;
class Path;
struct Instance;
@@ -94,7 +95,7 @@ public:
std::list<ClientMessage> messages;
Client(EventLoop &loop, Partition &partition,
SocketDescriptor fd, int uid, int num);
UniqueSocketDescriptor &&fd, int uid, int num);
~Client() {
if (FullyBufferedSocket::IsDefined())
@@ -236,7 +237,7 @@ client_manager_init();
void
client_new(EventLoop &loop, Partition &partition,
SocketDescriptor fd, SocketAddress address, int uid);
UniqueSocketDescriptor &&fd, SocketAddress address, int uid);
/**
* Write a printf-like formatted string to the client.

16
src/client/ClientNew.cxx
View File

@@ -23,6 +23,7 @@
#include "Partition.hxx"
#include "Instance.hxx"
#include "system/fd_util.h"
#include "net/UniqueSocketDescriptor.hxx"
#include "net/SocketAddress.hxx"
#include "net/ToString.hxx"
#include "Permission.hxx"
@@ -42,8 +43,9 @@
static const char GREETING[] = "OK MPD " PROTOCOL_VERSION "\n";
Client::Client(EventLoop &_loop, Partition &_partition,
SocketDescriptor _fd, int _uid, int _num)
:FullyBufferedSocket(_fd, _loop, 16384, client_max_output_buffer_size),
UniqueSocketDescriptor &&_fd, int _uid, int _num)
:FullyBufferedSocket(_fd.Release(), _loop,
16384, client_max_output_buffer_size),
TimeoutMonitor(_loop),
partition(&_partition),
permission(getDefaultPermissions()),
@@ -57,7 +59,7 @@ Client::Client(EventLoop &_loop, Partition &_partition,
void
client_new(EventLoop &loop, Partition &partition,
SocketDescriptor fd, SocketAddress address, int uid)
UniqueSocketDescriptor &&fd, SocketAddress address, int uid)
{
static unsigned int next_client_num;
const auto remote = ToString(address);
@@ -80,7 +82,6 @@ client_new(EventLoop &loop, Partition &partition,
"libwrap refused connection (libwrap=%s) from %s",
progname, remote.c_str());
fd.Close();
return;
}
}
@@ -89,15 +90,14 @@ client_new(EventLoop &loop, Partition &partition,
ClientList &client_list = *partition.instance.client_list;
if (client_list.IsFull()) {
LogWarning(client_domain, "Max connections reached");
fd.Close();
return;
}
Client *client = new Client(loop, partition, fd, uid,
next_client_num++);
(void)fd.Write(GREETING, sizeof(GREETING) - 1);
Client *client = new Client(loop, partition, std::move(fd), uid,
next_client_num++);
client_list.Add(*client);
FormatInfo(client_domain, "[%u] opened from %s",