1 files changed, 15 insertions, 21 deletions

diff --git a/embeddable-dll-service/csharp/Service.cs b/embeddable-dll-service/csharp/TunnelDll/Service.cs
index db600819..74e1a888 100644
--- a/embeddable-dll-service/csharp/Service.cs
+++ b/embeddable-dll-service/csharp/TunnelDll/Service.cs
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: MIT
  *
- * Copyright (C) 2019 WireGuard LLC. All Rights Reserved.
+ * Copyright (C) 2019-2022 WireGuard LLC. All Rights Reserved.
  */
 
 using System;
@@ -9,36 +9,30 @@ using System.IO.Pipes;
 using System.Runtime.InteropServices;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Security.Principal;
 using System.Threading;
 
 namespace Tunnel
 {
     public class Service
     {
-        private const string LongName = "Example WireGuard Tunnel Client";
-        private const string Description = "A WireGuard tunnel created by example code.";
+        private const string LongName = "WireGuard Demo Box";
+        private const string Description = "Demonstration tunnel for testing WireGuard";
 
         [DllImport("tunnel.dll", EntryPoint = "WireGuardTunnelService", CallingConvention = CallingConvention.Cdecl)]
         public static extern bool Run([MarshalAs(UnmanagedType.LPWStr)] string configFile);
 
-        public static NamedPipeClientStream GetPipe(string configFile)
+        public static Driver.Adapter GetAdapter(string configFile)
         {
-            var pipepath = "ProtectedPrefix\\Administrators\\WireGuard\\" + Path.GetFileNameWithoutExtension(configFile);
-            return new NamedPipeClientStream(pipepath);
+            return new Driver.Adapter(Path.GetFileNameWithoutExtension(configFile));
         }
 
-        public static void Add(string configFile)
+        public static void Add(string configFile, bool ephemeral)
         {
             var tunnelName = Path.GetFileNameWithoutExtension(configFile);
             var shortName = String.Format("WireGuardTunnel${0}", tunnelName);
             var longName = String.Format("{0}: {1}", LongName, tunnelName);
             var exeName = Process.GetCurrentProcess().MainModule.FileName;
-            var pathAndArgs = String.Format("\"{0}\" /service \"{1}\"", exeName, configFile); //TODO: This is not the proper way to escape file args.
-
-            var accessControl = File.GetAccessControl(configFile); //TODO: TOCTOU!
-            accessControl.SetOwner(new NTAccount(Environment.UserDomainName, Environment.UserName));
-            File.SetAccessControl(configFile, accessControl);
+            var pathAndArgs = String.Format("\"{0}\" /service \"{1}\" {2}", exeName, configFile, Process.GetCurrentProcess().Id); //TODO: This is not the proper way to escape file args.
 
             var scm = Win32.OpenSCManager(null, null, Win32.ScmAccessRights.AllAccess);
             if (scm == IntPtr.Zero)
@@ -49,9 +43,9 @@ namespace Tunnel
                 if (service != IntPtr.Zero)
                 {
                     Win32.CloseServiceHandle(service);
-                    Remove(configFile);
+                    Remove(configFile, true);
                 }
-                service = Win32.CreateService(scm, shortName, longName, Win32.ServiceAccessRights.AllAccess, Win32.ServiceType.Win32OwnProcess, Win32.ServiceStartType.Demand, Win32.ServiceError.Normal, pathAndArgs, null, IntPtr.Zero, "Nsi", null, null);
+                service = Win32.CreateService(scm, shortName, longName, Win32.ServiceAccessRights.AllAccess, Win32.ServiceType.Win32OwnProcess, Win32.ServiceStartType.Demand, Win32.ServiceError.Normal, pathAndArgs, null, IntPtr.Zero, "Nsi\0TcpIp\0", null, null);
                 if (service == IntPtr.Zero)
                     throw new Win32Exception(Marshal.GetLastWin32Error());
                 try
@@ -66,6 +60,9 @@ namespace Tunnel
 
                     if (!Win32.StartService(service, 0, null))
                         throw new Win32Exception(Marshal.GetLastWin32Error());
+
+                    if (ephemeral && !Win32.DeleteService(service))
+                        throw new Win32Exception(Marshal.GetLastWin32Error());
                 }
                 finally
                 {
@@ -78,7 +75,7 @@ namespace Tunnel
             }
         }
 
-        public static void Remove(string configFile)
+        public static void Remove(string configFile, bool waitForStop)
         {
             var tunnelName = Path.GetFileNameWithoutExtension(configFile);
             var shortName = String.Format("WireGuardTunnel${0}", tunnelName);
@@ -90,19 +87,16 @@ namespace Tunnel
             {
                 var service = Win32.OpenService(scm, shortName, Win32.ServiceAccessRights.AllAccess);
                 if (service == IntPtr.Zero)
-                {
-                    Win32.CloseServiceHandle(service);
                     return;
-                }
                 try
                 {
                     var serviceStatus = new Win32.ServiceStatus();
                     Win32.ControlService(service, Win32.ServiceControl.Stop, serviceStatus);
 
-                    for (int i = 0; i < 180 && Win32.QueryServiceStatus(service, serviceStatus) && serviceStatus.dwCurrentState != Win32.ServiceState.Stopped; ++i)
+                    for (int i = 0; waitForStop && i < 180 && Win32.QueryServiceStatus(service, serviceStatus) && serviceStatus.dwCurrentState != Win32.ServiceState.Stopped; ++i)
                         Thread.Sleep(1000);
 
-                    if (!Win32.DeleteService(service))
+                    if (!Win32.DeleteService(service) && Marshal.GetLastWin32Error() != 0x00000430)
                         throw new Win32Exception(Marshal.GetLastWin32Error());
                 }
                 finally