From 63907817cb057f497f03a28016d408885cbe41ea Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Sun, 1 Mar 2009 00:51:00 +0100
Subject: Alle uebrigen Requests ausser GSSAPIAuthRequest in XmlRequests
 umgewandelt

---
 src/mad.cpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'src/mad.cpp')

diff --git a/src/mad.cpp b/src/mad.cpp
index 40d9ead..4a9904a 100644
--- a/src/mad.cpp
+++ b/src/mad.cpp
@@ -37,7 +37,7 @@
 using namespace Mad;
 
 
-static void requestFinished(const Common::Request<>&) {
+static void requestFinished(const Common::XmlRequest&) {
   Common::Logger::log("Identified.");
 }
 
@@ -50,10 +50,8 @@ int main() {
 
   Common::ConfigManager::get()->finish();
 
-  Common::RequestManager::get()->registerPacketType<Common::RequestHandlers::FSInfoRequestHandler>(Net::Packet::FS_INFO);
-  Common::RequestManager::get()->registerPacketType<Daemon::RequestHandlers::CommandRequestHandler>(Net::Packet::COMMAND_REBOOT);
-  Common::RequestManager::get()->registerPacketType<Daemon::RequestHandlers::CommandRequestHandler>(Net::Packet::COMMAND_SHUTDOWN);
-
+  Common::RequestManager::get()->registerPacketType<Daemon::RequestHandlers::CommandRequestHandler>("Command");
+  Common::RequestManager::get()->registerPacketType<Common::RequestHandlers::FSInfoRequestHandler>("FSInfo");
   Common::RequestManager::get()->registerPacketType<Common::RequestHandlers::StatusRequestHandler>("GetStatus");
 
   Net::ClientConnection *connection = new Net::ClientConnection;
@@ -72,8 +70,8 @@ int main() {
 
     //char hostname[256];
     //gethostname(hostname, sizeof(hostname));
-    //Common::RequestManager::get()->sendRequest(connection, std::auto_ptr<Common::RequestBase>(new Daemon::Requests::IdentifyRequest(hostname, sigc::ptr_fun(requestFinished))));
-    Common::RequestManager::get()->sendRequest(connection, std::auto_ptr<Common::RequestBase>(new Daemon::Requests::IdentifyRequest("test", sigc::ptr_fun(requestFinished))));
+    //Common::RequestManager::get()->sendRequest(connection, std::auto_ptr<Common::XmlRequest>(new Daemon::Requests::IdentifyRequest(hostname, sigc::ptr_fun(requestFinished))));
+    Common::RequestManager::get()->sendRequest(connection, std::auto_ptr<Common::XmlRequest>(new Daemon::Requests::IdentifyRequest("test", sigc::ptr_fun(requestFinished))));
 
     while(connection->isConnected())
       Net::FdManager::get()->run();
@@ -88,10 +86,8 @@ int main() {
 
   delete connection;
 
-  Common::RequestManager::get()->unregisterPacketType(Net::Packet::FS_INFO);
-  Common::RequestManager::get()->unregisterPacketType(Net::Packet::COMMAND_REBOOT);
-  Common::RequestManager::get()->unregisterPacketType(Net::Packet::COMMAND_SHUTDOWN);
-
+  Common::RequestManager::get()->unregisterPacketType("Command");
+  Common::RequestManager::get()->unregisterPacketType("FSInfo");
   Common::RequestManager::get()->unregisterPacketType("GetStatus");
 
   Common::Initializable::deinit();
-- 
cgit v1.2.3