X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FconnectionList.h;fp=src%2FconnectionList.h;h=1476dc3648ca855c2e119c57e0a92fe50f1b774b;hb=65944fb7a518dc659bacaf80cf235a0352fc6a7e;hp=750a1423f36696553db65eb9be30ec894e922a28;hpb=ef0cacf2508418915d3f64b04003be3c13fed3cc;p=anytun.git

diff --git a/src/connectionList.h b/src/connectionList.h
index 750a142..1476dc3 100644
--- a/src/connectionList.h
+++ b/src/connectionList.h
@@ -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_connectionList_h_INCLUDED
@@ -47,7 +60,9 @@ class ConnectionList
 public:
   ConnectionList();
   ~ConnectionList();
+
   static ConnectionList& instance();
+
   void addConnection(ConnectionParam& conn, uint16_t mux);
   const ConnectionMap::iterator getConnection(uint16_t mux);
   const ConnectionMap::iterator getEnd();
@@ -60,17 +75,6 @@ public:
   Mutex& getMutex();
 
 private:
-  static Mutex instMutex;
-  static ConnectionList* inst;
-  class instanceCleaner
-  {
-  public:
-    ~instanceCleaner() {
-      if(ConnectionList::inst != 0) {
-        delete ConnectionList::inst;
-      }
-    }
-  };
   ConnectionList(const ConnectionList& s);
   void operator=(const ConnectionList& s);
   ConnectionMap connections_;