From ddfc1b38d7bb5cc607afc7fadc6374911f5a9e60 Mon Sep 17 00:00:00 2001 From: Markus Grüneis Date: Wed, 17 Feb 2010 21:40:54 +0000 Subject: whitespace only change: unified formatting with "astyle --style=k/r --indent=spaces=2 --unpad-paren --add-brackets --align-pointer=type --keep-one-line-blocks --indent-col1-comments --lineend=linux --suffix=none --recursive" --- src/connectionList.h | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) (limited to 'src/connectionList.h') diff --git a/src/connectionList.h b/src/connectionList.h index 29eb94f..949889d 100644 --- 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 * * This file is part of Anytun. @@ -45,32 +45,35 @@ typedef std::map 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, 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(); 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_; }; -- cgit v1.2.3