Send local IP in heartbeat

Author: ocdtrekkie

Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // 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("1.0.0.13")]
-[assembly: AssemblyFileVersion("1.0.0.13")]
+[assembly: AssemblyVersion("1.0.0.14")]
+[assembly: AssemblyFileVersion("1.0.0.14")]

XRFAgent.csproj

@@ -25,7 +25,7 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>13</ApplicationRevision>
+    <ApplicationRevision>14</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>

modNetwork.cs

@@ -68,9 +68,8 @@ public static string GetLocalIPAddress()
             if (IsOnline == true)
             {
                 // https://stackoverflow.com/a/44226831
-                // TODO: We need to account for wireless adapters too.
                 List<string> iplist = NetworkInterface.GetAllNetworkInterfaces()
-                   .Where(x => x.NetworkInterfaceType == NetworkInterfaceType.Ethernet && x.OperationalStatus == OperationalStatus.Up)
+                   .Where(x => (x.NetworkInterfaceType == NetworkInterfaceType.Ethernet || x.NetworkInterfaceType == NetworkInterfaceType.Wireless80211) && x.OperationalStatus == OperationalStatus.Up)
                    .SelectMany(x => x.GetIPProperties().UnicastAddresses)
                    .Where(x => x.Address.AddressFamily == AddressFamily.InterNetwork)
                    .Select(x => x.Address.ToString())
@@ -200,6 +199,7 @@ private static void PingInternetHandler(object sender, EventArgs e)
                 if (IsOnline == false)
                 {
                     modLogging.LogEvent("System is now connected to the Internet", EventLogEntryType.Information);
+                    GetLocalIPAddress();
                     GetPublicIPAddress();
                 }
                 IsOnline = true;

modSync.cs

@@ -64,9 +64,10 @@ public static async void SendMessage(string Destination, string MessageType, str
             try
             {
                 HttpClient MessageClient = new HttpClient();
+                string localIP = modDatabase.GetConfig("Ping_LastKnownLocalIP");
                 string publicIP = modDatabase.GetConfig("Ping_LastKnownPublicIP");
                 string windowsVersion = modDatabase.GetConfig("System_LastKnownWindowsVersion");
-                HttpRequestMessage MessageBuilder = new HttpRequestMessage(HttpMethod.Post, Sync_ServerURL + "?message_type=" + MessageType + "&destination=" + Destination + "&access_key=" + Sync_AccessKey + "&message=" + Message + "&user_agent=XRFAgent/" + Assembly.GetExecutingAssembly().GetName().Version + "&ip_address=" + publicIP + "&windows_version=" + windowsVersion);
+                HttpRequestMessage MessageBuilder = new HttpRequestMessage(HttpMethod.Post, Sync_ServerURL + "?message_type=" + MessageType + "&destination=" + Destination + "&access_key=" + Sync_AccessKey + "&message=" + Message + "&user_agent=XRFAgent/" + Assembly.GetExecutingAssembly().GetName().Version + "&ip_address=" + publicIP + "&ip_local=" + localIP + "&windows_version=" + windowsVersion);
                 TimeSpan httpTimeout = TimeSpan.FromSeconds(10);
                 MessageClient.Timeout = httpTimeout;
                 string EncodedCreds = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes("sandstorm:" + Sync_SandstormToken));