New upstream version 2.4.0upstream/2.4.0

1 files changed, 185 insertions, 155 deletions

diff --git a/src/openvpnserv/service.c b/src/openvpnserv/service.c
index 82f5551..b79e999 100644
--- a/src/openvpnserv/service.c
+++ b/src/openvpnserv/service.c
@@ -19,227 +19,257 @@ openvpn_service_t openvpn_service[_service_max];
 
 
 BOOL
-ReportStatusToSCMgr (SERVICE_STATUS_HANDLE service, SERVICE_STATUS *status)
+ReportStatusToSCMgr(SERVICE_STATUS_HANDLE service, SERVICE_STATUS *status)
 {
-  static DWORD dwCheckPoint = 1;
-  BOOL res = TRUE;
-
-  if (status->dwCurrentState == SERVICE_START_PENDING)
-    status->dwControlsAccepted = 0;
-  else
-    status->dwControlsAccepted = SERVICE_ACCEPT_STOP;
-
-  if (status->dwCurrentState == SERVICE_RUNNING ||
-      status->dwCurrentState == SERVICE_STOPPED)
-    status->dwCheckPoint = 0;
-  else
-    status->dwCheckPoint = dwCheckPoint++;
-
-  /* Report the status of the service to the service control manager. */
-  res = SetServiceStatus (service, status);
-  if (!res)
-    MsgToEventLog(MSG_FLAGS_ERROR, TEXT("SetServiceStatus"));
-
-  return res;
+    static DWORD dwCheckPoint = 1;
+    BOOL res = TRUE;
+
+    if (status->dwCurrentState == SERVICE_START_PENDING)
+    {
+        status->dwControlsAccepted = 0;
+    }
+    else
+    {
+        status->dwControlsAccepted = SERVICE_ACCEPT_STOP;
+    }
+
+    if (status->dwCurrentState == SERVICE_RUNNING
+        || status->dwCurrentState == SERVICE_STOPPED)
+    {
+        status->dwCheckPoint = 0;
+    }
+    else
+    {
+        status->dwCheckPoint = dwCheckPoint++;
+    }
+
+    /* Report the status of the service to the service control manager. */
+    res = SetServiceStatus(service, status);
+    if (!res)
+    {
+        MsgToEventLog(MSG_FLAGS_ERROR, TEXT("SetServiceStatus"));
+    }
+
+    return res;
 }
 
 static int
-CmdInstallServices ()
+CmdInstallServices()
 {
-  SC_HANDLE service;
-  SC_HANDLE svc_ctl_mgr;
-  TCHAR path[512];
-  int i, ret = _service_max;
-
-  if (GetModuleFileName (NULL, path + 1, 510) == 0)
-  {
-    _tprintf (TEXT("Unable to install service - %s\n"), GetLastErrorText ());
-    return 1;
-  }
-
-  path[0] = TEXT('\"');
-  _tcscat (path, TEXT("\""));
-
-  svc_ctl_mgr = OpenSCManager (NULL, NULL, SC_MANAGER_CONNECT | SC_MANAGER_CREATE_SERVICE);
-  if (svc_ctl_mgr == NULL)
+    SC_HANDLE service;
+    SC_HANDLE svc_ctl_mgr;
+    TCHAR path[512];
+    int i, ret = _service_max;
+
+    if (GetModuleFileName(NULL, path + 1, 510) == 0)
     {
-      _tprintf (TEXT("OpenSCManager failed - %s\n"), GetLastErrorText ());
-      return 1;
+        _tprintf(TEXT("Unable to install service - %s\n"), GetLastErrorText());
+        return 1;
     }
 
-  for (i = 0; i < _service_max; i++)
+    path[0] = TEXT('\"');
+    _tcscat(path, TEXT("\""));
+
+    svc_ctl_mgr = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT | SC_MANAGER_CREATE_SERVICE);
+    if (svc_ctl_mgr == NULL)
     {
-      service = CreateService (svc_ctl_mgr,
-                               openvpn_service[i].name,
-                               openvpn_service[i].display_name,
-                               SERVICE_QUERY_STATUS,
-                               SERVICE_WIN32_SHARE_PROCESS,
-                               openvpn_service[i].start_type,
-                               SERVICE_ERROR_NORMAL,
-                               path, NULL, NULL,
-                               openvpn_service[i].dependencies,
-                               NULL, NULL);
-      if (service)
+        _tprintf(TEXT("OpenSCManager failed - %s\n"), GetLastErrorText());
+        return 1;
+    }
+
+    for (i = 0; i < _service_max; i++)
+    {
+        service = CreateService(svc_ctl_mgr,
+                                openvpn_service[i].name,
+                                openvpn_service[i].display_name,
+                                SERVICE_QUERY_STATUS,
+                                SERVICE_WIN32_SHARE_PROCESS,
+                                openvpn_service[i].start_type,
+                                SERVICE_ERROR_NORMAL,
+                                path, NULL, NULL,
+                                openvpn_service[i].dependencies,
+                                NULL, NULL);
+        if (service)
+        {
+            _tprintf(TEXT("%s installed.\n"), openvpn_service[i].display_name);
+            CloseServiceHandle(service);
+            --ret;
+        }
+        else
         {
-          _tprintf (TEXT("%s installed.\n"), openvpn_service[i].display_name);
-          CloseServiceHandle (service);
-          --ret;
+            _tprintf(TEXT("CreateService failed - %s\n"), GetLastErrorText());
         }
-      else
-        _tprintf (TEXT("CreateService failed - %s\n"), GetLastErrorText ());
     }
 
