X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FroutingTable.h;h=ec874068666e3c77d1164dceec413bd7f5f84435;hb=74b165bb1a2b001b52ee01eb56ee3ea59a81d10f;hp=9ab3260369075b500271b4e9183b89bd39c94817;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/routingTable.h b/src/routingTable.h
index 9ab3260..ec87406 100644
--- a/src/routingTable.h
+++ b/src/routingTable.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 _ROUTINGTABLE_H
-#define _ROUTINGTABLE_H
+#ifndef ANYTUN_routingTable_h_INCLUDED
+#define ANYTUN_routingTable_h_INCLUDED
 
 #include <map>
 #include <deque>
@@ -41,39 +55,31 @@
 #include "networkPrefix.h"
 #include "routingTreeNode.h"
 #include "boost/array.hpp"
-typedef std::map<NetworkPrefix,u_int16_t> RoutingMap;
+typedef std::map<NetworkPrefix,uint16_t> RoutingMap;
 
 class RoutingTable
 {
 public:
-	static RoutingTable& instance();
-	RoutingTable();
-	~RoutingTable();
-	void addRoute(const NetworkPrefix & ,u_int16_t);
-	void updateRouteTreeUnlocked(const NetworkPrefix & pref);
-	void delRoute(const NetworkPrefix & );
-	u_int16_t getRoute(const NetworkAddress &);
-	bool empty(network_address_type_t type);
-	void clear(network_address_type_t type);
+  static RoutingTable& instance();
+  RoutingTable();
+  ~RoutingTable();
+  void addRoute(const NetworkPrefix& ,uint16_t);
+  void updateRouteTreeUnlocked(const NetworkPrefix& pref);
+  void delRoute(const NetworkPrefix&);
+  uint16_t getRoute(const NetworkAddress&);
+  bool empty(network_address_type_t type);
+  void clear(network_address_type_t type);
   Mutex& getMutex();
-	u_int16_t* getOrNewRoutingTEUnlocked(const NetworkPrefix & addr);
-	u_int16_t getCountUnlocked(network_address_type_t type);
-	RoutingMap::iterator getBeginUnlocked(network_address_type_t type);
-	RoutingMap::iterator getEndUnlocked(network_address_type_t type);
+  uint16_t* getOrNewRoutingTEUnlocked(const NetworkPrefix& addr);
+  uint16_t getCountUnlocked(network_address_type_t type);
+  RoutingMap::iterator getBeginUnlocked(network_address_type_t type);
+  RoutingMap::iterator getEndUnlocked(network_address_type_t type);
 
 private:
-  static Mutex instMutex;
-	static RoutingTable* inst;
-  class instanceCleaner {
-    public: ~instanceCleaner() {
-     if(RoutingTable::inst != 0)
-       delete RoutingTable::inst;
-   }
-	};
-	RoutingTable(const RoutingTable &s);
-  void operator=(const RoutingTable &s);
-	boost::array<RoutingMap,3> routes_;
-	boost::array<RoutingTreeNode,3> root_;
+  RoutingTable(const RoutingTable& s);
+  void operator=(const RoutingTable& s);
+  boost::array<RoutingMap,3> routes_;
+  boost::array<RoutingTreeNode,3> root_;
   Mutex mutex_;
 };