Create patch to fix two typos in the documentation

[anytun.git] / src / syncOnConnect.hpp

diff --git a/src/syncOnConnect.hpp b/src/syncOnConnect.hpp
index 79df42f..85895d1 100644 (file)
--- a/src/syncOnConnect.hpp
+++ b/src/syncOnConnect.hpp
@@ -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_syncOnConnect_hpp_INCLUDED
@@ -35,13 +48,12 @@
 
 // TODO required headers
 
-void syncOnConnect(SyncTcpConnection * connptr)
+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);
@@ -51,25 +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