Imported Upstream version 0.3.4

[anytun.git] / src / connectionList.h

diff --git a/src/connectionList.h b/src/connectionList.h
index 29eb94f..750a142 100644 (file)
--- a/src/connectionList.h
+++ b/src/connectionList.h
@@ -11,7 +11,7 @@
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl,
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
@@ -40,37 +40,40 @@
 #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;
-   }
+  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_;
 };