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

diff --git a/src/win32/winService.h b/src/win32/winService.h
index 6867c7c..91853fe 100644
--- a/src/win32/winService.h
+++ b/src/win32/winService.h
@@ -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.
@@ -36,46 +36,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