1 files changed, 21 insertions, 7 deletions
diff --git a/src/Core/RequestHandlers/IdentifyRequestHandler.cpp b/src/Core/RequestHandlers/IdentifyRequestHandler.cpp
index 9666f7e..4bf921e 100644
--- a/src/Core/RequestHandlers/IdentifyRequestHandler.cpp
+++ b/src/Core/RequestHandlers/IdentifyRequestHandler.cpp
@@ -20,18 +20,23 @@
 #include "IdentifyRequestHandler.h"
 #include "../ConnectionManager.h"
 #include <Common/Logger.h>
+#include <Common/XmlPacket.h>
 #include <Net/Connection.h>
-#include <Net/Packets/ErrorPacket.h>
 
 
 namespace Mad {
 namespace Core {
 namespace RequestHandlers {
 
-void IdentifyRequestHandler::handlePacket(Net::Connection *connection, const Net::Packet &packet) {
-  if(packet.getType() != Net::Packet::IDENTIFY) {
+void IdentifyRequestHandler::handlePacket(Net::Connection *connection, uint16_t requestId, const Common::XmlPacket &packet) {
+  if(packet.getType() != "Identify") {
     Common::Logger::log(Common::Logger::ERROR, "Received an unexpected packet.");
-    connection->send(Net::Packets::ErrorPacket(Net::Packet::ERROR, packet.getRequestId(), Common::Exception(Common::Exception::UNEXPECTED_PACKET)));
+
+    Common::XmlPacket ret;
+    ret.setType("Error");
+    ret.add("ErrorCode", Common::Exception::UNEXPECTED_PACKET);
+
+    connection->send(ret.encode(requestId));
 
     signalFinished().emit();
     return;
@@ -39,12 +44,21 @@ void IdentifyRequestHandler::handlePacket(Net::Connection *connection, const Net
 
   // TODO Require authentication
   try {
-    ConnectionManager::get()->identifyDaemonConnection(connection, std::string((const char*)packet.getData(), packet.getLength()));
+    ConnectionManager::get()->identifyDaemonConnection(connection, packet["hostname"]);
 
-    connection->send(Net::Packet(Net::Packet::OK, packet.getRequestId()));
+    Common::XmlPacket ret;
+    ret.setType("OK");
+    connection->send(ret.encode(requestId));
   }
   catch(Common::Exception &e) {
-    connection->send(Net::Packets::ErrorPacket(Net::Packet::ERROR, packet.getRequestId(), e));
+    Common::XmlPacket ret;
+    ret.setType("Error");
+    ret.add("ErrorCode", e.getErrorCode());
+    ret.add("SubCode", e.getSubCode());
+    ret.add("SubSubCode", e.getSubSubCode());
+    ret.add("Where", e.getWhere());
+
+    connection->send(ret.encode(requestId));
   }
 
   signalFinished().emit();