From 224b5700c7dbd0e2bb4eaeb8d965030bcd204442 Mon Sep 17 00:00:00 2001 From: MCARDLE Sean M Date: Fri, 18 Nov 2016 19:53:32 -0800 Subject: [PATCH 1/2] Added logging to the reset nic state operation. --- WifiSitter/WifiSitter.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/WifiSitter/WifiSitter.cs b/WifiSitter/WifiSitter.cs index e4b99c4..d1321af 100644 --- a/WifiSitter/WifiSitter.cs +++ b/WifiSitter/WifiSitter.cs @@ -323,17 +323,19 @@ namespace WifiSitter private void ResetNicState (NetworkState netstate) { var taskList = new List(); foreach (var n in netstate.OriginalNicState) { - var id = n[0]; - var stat = n[1]; + var id = n[0]; + var state = n[1]; TrackedNic now = netstate.Nics.Where(x => x.Id == id).FirstOrDefault(); if (now != null) { - if (stat.ToLower() != now.IsEnabled.ToString().ToLower()) { - if (stat == true.ToString()) { + if (state.ToLower() != now.IsEnabled.ToString().ToLower()) { + if (state == true.ToString()) { + WriteLog(LogType.info, "Restoring adapter state, enabling adapter: {0} - {1}", now.Name, now.Description); var enableTask = new Task(() => { now.Enable(); }); enableTask.Start(); taskList.Add(enableTask); } else { + WriteLog(LogType.info, "Restoring adapter state, disabling adapter: {0} - {1}", now.Name, now.Description); var disableTask = new Task(() => { now.Disable(); }); disableTask.Start(); taskList.Add(disableTask); } From d6df318169979b326f433e2dd2e12717b4ff5f65 Mon Sep 17 00:00:00 2001 From: MCARDLE Sean M Date: Fri, 18 Nov 2016 19:53:57 -0800 Subject: [PATCH 2/2] Ensuring the whitelist is observed in another instance. --- WifiSitter/NetworkState.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WifiSitter/NetworkState.cs b/WifiSitter/NetworkState.cs index 1d7100f..381073a 100644 --- a/WifiSitter/NetworkState.cs +++ b/WifiSitter/NetworkState.cs @@ -29,7 +29,8 @@ namespace WifiSitter this.Nics = QueryNetworkAdapters(NicWhitelist); // Loop through nics and add id:state to _originalNicState list - Nics.ForEach(x => _originalNicState.Add(new string[] { x.Id, x.IsEnabled.ToString() })); + Nics.Where(x => !NicWhitelist.Any(y => x.Description.StartsWith(y))).ToList() + .ForEach(x => _originalNicState.Add(new string[] { x.Id, x.IsEnabled.ToString() })); _ignoreAdapters = NicWhitelist;