Imported Upstream version 0.3.5

[anytun.git] / src / networkPrefix.cpp

diff --git a/src/networkPrefix.cpp b/src/networkPrefix.cpp
index 045b251..3057ed8 100644 (file)
--- a/src/networkPrefix.cpp
+++ b/src/networkPrefix.cpp
@@ -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,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.
  */
 
 #include "threadUtils.hpp"
@@ -39,31 +53,33 @@ NetworkPrefix::NetworkPrefix(): NetworkAddress(),length_(0)
 {
 }
 
-NetworkPrefix::NetworkPrefix(const NetworkAddress & src,u_int8_t length): NetworkAddress(src),length_(length)
+NetworkPrefix::NetworkPrefix(const NetworkAddress& src,uint8_t length): NetworkAddress(src),length_(length)
 {
 }
 
-NetworkPrefix::NetworkPrefix(const NetworkPrefix & src): NetworkAddress(src),length_(src.length_)
+NetworkPrefix::NetworkPrefix(const NetworkPrefix& src): NetworkAddress(src),length_(src.length_)
 {
 }
 
-void NetworkPrefix::setNetworkPrefixLength(u_int8_t length )
+void NetworkPrefix::setNetworkPrefixLength(uint8_t length)
 {
-       length_ = length;
+  length_ = length;
 }
 
-u_int8_t NetworkPrefix::getNetworkPrefixLength() const
+uint8_t NetworkPrefix::getNetworkPrefixLength() const
 {
-       return length_;
+  return length_;
 }
 
 
-bool NetworkPrefix::operator<(const NetworkPrefix &right) const
+bool NetworkPrefix::operator<(const NetworkPrefix& right) const
 {
-       if (network_address_type_!=right.network_address_type_)
-               return false;
-       if (right.length_!=length_)
-               return (length_<right.length_);
-       return static_cast<NetworkAddress>(*this)<static_cast<NetworkAddress>(right);
+  if(network_address_type_!=right.network_address_type_) {
+    return false;
+  }
+  if(right.length_!=length_) {
+    return (length_<right.length_);
+  }
+  return static_cast<NetworkAddress>(*this)<static_cast<NetworkAddress>(right);
 }