Imported Upstream version 0.3.5

[anytun.git] / src / syncQueue.cpp

diff --git a/src/syncQueue.cpp b/src/syncQueue.cpp
index 636107b..f799532 100644 (file)
--- a/src/syncQueue.cpp
+++ b/src/syncQueue.cpp
@@ -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,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.
  */
 
 #include "threadUtils.hpp"
@@ -42,48 +56,42 @@
 
 #include "syncQueue.h"
 
-SyncQueue* SyncQueue::inst = NULL;
-Mutex SyncQueue::instMutex;
 SyncQueue& gSyncQueue = SyncQueue::instance();
 
-
 SyncQueue& SyncQueue::instance()
 {
-  Lock lock(instMutex);
-  static instanceCleaner c;
-  if(!inst)
-    inst = new SyncQueue();
-
-  return *inst;
+  static SyncQueue instance;
+  return instance;
 }
 
-void SyncQueue::push(const SyncCommand & scom )
+void SyncQueue::push(const SyncCommand& scom)
 {
-       std::ostringstream sout;
-       boost::archive::text_oarchive oa(sout);
-       oa << scom;
+  std::ostringstream sout;
+  boost::archive::text_oarchive oa(sout);
+  oa << scom;
 
   std::stringstream lengthout;
   lengthout << std::setw(5) << std::setfill('0') << sout.str().size()<< ' ';
-       push(lengthout.str()+sout.str());
+  push(lengthout.str()+sout.str());
 }
 
-void SyncQueue::push(const std::string & str )
+void SyncQueue::push(const std::string& str)
 {
   Lock lock(mutex_);
-//     std::cout << "Debug" << std:endl;
-       if( syncServer_)
-         syncServer_->send(str);
+  // std::cout << "Debug" << std:endl;
+  if(syncServer_) {
+    syncServer_->send(str);
+  }
 }
 
-void SyncQueue::setSyncServerPtr(SyncServer * ptr)
+void SyncQueue::setSyncServerPtr(SyncServer* ptr)
 {
   Lock lock(mutex_);
-       syncServer_=ptr;
+  syncServer_=ptr;
 }
 
 bool SyncQueue::empty()
 {
   Lock lock(mutex_);
-       return 1;
+  return 1;
 }