From e199c33c6e9eb2f1aa588073f49f44de274985d5 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 24 Jan 2014 00:26:53 +0100
Subject: Client*: move to client/

---
 src/ClientNew.cxx | 117 ------------------------------------------------------
 1 file changed, 117 deletions(-)
 delete mode 100644 src/ClientNew.cxx

(limited to 'src/ClientNew.cxx')

diff --git a/src/ClientNew.cxx b/src/ClientNew.cxx
deleted file mode 100644
index a080e9ec6..000000000
--- a/src/ClientNew.cxx
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2003-2014 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 "ClientInternal.hxx"
-#include "ClientList.hxx"
-#include "Partition.hxx"
-#include "Instance.hxx"
-#include "system/fd_util.h"
-#include "system/Resolver.hxx"
-#include "Permission.hxx"
-#include "util/Error.hxx"
-#include "Log.hxx"
-
-#include <assert.h>
-#ifdef WIN32
-#include <winsock2.h>
-#else
-#include <sys/socket.h>
-#endif
-
-#ifdef HAVE_LIBWRAP
-#include <tcpd.h>
-#endif
-
-static const char GREETING[] = "OK MPD " PROTOCOL_VERSION "\n";
-
-Client::Client(EventLoop &_loop, Partition &_partition,
-	       int _fd, int _uid, int _num)
-	:FullyBufferedSocket(_fd, _loop, 16384, client_max_output_buffer_size),
-	 TimeoutMonitor(_loop),
-	 partition(_partition),
-	 playlist(partition.playlist), player_control(partition.pc),
-	 permission(getDefaultPermissions()),
-	 uid(_uid),
-	 num(_num),
-	 idle_waiting(false), idle_flags(0),
-	 num_subscriptions(0)
-{
-	TimeoutMonitor::ScheduleSeconds(client_timeout);
-}
-
-void
-client_new(EventLoop &loop, Partition &partition,
-	   int fd, const struct sockaddr *sa, size_t sa_length, int uid)
-{
-	static unsigned int next_client_num;
-	const auto remote = sockaddr_to_string(sa, sa_length);
-
-	assert(fd >= 0);
-
-#ifdef HAVE_LIBWRAP
-	if (sa->sa_family != AF_UNIX) {
-		// TODO: shall we obtain the program name from argv[0]?
-		const char *progname = "mpd";
-
-		struct request_info req;
-		request_init(&req, RQ_FILE, fd, RQ_DAEMON, progname, 0);
-
-		fromhost(&req);
-
-		if (!hosts_access(&req)) {
-			/* tcp wrappers says no */
-			FormatWarning(client_domain,
-				      "libwrap refused connection (libwrap=%s) from %s",
-				      progname, remote.c_str());
-
-			close_socket(fd);
-			return;
-		}
-	}
-#endif	/* HAVE_WRAP */
-
-	ClientList &client_list = *partition.instance.client_list;
-	if (client_list.IsFull()) {
-		LogWarning(client_domain, "Max connections reached");
-		close_socket(fd);
-		return;
-	}
-
-	Client *client = new Client(loop, partition, fd, uid,
-				    next_client_num++);
-
-	(void)send(fd, GREETING, sizeof(GREETING) - 1, 0);
-
-	client_list.Add(*client);
-
-	FormatInfo(client_domain, "[%u] opened from %s",
-		   client->num, remote.c_str());
-}
-
-void
-Client::Close()
-{
-	partition.instance.client_list->Remove(*this);
-
-	SetExpired();
-
-	FormatInfo(client_domain, "[%u] closed", num);
-	delete this;
-}
-- 
cgit v1.2.3