diff --git a/client/Frontend/App.xaml.cs b/client/Frontend/App.xaml.cs
index cbedd5b..74a3798 100644
--- a/client/Frontend/App.xaml.cs
+++ b/client/Frontend/App.xaml.cs
@@ -64,10 +64,6 @@ private async void Application_Startup(object sender, StartupEventArgs e)
Settings.RedactOneDriveCommercial = true;
break;
- case "-redact-networking":
- Settings.RedactNetworking = true;
- break;
-
case "-dont-upload":
Settings.DontUpload = true;
break;
diff --git a/client/Frontend/StartButtons.xaml b/client/Frontend/StartButtons.xaml
index 6628f6c..6e56226 100644
--- a/client/Frontend/StartButtons.xaml
+++ b/client/Frontend/StartButtons.xaml
@@ -118,7 +118,6 @@
-
@@ -194,23 +193,6 @@
-
-
-
-
-
-
-
-
diff --git a/client/Frontend/StartButtons.xaml.cs b/client/Frontend/StartButtons.xaml.cs
index e5489fb..3af711a 100644
--- a/client/Frontend/StartButtons.xaml.cs
+++ b/client/Frontend/StartButtons.xaml.cs
@@ -61,16 +61,6 @@ private void SerialNumberOff(object sender, RoutedEventArgs e)
Settings.RedactSerialNumber = false;
}
- private void RedactNetworkingOn(object sender, RoutedEventArgs e)
- {
- Settings.RedactNetworking = true;
- }
-
- private void RedactNetworkingOff(object sender, RoutedEventArgs e)
- {
- Settings.RedactNetworking = false;
- }
-
private void DebugLogToggleOn(object sender, RoutedEventArgs e)
{
Settings.EnableDebug = true;
diff --git a/client/Settings.cs b/client/Settings.cs
index 8f98f19..913ac23 100644
--- a/client/Settings.cs
+++ b/client/Settings.cs
@@ -5,7 +5,6 @@ public static class Settings
public static bool RedactUsername { get; set; } = false;
public static bool RedactSerialNumber { get; set; } = false;
public static bool RedactOneDriveCommercial { get; set; } = false;
- public static bool RedactNetworking { get; set; } = false;
public static bool DontUpload { get; set; } = false;
public static bool Headless { get; set; } = false;
public static bool LocalCulture { get; set; } = false;
diff --git a/client/data/Methods/Network.cs b/client/data/Methods/Network.cs
index 396afea..7faba8d 100644
--- a/client/data/Methods/Network.cs
+++ b/client/data/Methods/Network.cs
@@ -20,36 +20,21 @@ public static async Task MakeNetworkData()
{
DebugLog.Region region = DebugLog.Region.Networking;
await DebugLog.StartRegion(region);
- if (Settings.RedactNetworking)
- {
- NetAdapters = new List>();
- NetAdapters2 = new List>();
- IPRoutes = new List>();
- TCPConnections = new List();
- UDPEndpoints = new List>();
- HostsFile = "";
- HostsFileHash = "";
-
- await DebugLog.LogEventAsync("Networking redaction enabled. NICs, routes, hosts file, and network connections were skipped.", region);
- }
- else
- {
- NetAdapters = Utils.GetWmi("Win32_NetworkAdapterConfiguration",
- "Description, DHCPEnabled, DHCPServer, DNSDomain, DNSDomainSuffixSearchOrder, DNSHostName, "
- + "DNSServerSearchOrder, IPEnabled, IPAddress, IPSubnet, DHCPLeaseObtained, DHCPLeaseExpires, "
- + "DefaultIPGateway, MACAddress, InterfaceIndex");
+ NetAdapters = Utils.GetWmi("Win32_NetworkAdapterConfiguration",
+ "Description, DHCPEnabled, DHCPServer, DNSDomain, DNSDomainSuffixSearchOrder, DNSHostName, "
+ + "DNSServerSearchOrder, IPEnabled, IPAddress, IPSubnet, DHCPLeaseObtained, DHCPLeaseExpires, "
+ + "DefaultIPGateway, MACAddress, InterfaceIndex");
- NetAdapters2 = Utils.GetWmi("MSFT_NetAdapter",
- "*",
- @"root\standardcimv2");
- IPRoutes = Utils.GetWmi("Win32_IP4RouteTable",
- "Description, Destination, Mask, NextHop, Metric1, InterfaceIndex");
+ NetAdapters2 = Utils.GetWmi("MSFT_NetAdapter",
+ "*",
+ @"root\standardcimv2");
+ IPRoutes = Utils.GetWmi("Win32_IP4RouteTable",
+ "Description, Destination, Mask, NextHop, Metric1, InterfaceIndex");
- await DebugLog.LogEventAsync("Networking WMI Information Retrieved.", region);
+ await DebugLog.LogEventAsync("Networking WMI Information Retrieved.", region);
- GetAdapterProperties();
- CombineAdapterInformation();
- }
+ GetAdapterProperties();
+ CombineAdapterInformation();
var rssWmi = Utils.GetWmi("MSFT_NetOffloadGlobalSetting", "ReceiveSideScaling", "root\\standardcimv2").FirstOrDefault();
rssWmi.TryWmiRead("ReceiveSideScaling", out byte? rcvSideScaling);
@@ -60,17 +45,14 @@ public static async Task MakeNetworkData()
AutoTuningLevelLocal = GetAutoTuningLevels();
- if (!Settings.RedactNetworking)
- {
- HostsFile = GetHostsFile();
- HostsFileHash = GetHostsFileHash();
- await DebugLog.LogEventAsync("Hosts file retrieved.", region);
-
- TCPConnections = GetTCPConnections();
- UDPEndpoints = Utils.GetWmi("MSFT_NetUDPEndpoint", "LocalAddress,LocalPort,OwningProcess",
- @"root\standardcimv2");
- await DebugLog.LogEventAsync("Network Connections Information retrieved.", region);
- }
+ HostsFile = GetHostsFile();
+ HostsFileHash = GetHostsFileHash();
+ await DebugLog.LogEventAsync("Hosts file retrieved.", region);
+
+ TCPConnections = GetTCPConnections();
+ UDPEndpoints = Utils.GetWmi("MSFT_NetUDPEndpoint", "LocalAddress,LocalPort,OwningProcess",
+ @"root\standardcimv2");
+ await DebugLog.LogEventAsync("Network Connections Information retrieved.", region);
await DebugLog.EndRegion(DebugLog.Region.Networking);
}
diff --git a/client/specify_client.csproj.bak b/client/specify_client.csproj.bak
deleted file mode 100644
index c508f47..0000000
--- a/client/specify_client.csproj.bak
+++ /dev/null
@@ -1,236 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {9B614719-FEA4-4E3E-A5C3-7021E08A11FC}
- WinExe
- Properties
- specify_client
- specify_client
- v4.7.2
- 512
- {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 4
- true
- true
- false
- specify_client.App
- specify-client-favicon.ico
- latest
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- false
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
- false
- app.manifest
-
-
-
- packages\HidSharp.2.1.0\lib\net35\HidSharp.dll
-
-
- packages\LibreHardwareMonitorLib.0.9.1\lib\net472\LibreHardwareMonitorLib.dll
-
-
-
- packages\TaskScheduler.2.10.1\lib\net452\Microsoft.Win32.TaskScheduler.dll
-
-
-
- packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 4.0
-
-
-
-
-
-
-
- MSBuild:Compile
- Designer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ProgramFailed.xaml
-
-
-
-
-
- Landing.xaml
-
-
- ProgramFinalized.xaml
-
-
- ProgramFinalizeNoUpload.xaml
-
-
- Run.xaml
-
-
- StartButtons.xaml
-
-
- UploadFail.xaml
-
-
- MSBuild:Compile
- Designer
-
-
- Designer
- MSBuild:Compile
-
-
- App.xaml
- Code
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- MSBuild:Compile
- Designer
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
-
-
-
-
- Code
-
-
- True
- True
- Resources.resx
-
-
- True
- Settings.settings
- True
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
-
-
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
- False
- Microsoft .NET Framework 4.7.2 %28x86 and x64%29
- true
-
-
- False
- .NET Framework 3.5 SP1
- false
-
-
-
-
-
-
-
-
-
-
- $(MSBuildThisFileDirectory)bin\$(Configuration)\$(TargetFramework)
-
-
-
-
-
-
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.
-
-
-
-
\ No newline at end of file
diff --git a/client/specify_client_OLD.csproj b/client/specify_client_OLD.csproj
deleted file mode 100644
index 04e7617..0000000
--- a/client/specify_client_OLD.csproj
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {9B614719-FEA4-4E3E-A5C3-7021E08A11FC}
- Exe
- Properties
- specify_client
- specify_client
- v4.7.2
- 512
- true
- SNOO_256.ico
- latest
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- false
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
-
-
- prompt
- 4
- false
- app.manifest
-
-
-
- packages\HidSharp.2.1.0\lib\net35\HidSharp.dll
-
-
- packages\LibreHardwareMonitorLib.0.9.1\lib\net472\LibreHardwareMonitorLib.dll
-
-
-
- packages\TaskScheduler.2.10.1\lib\net452\Microsoft.Win32.TaskScheduler.dll
-
-
- packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(MSBuildThisFileDirectory)bin\$(Configuration)\$(TargetFramework)
-
-
-
-
-
-
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.
-
-
-
-
\ No newline at end of file