X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FroutingTree.hpp;h=9bac78ed1f1a9377efa3d69ff98bf26175e7af5e;hb=326bc57905738d0bd416ce3d0d7cc79b14ef7a4a;hp=3a9024d5cb371bb937b97d716e9486f6a1c24589;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/routingTree.hpp b/src/routingTree.hpp
index 3a9024d..9bac78e 100644
--- a/src/routingTree.hpp
+++ b/src/routingTree.hpp
@@ -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,38 +27,50 @@
  *  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 __ROUTING_TREE_
-#define __ROUTING_TREE_
+#ifndef ANYTUN_routingTree_hpp_INCLUDED
+#define ANYTUN_routingTree_hpp_INCLUDED
 
 #include "anytunError.h"
 
-class RoutingTree {
+class RoutingTree
+{
 
 public:
   template <class BinaryType>
-  static void walk(BinaryType bytes ,RoutingTreeNode * node,u_int8_t length,u_int16_t mux)
-  {
-    for (int i=0; i<(length/8); i++)
-    {
-      if (!node->nodes_[bytes[i]])
+  static void walk(BinaryType bytes ,RoutingTreeNode* node,uint8_t length,uint16_t mux) {
+    for(int i=0; i<(length/8); i++) {
+      if(!node->nodes_[bytes[i]]) {
         node->nodes_[bytes[i]] = new RoutingTreeNode;
+      }
       node=node->nodes_[bytes[i]];
     }
-    if (length%8)
-    {
+    if(length%8) {
       unsigned char idx=0xff;
       idx <<=8-(length%8);
       idx &= bytes[length/8];
       unsigned char maxidx=0xff;
       maxidx>>=(length%8);
       maxidx|=idx;
-      for (unsigned char i=idx; i<=maxidx; i++)
-      {
-        if (!node->nodes_[i])
+      for(unsigned char i=idx; i<=maxidx; i++) {
+        if(!node->nodes_[i]) {
           node->nodes_[i] = new RoutingTreeNode;
+        }
         node->nodes_[i]->valid_=true;
         node->nodes_[i]->mux_=mux;
       }
@@ -66,25 +79,20 @@ public:
       node->mux_=mux;
     }
   }
-  
+
   template <class BinaryType>
-  static u_int16_t find(BinaryType bytes ,RoutingTreeNode & root )
-  {
+  static uint16_t find(BinaryType bytes ,RoutingTreeNode& root) {
     bool valid=0;
-    u_int16_t mux=0;
-    RoutingTreeNode * node = &root;
-    if (root.valid_)
-    {
+    uint16_t mux=0;
+    RoutingTreeNode* node = &root;
+    if(root.valid_) {
       mux=root.mux_;
       valid=1;
     }
-    for (size_t level=0;level<bytes.size();level++)
-    {
-      if (node->nodes_[bytes[level]])
-      {
+    for(size_t level=0; level<bytes.size(); level++) {
+      if(node->nodes_[bytes[level]]) {
         node=node->nodes_[bytes[level]];
-        if(node->valid_)
-        {
+        if(node->valid_) {
           mux=node->mux_;
           valid=1;
         }
@@ -92,13 +100,12 @@ public:
         break;
       }
     }
-    if(!valid)
+    if(!valid) {
       AnytunError::throwErr() << "no route";
+    }
     return mux;
   }
 
 };
 
 #endif
-  
-