X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FsignalController.h;h=491c529cd7eec41d3d520d2da38e6785aff76711;hb=refs%2Fheads%2Fupstream;hp=fa5f0fb21711eaca51a13839611406f1e18b4bdd;hpb=ece844834d2cecc028ce81ca283f5d441088580e;p=anytun.git

diff --git a/src/signalController.h b/src/signalController.h
index fa5f0fb..491c529 100644
--- a/src/signalController.h
+++ b/src/signalController.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_signalController_h_INCLUDED
@@ -66,18 +79,8 @@ public:
 private:
   SignalController() {};
   ~SignalController() {};
-  SignalController(const SignalController &s);
-  void operator=(const SignalController &s);
-
-  static SignalController* inst;
-  static Mutex instMutex;
-  class instanceCleaner {
-    public: ~instanceCleaner() {
-      if(SignalController::inst != NULL)
-        delete SignalController::inst;
-    }
-  };
-  friend class instanceCleaner;
+  SignalController(const SignalController& s);
+  void operator=(const SignalController& s);
 
   typedef std::pair<int, std::string> SigPair;
   std::queue<SigPair> sigQueue;