X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FsyncRouteCommand.h;h=1de195145275a0d822e58de039744167eb99bf2e;hb=refs%2Fheads%2Fupstream;hp=5bef2f90cc6b9ba6ed7bd3393d199c87f9c81b06;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/syncRouteCommand.h b/src/syncRouteCommand.h
index 5bef2f9..1de1951 100644
--- a/src/syncRouteCommand.h
+++ b/src/syncRouteCommand.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,10 +27,25 @@
  *  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 _SYNCROUTECOMMAND_H
-#define _SYNCROUTECOMMAND_H
+
+#ifndef ANYTUN_syncRouteCommands_h_INCLUDED
+#define ANYTUN_syncRouteCommands_h_INCLUDED
+
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/archive/text_iarchive.hpp>
 
@@ -40,26 +56,25 @@
 class SyncRouteCommand
 {
 public:
-	SyncRouteCommand(const NetworkPrefix & );
-	SyncRouteCommand();
-	NetworkPrefix getPrefix() const;
+  SyncRouteCommand(const NetworkPrefix&);
+  SyncRouteCommand();
+  NetworkPrefix getPrefix() const;
 
 private:
-	SyncRouteCommand(const SyncRouteCommand &);
-	u_int16_t count_;
-	NetworkPrefix addr_;
+  SyncRouteCommand(const SyncRouteCommand&);
+  uint16_t count_;
+  NetworkPrefix addr_;
   friend class boost::serialization::access;
   template<class Archive>
-  void serialize(Archive & ar, const unsigned int version)
-  {
-		Lock lock(gRoutingTable.getMutex());
-		ar & addr_;
-//		u_int16_t & mux (gRoutingTable.getOrNewRoutingTEUnlocked(addr_));
-//		ar & mux;
-		ar & (*(gRoutingTable.getOrNewRoutingTEUnlocked(addr_)));
-		gRoutingTable.updateRouteTreeUnlocked(addr_);
-	};
+  void serialize(Archive& ar, const unsigned int version) {
+    Lock lock(gRoutingTable.getMutex());
+    ar& addr_;
+    //		uint16_t & mux (gRoutingTable.getOrNewRoutingTEUnlocked(addr_));
+    //		ar & mux;
+    ar & (*(gRoutingTable.getOrNewRoutingTEUnlocked(addr_)));
+    gRoutingTable.updateRouteTreeUnlocked(addr_);
+  };
 };
 
 
-#endif // _SYNCCOMMAND_H
+#endif