X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2Fanytun-controld.cpp;h=c4813cad1c812f3d86000f308ec3f50b57e0e9dd;hb=bd02a5f6be4815d46524d613f727199ca756c971;hp=1dbc6f89be6aa5a8ae4ea64d5eadbe049f62de41;hpb=f9ad69dfae6bcec427652b0c4230603e465bd544;p=anytun.git

diff --git a/src/anytun-controld.cpp b/src/anytun-controld.cpp
index 1dbc6f8..c4813ca 100644
--- a/src/anytun-controld.cpp
+++ b/src/anytun-controld.cpp
@@ -11,7 +11,7 @@
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl,
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
@@ -46,112 +46,98 @@
 #include "resolver.h"
 
 #include "syncServer.h"
-#include "daemon.hpp"
+#include "daemonService.h"
+#include <vector>
 
-void syncOnConnect(SyncTcpConnection * connptr)
+std::list<std::string> config_;
+
+void syncOnConnect(SyncTcpConnection* connptr)
 {
-  std::ifstream file(gOpt.getFileName().c_str());
-  if(file.is_open()) {
-    std::string line;
-    while (!file.eof()) {
-      getline (file,line);
-      connptr->Send(line);
-    }
-    file.close();
+  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();
   }
 }
 
 int main(int argc, char* argv[])
 {
-  bool daemonized=false;
-  try 
-  {
-    try 
-    {
-      bool result = gOpt.parse(argc, argv);
-      if(!result) {
-        gOpt.printUsage();
+  DaemonService service;
+  try {
+    try {
+      if(!gOpt.parse(argc, argv)) {
         exit(0);
       }
+
       StringList targets = gOpt.getLogTargets();
-      if(targets.empty()) {
-        cLog.addTarget("syslog:3,anytun-controld,daemon");
+      for(StringList::const_iterator it = targets.begin(); it != targets.end(); ++it) {
+        cLog.addTarget(*it);
       }
-      else {
-        StringList::const_iterator it;
-        for(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::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 {
+    } else {
       std::cout << "ERROR: unable to open file!" << std::endl;
       exit(-1);
     }
-    
-    PrivInfo privs(gOpt.getUsername(), gOpt.getGroupname());
+
+    service.initPrivs(gOpt.getUsername(), gOpt.getGroupname());
     if(gOpt.getDaemonize()) {
-      daemonize();
-      daemonized = true;
+      service.daemonize();
+    }
+
+    if(gOpt.getChrootDir() != "") {
+      service.chroot(gOpt.getChrootDir());
     }
+    service.dropPrivs();
 
-    gSignalController.init();
+    gSignalController.init(service);
     gResolver.init();
-    
-    if(gOpt.getChrootDir() != "")
-      do_chroot(gOpt.getChrootDir());
-    
-    privs.drop();
 
-    boost::thread * syncListenerThread;
+    boost::thread* syncListenerThread;
     syncListenerThread = new boost::thread(boost::bind(syncListener));
-    
+
     int ret = gSignalController.run();
-    
+
     return ret;
-  }
-  catch(std::runtime_error& e)
-  {
-    if(daemonized)
+  } 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(daemonized)
+    }
+  } 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;
+    }
   }
 }