X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2Fanytun-controld.cpp;h=9073ce0a2922fd9d5991d81b02c1b8a7d12ec985;hb=eadcba6b0fd5c506e953a6a6e63f43cd880c8b0e;hp=767db53fa64ec19c6ad3f31fa2215a5566b2cc36;hpb=bf2cb4e3379948d1f2e65f2a6373cf0f8c379481;p=anytun.git

diff --git a/src/anytun-controld.cpp b/src/anytun-controld.cpp
index 767db53..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 <satp@wirdorange.org>
  *
  *  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 <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 <iostream>
 #include <fstream>
-#include <poll.h>
-#include <fcntl.h>
-#include <pwd.h>
-#include <grp.h>
 #include <string>
 
 #include "datatypes.h"
@@ -46,31 +55,31 @@
 #include "resolver.h"
 
 #include "syncServer.h"
-#include "daemonService.h"
+#if !defined(_MSC_VER) && !defined(MINGW)
+# include "daemonService.h"
+#else
+# include "nullDaemon.h"
+#endif
 #include <vector>
 
 std::list<std::string> config_;
 
-void syncOnConnect(SyncTcpConnection * connptr)
+void syncOnConnect(SyncTcpConnection* connptr)
 {
-	for(std::list<std::string>::const_iterator it=config_.begin(); it!=config_.end();++it)
-	{
+  for(std::list<std::string>::const_iterator it=config_.begin(); it!=config_.end(); ++it) {
     connptr->Send(*it);
   }
 }
 
 void syncListener()
 {
- boost::asio::io_service io_service;
-  try
-  {
+  boost::asio::io_service io_service;
+  try {
     SyncServer server(gOpt.getBindToAddr(), gOpt.getBindToPort(), boost::bind(syncOnConnect, _1));
     server.run();
-  }
-  catch(std::runtime_error& e) {
+  } catch(std::runtime_error& e) {
     cLog.msg(Log::PRIO_ERROR) << "sync listener thread died due to an uncaught runtime_error: " << e.what();
-  }
-  catch(std::exception& e) {
+  } catch(std::exception& e) {
     cLog.msg(Log::PRIO_ERROR) << "sync listener thread died due to an uncaught exception: " << e.what();
   }
 }
@@ -78,73 +87,71 @@ void syncListener()
 int main(int argc, char* argv[])
 {
   DaemonService service;
-  try 
-  {
-    try 
-    {
-      if(!gOpt.parse(argc, argv))
+  try {
+    try {
+      if(!gOpt.parse(argc, argv)) {
         exit(0);
+      }
 
       StringList targets = gOpt.getLogTargets();
-      for(StringList::const_iterator it = targets.begin();it != targets.end(); ++it)
+      for(StringList::const_iterator it = targets.begin(); it != targets.end(); ++it) {
         cLog.addTarget(*it);
-    }
-    catch(syntax_error& e)
-    {
+      }
+    } catch(syntax_error& e) {
       std::cerr << e << std::endl;
       gOpt.printUsage();
       exit(-1);
     }
-       
-    cLog.msg(Log::PRIO_NOTICE) << "anytun-controld started..."; 
+
+    cLog.msg(Log::PRIO_NOTICE) << "anytun-controld started...";
     gOpt.parse_post(); // print warnings
 
 
-    std::ifstream file( gOpt.getFileName().c_str() );
-    if( file.is_open() )
-    {
-    	std::string line;
-    	while (!file.eof()) {
-      	getline (file,line);
+    std::ifstream file(gOpt.getFileName().c_str());
+    if(file.is_open()) {
+      std::string line;
+      while(!file.eof()) {
+        getline(file,line);
         config_.push_back(line);
-			}
+      }
       file.close();
     } else {
       std::cout << "ERROR: unable to open file!" << std::endl;
       exit(-1);
     }
-    
+
     service.initPrivs(gOpt.getUsername(), gOpt.getGroupname());
-    if(gOpt.getDaemonize())
+    if(gOpt.getDaemonize()) {
       service.daemonize();
+    }
 
-    if(gOpt.getChrootDir() != "")
+    if(gOpt.getChrootDir() != "") {
       service.chroot(gOpt.getChrootDir());
+    }
     service.dropPrivs();
 
     gSignalController.init(service);
     gResolver.init();
 
-    boost::thread * syncListenerThread;
+    boost::thread* syncListenerThread;
     syncListenerThread = new boost::thread(boost::bind(syncListener));
-    
+    if(syncListenerThread) syncListenerThread->detach();
+
     int ret = gSignalController.run();
-    
+
     return ret;
-  }
-  catch(std::runtime_error& e)
-  {
-    if(service.isDaemonized())
+  } catch(std::runtime_error& e) {
+    if(service.isDaemonized()) {
       cLog.msg(Log::PRIO_ERROR) << "uncaught runtime error, exiting: " << e.what();
-    else
+    } else {
       std::cout << "uncaught runtime error, exiting: " << e.what() << std::endl;
-  }
-  catch(std::exception& e)
-  {
-    if(service.isDaemonized())
+    }
+  } catch(std::exception& e) {
+    if(service.isDaemonized()) {
       cLog.msg(Log::PRIO_ERROR) << "uncaught exception, exiting: " << e.what();
-    else
+    } else {
       std::cout << "uncaught exception, exiting: " << e.what() << std::endl;
+    }
   }
 }