Request- und RequestHandler-Interfaces vereinfacht

1 files changed, 3 insertions, 8 deletions

diff --git a/src/Common/RequestHandlers/StatusRequestHandler.cpp b/src/Common/RequestHandlers/StatusRequestHandler.cpp
index 86ed970..e03c345 100644
--- a/src/Common/RequestHandlers/StatusRequestHandler.cpp
+++ b/src/Common/RequestHandlers/StatusRequestHandler.cpp
@@ -21,14 +21,12 @@
 #include "../Exception.h"
 #include "../SystemBackend.h"
 #include "../Logger.h"
-#include "../XmlPacket.h"
-#include <Net/Connection.h>
 
 namespace Mad {
 namespace Common {
 namespace RequestHandlers {
 
-void StatusRequestHandler::handlePacket(Net::Connection *con, uint16_t requestId, const XmlPacket &packet) {
+void StatusRequestHandler::handlePacket(const XmlPacket &packet) {
   if(packet.getType() != "GetStatus") {
     Logger::log(Logger::ERROR, "Received an unexpected packet.");
 
@@ -36,7 +34,7 @@ void StatusRequestHandler::handlePacket(Net::Connection *con, uint16_t requestId
     ret.setType("Error");
     ret.add("ErrorCode", Exception::UNEXPECTED_PACKET);
 
-    con->send(ret.encode(requestId));
+    sendPacket(ret);
 
     signalFinished().emit();
     return;
@@ -44,9 +42,6 @@ void StatusRequestHandler::handlePacket(Net::Connection *con, uint16_t requestId
 
   // TODO Require authentication
 
-  connection = con;
-  rid = requestId;
-
   if(!SystemBackend::getUptimeInfo(sigc::mem_fun(this, &StatusRequestHandler::uptimeHandler)))
     needUptime = false;
   if(!SystemBackend::getMemoryInfo(sigc::mem_fun(this, &StatusRequestHandler::memoryHandler)))
@@ -77,7 +72,7 @@ void StatusRequestHandler::send() {
   packet.add("loadAvg5", loadAvg5);
   packet.add("loadAvg15", loadAvg15);
 
-  connection->send(packet.encode(rid));
+  sendPacket(packet);
 
   sent = true;