From 9ca70bbfa460fe1c6c31b8e685be6df24935ab73 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 15 Sep 2008 06:26:15 +0200 Subject: Kann jetzt Status von Daemons abfragen --- .../RequestHandlers/CoreStatusRequestHandler.cpp | 52 ---------------------- .../RequestHandlers/CoreStatusRequestHandler.h | 40 ----------------- .../RequestHandlers/DaemonListRequestHandler.cpp | 5 +-- .../RequestHandlers/DaemonStatusRequestHandler.cpp | 23 ++++++---- .../RequestHandlers/DaemonStatusRequestHandler.h | 16 ++++++- .../RequestHandlers/GSSAPIAuthRequestHandler.cpp | 5 +-- .../RequestHandlers/IdentifyRequestHandler.cpp | 5 +-- src/Core/RequestHandlers/Makefile.am | 4 +- src/Core/RequestHandlers/Makefile.in | 11 +++-- 9 files changed, 40 insertions(+), 121 deletions(-) delete mode 100644 src/Core/RequestHandlers/CoreStatusRequestHandler.cpp delete mode 100644 src/Core/RequestHandlers/CoreStatusRequestHandler.h (limited to 'src/Core/RequestHandlers') diff --git a/src/Core/RequestHandlers/CoreStatusRequestHandler.cpp b/src/Core/RequestHandlers/CoreStatusRequestHandler.cpp deleted file mode 100644 index 352de86..0000000 --- a/src/Core/RequestHandlers/CoreStatusRequestHandler.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/* - * CoreStatusRequestHandler.cpp - * - * 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 . - */ - -#include "CoreStatusRequestHandler.h" -#include -#include -#include - -namespace Mad { -namespace Core { -namespace RequestHandlers { - -bool CoreStatusRequestHandler::handlePacket(Net::Connection *connection, const Net::Packet &packet) { - if(isFinished()) - return false; - - if(packet.getType() != Net::Packet::CORE_STATUS) - return false; // TODO Logging - - // TODO Require authentication - - Common::SystemBackend::UptimeInfo uptimeInfo = Common::SystemBackend::getBackend()->getUptimeInfo(); - Common::SystemBackend::MemoryInfo memInfo = Common::SystemBackend::getBackend()->getMemoryInfo(); - - if(!connection->send(Net::Packets::HostStatusPacket(Net::Packet::OK, packet.getRequestId(), uptimeInfo.uptime, uptimeInfo.idleTime, - memInfo.totalMem, memInfo.freeMem, memInfo.totalSwap, memInfo.freeSwap))) - return false; - - setFinished(); - - return true; -} - -} -} -} diff --git a/src/Core/RequestHandlers/CoreStatusRequestHandler.h b/src/Core/RequestHandlers/CoreStatusRequestHandler.h deleted file mode 100644 index c9d3199..0000000 --- a/src/Core/RequestHandlers/CoreStatusRequestHandler.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * CoreStatusRequestHandler.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_CORE_REQUESTHANDLERS_CORESTATUSREQUESTHANDLER_H_ -#define MAD_CORE_REQUESTHANDLERS_CORESTATUSREQUESTHANDLER_H_ - -#include - -namespace Mad { -namespace Core { -namespace RequestHandlers { - -class CoreStatusRequestHandler : public Common::RequestHandler { - public: - CoreStatusRequestHandler() {} - - virtual bool handlePacket(Net::Connection *connection, const Net::Packet &packet); -}; - -} -} -} - -#endif /* MAD_CORE_REQUESTHANDLERS_CORESTATUSREQUESTHANDLER_H_ */ diff --git a/src/Core/RequestHandlers/DaemonListRequestHandler.cpp b/src/Core/RequestHandlers/DaemonListRequestHandler.cpp index 00ee0ff..1f137ad 100644 --- a/src/Core/RequestHandlers/DaemonListRequestHandler.cpp +++ b/src/Core/RequestHandlers/DaemonListRequestHandler.cpp @@ -27,9 +27,6 @@ namespace Core { namespace RequestHandlers { bool DaemonListRequestHandler::handlePacket(Net::Connection *connection, const Net::Packet &packet) { - if(isFinished()) - return false; - if(packet.getType() != Net::Packet::LIST_DAEMONS) return false; // TODO Logging @@ -44,7 +41,7 @@ bool DaemonListRequestHandler::handlePacket(Net::Connection *connection, const N if(!connection->send(Net::Packets::NameListPacket(Net::Packet::OK, packet.getRequestId(), names))) return false; - setFinished(); + signalFinished().emit(); return true; } diff --git a/src/Core/RequestHandlers/DaemonStatusRequestHandler.cpp b/src/Core/RequestHandlers/DaemonStatusRequestHandler.cpp index 81f066d..0179ecc 100644 --- a/src/Core/RequestHandlers/DaemonStatusRequestHandler.cpp +++ b/src/Core/RequestHandlers/DaemonStatusRequestHandler.cpp @@ -19,32 +19,39 @@ #include "DaemonStatusRequestHandler.h" #include "../ConnectionManager.h" -#include +#include +#include namespace Mad { namespace Core { namespace RequestHandlers { -bool DaemonStatusRequestHandler::handlePacket(Net::Connection*, const Net::Packet &packet) { - if(isFinished()) - return false; - +bool DaemonStatusRequestHandler::handlePacket(Net::Connection *connection, const Net::Packet &packet) { if(packet.getType() != Net::Packet::DAEMON_STATUS) return false; // TODO Logging // TODO Require authentication + con = connection; + requestId = packet.getRequestId(); + std::string daemonName((char*)packet.getData(), packet.getLength()); - /*Net::Connection *daemonCon = connectionManager->getDaemonConnection(daemonName); + Net::Connection *daemonCon = ConnectionManager::getConnectionManager()->getDaemonConnection(daemonName); if(!daemonCon) - return false;*/ - + return false; + Requests::DaemonStatusRequest::send(daemonCon, sigc::mem_fun(this, &DaemonStatusRequestHandler::requestFinished)); return true; } +void DaemonStatusRequestHandler::requestFinished(const Net::Packets::HostStatusPacket &packet) { + con->send(Net::Packet(Net::Packet::OK, requestId, packet.getData(), packet.getLength())); + + signalFinished().emit(); +} + } } } diff --git a/src/Core/RequestHandlers/DaemonStatusRequestHandler.h b/src/Core/RequestHandlers/DaemonStatusRequestHandler.h index accc990..5d755bd 100644 --- a/src/Core/RequestHandlers/DaemonStatusRequestHandler.h +++ b/src/Core/RequestHandlers/DaemonStatusRequestHandler.h @@ -21,8 +21,16 @@ #define MAD_CORE_REQUESTHANDLERS_DAEMONSTATUSREQUESTHANDLER_H_ #include +#include namespace Mad { + +namespace Net { +namespace Packets { +class HostStatusPacket; +} +} + namespace Core { class ConnectionManager; @@ -30,10 +38,16 @@ class ConnectionManager; namespace RequestHandlers { class DaemonStatusRequestHandler : public Common::RequestHandler { + private: + Net::Connection *con; + uint16_t requestId; + + void requestFinished(const Net::Packets::HostStatusPacket &packet); + public: DaemonStatusRequestHandler() {} - virtual bool handlePacket(Net::Connection*, const Net::Packet &packet); + virtual bool handlePacket(Net::Connection *connection, const Net::Packet &packet); }; } diff --git a/src/Core/RequestHandlers/GSSAPIAuthRequestHandler.cpp b/src/Core/RequestHandlers/GSSAPIAuthRequestHandler.cpp index c1b7e7c..94098b9 100644 --- a/src/Core/RequestHandlers/GSSAPIAuthRequestHandler.cpp +++ b/src/Core/RequestHandlers/GSSAPIAuthRequestHandler.cpp @@ -31,9 +31,6 @@ namespace RequestHandlers { // TODO Error handling bool GSSAPIAuthRequestHandler::handlePacket(Net::Connection *connection, const Net::Packet &packet) { - if(isFinished()) - return false; - if(packet.getType() != Net::Packet::GSSAPI_AUTH) return false; // TODO Logging @@ -102,7 +99,7 @@ bool GSSAPIAuthRequestHandler::handlePacket(Net::Connection *connection, const N if(majStat != GSS_S_COMPLETE) return false; - setFinished(); + signalFinished().emit(); } return true; diff --git a/src/Core/RequestHandlers/IdentifyRequestHandler.cpp b/src/Core/RequestHandlers/IdentifyRequestHandler.cpp index 9a80959..48fccf2 100644 --- a/src/Core/RequestHandlers/IdentifyRequestHandler.cpp +++ b/src/Core/RequestHandlers/IdentifyRequestHandler.cpp @@ -26,9 +26,6 @@ namespace Core { namespace RequestHandlers { bool IdentifyRequestHandler::handlePacket(Net::Connection *connection, const Net::Packet &packet) { - if(isFinished()) - return false; - if(packet.getType() != Net::Packet::IDENTIFY) return false; // TODO Logging @@ -39,7 +36,7 @@ bool IdentifyRequestHandler::handlePacket(Net::Connection *connection, const Net if(!connection->send(Net::Packet(Net::Packet::OK, packet.getRequestId()))) return false; - setFinished(); + signalFinished().emit(); return true; } diff --git a/src/Core/RequestHandlers/Makefile.am b/src/Core/RequestHandlers/Makefile.am index 8155a80..2c65ceb 100644 --- a/src/Core/RequestHandlers/Makefile.am +++ b/src/Core/RequestHandlers/Makefile.am @@ -1,4 +1,4 @@ noinst_LTLIBRARIES = librequesthandlers.la -librequesthandlers_la_SOURCES = CoreStatusRequestHandler.cpp DaemonListRequestHandler.cpp DaemonStatusRequestHandler.cpp GSSAPIAuthRequestHandler.cpp IdentifyRequestHandler.cpp +librequesthandlers_la_SOURCES = DaemonListRequestHandler.cpp DaemonStatusRequestHandler.cpp GSSAPIAuthRequestHandler.cpp IdentifyRequestHandler.cpp -noinst_HEADERS = CoreStatusRequestHandler.h DaemonListRequestHandler.h DaemonStatusRequestHandler.h GSSAPIAuthRequestHandler.h IdentifyRequestHandler.h +noinst_HEADERS = DaemonListRequestHandler.h DaemonStatusRequestHandler.h GSSAPIAuthRequestHandler.h IdentifyRequestHandler.h diff --git a/src/Core/RequestHandlers/Makefile.in b/src/Core/RequestHandlers/Makefile.in index 88e1ca3..1729c8b 100644 --- a/src/Core/RequestHandlers/Makefile.in +++ b/src/Core/RequestHandlers/Makefile.in @@ -45,9 +45,9 @@ CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) librequesthandlers_la_LIBADD = -am_librequesthandlers_la_OBJECTS = CoreStatusRequestHandler.lo \ - DaemonListRequestHandler.lo DaemonStatusRequestHandler.lo \ - GSSAPIAuthRequestHandler.lo IdentifyRequestHandler.lo +am_librequesthandlers_la_OBJECTS = DaemonListRequestHandler.lo \ + DaemonStatusRequestHandler.lo GSSAPIAuthRequestHandler.lo \ + IdentifyRequestHandler.lo librequesthandlers_la_OBJECTS = $(am_librequesthandlers_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -186,8 +186,8 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = librequesthandlers.la -librequesthandlers_la_SOURCES = CoreStatusRequestHandler.cpp DaemonListRequestHandler.cpp DaemonStatusRequestHandler.cpp GSSAPIAuthRequestHandler.cpp IdentifyRequestHandler.cpp -noinst_HEADERS = CoreStatusRequestHandler.h DaemonListRequestHandler.h DaemonStatusRequestHandler.h GSSAPIAuthRequestHandler.h IdentifyRequestHandler.h +librequesthandlers_la_SOURCES = DaemonListRequestHandler.cpp DaemonStatusRequestHandler.cpp GSSAPIAuthRequestHandler.cpp IdentifyRequestHandler.cpp +noinst_HEADERS = DaemonListRequestHandler.h DaemonStatusRequestHandler.h GSSAPIAuthRequestHandler.h IdentifyRequestHandler.h all: all-am .SUFFIXES: @@ -239,7 +239,6 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoreStatusRequestHandler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DaemonListRequestHandler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DaemonStatusRequestHandler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GSSAPIAuthRequestHandler.Plo@am__quote@ -- cgit v1.2.3