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

Listen: move class ClientListener to src/client/Listener.hxx

This commit is contained in:
Max Kellermann 2018-01-29 23:48:16 +01:00
parent 52da387a1d
commit 1df5c5a76e
4 changed files with 74 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -105,6 +105,7 @@ libmpd_a_SOURCES = \
src/decoder/DecoderPlugin.hxx \
src/decoder/Bridge.cxx src/decoder/Bridge.hxx \
src/decoder/DecoderPrint.cxx src/decoder/DecoderPrint.hxx \
src/client/Listener.cxx src/client/Listener.hxx \
src/client/Client.cxx src/client/Client.hxx \
src/client/ClientInternal.hxx \
src/client/ClientEvent.cxx \

17
src/Listen.cxx
View File

@ -19,7 +19,7 @@
#include "config.h"
#include "Listen.hxx"
#include "client/Client.hxx"
#include "client/Listener.hxx"
#include "config/Param.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigOption.hxx"
@ -43,21 +43,6 @@ static constexpr Domain listen_domain("listen");
#define DEFAULT_PORT 6600
class ClientListener final : public ServerSocket {
Partition &partition;
public:
ClientListener(EventLoop &_loop, Partition &_partition)
:ServerSocket(_loop), partition(_partition) {}
private:
void OnAccept(UniqueSocketDescriptor fd,
SocketAddress address, int uid) override {
client_new(GetEventLoop(), partition,
std::move(fd), address, uid);
}
};
static ClientListener *listen_socket;
int listen_port;

32
src/client/Listener.cxx Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright 2003-2018 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
#include "Listener.hxx"
#include "Client.hxx"
#include "net/UniqueSocketDescriptor.hxx"
#include "net/SocketAddress.hxx"
void
ClientListener::OnAccept(UniqueSocketDescriptor fd,
SocketAddress address, int uid) noexcept
{
client_new(GetEventLoop(), partition,
std::move(fd), address, uid);
}

40
src/client/Listener.hxx Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright 2003-2018 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_CLIENT_LISTENER_HXX
#define MPD_CLIENT_LISTENER_HXX
#include "check.h"
#include "event/ServerSocket.hxx"
struct Partition;
class ClientListener final : public ServerSocket {
Partition &partition;
public:
ClientListener(EventLoop &_loop, Partition &_partition)
:ServerSocket(_loop), partition(_partition) {}
private:
void OnAccept(UniqueSocketDescriptor fd,
SocketAddress address, int uid) noexcept override;
};
#endif