From 0b444d04c225a4fd1a42f7c60dcd48b31b5cd1b3 Mon Sep 17 00:00:00 2001
From: Sean McArdle <sean.mcardle0@gmail.com>
Date: Thu, 17 Nov 2016 00:10:44 -0800
Subject: [PATCH] Now passing simplified network state to client.

---
 WifiSitter/{ => Model}/NetworkState.cs         |  3 ++
 WifiSitter/Model/SimpleNetworkState.cs         | 50 ++++++++++++++++++++
 WifiSitter/{ => Model}/SitterNic.cs            | 19 +++++---
 WifiSitter/Model/WifiSitterIpcMessage.cs       | 64 ++++++++++++++++++++++++++
 WifiSitter/WifiSitter.cs                       |  6 +--
 WifiSitter/WifiSitter.csproj                   |  9 ++--
 WifiSitter/WifiSitterIpcMessage.cs             | 32 -------------
 WifiSitterGui/TrayIconControl.xaml             |  6 +--
 WifiSitterGui/TrayIconControl.xaml.cs          |  8 ++--
 WifiSitterGui/ViewModel/MainWindowViewModel.cs |  9 ++--
 WifiSitterGui/WifiSitterGui.csproj             | 11 +++--
 11 files changed, 156 insertions(+), 61 deletions(-)
 rename WifiSitter/{ => Model}/NetworkState.cs (98%)
 create mode 100644 WifiSitter/Model/SimpleNetworkState.cs
 rename WifiSitter/{ => Model}/SitterNic.cs (98%)
 create mode 100644 WifiSitter/Model/WifiSitterIpcMessage.cs
 delete mode 100644 WifiSitter/WifiSitterIpcMessage.cs

diff --git a/WifiSitter/NetworkState.cs b/WifiSitter/Model/NetworkState.cs
similarity index 98%
rename from WifiSitter/NetworkState.cs
rename to WifiSitter/Model/NetworkState.cs
index 1d7100f..08d47f3 100644
--- a/WifiSitter/NetworkState.cs
+++ b/WifiSitter/Model/NetworkState.cs
@@ -22,6 +22,9 @@ namespace WifiSitter
 
 
         #region constructor
