X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FroutingTreeNode.h;h=f4ebaa1eb8458f54c5a32b89be276e46c7396ffa;hb=ad05e83616ca7c348db398c0fd6d5c4acce49fae;hp=9efc6f2811e0c7b828ff47af20b5aeff6fdfb9e4;hpb=f9ad69dfae6bcec427652b0c4230603e465bd544;p=anytun.git

diff --git a/src/routingTreeNode.h b/src/routingTreeNode.h
index 9efc6f2..f4ebaa1 100644
--- a/src/routingTreeNode.h
+++ b/src/routingTreeNode.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_routingTreeNode_h_INCLUDED
@@ -43,15 +56,15 @@ class RoutingTree;
 class RoutingTreeNode
 {
 public:
-	RoutingTreeNode();
-	~RoutingTreeNode();
-	void print(int) const;
+  RoutingTreeNode();
+  ~RoutingTreeNode();
+  void print(int) const;
 
 private:
-//  Mutex mutex_;
-	u_int16_t mux_;
-	bool valid_;
-	boost::array<RoutingTreeNode *,256> nodes_;
+  //  Mutex mutex_;
+  uint16_t mux_;
+  bool valid_;
+  boost::array<RoutingTreeNode*,256> nodes_;
 
   friend class RoutingTree;
 };