From 47d7a53099be598c26be4de63e9d8fe52c2e0e66 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 13 Sep 2008 01:06:43 +0200 Subject: CoreStatusRequest nach Client/Request/ verschoben --- src/Common/Request/CoreStatusRequest.h | 82 ---------------------------------- src/Common/Request/Makefile.am | 2 +- src/Common/Request/Makefile.in | 2 +- 3 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 src/Common/Request/CoreStatusRequest.h (limited to 'src/Common') diff --git a/src/Common/Request/CoreStatusRequest.h b/src/Common/Request/CoreStatusRequest.h deleted file mode 100644 index 48c9302..0000000 --- a/src/Common/Request/CoreStatusRequest.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * CoreStatusRequest.h - * - * Copyright (C) 2008 Matthias Schiffer - * - * 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 3 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, see . - */ - -#ifndef MAD_COMMON_REQUEST_CORESTATUSREQUEST_H_ -#define MAD_COMMON_REQUEST_CORESTATUSREQUEST_H_ - -#include "Request.h" -#include "../RequestManager.h" -#include -#include - -#include - -namespace Mad { -namespace Common { -namespace Request { - -class CoreStatusRequest: public Request { - private: - sigc::signal finished; - - CoreStatusRequest() {} - - public: - static bool send(Net::Connection *connection, RequestManager &requestManager, const sigc::slot &callback) { - CoreStatusRequest *request = new CoreStatusRequest(); - - request->finished.connect(callback); - - if(requestManager.sendRequest(connection, request)) - return true; - - delete request; - return false; - } - - virtual bool sendRequest(Net::Connection *connection, uint16_t requestId) { - if(isSent()) - return false; - - if(!connection->send(Net::Packet(Net::Packet::CORE_STATUS, requestId))) - return false; - - setSent(); - return true; - } - - virtual bool handlePacket(Net::Connection*, const Net::Packet &packet) { - if(isFinished()) - return false; - - if(packet.getType() != Net::Packet::OK) - return false; // TODO Logging - - finished(Net::Packets::HostStatusPacket(packet)); - - setFinished(); - return true; - } -}; - -} -} -} - -#endif /* MAD_COMMON_REQUEST_CORESTATUSREQUEST_H_ */ diff --git a/src/Common/Request/Makefile.am b/src/Common/Request/Makefile.am index 4c6ffd5..64c5078 100644 --- a/src/Common/Request/Makefile.am +++ b/src/Common/Request/Makefile.am @@ -1 +1 @@ -noinst_HEADERS = CoreStatusRequest.h DisconnectRequest.h GSSAPIAuthRequest.h IdentifyRequest.h Request.h +noinst_HEADERS = DisconnectRequest.h GSSAPIAuthRequest.h IdentifyRequest.h Request.h diff --git a/src/Common/Request/Makefile.in b/src/Common/Request/Makefile.in index 6c3b68d..4aa720d 100644 --- a/src/Common/Request/Makefile.in +++ b/src/Common/Request/Makefile.in @@ -164,7 +164,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -noinst_HEADERS = CoreStatusRequest.h DisconnectRequest.h GSSAPIAuthRequest.h IdentifyRequest.h Request.h +noinst_HEADERS = DisconnectRequest.h GSSAPIAuthRequest.h IdentifyRequest.h Request.h all: all-am .SUFFIXES: -- cgit v1.2.3