-  CloseServiceHandle (svc_ctl_mgr);
-  return ret;
+    CloseServiceHandle(svc_ctl_mgr);
+    return ret;
 }
 
 
 static int
-CmdStartService (openvpn_service_type type)
+CmdStartService(openvpn_service_type type)
 {
-  int ret = 1;
-  SC_HANDLE svc_ctl_mgr;
-  SC_HANDLE service;
+    int ret = 1;
+    SC_HANDLE svc_ctl_mgr;
+    SC_HANDLE service;
 
-  svc_ctl_mgr = OpenSCManager (NULL, NULL, SC_MANAGER_ALL_ACCESS);
-  if (svc_ctl_mgr == NULL)
+    svc_ctl_mgr = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+    if (svc_ctl_mgr == NULL)
     {
-      _tprintf (TEXT("OpenSCManager failed - %s\n"), GetLastErrorText ());
-      return 1;
+        _tprintf(TEXT("OpenSCManager failed - %s\n"), GetLastErrorText());
+        return 1;
     }
 
-  service = OpenService (svc_ctl_mgr, openvpn_service[type].name, SERVICE_ALL_ACCESS);
-  if (service)
+    service = OpenService(svc_ctl_mgr, openvpn_service[type].name, SERVICE_ALL_ACCESS);
+    if (service)
     {
-      if (StartService (service, 0, NULL))
+        if (StartService(service, 0, NULL))
         {
-          _tprintf (TEXT("Service Started\n"));
-          ret = 0;
+            _tprintf(TEXT("Service Started\n"));
+            ret = 0;
+        }
+        else
+        {
+            _tprintf(TEXT("StartService failed - %s\n"), GetLastErrorText());
         }
-      else
-        _tprintf (TEXT("StartService failed - %s\n"), GetLastErrorText ());
 
-      CloseServiceHandle(service);
+        CloseServiceHandle(service);
     }
-  else
+    else
     {
-      _tprintf (TEXT("OpenService failed - %s\n"), GetLastErrorText ());
+        _tprintf(TEXT("OpenService failed - %s\n"), GetLastErrorText());
     }
 
-  CloseServiceHandle(svc_ctl_mgr);
-  return ret;
+    CloseServiceHandle(svc_ctl_mgr);
+    return ret;
 }
 
 
 static int
