Imported Upstream version 0.3.5

[anytun.git] / src / signalController.cpp

diff --git a/src/signalController.cpp b/src/signalController.cpp
index 6a20588..d8dcade 100644 (file)
--- a/src/signalController.cpp
+++ b/src/signalController.cpp
@@ -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.
  */
 
 #include <map>
@@ -39,18 +52,13 @@
 #include "anytunError.h"
 #include "threadUtils.hpp"
 
-SignalController* SignalController::inst = NULL;
-Mutex SignalController::instMutex;
+
 SignalController& gSignalController = SignalController::instance();
 
 SignalController& SignalController::instance()
 {
-       Lock lock(instMutex);
-       static instanceCleaner c;
-       if(!inst)
-               inst = new SignalController();
-
-       return *inst;
+  static SignalController instance;
+  return instance;
 }
 
 int SigErrorHandler(int /*sig*/, const std::string& msg)
@@ -61,14 +69,14 @@ int SigErrorHandler(int /*sig*/, const std::string& msg)
 }
 
 //use system specific signal handler
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) && !defined(MINGW)
 #include "signalHandler.hpp"
 #else
- #ifdef WIN_SERVICE
- #include "win32/signalServiceHandler.hpp"
- #else
- #include "win32/signalHandler.hpp"
- #endif
+#ifdef WIN_SERVICE
+#include "win32/signalServiceHandler.hpp"
+#else
+#include "win32/signalHandler.hpp"
+#endif
 #endif
 
 void SignalController::init(DaemonService& service)
@@ -89,11 +97,12 @@ void SignalController::inject(int sig, const std::string& msg)
 int SignalController::run()
 {
   for(CallbackMap::iterator it = callbacks.begin(); it != callbacks.end(); ++it)
-    if(it->first == CALLB_RUNNING)
+    if(it->first == CALLB_RUNNING) {
       it->second();
+    }
 
   int ret = 0;
-  while(1) {
+  for(;;) {
     sigQueueSem.down();
     SigPair sig;
     {
@@ -101,27 +110,28 @@ int SignalController::run()
       sig = sigQueue.front();
       sigQueue.pop();
     }
-    
+
     HandlerMap::iterator it = handler.find(sig.first);
-    if(it != handler.end())
-    {
+    if(it != handler.end()) {
       ret = it->second(sig.first, sig.second);
 
-      if(ret)
+      if(ret) {
         break;
-    }
-    else {
+      }
+    } else {
       it = handler.find(SIGUNKNOWN);
-      if(it != handler.end())
+      if(it != handler.end()) {
         it->second(sig.first, sig.second);
-      else
+      } else {
         cLog.msg(Log::PRIO_NOTICE) << "SIG " << sig.first << " caught with message '" << sig.second << "' - ignoring";
+      }
     }
   }
 
   for(CallbackMap::iterator it = callbacks.begin(); it != callbacks.end(); ++it)
-    if(it->first == CALLB_STOPPING)
+    if(it->first == CALLB_STOPPING) {
       it->second();
+    }
 
   return ret;
 }