+        public NetworkState() {
+            Initialize();
+        }
 
         public NetworkState(string[] NicWhitelist) {
             if (NicWhitelist == null)
diff --git a/WifiSitter/Model/SimpleNetworkState.cs b/WifiSitter/Model/SimpleNetworkState.cs
new file mode 100644
index 0000000..4335fdf
--- /dev/null
+++ b/WifiSitter/Model/SimpleNetworkState.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WifiSitter;
+
+namespace WifiSitter.Model
+{
+    [Serializable]
+    public class SimpleNetworkState
+    {
+        public bool EthernetUp { get; set; }
+        public bool CheckNet { get; set; }
+        public List<SimpleNic> Nics { get; set; }
+        public bool NetworkAvailable { get; set; }
+        public bool ProcessingState { get; set; }
+
+        public SimpleNetworkState() { }
+
+        public SimpleNetworkState(NetworkState netstate) {
+            NetworkAvailable = netstate.NetworkAvailable;
+            ProcessingState = netstate.ProcessingState;
+            EthernetUp = netstate.EthernetUp;
+            CheckNet = netstate.CheckNet;
+            Nics = netstate.Nics.Select(x => new SimpleNic(x)).ToList();
+        }
+    }
+
+    [Serializable]
+    public class SimpleNic {
+        public bool IsEnabled { get; set; }
+        public bool IsConnected { get; set; }
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public string Id { get; set; }
+        public string InterfaceType { get; set; }
+
+        public SimpleNic() { }
+        
+        public SimpleNic(TrackedNic nic) {
+            IsEnabled = nic.IsEnabled;
+            IsConnected = nic.IsConnected;
+            Name = nic.Name;
+            Description = nic.Description;
+            Id = nic.Id;
+            InterfaceType = nic.Nic.NetworkInterfaceType.ToString();
+        }
+    }
+}
diff --git a/WifiSitter/SitterNic.cs b/WifiSitter/Model/SitterNic.cs
similarity index 98%
rename from WifiSitter/SitterNic.cs
rename to WifiSitter/Model/SitterNic.cs
index 359fa2d..0efd075 100644
--- a/WifiSitter/SitterNic.cs
+++ b/WifiSitter/Model/SitterNic.cs
@@ -17,6 +17,10 @@ namespace WifiSitter
         private bool _isEnabled;
         private bool _isConnected;
 
+        public TrackedNic() {
+            
+        }
+
         #region constructor
         public TrackedNic(NetworkInterface Nic) {
             this._nic = Nic;
@@ -34,6 +38,7 @@ namespace WifiSitter
 
         public NetworkInterface Nic {
             get { return _nic; }
+            set { _nic = value; }
         }
 
         public bool IsEnabled {
@@ -42,6 +47,12 @@ namespace WifiSitter
         }
 
 
+        public bool IsConnected {
+            get { return _isConnected; }
+            set { _isConnected = value; }
+        }
+
+
         public string Name {
             get { return Nic.Name; }
         }
@@ -55,13 +66,7 @@ namespace WifiSitter
         public string Id {
             get { return Nic.Id; }
         }
-
-
-        public bool IsConnected {
-            get { return _isConnected; }
-            set { _isConnected = value; }
-        }
-
+        
         #endregion // properties
 
 
diff --git a/WifiSitter/Model/WifiSitterIpcMessage.cs b/WifiSitter/Model/WifiSitterIpcMessage.cs
new file mode 100644
index 0000000..78a9e59
--- /dev/null
+++ b/WifiSitter/Model/WifiSitterIpcMessage.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
+
+namespace WifiSitter
+{
+    [Serializable]
+    public class WifiSitterIpcMessage
+    {
+        public string Request { get; set; }
+        public string Requestor { get; set;  }
+        public string Target { get; set; }
+        public byte[] Payload { get; set; }
+        public Type PayloadType { get; set; }
+
+        public WifiSitterIpcMessage() { }
+
+        public WifiSitterIpcMessage(string Verb, string WhosAsking, string WhereTo, string SendingWhat = "") {
+            Request = Verb;
+            Requestor = WhosAsking;
+            Target = WhereTo;
+            Payload = System.Text.Encoding.UTF8.GetBytes(SendingWhat);
+            PayloadType = typeof(string);
+        }
+
+        public WifiSitterIpcMessage(string Verb, string WhosAsking, string WhereTo, object SendingWhat, Type type) {
+            Request = Verb;
+            Requestor = WhosAsking;
+            Target = WhereTo;
+            Payload = SendingWhat.ObjectToByteArray();
+            PayloadType = SendingWhat.GetType();
+        }
+    }
+
+    public static class WifiSitterExtensions
+    {
+        public static string IpcMessageJsonString(this WifiSitterIpcMessage message) {
+            string result;
+            result = Newtonsoft.Json.JsonConvert.SerializeObject(message);
+            return result;
+        }
+
+        public static byte[] ObjectToByteArray(this object obj) {
+            BinaryFormatter bf = new BinaryFormatter();
+            using (var ms = new MemoryStream()) {
+                bf.Serialize(ms, obj);
+                return ms.ToArray();
+            }
+        }
+
+        public static Object ByteArrayToObject(this byte[] arrBytes) {
+            using (var memStream = new MemoryStream()) {
+                var binForm = new BinaryFormatter();
+                memStream.Write(arrBytes, 0, arrBytes.Length);
+                memStream.Seek(0, SeekOrigin.Begin);
+                var obj = binForm.Deserialize(memStream);
+                return obj;
+            }
+        }
+    }
+}
diff --git a/WifiSitter/WifiSitter.cs b/WifiSitter/WifiSitter.cs
index b9a6677..4c9bf9d 100644
--- a/WifiSitter/WifiSitter.cs
+++ b/WifiSitter/WifiSitter.cs
@@ -369,13 +369,13 @@ namespace WifiSitter
 
             WifiSitterIpcMessage _msg = null;
             try { _msg = Newtonsoft.Json.JsonConvert.DeserializeObject<WifiSitterIpcMessage>(e.DataGram.Message); }
-            catch { Trace.WriteLine("Deserialize to ServiceRequest failed."); }
+            catch { LogLine("Deserialize to WifiSitterIpcMessage failed."); }
 
             if (_msg != null) {
                 if (_msg.Request == "get_netstate") {
                     LogLine("Sending netstate to: {0}", _msg.Requestor);
-                    var response = new WifiSitterIpcMessage("give_netstate", _wsIpc.MyChannelName, "", Newtonsoft.Json.JsonConvert.SerializeObject(netstate));
-                    _wsIpc.MsgBroadcaster.SendToChannel(_msg.Target, response);
+                    var response = new WifiSitterIpcMessage("give_netstate", _wsIpc.MyChannelName, "", Newtonsoft.Json.JsonConvert.SerializeObject(new Model.SimpleNetworkState(netstate)));
+                    _wsIpc.MsgBroadcaster.SendToChannel(_msg.Target, response.IpcMessageJsonString());
                 }
             }
             else {
diff --git a/WifiSitter/WifiSitter.csproj b/WifiSitter/WifiSitter.csproj
index 7e0afea..4d72795 100644
--- a/WifiSitter/WifiSitter.csproj
+++ b/WifiSitter/WifiSitter.csproj
@@ -109,15 +109,16 @@
     <Compile Include="Helpers\Interop.cs" />
     <Compile Include="Helpers\NativeWifi.cs" />
     <Compile Include="Helpers\NetshHelper.cs" />
-    <Compile Include="NetworkState.cs" />
+    <Compile Include="Model\NetworkState.cs" />
+    <Compile Include="Model\SimpleNetworkState.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="WifiSitter.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SitterNic.cs" />
+    <Compile Include="Model\SitterNic.cs" />
     <Compile Include="WifiSitterIpc.cs" />
-    <Compile Include="WifiSitterIpcMessage.cs" />
+    <Compile Include="Model\WifiSitterIpcMessage.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -148,7 +149,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UpdateFileVersion="False" BuildVersion_BuildVersioningStyle="None.None.None.Increment" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_BuildVersioningStyle="None.None.None.Increment" BuildVersion_UpdateFileVersion="False" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/WifiSitter/WifiSitterIpcMessage.cs b/WifiSitter/WifiSitterIpcMessage.cs
deleted file mode 100644
index d9df212..0000000
--- a/WifiSitter/WifiSitterIpcMessage.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace WifiSitter
-{
-    [Serializable]
-    public class WifiSitterIpcMessage
-    {
-        public string Request { get; set; }
-        public string Requestor { get; set;  }
-        public string Target { get; set; }
-        public string Payload { get; set; }
-
-        public WifiSitterIpcMessage(string Verb, string WhosAsking, string WhereTo, string SendingWhat = "") {
-            Request = Verb;
-            Requestor = WhosAsking;
-            Target = WhereTo;
-            Payload = SendingWhat;
-        }
-    }
-
-    public static class WifiSitterExtensions
-    {
-        public static string IpcMessageJsonString(this WifiSitterIpcMessage message) {
-            string result;
-            result = Newtonsoft.Json.JsonConvert.SerializeObject(message);
-            return result;
-        }
-    }
-}
diff --git a/WifiSitterGui/TrayIconControl.xaml b/WifiSitterGui/TrayIconControl.xaml
index 22bfa43..d2f3a5e 100644
--- a/WifiSitterGui/TrayIconControl.xaml
+++ b/WifiSitterGui/TrayIconControl.xaml
@@ -17,7 +17,7 @@
         <tb:TaskbarIcon
               x:Name="TaskBarIcon"
               IconSource="pack://application:,,,/Resources/wifisitter-icon.ico"
-              ToolTipText="hello world" 
+              ToolTipText="WifiSitter Agent" 
               MenuActivation="LeftOrRightClick"
               NoLeftClickDelay="True">
             <tb:TaskbarIcon.ContextMenu>
@@ -29,8 +29,8 @@
                               Click="ContextMenu_StatusSettings"/>
                     <MenuItem Header="Quit"
                               Click="ContextMenu_Quit"
-                              Icon="{StaticResource CloseIcon}" 
-                              />
+                              Icon="{StaticResource CloseIcon}"
+                              ToolTip="Does not stop WifiSitter service." />
                 </ContextMenu>
             </tb:TaskbarIcon.ContextMenu>
         </tb:TaskbarIcon>
diff --git a/WifiSitterGui/TrayIconControl.xaml.cs b/WifiSitterGui/TrayIconControl.xaml.cs
index 93a7b89..caa8f23 100644
--- a/WifiSitterGui/TrayIconControl.xaml.cs
+++ b/WifiSitterGui/TrayIconControl.xaml.cs
@@ -15,6 +15,7 @@ using System.Diagnostics;
 
 using WifiSitterGui.ViewModel;
 using WifiSitter;
+using WifiSitter.Model;
 
 using XDMessaging;
 
@@ -78,7 +79,8 @@ namespace WifiSitterGui
         }
 
         private void GetServiceChannelName() {
-            var serviceProc = Process.GetProcesses().Where(x => x.ProcessName.ToLower() == "wifisitter").ToArray();
+            var serviceProc = Process.GetProcesses().Where(x => x.ProcessName.ToLower().StartsWith("wifisitter"))
+                .Where(x => !x.ProcessName.ToLower().Contains("gui")).ToArray();
             if (serviceProc != null && 
                 serviceProc.Length > 0) {
                 _serviceChannel = String.Format("{0}-{1}", serviceProc[0].Id, serviceProc[0].ProcessName);
@@ -134,9 +136,9 @@ namespace WifiSitterGui
             if (_sr != null) {
                 if (_sr.Request == "give_netstate") {
                     try {
-                        WifiSitter.NetworkState ns = Newtonsoft.Json.JsonConvert.DeserializeObject<WifiSitter.NetworkState>(_sr.Payload);
+                        _windowVm.NetState = Newtonsoft.Json.JsonConvert.DeserializeObject<SimpleNetworkState>(System.Text.Encoding.UTF8.GetString(_sr.Payload));
                     }
-                    catch { WifiSitter.WifiSitter.LogLine("Failed to deserialize netstate, payload: {0}", _sr.Payload); }
+                    catch { WifiSitter.WifiSitter.LogLine("Failed to deserialize netstate, payload."); }
                 }
             }
             else {
diff --git a/WifiSitterGui/ViewModel/MainWindowViewModel.cs b/WifiSitterGui/ViewModel/MainWindowViewModel.cs
index 1f44a46..7462d9a 100644
--- a/WifiSitterGui/ViewModel/MainWindowViewModel.cs
+++ b/WifiSitterGui/ViewModel/MainWindowViewModel.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 
 using WifiSitter;
+using WifiSitter.Model;
 
 namespace WifiSitterGui.ViewModel
 {
@@ -11,7 +12,7 @@ namespace WifiSitterGui.ViewModel
     {
         #region fields
 
-        WifiSitter.NetworkState _netState;
+        SimpleNetworkState _netState;
 
         #endregion  // fields
 
@@ -19,7 +20,7 @@ namespace WifiSitterGui.ViewModel
         #region constructor
 
         public MainWindowViewModel () {
-            _netState = new NetworkState(new string[] { });
+            _netState = new SimpleNetworkState();
         }
 
         #endregion  // constructor
@@ -27,9 +28,9 @@ namespace WifiSitterGui.ViewModel
 
         #region properties
         
-        public NetworkState NetState {
+        public SimpleNetworkState NetState {
             get { return _netState; }
-            set { _netState = value; }
+            set { _netState = value; OnPropertyChanged("NetState"); }
         }
         
         #endregion  // properties
diff --git a/WifiSitterGui/WifiSitterGui.csproj b/WifiSitterGui/WifiSitterGui.csproj
index cbf3d6b..4b5c1b8 100644
--- a/WifiSitterGui/WifiSitterGui.csproj
+++ b/WifiSitterGui/WifiSitterGui.csproj
@@ -73,18 +73,19 @@
     <Compile Include="..\WifiSitter\Helpers\NetshHelper.cs">
       <Link>Model\NetshHelper.cs</Link>
     </Compile>
-    <Compile Include="..\WifiSitter\NetworkState.cs">
+    <Compile Include="..\WifiSitter\Model\NetworkState.cs">
       <Link>Model\NetworkState.cs</Link>
     </Compile>
-    <Compile Include="..\WifiSitter\SitterNic.cs">
+    <Compile Include="..\WifiSitter\Model\SimpleNetworkState.cs">
+      <Link>Model\SimpleNetworkState.cs</Link>
+    </Compile>
+    <Compile Include="..\WifiSitter\Model\SitterNic.cs">
       <Link>Model\SitterNic.cs</Link>
     </Compile>
     <Compile Include="..\WifiSitter\WifiSitterIpc.cs">
       <Link>WifiSitterIpc.cs</Link>
     </Compile>
-    <Compile Include="..\WifiSitter\WifiSitterIpcMessage.cs">
-      <Link>WifiSitterIpcMessage.cs</Link>
-    </Compile>
+    <Compile Include="Model\WifiSitterIpcMessage.cs" />
     <Compile Include="Model\WifiSitterStub.cs" />
     <Compile Include="TrayIconControl.xaml.cs">
       <DependentUpon>TrayIconControl.xaml</DependentUpon>