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

Main: move global variables to struct Instance

Browse Source 
More preparations for multi-player support.
This commit is contained in:
Max Kellermann
2013-04-17 22:58:33 +02:00
parent 08dfd263ba
commit b2d3d15e97
12 changed files with 149 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ClientNew.cxx
View File

@@ -21,7 +21,7 @@
#include "ClientInternal.hxx"
#include "ClientList.hxx"
#include "Partition.hxx"
#include "Main.hxx"
#include "Instance.hxx"
#include "fd_util.h"
extern "C" {
#include "resolver.h"
@@ -95,7 +95,8 @@ client_new(EventLoop &loop, Partition &partition,
}
#endif /* HAVE_WRAP */
if (client_list->IsFull()) {
ClientList &client_list = *partition.instance.client_list;
if (client_list.IsFull()) {
g_warning("Max Connections Reached!");
close_socket(fd);
return;
@@ -106,7 +107,7 @@ client_new(EventLoop &loop, Partition &partition,
(void)send(fd, GREETING, sizeof(GREETING) - 1, 0);
client_list->Add(*client);
client_list.Add(*client);
remote = sockaddr_to_string(sa, sa_length, NULL);
g_log(G_LOG_DOMAIN, LOG_LEVEL_SECURE,
@@ -117,7 +118,7 @@ client_new(EventLoop &loop, Partition &partition,
void
Client::Close()
{
client_list->Remove(*this);
partition.instance.client_list->Remove(*this);
SetExpired();