X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FsignalController.cpp;h=d8dcade1677691c763fcd0c79e1ef6ee49d0c41c;hb=65944fb7a518dc659bacaf80cf235a0352fc6a7e;hp=b2017fd45911df630e763dd03c67cf37d51d6eed;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git diff --git a/src/signalController.cpp b/src/signalController.cpp index b2017fd..d8dcade 100644 --- a/src/signalController.cpp +++ b/src/signalController.cpp @@ -6,19 +6,20 @@ * 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-2008 Othmar Gsenger, Erwin Nindl, + * Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl, * Christian Pointner * * 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 @@ -26,193 +27,62 @@ * 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 . + * along with Anytun. If not, see . + * + * 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 #include +#include #include "signalController.h" #include "log.h" #include "anytunError.h" #include "threadUtils.hpp" -#ifndef _MSC_VER -#include -#include -#else -#include -#endif -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::handle(const std::string& msg) +int SigErrorHandler(int /*sig*/, const std::string& msg) { AnytunError::throwErr() << msg; return 0; } -#ifndef _MSC_VER - -int SigIntHandler::handle() -{ - cLog.msg(Log::PRIO_NOTICE) << "SIG-Int caught, exiting"; - - return 1; -} - -int SigQuitHandler::handle() -{ - cLog.msg(Log::PRIO_NOTICE) << "SIG-Quit caught, exiting"; - - return 1; -} - -int SigHupHandler::handle() -{ - cLog.msg(Log::PRIO_NOTICE) << "SIG-Hup caught"; - - return 0; -} - -int SigTermHandler::handle() -{ - cLog.msg(Log::PRIO_NOTICE) << "SIG-Term caughtm, exiting"; - - return 1; -} - -int SigUsr1Handler::handle() -{ - cLog.msg(Log::PRIO_NOTICE) << "SIG-Usr1 caught"; - - return 0; -} - -int SigUsr2Handler::handle() -{ - cLog.msg(Log::PRIO_NOTICE) << "SIG-Usr2 caught"; - - return 0; -} +//use system specific signal handler +#if !defined(_MSC_VER) && !defined(MINGW) +#include "signalHandler.hpp" #else -int CtrlCHandler::handle() -{ - cLog.msg(Log::PRIO_NOTICE) << "CTRL-C Event received, exitting"; - - return 1; -} - -int CtrlBreakHandler::handle() -{ - cLog.msg(Log::PRIO_NOTICE) << "CTRL-Break Event received, ignoring"; - - return 0; -} - -int CtrlCloseHandler::handle() -{ - cLog.msg(Log::PRIO_NOTICE) << "Close Event received, exitting"; - - return 1; -} - -int CtrlLogoffHandler::handle() -{ - cLog.msg(Log::PRIO_NOTICE) << "LogOff Event received, exitting"; - - return 1; -} - -int CtrlShutdownHandler::handle() -{ - cLog.msg(Log::PRIO_NOTICE) << "Shutdown Event received, exitting"; - - return 1; -} -#endif - -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 -void SignalController::handle() -{ - sigset_t signal_set; - int sigNum; - - while(1) - { - sigfillset(&signal_set); - sigwait(&signal_set, &sigNum); - inject(sigNum); - } -} -#else -bool SignalController::handle(DWORD ctrlType) -{ - gSignalController.inject(ctrlType); - return true; -} -#endif - -void SignalController::init() -{ -#ifndef _MSC_VER - sigset_t signal_set; - - sigfillset(&signal_set); - sigdelset(&signal_set, SIGCHLD); - sigdelset(&signal_set, SIGSEGV); - sigdelset(&signal_set, SIGBUS); - sigdelset(&signal_set, SIGFPE); - -#if defined(BOOST_HAS_PTHREADS) - pthread_sigmask(SIG_BLOCK, &signal_set, NULL); +#ifdef WIN_SERVICE +#include "win32/signalServiceHandler.hpp" #else -#error The signalhandler works only with pthreads +#include "win32/signalHandler.hpp" #endif - - thread = new boost::thread(boost::bind(&SignalController::handle, this)); - - handler[SIGINT] = new SigIntHandler; - handler[SIGQUIT] = new SigQuitHandler; - handler[SIGHUP] = new SigHupHandler; - handler[SIGTERM] = new SigTermHandler; - handler[SIGUSR1] = new SigUsr1Handler; - handler[SIGUSR2] = new SigUsr2Handler; -#else - if(!SetConsoleCtrlHandler((PHANDLER_ROUTINE)SignalController::handle, true)) - AnytunError::throwErr() << "Error on SetConsoleCtrlhandler: " << AnytunErrno(GetLastError()); - - handler[CTRL_C_EVENT] = new CtrlCHandler; - handler[CTRL_BREAK_EVENT] = new CtrlBreakHandler; - handler[CTRL_CLOSE_EVENT] = new CtrlCloseHandler; - handler[CTRL_LOGOFF_EVENT] = new CtrlLogoffHandler; - handler[CTRL_SHUTDOWN_EVENT] = new CtrlShutdownHandler; #endif - handler[SIGERROR] = new SigErrorHandler; +void SignalController::init(DaemonService& service) +{ + registerSignalHandler(*this, service); + handler[SIGERROR] = boost::bind(SigErrorHandler, _1, _2); } void SignalController::inject(int sig, const std::string& msg) @@ -226,7 +96,13 @@ void SignalController::inject(int sig, const std::string& msg) int SignalController::run() { - while(1) { + for(CallbackMap::iterator it = callbacks.begin(); it != callbacks.end(); ++it) + if(it->first == CALLB_RUNNING) { + it->second(); + } + + int ret = 0; + for(;;) { sigQueueSem.down(); SigPair sig; { @@ -234,22 +110,29 @@ int SignalController::run() sig = sigQueue.front(); sigQueue.pop(); } - + HandlerMap::iterator it = handler.find(sig.first); - if(it != handler.end()) - { - int ret; - if(sig.second == "") - ret = it->second->handle(); - else - ret = it->second->handle(sig.second); - - if(ret) - return ret; + if(it != handler.end()) { + ret = it->second(sig.first, sig.second); + + if(ret) { + break; + } + } else { + it = handler.find(SIGUNKNOWN); + if(it != handler.end()) { + it->second(sig.first, sig.second); + } else { + cLog.msg(Log::PRIO_NOTICE) << "SIG " << sig.first << " caught with message '" << sig.second << "' - ignoring"; + } } - else - cLog.msg(Log::PRIO_NOTICE) << "SIG " << sig.first << " caught with message '" << sig.second << "'- ignoring"; } - return 0; + + for(CallbackMap::iterator it = callbacks.begin(); it != callbacks.end(); ++it) + if(it->first == CALLB_STOPPING) { + it->second(); + } + + return ret; }