-CmdRemoveServices ()
+CmdRemoveServices()
 {
-  SC_HANDLE service;
-  SC_HANDLE svc_ctl_mgr;
-  SERVICE_STATUS status;
-  int i, ret = _service_max;
+    SC_HANDLE service;
+    SC_HANDLE svc_ctl_mgr;
+    SERVICE_STATUS status;
+    int i, ret = _service_max;
 
-  svc_ctl_mgr = OpenSCManager (NULL, NULL, SC_MANAGER_CONNECT);
-  if (svc_ctl_mgr == NULL)
+    svc_ctl_mgr = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT);
+    if (svc_ctl_mgr == NULL)
     {
-      _tprintf(TEXT("OpenSCManager failed - %s\n"), GetLastErrorText ());
-      return 1;
+        _tprintf(TEXT("OpenSCManager failed - %s\n"), GetLastErrorText());
+        return 1;
     }
 
-  for (i = 0; i < _service_max; i++)
+    for (i = 0; i < _service_max; i++)
     {
-      openvpn_service_t *ovpn_svc = &openvpn_service[i];
-      service = OpenService (svc_ctl_mgr, ovpn_svc->name,
-                             DELETE | SERVICE_STOP | SERVICE_QUERY_STATUS);
-      if (service == NULL)
+        openvpn_service_t *ovpn_svc = &openvpn_service[i];
+        service = OpenService(svc_ctl_mgr, ovpn_svc->name,
+                              DELETE | SERVICE_STOP | SERVICE_QUERY_STATUS);
+        if (service == NULL)
         {
-          _tprintf (TEXT("OpenService failed - %s\n"), GetLastErrorText ());
-          goto out;
+            _tprintf(TEXT("OpenService failed - %s\n"), GetLastErrorText());
+            goto out;
         }
 
-      /* try to stop the service */
-      if (ControlService (service, SERVICE_CONTROL_STOP, &status))
+        /* try to stop the service */
+        if (ControlService(service, SERVICE_CONTROL_STOP, &status))
         {
-          _tprintf (TEXT("Stopping %s."), ovpn_svc->display_name);
-          Sleep (1000);
+            _tprintf(TEXT("Stopping %s."), ovpn_svc->display_name);
+            Sleep(1000);
 
-          while (QueryServiceStatus (service, &status))
+            while (QueryServiceStatus(service, &status))
             {
-              if (status.dwCurrentState == SERVICE_STOP_PENDING)
+                if (status.dwCurrentState == SERVICE_STOP_PENDING)
                 {
-                  _tprintf (TEXT("."));
-                  Sleep (1000);
+                    _tprintf(TEXT("."));
+                    Sleep(1000);
+                }
+                else
+                {
+                    break;
                 }
-              else
-                break;
             }
 
-          if (status.dwCurrentState == SERVICE_STOPPED)
-            _tprintf (TEXT("\n%s stopped.\n"), ovpn_svc->display_name);
-          else
-            _tprintf (TEXT("\n%s failed to stop.\n"), ovpn_svc->display_name);
+            if (status.dwCurrentState == SERVICE_STOPPED)
+            {
+                _tprintf(TEXT("\n%s stopped.\n"), ovpn_svc->display_name);
+            }
+            else
+            {
+                _tprintf(TEXT("\n%s failed to stop.\n"), ovpn_svc->display_name);
+            }
         }
 
-      /* now remove the service */
-      if (DeleteService (service))
+        /* now remove the service */
+        if (DeleteService(service))
         {
-          _tprintf (TEXT("%s removed.\n"), ovpn_svc->display_name);
-          --ret;
+            _tprintf(TEXT("%s removed.\n"), ovpn_svc->display_name);
+            --ret;
+        }
+        else
+        {
+            _tprintf(TEXT("DeleteService failed - %s\n"), GetLastErrorText());
         }
-      else
-        _tprintf (TEXT("DeleteService failed - %s\n"), GetLastErrorText ());
 
-      CloseServiceHandle (service);
+        CloseServiceHandle(service);
     }
 
 out:
-  CloseServiceHandle (svc_ctl_mgr);
-  return ret;
+    CloseServiceHandle(svc_ctl_mgr);
+    return ret;
 }
 
 
 int
