mirror of
https://github.com/worldforge/cyphesis
synced 2026-08-13 12:26:04 -04:00
61415545d8
* server/CommPeer.h, server/CommPeer.cpp: Re-factor CommPeer to only be used for initiating peer connections. * server/Admin.cpp: Use the modified CommPeer constructor. * server/CommClient.h, server/CommClient.cpp: Make the connection a pointer rather than a reference, and pass it in during setup. * server/CommClientFactory.h, server/CommClientFactory.cpp: Re-factor the commclient factory to take connection type as a template param, and create the client and connection objects separately. * server/server.cpp: Use the modified CommClientFactory parameter. * server/Makefile.am: Remove the different kinds of client class from the build.
62 lines
1.9 KiB
C++
62 lines
1.9 KiB
C++
// Cyphesis Online RPG Server and AI Engine
|
|
// Copyright (C) 2009 Alistair Riddoch
|
|
//
|
|
// 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
|
|
|
|
// $Id$
|
|
|
|
#include "CommClientFactory.h"
|
|
|
|
#include "CommServer.h"
|
|
#include "CommClient.h"
|
|
#include "TrustedConnection.h"
|
|
#include "SlaveClientConnection.h"
|
|
#include "Peer.h"
|
|
|
|
#include "common/id.h"
|
|
#include "common/log.h"
|
|
#include "common/system.h"
|
|
|
|
CommClientKit::~CommClientKit()
|
|
{
|
|
}
|
|
|
|
template <class ConnectionT>
|
|
int CommClientFactory<ConnectionT>::newCommClient(CommServer & svr,
|
|
int asockfd,
|
|
const std::string & address)
|
|
{
|
|
std::string connection_id;
|
|
if (newId(connection_id) < 0) {
|
|
log(ERROR, "Unable to accept connection as no ID available");
|
|
closesocket(asockfd);
|
|
return -1;
|
|
}
|
|
|
|
CommClient * newcli = new CommClient(svr, asockfd);
|
|
|
|
newcli->setup(new ConnectionT(*newcli, svr.m_server, address, connection_id));
|
|
|
|
// Add this new client to the list.
|
|
svr.addSocket(newcli);
|
|
svr.addIdle(newcli);
|
|
|
|
return 0;
|
|
}
|
|
|
|
template class CommClientFactory<Connection>;
|
|
template class CommClientFactory<SlaveClientConnection>;
|
|
template class CommClientFactory<TrustedConnection>;
|
|
template class CommClientFactory<Peer>;
|