1 files changed, 29 insertions, 11 deletions
diff --git a/src/Core/RequestHandlers/UserListRequestHandler.cpp b/src/Core/RequestHandlers/UserListRequestHandler.cpp
index 01c2eb3..176fde9 100644
--- a/src/Core/RequestHandlers/UserListRequestHandler.cpp
+++ b/src/Core/RequestHandlers/UserListRequestHandler.cpp
@@ -19,19 +19,24 @@
 
 #include "UserListRequestHandler.h"
 #include "../UserBackend.h"
+#include <Common/Exception.h>
 #include <Common/Logger.h>
+#include <Common/XmlPacket.h>
 #include <Net/Connection.h>
-#include <Net/Packets/ErrorPacket.h>
-#include <Net/Packets/UserListPacket.h>
 
 namespace Mad {
 namespace Core {
 namespace RequestHandlers {
 
-void UserListRequestHandler::handlePacket(Net::Connection *con, const Net::Packet &packet) {
-  if(packet.getType() != Net::Packet::USERS_LIST) {
+void UserListRequestHandler::handlePacket(Net::Connection *con, uint16_t requestId, const Common::XmlPacket &packet) {
+  if(packet.getType() != "ListUsers") {
     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);
+
+    con->send(ret.encode(requestId));
 
     signalFinished().emit();
     return;
@@ -40,21 +45,34 @@ void UserListRequestHandler::handlePacket(Net::Connection *con, const Net::Packe
   // TODO Require authentication
 
   connection = con;
-  requestId = packet.getRequestId();
+  rid = requestId;
 
   if(!UserBackend::getUserList(sigc::mem_fun(this, &UserListRequestHandler::userListHandler))) {
-    con->send(Net::Packets::ErrorPacket(Net::Packet::ERROR, packet.getRequestId(), Common::Exception(Common::Exception::NOT_IMPLEMENTED)));
+    Common::XmlPacket ret;
+    ret.setType("Error");
+    ret.add("ErrorCode", Common::Exception::NOT_IMPLEMENTED);
+
+    con->send(ret.encode(requestId));
     signalFinished().emit();
   }
 }
 
 void UserListRequestHandler::userListHandler(const std::map<unsigned long, Common::UserInfo> &info) {
-  std::vector<Common::UserInfo> userList;
+  Common::XmlPacket ret;
+  ret.setType("OK");
+  ret.addList("users");
 
-  for(std::map<unsigned long, Common::UserInfo>::const_iterator user = info.begin(); user != info.end(); ++user)
-    userList.push_back(user->second);
+  for(std::map<unsigned long, Common::UserInfo>::const_iterator user = info.begin(); user != info.end(); ++user) {
+    ret["users"].addEntry();
+    Common::XmlPacket::Entry &entry = ret["users"].back();
+
+    entry.add("uid", user->second.getUid());
+    entry.add("gid", user->second.getGid());
+    entry.add("username", user->second.getUsername());
+    entry.add("fullName", user->second.getFullName());
+  }
 
-  connection->send(Net::Packets::UserListPacket(Net::Packet::OK, requestId, userList));
+  connection->send(ret.encode(rid));
   signalFinished().emit();
 }