X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FsyncOnConnect.hpp;h=85895d1c32ea8936e37868004e38f764f4f1328c;hb=8a36d5e03bd95d0d6429927f39d064f623960a69;hp=0b454e757f410036a0245cc0459de259bc6b766a;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/syncOnConnect.hpp b/src/syncOnConnect.hpp
index 0b454e7..85895d1 100644
--- a/src/syncOnConnect.hpp
+++ b/src/syncOnConnect.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,16 +27,33 @@
  *  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.
  */
 
-void syncOnConnect(SyncTcpConnection * connptr)
+#ifndef ANYTUN_syncOnConnect_hpp_INCLUDED
+#define ANYTUN_syncOnConnect_hpp_INCLUDED
+
+// TODO required headers
+
+void syncOnConnect(SyncTcpConnection* connptr)
 {
-  //TODO Locking here	
-  ConnectionList & cl_(gConnectionList);
+  //TODO Locking here
+  ConnectionList& cl_(gConnectionList);
   ConnectionMap::iterator cit = cl_.getBeginUnlocked();
-  for (;cit!=cl_.getEndUnlocked();++cit)
-  {
+  for(; cit!=cl_.getEndUnlocked(); ++cit) {
     std::ostringstream sout;
     boost::archive::text_oarchive oa(sout);
     const SyncCommand scom(cl_,cit->first);
@@ -45,24 +63,23 @@ void syncOnConnect(SyncTcpConnection * connptr)
     connptr->Send(lengthout.str());
     connptr->Send(sout.str());
   }
-  //TODO Locking here	
-	network_address_type_t types[] = {ipv4,ipv6,ethernet};
-	for (int types_idx=0; types_idx<3; types_idx++)
-	{
-		network_address_type_t type = types[types_idx];
-		RoutingMap::iterator it = gRoutingTable.getBeginUnlocked(type);
-		for (;it!=gRoutingTable.getEndUnlocked(type);++it)
-		{
-			NetworkPrefix tmp(it->first);
-			std::ostringstream sout;
-			boost::archive::text_oarchive oa(sout);
-			const SyncCommand scom(tmp);
-			oa << scom;
-			std::stringstream lengthout;
-			lengthout << std::setw(5) << std::setfill('0') << sout.str().size()<< ' ';
-			connptr->Send(lengthout.str());
-			connptr->Send(sout.str());
-		}
-	}
+  //TODO Locking here
+  network_address_type_t types[] = {ipv4,ipv6,ethernet};
+  for(int types_idx=0; types_idx<3; types_idx++) {
+    network_address_type_t type = types[types_idx];
+    RoutingMap::iterator it = gRoutingTable.getBeginUnlocked(type);
+    for(; it!=gRoutingTable.getEndUnlocked(type); ++it) {
+      NetworkPrefix tmp(it->first);
+      std::ostringstream sout;
+      boost::archive::text_oarchive oa(sout);
+      const SyncCommand scom(tmp);
+      oa << scom;
+      std::stringstream lengthout;
+      lengthout << std::setw(5) << std::setfill('0') << sout.str().size()<< ' ';
+      connptr->Send(lengthout.str());
+      connptr->Send(sout.str());
+    }
+  }
 }
 
+#endif