X-Git-Url: https://git.syn-net.org/debian/?p=anytun.git;a=blobdiff_plain;f=src%2FsyncQueue.cpp;h=f7995324938391c03898600f5dacf2583e54f13e;hp=8ddc7437f890a7e71031bff508df0c9a449411d1;hb=65944fb7a518dc659bacaf80cf235a0352fc6a7e;hpb=ef0cacf2508418915d3f64b04003be3c13fed3cc

diff --git a/src/syncQueue.cpp b/src/syncQueue.cpp
index 8ddc743..f799532 100644
--- a/src/syncQueue.cpp
+++ b/src/syncQueue.cpp
@@ -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.
  */
 
 #include "threadUtils.hpp"
@@ -43,20 +56,12 @@
 
 #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)
@@ -73,7 +78,7 @@ void SyncQueue::push(const SyncCommand& scom)
 void SyncQueue::push(const std::string& str)
 {
   Lock lock(mutex_);
-  //	std::cout << "Debug" << std:endl;
+  // std::cout << "Debug" << std:endl;
   if(syncServer_) {
     syncServer_->send(str);
   }