Add waiting for VPN disconnected.

rinrab · Jan 21, 2024 · 88938b4 · 88938b4
1 parent faee33b
commit 88938b4
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/AOVpnManager/RasApi.cs b/AOVpnManager/RasApi.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using System.Threading;
 
 namespace AOVpnManager
 {
@@ -32,14 +33,24 @@ public static void DisconnectAll(Predicate<string> filter)
                 count = (cb + dwSize - 1) / dwSize;
             }
 
+            bool wait = false;
+
             for (int i = 0; i < count; i++)
             {
                 if (filter(connections[i].szEntryName))
                 {
                     Trace.WriteLine("Disconnecting VPN connection '{0}'...");
                     RasHangUp(connections[i].hrasconn);
+                    wait = true;
                 }
             }
+
+            if (wait)
+            {
+                // Wait for disconnect. See: https://learn.microsoft.com/en-us/windows/win32/api/ras/nf-ras-rashangupa#remarks
+                // TODO: wait until RasGetConnectStatus() returns disconnected
+                Thread.Sleep(3000);
+            }
         }
 
         const int RAS_MaxEntryName = 256;