X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FconnectionList.h;h=1476dc3648ca855c2e119c57e0a92fe50f1b774b;hb=59f70c469910fe88a529c043ab0364ca5f8918b9;hp=29eb94f3546a595d1abce3c92b9903f5c6b8a920;hpb=bb834fe0ed7a38b724f49b944adb801634eb6194;p=anytun.git

diff --git a/src/connectionList.h b/src/connectionList.h
index 29eb94f..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
@@ -40,37 +53,31 @@
 #include "datatypes.h"
 #include "connectionParam.h"
 #include "networkAddress.h"
-typedef std::map<u_int16_t, ConnectionParam> ConnectionMap;
+typedef std::map<uint16_t, ConnectionParam> ConnectionMap;
 
 class ConnectionList
 {
 public:
-	ConnectionList();
-	~ConnectionList();
-	static ConnectionList& instance();
-	void addConnection(ConnectionParam &conn, u_int16_t mux);
-	const ConnectionMap::iterator getConnection(u_int16_t mux);
-	const ConnectionMap::iterator getEnd();
-	ConnectionMap::iterator getEndUnlocked();
-	ConnectionMap::iterator getBeginUnlocked();	
-	const ConnectionMap::iterator getBegin();
-	ConnectionParam & getOrNewConnectionUnlocked(u_int16_t mux);
-	bool empty();
-	void clear();
+  ConnectionList();
+  ~ConnectionList();
+
+  static ConnectionList& instance();
+
+  void addConnection(ConnectionParam& conn, uint16_t mux);
+  const ConnectionMap::iterator getConnection(uint16_t mux);
+  const ConnectionMap::iterator getEnd();
+  ConnectionMap::iterator getEndUnlocked();
+  ConnectionMap::iterator getBeginUnlocked();
+  const ConnectionMap::iterator getBegin();
+  ConnectionParam& getOrNewConnectionUnlocked(uint16_t mux);
+  bool empty();
+  void clear();
   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_;
+  ConnectionList(const ConnectionList& s);
+  void operator=(const ConnectionList& s);
+  ConnectionMap connections_;
   Mutex mutex_;
 };