X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FplainPacket.h;h=a215dd3a3bf0bb9114d5ee6959ccb5ac15708f84;hb=8a36d5e03bd95d0d6429927f39d064f623960a69;hp=5919c32767456ba259dc123312c57cc74bd76a77;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/plainPacket.h b/src/plainPacket.h
index 5919c32..a215dd3 100644
--- a/src/plainPacket.h
+++ b/src/plainPacket.h
@@ -6,19 +6,20 @@
  *  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-2008 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.
  *
  *  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
@@ -26,11 +27,24 @@
  *  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 _PLAIN_PACKET_H_
-#define _PLAIN_PACKET_H_
+#ifndef ANYTUN_plainPacket_h_INCLUDED
+#define ANYTUN_plainPacket_h_INCLUDED
 
 #include "datatypes.h"
 #include "buffer.h"
@@ -46,17 +60,17 @@ class Cipher;
 #define PAYLOAD_TYPE_TAP 0x6558
 #define PAYLOAD_TYPE_TUN 0x0000
 #define PAYLOAD_TYPE_TUN4 0x0800
-#define PAYLOAD_TYPE_TUN6 0x86DD 
+#define PAYLOAD_TYPE_TUN6 0x86DD
 
 class PlainPacket : public Buffer
 {
 public:
   /**
    * Packet constructor
-   * @param the length of the payload 
+   * @param the length of the payload
    * @param allow reallocation of buffer
    */
-  PlainPacket(u_int32_t payload_length, bool allow_realloc = false);
+  PlainPacket(uint32_t payload_length, bool allow_realloc = false);
 
   /**
    * Packet destructor
@@ -67,11 +81,11 @@ public:
    * Get the length of the header
    * @return the length of the header
    */
-  static u_int32_t getHeaderLength();
+  static uint32_t getHeaderLength();
 
   /**
    * Get the payload type
-   * @return the id of the payload type 
+   * @return the id of the payload type
    */
   payload_type_t getPayloadType() const;
 
@@ -85,31 +99,31 @@ 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();
 
-//  NetworkAddress getSrcAddr() const;
+  //  NetworkAddress getSrcAddr() const;
   NetworkAddress getDstAddr() const;
 
 private:
   PlainPacket();
-  PlainPacket(const PlainPacket &src);
+  PlainPacket(const PlainPacket& src);
 
   void reinit();
 
   payload_type_t* payload_type_;
-  u_int8_t* payload_;
+  uint8_t* payload_;
 };
 
 #endif