X-Git-Url: https://git.syn-net.org/debian/?p=anytun.git;a=blobdiff_plain;f=src%2Fanytun-controld.cpp;h=9073ce0a2922fd9d5991d81b02c1b8a7d12ec985;hp=c4813cad1c812f3d86000f308ec3f50b57e0e9dd;hb=65944fb7a518dc659bacaf80cf235a0352fc6a7e;hpb=ef0cacf2508418915d3f64b04003be3c13fed3cc diff --git a/src/anytun-controld.cpp b/src/anytun-controld.cpp index c4813ca..9073ce0 100644 --- a/src/anytun-controld.cpp +++ b/src/anytun-controld.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 * * This file is part of Anytun. @@ -27,15 +27,24 @@ * 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 -#include -#include #include #include "datatypes.h" @@ -46,7 +55,11 @@ #include "resolver.h" #include "syncServer.h" -#include "daemonService.h" +#if !defined(_MSC_VER) && !defined(MINGW) +# include "daemonService.h" +#else +# include "nullDaemon.h" +#endif #include std::list config_; @@ -122,6 +135,7 @@ int main(int argc, char* argv[]) boost::thread* syncListenerThread; syncListenerThread = new boost::thread(boost::bind(syncListener)); + if(syncListenerThread) syncListenerThread->detach(); int ret = gSignalController.run();