From a77d2d1e08e4e2e8dfb5e4fc326f6c8fe315a898 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 30 May 2009 13:37:06 +0200 Subject: Thread-sichere Signale implementiert --- src/Server/ConnectionManager.cpp | 8 ++++---- src/Server/RequestHandlers/DaemonCommandRequestHandler.cpp | 4 ++-- src/Server/RequestHandlers/DaemonFSInfoRequestHandler.cpp | 4 ++-- src/Server/RequestHandlers/DaemonListRequestHandler.cpp | 4 ++-- src/Server/RequestHandlers/DaemonStatusRequestHandler.cpp | 4 ++-- src/Server/RequestHandlers/GSSAPIAuthRequestHandler.cpp | 4 ++-- src/Server/RequestHandlers/GroupListRequestHandler.cpp | 4 ++-- src/Server/RequestHandlers/GroupUserListRequestHandler.cpp | 4 ++-- src/Server/RequestHandlers/IdentifyRequestHandler.cpp | 4 ++-- src/Server/RequestHandlers/LogRequestHandler.cpp | 4 ++-- src/Server/RequestHandlers/UserGroupListRequestHandler.cpp | 4 ++-- src/Server/RequestHandlers/UserInfoRequestHandler.cpp | 4 ++-- src/Server/RequestHandlers/UserListRequestHandler.cpp | 4 ++-- 13 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src/Server') diff --git a/src/Server/ConnectionManager.cpp b/src/Server/ConnectionManager.cpp index 2ce2bb5..37e04d2 100644 --- a/src/Server/ConnectionManager.cpp +++ b/src/Server/ConnectionManager.cpp @@ -53,7 +53,7 @@ bool ConnectionManager::ServerConnection::send(const Net::Packet &packet) { ConnectionManager::ServerConnection::ServerConnection(boost::shared_ptr connection0) : connection(connection0), type(UNKNOWN), hostInfo(0) { - connection->signalReceive().connect(boost::bind(&ServerConnection::receive, this, _1)); + connection->connectSignalReceive(boost::bind(&ServerConnection::receive, this, _1)); } bool ConnectionManager::ServerConnection::isConnected() const { @@ -146,7 +146,7 @@ void ConnectionManager::configFinished() { if(listenerAddresses.empty()) { try { boost::shared_ptr listener(new Net::Listener(x509CertFile, x509KeyFile)); - listener->signalNewConnection().connect(boost::bind(&ConnectionManager::handleNewConnection, this, _1)); + listener->connectSignalNewConnection(boost::bind(&ConnectionManager::handleNewConnection, this, _1)); listeners.push_back(listener); } catch(Net::Exception &e) { @@ -157,7 +157,7 @@ void ConnectionManager::configFinished() { for(std::vector::const_iterator address = listenerAddresses.begin(); address != listenerAddresses.end(); ++address) { try { boost::shared_ptr listener(new Net::Listener(x509CertFile, x509KeyFile, *address)); - listener->signalNewConnection().connect(boost::bind(&ConnectionManager::handleNewConnection, this, _1)); + listener->connectSignalNewConnection(boost::bind(&ConnectionManager::handleNewConnection, this, _1)); listeners.push_back(listener); } catch(Net::Exception &e) { @@ -169,7 +169,7 @@ void ConnectionManager::configFinished() { void ConnectionManager::handleNewConnection(boost::shared_ptr con) { boost::shared_ptr connection(new ServerConnection(con)); - con->signalDisconnected().connect(boost::bind(&ConnectionManager::handleDisconnect, this, connection)); + con->connectSignalDisconnected(boost::bind(&ConnectionManager::handleDisconnect, this, connection)); connections.insert(connection); Common::RequestManager::get()->registerConnection(connection.get()); diff --git a/src/Server/RequestHandlers/DaemonCommandRequestHandler.cpp b/src/Server/RequestHandlers/DaemonCommandRequestHandler.cpp index e4b511e..3a09de7 100644 --- a/src/Server/RequestHandlers/DaemonCommandRequestHandler.cpp +++ b/src/Server/RequestHandlers/DaemonCommandRequestHandler.cpp @@ -37,7 +37,7 @@ void DaemonCommandRequestHandler::handlePacket(const Common::XmlPacket &packet) sendPacket(ret); - signalFinished()(); + signalFinished(); return; } @@ -77,7 +77,7 @@ void DaemonCommandRequestHandler::requestFinished(const Common::Request &request sendPacket(ret); } - signalFinished()(); + signalFinished(); } } diff --git a/src/Server/RequestHandlers/DaemonFSInfoRequestHandler.cpp b/src/Server/RequestHandlers/DaemonFSInfoRequestHandler.cpp index 11a3f09..2bb316b 100644 --- a/src/Server/RequestHandlers/DaemonFSInfoRequestHandler.cpp +++ b/src/Server/RequestHandlers/DaemonFSInfoRequestHandler.cpp @@ -37,7 +37,7 @@ void DaemonFSInfoRequestHandler::handlePacket(const Common::XmlPacket &packet) { sendPacket(ret); - signalFinished()(); + signalFinished(); return; } @@ -75,7 +75,7 @@ void DaemonFSInfoRequestHandler::requestFinished(const Common::Request &request) sendPacket(ret); } - signalFinished()(); + signalFinished(); } } diff --git a/src/Server/RequestHandlers/DaemonListRequestHandler.cpp b/src/Server/RequestHandlers/DaemonListRequestHandler.cpp index 541148d..f960eaa 100644 --- a/src/Server/RequestHandlers/DaemonListRequestHandler.cpp +++ b/src/Server/RequestHandlers/DaemonListRequestHandler.cpp @@ -35,7 +35,7 @@ void DaemonListRequestHandler::handlePacket(const Common::XmlPacket &packet) { sendPacket(ret); - signalFinished()(); + signalFinished(); return; } @@ -57,7 +57,7 @@ void DaemonListRequestHandler::handlePacket(const Common::XmlPacket &packet) { sendPacket(ret); - signalFinished()(); + signalFinished(); } } diff --git a/src/Server/RequestHandlers/DaemonStatusRequestHandler.cpp b/src/Server/RequestHandlers/DaemonStatusRequestHandler.cpp index c1e2fcd..15f63c7 100644 --- a/src/Server/RequestHandlers/DaemonStatusRequestHandler.cpp +++ b/src/Server/RequestHandlers/DaemonStatusRequestHandler.cpp @@ -37,7 +37,7 @@ void DaemonStatusRequestHandler::handlePacket(const Common::XmlPacket &packet) { sendPacket(ret); - signalFinished()(); + signalFinished(); return; } @@ -77,7 +77,7 @@ void DaemonStatusRequestHandler::requestFinished(const Common::Request &request) sendPacket(ret); } - signalFinished()(); + signalFinished(); } } diff --git a/src/Server/RequestHandlers/GSSAPIAuthRequestHandler.cpp b/src/Server/RequestHandlers/GSSAPIAuthRequestHandler.cpp index ade8329..dba92c7 100644 --- a/src/Server/RequestHandlers/GSSAPIAuthRequestHandler.cpp +++ b/src/Server/RequestHandlers/GSSAPIAuthRequestHandler.cpp @@ -39,7 +39,7 @@ void GSSAPIAuthRequestHandler::handlePacket(const Common::XmlPacket &packet) { sendPacket(ret); - signalFinished()(); + signalFinished(); return; } @@ -118,7 +118,7 @@ void GSSAPIAuthRequestHandler::handlePacket(const Common::XmlPacket &packet) { if(majStat != GSS_S_COMPLETE) return; - signalFinished()(); + signalFinished(); } } diff --git a/src/Server/RequestHandlers/GroupListRequestHandler.cpp b/src/Server/RequestHandlers/GroupListRequestHandler.cpp index 356e105..5d8c9be 100644 --- a/src/Server/RequestHandlers/GroupListRequestHandler.cpp +++ b/src/Server/RequestHandlers/GroupListRequestHandler.cpp @@ -36,7 +36,7 @@ void GroupListRequestHandler::handlePacket(const Common::XmlPacket &packet) { sendPacket(ret); - signalFinished()(); + signalFinished(); return; } @@ -69,7 +69,7 @@ void GroupListRequestHandler::handlePacket(const Common::XmlPacket &packet) { } sendPacket(ret); - signalFinished()(); + signalFinished(); } } diff --git a/src/Server/RequestHandlers/GroupUserListRequestHandler.cpp b/src/Server/RequestHandlers/GroupUserListRequestHandler.cpp index df1253a..07ed446 100644 --- a/src/Server/RequestHandlers/GroupUserListRequestHandler.cpp +++ b/src/Server/RequestHandlers/GroupUserListRequestHandler.cpp @@ -36,7 +36,7 @@ void GroupUserListRequestHandler::handlePacket(const Common::XmlPacket &packet) sendPacket(ret); - signalFinished()(); + signalFinished(); return; } @@ -66,7 +66,7 @@ void GroupUserListRequestHandler::handlePacket(const Common::XmlPacket &packet) } sendPacket(ret); - signalFinished()(); + signalFinished(); } } diff --git a/src/Server/RequestHandlers/IdentifyRequestHandler.cpp b/src/Server/RequestHandlers/IdentifyRequestHandler.cpp index b47b505..5300c19 100644 --- a/src/Server/RequestHandlers/IdentifyRequestHandler.cpp +++ b/src/Server/RequestHandlers/IdentifyRequestHandler.cpp @@ -36,7 +36,7 @@ void IdentifyRequestHandler::handlePacket(const Common::XmlPacket &packet) { sendPacket(ret); - signalFinished()(); + signalFinished(); return; } @@ -62,7 +62,7 @@ void IdentifyRequestHandler::handlePacket(const Common::XmlPacket &packet) { sendPacket(ret); } - signalFinished()(); + signalFinished(); } } diff --git a/src/Server/RequestHandlers/LogRequestHandler.cpp b/src/Server/RequestHandlers/LogRequestHandler.cpp index f4547e4..019a7f2 100644 --- a/src/Server/RequestHandlers/LogRequestHandler.cpp +++ b/src/Server/RequestHandlers/LogRequestHandler.cpp @@ -36,7 +36,7 @@ void LogRequestHandler::handlePacket(const Common::XmlPacket &packet) { sendPacket(ret); - signalFinished()(); + signalFinished(); return; } @@ -55,7 +55,7 @@ void LogRequestHandler::handlePacket(const Common::XmlPacket &packet) { sendPacket(ret); - signalFinished()(); + signalFinished(); } } diff --git a/src/Server/RequestHandlers/UserGroupListRequestHandler.cpp b/src/Server/RequestHandlers/UserGroupListRequestHandler.cpp index e127649..435a507 100644 --- a/src/Server/RequestHandlers/UserGroupListRequestHandler.cpp +++ b/src/Server/RequestHandlers/UserGroupListRequestHandler.cpp @@ -36,7 +36,7 @@ void UserGroupListRequestHandler::handlePacket(const Common::XmlPacket &packet) sendPacket(ret); - signalFinished()(); + signalFinished(); return; } @@ -66,7 +66,7 @@ void UserGroupListRequestHandler::handlePacket(const Common::XmlPacket &packet) } sendPacket(ret); - signalFinished()(); + signalFinished(); } } diff --git a/src/Server/RequestHandlers/UserInfoRequestHandler.cpp b/src/Server/RequestHandlers/UserInfoRequestHandler.cpp index e4ef447..1773658 100644 --- a/src/Server/RequestHandlers/UserInfoRequestHandler.cpp +++ b/src/Server/RequestHandlers/UserInfoRequestHandler.cpp @@ -36,7 +36,7 @@ void UserInfoRequestHandler::handlePacket(const Common::XmlPacket &packet) { sendPacket(ret); - signalFinished()(); + signalFinished(); return; } @@ -63,7 +63,7 @@ void UserInfoRequestHandler::handlePacket(const Common::XmlPacket &packet) { } sendPacket(ret); - signalFinished()(); + signalFinished(); } } diff --git a/src/Server/RequestHandlers/UserListRequestHandler.cpp b/src/Server/RequestHandlers/UserListRequestHandler.cpp index 37db6d5..519ba6f 100644 --- a/src/Server/RequestHandlers/UserListRequestHandler.cpp +++ b/src/Server/RequestHandlers/UserListRequestHandler.cpp @@ -36,7 +36,7 @@ void UserListRequestHandler::handlePacket(const Common::XmlPacket &packet) { sendPacket(ret); - signalFinished()(); + signalFinished(); return; } @@ -69,7 +69,7 @@ void UserListRequestHandler::handlePacket(const Common::XmlPacket &packet) { } sendPacket(ret); - signalFinished()(); + signalFinished(); } } -- cgit v1.2.3