Release Version 5.3.0

DPCDevClient/DPCDevClient.csproj

@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
@@ -32,6 +33,9 @@
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>DPCDevClient.Program</StartupObject>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />

DPCDevClient/Program.cs

@@ -1,18 +1,50 @@
-using DPCLibrary.Utils;
+using DPCLibrary.Enums;
+using DPCLibrary.Utils;
 using DPCService.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Net.NetworkInformation;
 
 namespace DPCDevClient
 {
     internal class Program
     {
         static void Main(string[] args)
         {
+            AddressChangedCallback(null, null);
 
+            NetworkChange.NetworkAddressChanged += new NetworkAddressChangedEventHandler(AddressChangedCallback);
+
+            string value;
+            do
+            {
+                Console.WriteLine("Startup Complete, Type 'quit' to Shutdown...");
+                value = Console.ReadLine();
+            } while (value.ToUpperInvariant() != "QUIT");
+        }
+
+        static void AddressChangedCallback(object sender, EventArgs e)
+        {
+            Console.WriteLine("Network change detected");
+
+            Console.WriteLine("All Gateway Settings");
+            IList<NetworkInterface> allAdapters = AccessNetInterface.GetAllNetworkInterfaces();
+            foreach (NetworkInterface n in allAdapters)
+            {
+                Console.WriteLine("Name: {0}", n.Name);
+                Console.WriteLine("   Has IPv4 Gateway {0}", AccessNetInterface.InterfaceHasIPv4Gateway(n));
+                Console.WriteLine("   Has IPv6 Gateway {0}", AccessNetInterface.InterfaceHasIPv6Gateway(n));
+            }
+
+            Console.WriteLine("Local Gateway Settings");
+            IList<NetworkInterface> localAdapters = AccessNetInterface.GetLocalNetworkInterfaces();
+            foreach (NetworkInterface n in localAdapters)
+            {
+                Console.WriteLine("Name: {0}", n.Name);
+                Console.WriteLine("   Has IPv4 Gateway {0}", AccessNetInterface.InterfaceHasIPv4Gateway(n));
+                Console.WriteLine("   Has IPv6 Gateway {0}", AccessNetInterface.InterfaceHasIPv6Gateway(n));
+            }
         }
     }
 }

DPCInstaller/ADMX/en-US/DPC.adml

@@ -397,8 +397,6 @@ NOTE: This is equivalent to nslookup and cannot account for related but unknown
 
 NOTE: This option does not support wildcards
 
-NOTE: This option only supports IPv4 address resolution
-
 When a Forced Tunnel configuration is enabled this setting is ignored
 
 'Value Name' should be the route to include
@@ -423,8 +421,6 @@ NOTE: This is equivalent to nslookup and cannot account for related but unknown
 
 NOTE: This option does not support wildcards
 
-NOTE: This option only supports IPv4 address resolution
-
 When a Split Tunnel configuration is enabled this setting is ignored
 
 'Value Name' should be the route to include
@@ -481,8 +477,6 @@ NOTE: When Register DNS is configured on the Machine Tunnel, this option is igno
       <string id="DPCCategory_UserTunnel_ExcludeOffice365_Help">Office 365 traffic is often high bandwidth and communicating with a known and trusted source.  These routes can change weekly so the exclusion list is dynamically generated by querying the Microsoft API.
 
 NOTE: This option requires the device identity (not just the user) to have direct (unauthenticated) Internet access to https://endpoints.office.com.  Currently a proxy is not supported with this option.
-
-NOTE: This option only supports IPv4 address resolution
       </string>
       <string id="DPCCategory_UserTunnel_VPNStrategy">Optional - VPN Protocol</string>
       <string id="DPCCategory_UserTunnel_VPNStrategy_Help">Specify the VPN Protocol to use and the order to fallback.

DPCInstaller/ProductVersion.wxi

@@ -1,3 +1,3 @@
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?define ProductVersion=5.2.2?>
+  <?define ProductVersion=5.3.0?>
 </Include>

DPCLibrary/DPCLibrary.csproj

@@ -77,6 +77,7 @@
   <ItemGroup>
     <Compile Include="Enums\InterfaceOffloadFlags.cs" />
     <Compile Include="Enums\IPAddressFamily.cs" />
+    <Compile Include="Enums\NetworkCapability.cs" />
     <Compile Include="Enums\RasConnSubState.cs" />
     <Compile Include="Enums\RasDialOptions.cs" />
     <Compile Include="Enums\RasEapDialFlags.cs" />
@@ -127,7 +128,7 @@
     <Compile Include="Models\IPv6Address.cs" />
     <Compile Include="Models\Office365Exclusion.cs" />
     <Compile Include="Models\OSVersion.cs" />
-    <Compile Include="Models\ProfileUpdate.cs" />
+    <Compile Include="Models\ManagedProfile.cs" />
     <Compile Include="Models\RasConnection.cs" />
     <Compile Include="Models\RasConstants.cs" />
     <Compile Include="Models\RasEntry.cs" />
