From 3a3751f02a3efdc079c3f79987da59b234813f16 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Fri, 12 Sep 2008 21:43:42 +0200
Subject: Schreibe Pakettypen ohne TYPE_

---
 src/Common/Request/CoreStatusRequest.h | 4 ++--
 src/Common/Request/DisconnectRequest.h | 4 ++--
 src/Common/Request/GSSAPIAuthRequest.h | 8 ++++----
 src/Common/Request/IdentifyRequest.h   | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/Common/Request')

diff --git a/src/Common/Request/CoreStatusRequest.h b/src/Common/Request/CoreStatusRequest.h
index cd28cc2..fb16675 100644
--- a/src/Common/Request/CoreStatusRequest.h
+++ b/src/Common/Request/CoreStatusRequest.h
@@ -54,7 +54,7 @@ class CoreStatusRequest: public Request {
       if(isSent())
         return false;
 
-      if(!connection->send(Net::Packet(Net::Packet::TYPE_CORE_STATUS, requestId)))
+      if(!connection->send(Net::Packet(Net::Packet::CORE_STATUS, requestId)))
         return false;
 
       setSent();
@@ -65,7 +65,7 @@ class CoreStatusRequest: public Request {
       if(isFinished())
         return false;
 
-      if(packet.getType() != Net::Packet::TYPE_OK)
+      if(packet.getType() != Net::Packet::OK)
         return false; // TODO Logging
 
       finished(Net::Packets::CoreStatusPacket(packet));
diff --git a/src/Common/Request/DisconnectRequest.h b/src/Common/Request/DisconnectRequest.h
index 3f6e018..1b2d467 100644
--- a/src/Common/Request/DisconnectRequest.h
+++ b/src/Common/Request/DisconnectRequest.h
@@ -54,7 +54,7 @@ class DisconnectRequest: public Request {
       if(isSent())
         return false;
 
-      if(!connection->send(Net::Packet(Net::Packet::TYPE_DISCONNECT, requestId)))
+      if(!connection->send(Net::Packet(Net::Packet::DISCONNECT, requestId)))
         return false;
 
       setSent();
@@ -65,7 +65,7 @@ class DisconnectRequest: public Request {
       if(isFinished())
         return false;
 
-      if(packet.getType() != Net::Packet::TYPE_OK)
+      if(packet.getType() != Net::Packet::OK)
         return false; // TODO Logging
 
       connection->disconnect();
diff --git a/src/Common/Request/GSSAPIAuthRequest.h b/src/Common/Request/GSSAPIAuthRequest.h
index ff92755..6882f36 100644
--- a/src/Common/Request/GSSAPIAuthRequest.h
+++ b/src/Common/Request/GSSAPIAuthRequest.h
@@ -97,7 +97,7 @@ class GSSAPIAuthRequest : public Request {
         return false;
       }
 
-      if(!connection->send(Net::Packet(Net::Packet::TYPE_GSSAPI_AUTH, requestId, buffer.value, buffer.length))) {
+      if(!connection->send(Net::Packet(Net::Packet::GSSAPI_AUTH, requestId, buffer.value, buffer.length))) {
         gss_release_buffer(&minStat, &buffer);
         return false;
       }
@@ -112,7 +112,7 @@ class GSSAPIAuthRequest : public Request {
       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;
@@ -137,7 +137,7 @@ class GSSAPIAuthRequest : public Request {
           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;
         }
@@ -171,7 +171,7 @@ class GSSAPIAuthRequest : public Request {
           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;
         }
diff --git a/src/Common/Request/IdentifyRequest.h b/src/Common/Request/IdentifyRequest.h
index dfb6ce6..e7b9d21 100644
--- a/src/Common/Request/IdentifyRequest.h
+++ b/src/Common/Request/IdentifyRequest.h
@@ -53,7 +53,7 @@ class IdentifyRequest: public Request {
       if(isSent())
         return false;
 
-      if(!connection->send(Net::Packet(Net::Packet::TYPE_IDENTIFY, requestId, hostname.c_str(), hostname.length())))
+      if(!connection->send(Net::Packet(Net::Packet::IDENTIFY, requestId, hostname.c_str(), hostname.length())))
         return false;
 
       setSent();
@@ -64,7 +64,7 @@ class IdentifyRequest: public Request {
       if(isFinished())
         return false;
 
-      if(packet.getType() != Net::Packet::TYPE_IDENTIFY)
+      if(packet.getType() != Net::Packet::IDENTIFY)
         return false; // TODO Logging
 
       std::cout << "Identified as '" << hostname << "'." << std::endl;
-- 
cgit v1.2.3