-_tmain (int argc, TCHAR *argv[])
+_tmain(int argc, TCHAR *argv[])
 {
-  SERVICE_TABLE_ENTRY dispatchTable[] = {
-    { automatic_service.name, ServiceStartAutomatic },
-    { interactive_service.name, ServiceStartInteractive },
-    { NULL, NULL }
-  };
-
-  openvpn_service[0] = automatic_service;
-  openvpn_service[1] = interactive_service;
-
-  if (argc > 1 && (*argv[1] == TEXT('-') || *argv[1] == TEXT('/')))
-  {
-    if (_tcsicmp (TEXT("install"), argv[1] + 1) == 0)
-      return CmdInstallServices ();
-    else if (_tcsicmp (TEXT("remove"), argv[1] + 1) == 0)
-      return CmdRemoveServices ();
-    else if (_tcsicmp (TEXT("start"), argv[1] + 1) == 0)
-      {
-        BOOL is_auto = argc < 3 || _tcsicmp (TEXT("interactive"), argv[2]) != 0;
-        return CmdStartService (is_auto ? automatic : interactive);
-      }
-    else
-      goto dispatch;
+    SERVICE_TABLE_ENTRY dispatchTable[] = {
+        { automatic_service.name, ServiceStartAutomatic },
+        { interactive_service.name, ServiceStartInteractive },
+        { NULL, NULL }
+    };
 
-    return 0;
-  }
+    openvpn_service[0] = automatic_service;
+    openvpn_service[1] = interactive_service;
 
-  /* If it doesn't match any of the above parameters
-   * the service control manager may be starting the service
-   * so we must call StartServiceCtrlDispatcher
-   */
+    if (argc > 1 && (*argv[1] == TEXT('-') || *argv[1] == TEXT('/')))
+    {
+        if (_tcsicmp(TEXT("install"), argv[1] + 1) == 0)
+        {
+            return CmdInstallServices();
+        }
+        else if (_tcsicmp(TEXT("remove"), argv[1] + 1) == 0)
+        {
+            return CmdRemoveServices();
+        }
+        else if (_tcsicmp(TEXT("start"), argv[1] + 1) == 0)
+        {
+            BOOL is_auto = argc < 3 || _tcsicmp(TEXT("interactive"), argv[2]) != 0;
+            return CmdStartService(is_auto ? automatic : interactive);
+        }
+        else
+        {
+            goto dispatch;
+        }
+
+        return 0;
+    }
+
+    /* If it doesn't match any of the above parameters
+     * the service control manager may be starting the service
+     * so we must call StartServiceCtrlDispatcher
+     */
 dispatch:
-  _tprintf (TEXT("%s -install        to install the services\n"), APPNAME);
-  _tprintf (TEXT("%s -start <name>   to start a service (\"automatic\" or \"interactive\")\n"), APPNAME);
-  _tprintf (TEXT("%s -remove         to remove the services\n"), APPNAME);
-  _tprintf (TEXT("\nStartServiceCtrlDispatcher being called.\n"));
-  _tprintf (TEXT("This may take several seconds. Please wait.\n"));
+    _tprintf(TEXT("%s -install        to install the services\n"), APPNAME);
+    _tprintf(TEXT("%s -start <name>   to start a service (\"automatic\" or \"interactive\")\n"), APPNAME);
+    _tprintf(TEXT("%s -remove         to remove the services\n"), APPNAME);
+    _tprintf(TEXT("\nStartServiceCtrlDispatcher being called.\n"));
+    _tprintf(TEXT("This may take several seconds. Please wait.\n"));
 
-  if (!StartServiceCtrlDispatcher (dispatchTable))
-    MsgToEventLog (MSG_FLAGS_ERROR, TEXT("StartServiceCtrlDispatcher failed."));
+    if (!StartServiceCtrlDispatcher(dispatchTable))
+    {
+        MsgToEventLog(MSG_FLAGS_ERROR, TEXT("StartServiceCtrlDispatcher failed."));
+    }
 
-  return 0;
+    return 0;
 }