@@ -145,6 +146,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="Utils\AccessFile.cs" />
+    <Compile Include="Utils\AccessNetInterface.cs" />
     <Compile Include="Utils\AccessNetSh.cs" />
     <Compile Include="Utils\AccessServices.cs" />
     <Compile Include="Utils\AccessUserEnv.cs" />

DPCLibrary/Enums/NetworkCapability.cs

@@ -0,0 +1,10 @@
+namespace DPCLibrary.Enums
+{
+    public enum NetworkCapability
+    {
+        Unknown,
+        IPv4Only,
+        IPv6Only,
+        IPv4AndIpv6
+    }
+}

DPCLibrary/Models/RasConstants.cs

@@ -23,6 +23,7 @@ public static class RasConstants
         public const int CNLEN = 15; //lmcons.h
         public const int DNLEN = CNLEN; //lmcons.h
         public static readonly IntPtr INVALID_HANDLE_VALUE = new IntPtr(-1);
+        public const int RTM_MAX_ADDRESS_SIZE = 16;
 
         public const int MaxAdapterName = 128;
     }

DPCLibrary/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("D'Arcy Services Ltd")]
 [assembly: AssemblyProduct("DPCLibrary")]
-[assembly: AssemblyCopyright("Copyright © 2024")]
+[assembly: AssemblyCopyright("Copyright © 2025")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.*")]
+[assembly: AssemblyVersion("5.0.*")]
 [assembly: NeutralResourcesLanguage("en")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]

DPCLibrary/Utils/AccessNetInterface.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.NetworkInformation;
+
+namespace DPCLibrary.Utils
+{
+    public static class AccessNetInterface
+    {
+        public static IList<NetworkInterface> GetAllNetworkInterfaces()
+        {
+            IList<NetworkInterface> adapters = NetworkInterface.GetAllNetworkInterfaces().ToList();
+            return adapters;
+        }
+
+        public static IList<NetworkInterface> GetLocalNetworkInterfaces()
+        {
+            IList<NetworkInterface> adapters = GetAllNetworkInterfaces().Where(ni => ni.OperationalStatus == OperationalStatus.Up &&
+            ni.NetworkInterfaceType != NetworkInterfaceType.Loopback &&
+            ni.NetworkInterfaceType != NetworkInterfaceType.Ppp ).ToList();
+            return adapters;
+        }
+
+        public static IList<NetworkInterface> GetVPNNetworkInterfaces()
+        {
+            IList<NetworkInterface> adapters = GetAllNetworkInterfaces().Where(ni => ni.NetworkInterfaceType == NetworkInterfaceType.Ppp).ToList();
+            return adapters;
+        }
+
+        private static IPAddress[] ValidGateways(NetworkInterface ni)
+        {
+            IPInterfaceProperties IPDetails = ni.GetIPProperties();
+            IPAddress[] validGateways = IPDetails.GatewayAddresses.Where(gw => !gw.Address.IsIPv6Multicast).Select(gw => gw.Address).ToArray();
+            return validGateways;
+        }
+
+        public static bool InterfaceHasIPv4Gateway(NetworkInterface ni)
+        {
+            IPAddress[] validGateways = ValidGateways(ni);
+            return validGateways.Where(gw => gw.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork).Count() > 0;
+        }
+
+        public static bool InterfaceHasIPv6Gateway(NetworkInterface ni)
+        {
+            IPAddress[] validGateways = ValidGateways(ni);
+            return validGateways.Where(gw => gw.AddressFamily == System.Net.Sockets.AddressFamily.InterNetworkV6).Count() > 0;
+        }
+    }
+}

DPCLibrary/Utils/AccessWMI.cs

@@ -23,32 +23,17 @@ public static class AccessWMI
         private const string MDMWMINamespace = @"root\cimv2\mdm\dmmap";
         private const string MDMWMIClassName = "MDM_VPNv2_01";
         private const string NetAdapterWMINamespace = @"root\StandardCimv2";
-        private const string NetAdapterWMIClassName = "MSFT_NetAdapter";
-        private const string NetAdapterConfigWMINamespace = @"root\Cimv2";
-        private const string NetAdapterConfigWMIClassName = "Win32_NetworkAdapterConfiguration";
         private const string NetInterfaceWMIClassName = "MSFT_NetIPInterface";
         private const string RemoteAccessWMINamespace = @"root\Microsoft\Windows\RemoteAccess\Client";
 
         private const string CSPURI = "./Vendor/MSFT/VPNv2";
 
-        public static IList<CimInstance> GetNetworkAdapters()
-        {
-            IEnumerable<CimInstance> NetAdapters = WMISession.EnumerateInstances(NetAdapterWMINamespace, NetAdapterWMIClassName);
-            return NetAdapters.ToList();
-        }
-
         public static IList<CimInstance> GetNetIPInterfaces()
         {
             IEnumerable<CimInstance> NetAdapters = WMISession.EnumerateInstances(NetAdapterWMINamespace, NetInterfaceWMIClassName);
             return NetAdapters.ToList();
         }
 
-        public static IList<CimInstance> GetNetworkAdapterConfig()
-        {
-            IEnumerable<CimInstance> NetConfig = WMISession.EnumerateInstances(NetAdapterConfigWMINamespace, NetAdapterConfigWMIClassName);
-            return NetConfig.ToList();
-        }
-
         //Can't use Getinstance as Name format is not understood (see Get-NetIPInterface | ft name, interfacealias, addressfamily), instead pull
         //List of all interfaces and loop through them searching for the correct interface name
         public static CimInstance GetNetIPInterface(string interfaceName, IPAddressFamily protocol)
@@ -69,48 +54,6 @@ public static CimInstance GetNetIPInterface(string interfaceName, IPAddressFamil
             return null;
         }
 
-        //Can't use Getinstance as Name format is not understood (see Get-NetIPInterface | ft name, interfacealias, addressfamily), instead pull
-        //List of all interfaces and loop through them searching for the correct interface name
-        public static uint? GetNetIPInterfaceIndex(string interfaceName, IPAddressFamily protocol)
-        {
-            IList<CimInstance> interfaces = GetNetIPInterfaces();
-            foreach (CimInstance instance in interfaces)
-            {
-                if ((string)instance.CimInstanceProperties["InterfaceAlias"].Value == interfaceName)
-                {
-                    int familyInt = Convert.ToInt32(instance.CimInstanceProperties["AddressFamily"].Value, CultureInfo.InvariantCulture);
-                    if ((IPAddressFamily)familyInt == protocol)
-                    {
-                        return Convert.ToUInt32(instance.CimInstanceProperties["InterfaceIndex"].Value, CultureInfo.InvariantCulture);
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        public static CimInstance GetNetAdapterConfig(string interfaceName, IPAddressFamily protocol)
-        {
-            CimInstance interfaceInstance = GetNetIPInterface(interfaceName, protocol);
-            if (interfaceInstance == null) return null;
-
-            return GetNetAdapterConfig(Convert.ToInt32(interfaceInstance.CimInstanceProperties["InterfaceIndex"].Value, CultureInfo.InvariantCulture));
-        }
-
-        public static CimInstance GetNetAdapterConfig(int interfaceIndex)
-        {
-            IList<CimInstance> adapters = GetNetworkAdapterConfig();
-            foreach (CimInstance instance in adapters)
-            {
-                if (Convert.ToInt32(instance.CimInstanceProperties["InterfaceIndex"].Value, CultureInfo.InvariantCulture) == interfaceIndex)
-                {
-                    return instance;
-                }
-            }
-
-            return null;
-        }
-
         public static uint? GetInterfaceMTU(string interfaceName, IPAddressFamily protocol)
         {
             CimInstance instance = GetNetIPInterface(interfaceName, protocol);

DPCLibrary/Utils/HttpService.cs

@@ -1,8 +1,10 @@
-using DPCLibrary.Models;
+using DPCLibrary.Enums;
+using DPCLibrary.Models;
 using DPCLibrary.Singletons;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using IPAddress = System.Net.IPAddress;
@@ -13,6 +15,46 @@ public static class HttpService
     {
         private static bool breakNetwork = false; //Overridden in Tests - not a nice solution but simple without rewriting the entire network stack and removes the need for Microsoft Fakes (Enterprise Only)
 
+        /// <summary>
+        /// This method handles the core logic of preparing to get the latest Office 365 exclusion routes. The Microsoft endpoint requires a unique identifier
+        /// so we get it from registry if it already exists, if it doesn't we generate a new one and save it.
+        /// After we get the results from the HTTP Service we process the results to only return the results that DPC can handle. This is because the service
+        /// will return various types of result including URLs, wildcard URLs, IPv4 and IPv6 routes
+        /// </summary>
+        public static List<string> GetOffice365ExcludeRoutes()
+        {
+            Guid? nClientId = AccessRegistry.ReadMachineGuid(RegistrySettings.ClientId, RegistrySettings.InternalStateOffset);
+            Guid clientId;
+            if (nClientId == null)
+            {
+                clientId = Guid.NewGuid();
+                AccessRegistry.SaveMachineData(RegistrySettings.ClientId, clientId.ToString());
+            }
+            else
+            {
+                clientId = (Guid)nClientId;
+            }
+
+            Office365Exclusion[] Office365Endpoints = HttpService.GetOffice365EndPoints(clientId);
+            List<string[]> UsableIPList = Office365Endpoints.Where(e => e.Ips != null && e.Category == Office365EndpointCategory.Optimize).Select(e => e.Ips).ToList();
+            List<string> ipList = new List<string>();
+            foreach (string[] list in UsableIPList)
+            {
+                foreach (string item in list)
+                {
+                    //Skip existing entries
+                    if (ipList.Contains(item)) continue;
+
+                    if (Validate.IPv4EndpointAddress(item) || Validate.IPv4CIDR(item) || Validate.IPv6EndpointAddress(item) || Validate.IPv6CIDR(item))
+                    {
+                        ipList.Add(item);
+                    }
+                }
+            }
+
+            return ipList;
+        }
+
         public static Office365Exclusion[] GetOffice365EndPoints(Guid clientId)
         {
             if (breakNetwork)