summaryrefslogtreecommitdiffstats
path: root/src/Core
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2008-09-12 21:43:42 +0200
committerMatthias Schiffer <matthias@gamezock.de>2008-09-12 21:43:42 +0200
commit3a3751f02a3efdc079c3f79987da59b234813f16 (patch)
tree12034654eeda706be576742d62a847c041d4ad56 /src/Core
parentc6f395af944d74967243f4b680d34fa6667df4a1 (diff)
downloadmad-3a3751f02a3efdc079c3f79987da59b234813f16.tar
mad-3a3751f02a3efdc079c3f79987da59b234813f16.zip
Schreibe Pakettypen ohne TYPE_
Diffstat (limited to 'src/Core')
-rw-r--r--src/Core/ConnectionManager.cpp4
-rw-r--r--src/Core/RequestHandler/CoreStatusRequestHandler.h4
-rw-r--r--src/Core/RequestHandler/GSSAPIAuthRequestHandler.h6
3 files changed, 7 insertions, 7 deletions
diff --git a/src/Core/ConnectionManager.cpp b/src/Core/ConnectionManager.cpp
index e953fce..39c6705 100644
--- a/src/Core/ConnectionManager.cpp
+++ b/src/Core/ConnectionManager.cpp
@@ -54,8 +54,8 @@ void ConnectionManager::refreshPollfds() {
}
ConnectionManager::ConnectionManager(const ConfigManager& configManager) : requestManager(true) {
- requestManager.registerPacketType<RequestHandler::CoreStatusRequestHandler>(Net::Packet::TYPE_CORE_STATUS);
- requestManager.registerPacketType<RequestHandler::GSSAPIAuthRequestHandler>(Net::Packet::TYPE_GSSAPI_AUTH);
+ requestManager.registerPacketType<RequestHandler::CoreStatusRequestHandler>(Net::Packet::CORE_STATUS);
+ requestManager.registerPacketType<RequestHandler::GSSAPIAuthRequestHandler>(Net::Packet::GSSAPI_AUTH);
const std::vector<Net::IPAddress> &listenerAddresses = configManager.getListenerAddresses();
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;
}