Imported Upstream version 0.3.2

[anytun.git] / src / signalController.cpp

diff --git a/src/signalController.cpp b/src/signalController.cpp
index b2017fd..2e4a53e 100644 (file)
--- a/src/signalController.cpp
+++ b/src/signalController.cpp
@@ -11,14 +11,15 @@
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2008 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, 
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
  *
  *  Anytun is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
  *
  *  Anytun is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -149,10 +150,6 @@ SignalController::~SignalController()
 {
   for(HandlerMap::iterator it = handler.begin(); it != handler.end(); ++it)
     delete it->second;
-
-#ifndef _MSC_VER
-  if(thread) delete thread;
-#endif
 }
 
 #ifndef _MSC_VER
@@ -193,7 +190,7 @@ void SignalController::init()
 #error The signalhandler works only with pthreads
 #endif
   
-  thread = new boost::thread(boost::bind(&SignalController::handle, this));
+  boost::thread(boost::bind(&SignalController::handle, this));
 
   handler[SIGINT] = new SigIntHandler;
   handler[SIGQUIT] = new SigQuitHandler;
@@ -248,7 +245,7 @@ int SignalController::run()
         return ret;
     }
     else
-      cLog.msg(Log::PRIO_NOTICE) << "SIG " << sig.first << " caught with message '" << sig.second << "'- ignoring";
+      cLog.msg(Log::PRIO_NOTICE) << "SIG " << sig.first << " caught with message '" << sig.second << "' - ignoring";
   }
   return 0;
 }