X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2Fwin32%2FwinService.h;h=1ffdede31f47e7b0bcc2aae92a7215cc0436ed43;hb=refs%2Ftags%2Fupstream%2F0.3.6;hp=6867c7ca3b769d66a7c04341409a33f76e8cc2a5;hpb=bb834fe0ed7a38b724f49b944adb801634eb6194;p=anytun.git

diff --git a/src/win32/winService.h b/src/win32/winService.h
index 6867c7c..1ffdede 100644
--- a/src/win32/winService.h
+++ b/src/win32/winService.h
@@ -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,7 +27,20 @@
  *  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.
  */
 
 #ifndef ANYTUN_win32_winService_h_INCLUDED
@@ -36,46 +49,39 @@
 #ifdef WIN_SERVICE
 
 #include "../threadUtils.hpp"
+#include "../signalController.h"
 
 class WinService
 {
 public:
-  static WinService& instance();
-  #define SVC_NAME "anytun"
+#define SVC_NAME "anytun"
   static void install();
   static void uninstall();
   static void start();
 
-  void waitForStop();
-  void stop();
-
-  static VOID WINAPI main(DWORD dwArgc, LPTSTR *lpszArgv);
+  static VOID WINAPI main(DWORD dwArgc, LPTSTR* lpszArgv);
   static VOID WINAPI ctrlHandler(DWORD dwCtrl);
-private:
-  WinService() : started_(false) {};
-  ~WinService();
-  WinService(const WinService &w);
-  void operator=(const WinService &w);
 
-  void reportStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode, DWORD dwWaitHint=0);
+  void reportStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode);
+  int handleCtrlSignal(int sig, const std::string& msg);
+
+  void initPrivs(std::string const& username, std::string const& groupname);
+  void dropPrivs();
+  void chroot(std::string const& dir);
+  void daemonize();
+  bool isDaemonized();
+
+private:
+  WinService() {};
+  ~WinService() {};
+  WinService(const WinService& w);
+  void operator=(const WinService& w);
 
-  static WinService* inst;
-  static Mutex instMutex;
-  class instanceCleaner {
-    public: ~instanceCleaner() {
-      if(WinService::inst != NULL)
-        delete WinService::inst;
-    }
-  };
-  friend class instanceCleaner;
-  
-  bool started_;
   SERVICE_STATUS status_;
   SERVICE_STATUS_HANDLE status_handle_;
-  HANDLE stop_event_;
 };
 
-extern WinService& gWinService;
+typedef WinService DaemonService;
 
 #endif