Flexiblere ?bertragung von Host-Listen

1 files changed, 6 insertions, 6 deletions

diff --git a/src/Client/CommandParser.cpp b/src/Client/CommandParser.cpp
index aa203b3..76178dc 100644
--- a/src/Client/CommandParser.cpp
+++ b/src/Client/CommandParser.cpp
@@ -25,8 +25,8 @@
 #include <Common/Logger.h>
 #include <Common/RequestManager.h>
 #include <Common/Requests/DisconnectRequest.h>
+#include <Net/Packets/HostListPacket.h>
 #include <Net/Packets/HostStatusPacket.h>
-#include <Net/Packets/NameListPacket.h>
 
 #include <iostream>
 #include <cstdio>
@@ -182,18 +182,18 @@ void CommandParser::coreStatusRequestFinished(const Common::Request<Net::Packets
   requestFinished();
 }
 
-void CommandParser::daemonListRequestFinished(const Common::Request<Net::Packets::NameListPacket> &request) {
+void CommandParser::daemonListRequestFinished(const Common::Request<Net::Packets::HostListPacket> &request) {
   try {
-    const std::vector<std::string>& hosts = request.getResult().getNameList();
+    const std::vector<Common::HostInfo>& hosts = request.getResult().getHostInfo();
 
     if(hosts.empty()) {
       std::cout << "There aren't any active hosts." << std::endl << std::endl;
     }
     else {
-      std::cout << "Active hosts:" << std::endl;
+      std::cout << "Host list:" << std::endl;
 
-      for(std::vector<std::string>::const_iterator host = hosts.begin(); host != hosts.end(); ++host)
-        std::cout << "\t" << *host << std::endl;
+      for(std::vector<Common::HostInfo>::const_iterator host = hosts.begin(); host != hosts.end(); ++host)
+        std::cout << "\t" << host->getName() << " (" << (host->getStatus() == Common::HostInfo::RUNNING ? "running" : "inactive") << ")" << std::endl;
 
       std::cout << std::endl;
     }