Imported Upstream version 0.3.4

[anytun.git] / src / encryptedPacket.h

diff --git a/src/encryptedPacket.h b/src/encryptedPacket.h
index 618fa44..221c534 100644 (file)
--- a/src/encryptedPacket.h
+++ b/src/encryptedPacket.h
@@ -11,14 +11,15 @@
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2008 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl,
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
  *
  *  Anytun is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
  *
  *  Anytun is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,8 +30,8 @@
  *  along with anytun.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _ENCRYPTED_PACKET_H_
-#define _ENCRYPTED_PACKET_H_
+#ifndef ANYTUN_encryptedPacket_h_INCLUDED
+#define ANYTUN_encryptedPacket_h_INCLUDED
 
 #include "datatypes.h"
 #include "buffer.h"
@@ -42,10 +43,10 @@ public:
 
   /**
    * Packet constructor
-   * @param the length of the payload 
+   * @param the length of the payload
    * @param allow reallocation of buffer
    */
-  EncryptedPacket(u_int32_t payload_length, u_int32_t auth_tag_length, bool allow_realloc = false);
+  EncryptedPacket(uint32_t payload_length, uint32_t auth_tag_length, bool allow_realloc = false);
 
   /**
    * Packet destructor
@@ -56,7 +57,7 @@ public:
    * Get the length of the header
    * @return the length of the header
    */
-  static u_int32_t getHeaderLength();
+  static uint32_t getHeaderLength();
 
   /**
    * Get the sequence number
@@ -106,53 +107,52 @@ public:
    * Get the length of the payload
    * @return the length of the payload
    */
-  u_int32_t getPayloadLength() const;
+  uint32_t getPayloadLength() const;
 
   /**
    * Set the length of the payload
    * @param length length of the payload
    */
-  void setPayloadLength(u_int32_t payload_length);
+  void setPayloadLength(uint32_t payload_length);
 
   /**
    * Get the the payload
    * @return the Pointer to the payload
    */
-  u_int8_t* getPayload();
+  uint8_t* getPayload();
 
 
-  u_int8_t* getAuthenticatedPortion();
-  u_int32_t getAuthenticatedPortionLength();
+  uint8_t* getAuthenticatedPortion();
+  uint32_t getAuthenticatedPortionLength();
 
   void withAuthTag(bool b);
   void addAuthTag();
   void removeAuthTag();
-  u_int8_t* getAuthTag();
-  u_int32_t getAuthTagLength();
-                      
+  uint8_t* getAuthTag();
+  uint32_t getAuthTagLength();
+
 private:
   EncryptedPacket();
-  EncryptedPacket(const EncryptedPacket &src);
+  EncryptedPacket(const EncryptedPacket& src);
 
   void reinit();
 
 #ifdef _MSC_VER
-  #pragma pack(push, 1)
-#endif  
-  struct ATTR_PACKED HeaderStruct
-  {
+#pragma pack(push, 1)
+#endif
+  struct ATTR_PACKED HeaderStruct {
     seq_nr_t seq_nr;
     sender_id_t sender_id;
     mux_t mux;
   };
 #ifdef _MSC_VER
-  #pragma pack(pop)
+#pragma pack(pop)
 #endif
 
   struct HeaderStruct* header_;
-       u_int8_t * payload_;
-  u_int8_t * auth_tag_;
-  u_int32_t  auth_tag_length_;
+  uint8_t* payload_;
+  uint8_t* auth_tag_;
+  uint32_t  auth_tag_length_;
 };
 
 #endif