1 files changed, 13 insertions, 9 deletions

diff --git a/src/Server/ConnectionManager.cpp b/src/Server/ConnectionManager.cpp
index 0a60ff4..f568f74 100644
--- a/src/Server/ConnectionManager.cpp
+++ b/src/Server/ConnectionManager.cpp
@@ -24,13 +24,14 @@
 #include <Common/RequestHandlers/FSInfoRequestHandler.h>
 #include <Common/RequestHandlers/StatusRequestHandler.h>
 #include "Requests/DaemonStateUpdateRequest.h"
-#include "RequestHandlers/DaemonCommandRequestHandler.h"
-#include "RequestHandlers/DaemonFSInfoRequestHandler.h"
+//#include "RequestHandlers/DaemonCommandRequestHandler.h"
+//#include "RequestHandlers/DaemonFSInfoRequestHandler.h"
 #include "RequestHandlers/DaemonListRequestHandler.h"
-#include "RequestHandlers/DaemonStatusRequestHandler.h"
+//#include "RequestHandlers/DaemonStatusRequestHandler.h"
 //#include "RequestHandlers/GSSAPIAuthRequestHandler.h"
 #include "RequestHandlers/IdentifyRequestHandler.h"
 #include "RequestHandlers/LogRequestHandler.h"
+#include "RequestHandlers/DaemonRequestHandlerGroup.h"
 #include "RequestHandlers/UserRequestHandlerGroup.h"
 #include <Net/Packet.h>
 #include <Net/Listener.h>
@@ -185,18 +186,20 @@ void ConnectionManager::handleDisconnect(boost::shared_ptr<ServerConnection> con
 void ConnectionManager::doInit() {
   Common::RequestManager::get()->setServer(true);
 
+  daemonRequestHandlerGroup.reset(new RequestHandlers::DaemonRequestHandlerGroup);
   userRequestHandlerGroup.reset(new RequestHandlers::UserRequestHandlerGroup);
 
   //Common::RequestManager::get()->registerPacketType<RequestHandlers::GSSAPIAuthRequestHandler>("AuthGSSAPI");
-  Common::RequestManager::get()->registerPacketType<RequestHandlers::DaemonCommandRequestHandler>("DaemonCommand");
-  Common::RequestManager::get()->registerPacketType<RequestHandlers::DaemonFSInfoRequestHandler>("DaemonFSInfo");
+  //Common::RequestManager::get()->registerPacketType<RequestHandlers::DaemonCommandRequestHandler>("DaemonCommand");
+  //Common::RequestManager::get()->registerPacketType<RequestHandlers::DaemonFSInfoRequestHandler>("DaemonFSInfo");
   Common::RequestManager::get()->registerPacketType<Common::RequestHandlers::FSInfoRequestHandler>("FSInfo");
   Common::RequestManager::get()->registerPacketType<Common::RequestHandlers::StatusRequestHandler>("GetStatus");
-  Common::RequestManager::get()->registerPacketType<RequestHandlers::DaemonStatusRequestHandler>("GetDaemonStatus");
+  //Common::RequestManager::get()->registerPacketType<RequestHandlers::DaemonStatusRequestHandler>("GetDaemonStatus");
   Common::RequestManager::get()->registerPacketType<RequestHandlers::IdentifyRequestHandler>("Identify");
   Common::RequestManager::get()->registerPacketType<RequestHandlers::DaemonListRequestHandler>("ListHosts");
   Common::RequestManager::get()->registerPacketType<RequestHandlers::LogRequestHandler>("Log");
 
+  Common::RequestManager::get()->registerRequestHandlerGroup(daemonRequestHandlerGroup);
   Common::RequestManager::get()->registerRequestHandlerGroup(userRequestHandlerGroup);
 }
 
@@ -204,13 +207,14 @@ void ConnectionManager::doDeinit() {
   connections.clear();
 
   Common::RequestManager::get()->unregisterRequestHandlerGroup(userRequestHandlerGroup);
+  Common::RequestManager::get()->unregisterRequestHandlerGroup(daemonRequestHandlerGroup);
 
   //Common::RequestManager::get()->unregisterPacketType("AuthGSSAPI");
-  Common::RequestManager::get()->unregisterPacketType("DaemonCommand");
-  Common::RequestManager::get()->unregisterPacketType("DaemonFSInfo");
+  //Common::RequestManager::get()->unregisterPacketType("DaemonCommand");
+  //Common::RequestManager::get()->unregisterPacketType("DaemonFSInfo");
   Common::RequestManager::get()->unregisterPacketType("FSInfo");
   Common::RequestManager::get()->unregisterPacketType("GetStatus");
-  Common::RequestManager::get()->unregisterPacketType("GetDaemonStatus");
+  //Common::RequestManager::get()->unregisterPacketType("GetDaemonStatus");
   Common::RequestManager::get()->unregisterPacketType("Identify");
   Common::RequestManager::get()->unregisterPacketType("ListHosts");
   Common::RequestManager::get()->unregisterPacketType("Log");