X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FsyncQueue.h;h=1c9b5edb879a06c86761cca8c689a35196a316e3;hb=refs%2Fremotes%2Forigin%2Fmaster;hp=5cb4f6e1fe0757f136d40bd03929dea5a487a880;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/syncQueue.h b/src/syncQueue.h
index 5cb4f6e..1c9b5ed 100644
--- a/src/syncQueue.h
+++ b/src/syncQueue.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,11 +27,24 @@
  *  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 _SYNC_QUEUE_H
-#define _SYNC_QUEUE_H
+#ifndef ANYTUN_syncQueue_h_INCLUDED
+#define ANYTUN_syncQueue_h_INCLUDED
 
 #include <deque>
 #include <queue>
@@ -44,28 +58,20 @@
 class SyncQueue
 {
 public:
-	SyncQueue():syncServer_(NULL) {};
-	~SyncQueue() {};
+  SyncQueue():syncServer_(NULL) {};
+  ~SyncQueue() {};
   static SyncQueue& instance();
-	void setSyncServerPtr(SyncServer *);
-	void push(const std::string & );
-	void push(const SyncCommand & );
-	std::string pop();
-	bool empty();
+  void setSyncServerPtr(SyncServer*);
+  void push(const std::string&);
+  void push(const SyncCommand&);
+  std::string pop();
+  bool empty();
 
 private:
-  static Mutex instMutex;
-	static SyncQueue* inst;
-  class instanceCleaner {
-    public: ~instanceCleaner() {
-     if(SyncQueue::inst != 0)
-       delete SyncQueue::inst;
-   }
-  };
-  SyncQueue(const SyncQueue &s);
-  void operator=(const SyncQueue &s);
+  SyncQueue(const SyncQueue& s);
+  void operator=(const SyncQueue& s);
   Mutex mutex_;
-	SyncServer * syncServer_;
+  SyncServer* syncServer_;
 };
 
 extern SyncQueue& gSyncQueue;