From 3a3751f02a3efdc079c3f79987da59b234813f16 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 12 Sep 2008 21:43:42 +0200 Subject: Schreibe Pakettypen ohne TYPE_ --- src/Core/RequestHandler/CoreStatusRequestHandler.h | 4 ++-- src/Core/RequestHandler/GSSAPIAuthRequestHandler.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Core/RequestHandler') diff --git a/src/Core/RequestHandler/CoreStatusRequestHandler.h b/src/Core/RequestHandler/CoreStatusRequestHandler.h index ec94bb5..3cfa947 100644 --- a/src/Core/RequestHandler/CoreStatusRequestHandler.h +++ b/src/Core/RequestHandler/CoreStatusRequestHandler.h @@ -41,7 +41,7 @@ class CoreStatusRequestHandler : public Common::RequestHandler { if(isFinished()) return false; - if(packet.getType() != Net::Packet::TYPE_CORE_STATUS) + if(packet.getType() != Net::Packet::CORE_STATUS) return false; // TODO Logging // TODO Require authentication @@ -49,7 +49,7 @@ class CoreStatusRequestHandler : public Common::RequestHandler { 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, + if(!connection->send(Net::Packets::CoreStatusPacket(Net::Packet::OK, packet.getRequestId(), uptimeInfo.uptime, uptimeInfo.idleTime, memInfo.totalMem, memInfo.freeMem, memInfo.totalSwap, memInfo.freeSwap))) return false; diff --git a/src/Core/RequestHandler/GSSAPIAuthRequestHandler.h b/src/Core/RequestHandler/GSSAPIAuthRequestHandler.h index 47538a4..8713db7 100644 --- a/src/Core/RequestHandler/GSSAPIAuthRequestHandler.h +++ b/src/Core/RequestHandler/GSSAPIAuthRequestHandler.h @@ -46,7 +46,7 @@ class GSSAPIAuthRequestHandler : public Common::RequestHandler { if(isFinished()) return false; - if(packet.getType() != Net::Packet::TYPE_GSSAPI_AUTH) + if(packet.getType() != Net::Packet::GSSAPI_AUTH) return false; // TODO Logging OM_uint32 majStat, minStat; @@ -70,7 +70,7 @@ class GSSAPIAuthRequestHandler : public Common::RequestHandler { return false; } - if(!connection->send(Net::Packet(Net::Packet::TYPE_GSSAPI_AUTH, packet.getRequestId(), sendBuffer.value, sendBuffer.length))) { + if(!connection->send(Net::Packet(Net::Packet::GSSAPI_AUTH, packet.getRequestId(), sendBuffer.value, sendBuffer.length))) { gss_release_buffer(&minStat, &sendBuffer); return false; } @@ -93,7 +93,7 @@ class GSSAPIAuthRequestHandler : public Common::RequestHandler { return false; } - if(!connection->send(Net::Packet(Net::Packet::TYPE_GSSAPI_AUTH, packet.getRequestId(), sendBuffer.value, sendBuffer.length))) { + if(!connection->send(Net::Packet(Net::Packet::GSSAPI_AUTH, packet.getRequestId(), sendBuffer.value, sendBuffer.length))) { gss_release_buffer(&minStat, &sendBuffer); return false; } -- cgit v1.2.3