diff options
Diffstat (limited to 'src/Core/RequestHandlers/UserListRequestHandler.cpp')
-rw-r--r-- | src/Core/RequestHandlers/UserListRequestHandler.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/Core/RequestHandlers/UserListRequestHandler.cpp b/src/Core/RequestHandlers/UserListRequestHandler.cpp index 176fde9..bb67df9 100644 --- a/src/Core/RequestHandlers/UserListRequestHandler.cpp +++ b/src/Core/RequestHandlers/UserListRequestHandler.cpp @@ -21,14 +21,12 @@ #include "../UserBackend.h" #include <Common/Exception.h> #include <Common/Logger.h> -#include <Common/XmlPacket.h> -#include <Net/Connection.h> namespace Mad { namespace Core { namespace RequestHandlers { -void UserListRequestHandler::handlePacket(Net::Connection *con, uint16_t requestId, const Common::XmlPacket &packet) { +void UserListRequestHandler::handlePacket(const Common::XmlPacket &packet) { if(packet.getType() != "ListUsers") { Common::Logger::log(Common::Logger::ERROR, "Received an unexpected packet."); @@ -36,7 +34,7 @@ void UserListRequestHandler::handlePacket(Net::Connection *con, uint16_t request ret.setType("Error"); ret.add("ErrorCode", Common::Exception::UNEXPECTED_PACKET); - con->send(ret.encode(requestId)); + sendPacket(ret); signalFinished().emit(); return; @@ -44,15 +42,12 @@ void UserListRequestHandler::handlePacket(Net::Connection *con, uint16_t request // TODO Require authentication - connection = con; - rid = requestId; - if(!UserBackend::getUserList(sigc::mem_fun(this, &UserListRequestHandler::userListHandler))) { Common::XmlPacket ret; ret.setType("Error"); ret.add("ErrorCode", Common::Exception::NOT_IMPLEMENTED); - con->send(ret.encode(requestId)); + sendPacket(ret); signalFinished().emit(); } } @@ -72,7 +67,7 @@ void UserListRequestHandler::userListHandler(const std::map<unsigned long, Commo entry.add("fullName", user->second.getFullName()); } - connection->send(ret.encode(rid)); + sendPacket(ret); signalFinished().emit(); } |