1 files changed, 6 insertions, 2 deletions
diff --git a/src/Core/RequestHandler/CoreStatusRequestHandler.h b/src/Core/RequestHandler/CoreStatusRequestHandler.h
index eec0154..ec94bb5 100644
--- a/src/Core/RequestHandler/CoreStatusRequestHandler.h
+++ b/src/Core/RequestHandler/CoreStatusRequestHandler.h
@@ -44,9 +44,13 @@ class CoreStatusRequestHandler : public Common::RequestHandler {
       if(packet.getType() != Net::Packet::TYPE_CORE_STATUS)
         return false; // TODO Logging
 
-      Common::SystemBackend::Uptime uptime = Common::SystemBackend::getBackend()->getUptime();
+      // TODO Require authentication
 
-      if(!connection->send(Net::Packets::CoreStatusPacket(Net::Packet::TYPE_OK, packet.getRequestId(), uptime.uptime, uptime.idleTime)))
+      Common::SystemBackend::UptimeInfo uptimeInfo = Common::SystemBackend::getBackend()->getUptimeInfo();
+      Common::SystemBackend::MemoryInfo memInfo = Common::SystemBackend::getBackend()->getMemoryInfo();
+
+      if(!connection->send(Net::Packets::CoreStatusPacket(Net::Packet::TYPE_OK, packet.getRequestId(), uptimeInfo.uptime, uptimeInfo.idleTime,
+          memInfo.totalMem, memInfo.freeMem, memInfo.totalSwap, memInfo.freeSwap)))
         return false;
 
       setFinished();