Imported Upstream version 0.3.5

[anytun.git] / src / encryptedPacket.h

diff --git a/src/encryptedPacket.h b/src/encryptedPacket.h
index bd321b3..c924ad9 100644 (file)
--- a/src/encryptedPacket.h
+++ b/src/encryptedPacket.h
@@ -6,12 +6,12 @@
  *  tunnel endpoints.  It has less protocol overhead than IPSec in Tunnel
  *  mode and allows tunneling of every ETHER TYPE protocol (e.g.
  *  ethernet, ip, arp ...). satp directly includes cryptography and
- *  message authentication based on the methodes used by SRTP.  It is
+ *  message authentication based on the methods used by SRTP.  It is
  *  intended to deliver a generic, scaleable and secure solution for
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl,
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
@@ -27,7 +27,20 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with Anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL.  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so.  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version.  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
  */
 
 #ifndef ANYTUN_encryptedPacket_h_INCLUDED
@@ -43,10 +56,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
@@ -57,7 +70,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
@@ -107,53 +120,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