Kann jetzt Status von Daemons abfragen

6 files changed, 129 insertions, 24 deletions

diff --git a/src/Client/Requests/CoreStatusRequest.cpp b/src/Client/Requests/CoreStatusRequest.cpp
index af34752..1c477b8 100644
--- a/src/Client/Requests/CoreStatusRequest.cpp
+++ b/src/Client/Requests/CoreStatusRequest.cpp
@@ -38,27 +38,20 @@ bool CoreStatusRequest::send(Net::Connection *connection, const sigc::slot<void,
 }
 
 bool CoreStatusRequest::sendRequest(Net::Connection *connection, uint16_t requestId) {
-  if(isSent())
+  if(!connection->send(Net::Packet(Net::Packet::STATUS, requestId)))
     return false;
 
-  if(!connection->send(Net::Packet(Net::Packet::CORE_STATUS, requestId)))
-    return false;
-
-  setSent();
   return true;
 }
 
 bool CoreStatusRequest::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));
+  finished(Net::Packets::HostStatusPacket(packet));
 
-    setFinished();
-    return true;
+  signalFinished().emit();
+  return true;
 }
 
 }
diff --git a/src/Client/Requests/DaemonListRequest.cpp b/src/Client/Requests/DaemonListRequest.cpp
index a0e4cf1..97ee335 100644
--- a/src/Client/Requests/DaemonListRequest.cpp
+++ b/src/Client/Requests/DaemonListRequest.cpp
@@ -38,26 +38,19 @@ bool DaemonListRequest::send(Net::Connection *connection, const sigc::slot<void,
 }
 
 bool DaemonListRequest::sendRequest(Net::Connection *connection, uint16_t requestId) {
-  if(isSent())
-    return false;
-
   if(!connection->send(Net::Packet(Net::Packet::LIST_DAEMONS, requestId)))
     return false;
 
-  setSent();
   return true;
 }
 
 bool DaemonListRequest::handlePacket(Net::Connection*, const Net::Packet &packet) {
-  if(isFinished())
-    return false;
-
   if(packet.getType() != Net::Packet::OK)
     return false; // TODO Logging
 
   finished(Net::Packets::NameListPacket(packet));
 
-  setFinished();
+  signalFinished().emit();
   return true;
 }
 
diff --git a/src/Client/Requests/DaemonStatusRequest.cpp b/src/Client/Requests/DaemonStatusRequest.cpp
new file mode 100644
index 0000000..8308e96
--- /dev/null
+++ b/src/Client/Requests/DaemonStatusRequest.cpp
@@ -0,0 +1,59 @@
+/*
+ * DaemonStatusRequest.cpp
+ *
+ * Copyright (C) 2008 Matthias Schiffer <matthias@gamezock.de>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "DaemonStatusRequest.h"
+#include <Common/RequestManager.h>
+#include <Net/Packets/HostStatusPacket.h>
+
+namespace Mad {
+namespace Client {
+namespace Requests {
+
+bool DaemonStatusRequest::send(Net::Connection *connection, const sigc::slot<void,const Net::Packets::HostStatusPacket&> &callback, const std::string &daemon0) {
+  DaemonStatusRequest *request = new DaemonStatusRequest(daemon0);
+
+  request->finished.connect(callback);
+
+  if(Mad::Common::RequestManager::getRequestManager()->sendRequest(connection, request))
+    return true;
+
+  delete request;
+  return false;
+}
+
+bool DaemonStatusRequest::sendRequest(Net::Connection *connection, uint16_t requestId) {
+  if(!connection->send(Net::Packet(Net::Packet::DAEMON_STATUS, requestId, daemon.c_str(), daemon.length())))
+    return false;
+
+  return true;
+}
+
+bool DaemonStatusRequest::handlePacket(Net::Connection*, const Net::Packet &packet) {
+  if(packet.getType() != Net::Packet::OK)
+    return false; // TODO Logging
+
+  finished(Net::Packets::HostStatusPacket(packet));
+
+  signalFinished().emit();
+  return true;
+}
+
+}
+}
+}
diff --git a/src/Client/Requests/DaemonStatusRequest.h b/src/Client/Requests/DaemonStatusRequest.h
new file mode 100644
index 0000000..0aff41b
--- /dev/null
+++ b/src/Client/Requests/DaemonStatusRequest.h
@@ -0,0 +1,58 @@
+/*
+ * DaemonStatusRequest.h
+ *
+ * Copyright (C) 2008 Matthias Schiffer <matthias@gamezock.de>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAD_CLIENT_REQUESTS_DAEMONSTATUSREQUEST_H_
+#define MAD_CLIENT_REQUESTS_DAEMONSTATUSREQUEST_H_
+
+#include <Common/Request.h>
+
+#include <string>
+#include <sigc++/signal.h>
+
+namespace Mad {
+
+namespace Net {
+namespace Packets {
+class HostStatusPacket;
+}
+}
+
+namespace Client {
+namespace Requests {
+
+class DaemonStatusRequest : public Common::Request {
+  private:
+    sigc::signal<void,const Net::Packets::HostStatusPacket&> finished;
+
+    std::string daemon;
+
+    DaemonStatusRequest(const std::string &daemon0) : daemon(daemon0) {}
+
+  public:
+    static bool send(Net::Connection *connection, const sigc::slot<void,const Net::Packets::HostStatusPacket&> &callback, const std::string &daemon0);
+
+    virtual bool sendRequest(Net::Connection *connection, uint16_t requestId);
+    virtual bool handlePacket(Net::Connection*, const Net::Packet &packet);
+};
+
+}
+}
+}
+
+#endif /* MAD_CLIENT_REQUESTS_DAEMONSTATUSREQUEST_H_ */
diff --git a/src/Client/Requests/Makefile.am b/src/Client/Requests/Makefile.am
index bf15a08..e8e72d4 100644
--- a/src/Client/Requests/Makefile.am
+++ b/src/Client/Requests/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LTLIBRARIES     = librequests.la
-librequests_la_SOURCES = CoreStatusRequest.cpp DaemonListRequest.cpp
+librequests_la_SOURCES = CoreStatusRequest.cpp DaemonListRequest.cpp DaemonStatusRequest.cpp
 
-noinst_HEADERS         = CoreStatusRequest.h DaemonListRequest.h
+noinst_HEADERS         = CoreStatusRequest.h DaemonListRequest.h DaemonStatusRequest.h
diff --git a/src/Client/Requests/Makefile.in b/src/Client/Requests/Makefile.in
index 81f6cec..7ebd73d 100644
--- a/src/Client/Requests/Makefile.in
+++ b/src/Client/Requests/Makefile.in
@@ -45,7 +45,8 @@ CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 librequests_la_LIBADD =
-am_librequests_la_OBJECTS = CoreStatusRequest.lo DaemonListRequest.lo
+am_librequests_la_OBJECTS = CoreStatusRequest.lo DaemonListRequest.lo \
+	DaemonStatusRequest.lo
 librequests_la_OBJECTS = $(am_librequests_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -184,8 +185,8 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = librequests.la
-librequests_la_SOURCES = CoreStatusRequest.cpp DaemonListRequest.cpp
-noinst_HEADERS = CoreStatusRequest.h DaemonListRequest.h
+librequests_la_SOURCES = CoreStatusRequest.cpp DaemonListRequest.cpp DaemonStatusRequest.cpp
+noinst_HEADERS = CoreStatusRequest.h DaemonListRequest.h DaemonStatusRequest.h
 all: all-am
 
 .SUFFIXES:
@@ -239,6 +240,7 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoreStatusRequest.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DaemonListRequest.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DaemonStatusRequest.Plo@am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<