Merge remote-tracking branch 'libre/master'

# Conflicts:
#	.github/workflows/master.yml
#	.github/workflows/pull requests.yml
#	Directory.Build.props
#	LibreHardwareMonitor/UI/MainForm.Designer.cs
#	LibreHardwareMonitor/UI/PortForm.cs
#	OpenHardwareMonitor/UI/InterfacePortForm.Designer.cs
#	OpenHardwareMonitor/UI/InterfacePortForm.cs
#	OpenHardwareMonitor/UI/InterfacePortForm.resx
#	OpenHardwareMonitor/UI/PortForm.cs
#	OpenHardwareMonitor/Utilities/HttpServer.cs
#	OpenHardwareMonitorLib/Hardware/Controller/AquaComputer/Quadro.cs
#	OpenHardwareMonitorLib/Hardware/Cpu/IntelCpu.cs

Author: sergiye

OpenHardwareMonitor/OpenHardwareMonitor.csproj

@@ -46,8 +46,8 @@
     <Compile Update="UI\ParameterForm.Designer.cs">
       <DependentUpon>ParameterForm.cs</DependentUpon>
     </Compile>
-    <Compile Update="UI\PortForm.Designer.cs">
-      <DependentUpon>PortForm.cs</DependentUpon>
+    <Compile Update="UI\InterfacePortForm.Designer.cs">
+      <DependentUpon>InterfacePortForm.cs</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -63,8 +63,8 @@
     <EmbeddedResource Update="UI\ParameterForm.resx">
       <DependentUpon>ParameterForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Update="UI\PortForm.resx">
-      <DependentUpon>PortForm.cs</DependentUpon>
+    <EmbeddedResource Update="UI\InterfacePortForm.resx">
+      <DependentUpon>InterfacePortForm.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>

OpenHardwareMonitor/UI/InterfacePortForm.Designer.cs

@@ -3,37 +3,51 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Diagnostics;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+using System.Net.NetworkInformation;
 
 namespace OpenHardwareMonitor.UI;
 
-public partial class PortForm : Form
+public partial class InterfacePortForm : Form
 {
     private readonly MainForm _parent;
-    private readonly string _localIP;
-    public PortForm(MainForm m)
+    private string _localIP;
+    
+    public InterfacePortForm(MainForm m)
     {
         InitializeComponent();
         Icon = System.Drawing.Icon.ExtractAssociatedIcon(Utilities.Updater.CurrentFileLocation);
         _parent = m;
-        _localIP = GetLocalIP();
+        _localIP = LoadNetworkInterfaces(_parent.Server.ListenerIp);
     }
 
-    private void PortTextBox_TextChanged(object sender, EventArgs e)
-    {
-
-    }
-
-    private string GetLocalIP()
+    private string LoadNetworkInterfaces(string selectedListenerIp)
     {
         IPHostEntry host;
-        string localIP = "?";
+        interfaceComboBox.Items.Clear();
         host = Dns.GetHostEntry(Dns.GetHostName());
         foreach (IPAddress ip in host.AddressList)
         {
             if (ip.AddressFamily == AddressFamily.InterNetwork)
-                localIP = ip.ToString();
+                interfaceComboBox.Items.Add(ip.ToString());
+        }
+        // select the last one by default to match the existing behavior
+        if (interfaceComboBox.Items.Count > 0)
+        {
+            interfaceComboBox.SelectedIndex = interfaceComboBox.Items.Count - 1;
+        } else
+        {
+            // default to ? just like previous version
+            interfaceComboBox.Items.Add("?");
+            interfaceComboBox.SelectedIndex = 0;
         }
-        return localIP;
+        // check to see if the selected listener IP is in our list.
+        if (interfaceComboBox.Items.Contains(selectedListenerIp))
+        {
+            // default it to the previously selected IP.
+            interfaceComboBox.SelectedItem = selectedListenerIp;
+        }
+        return interfaceComboBox.SelectedItem as string;
     }
 
     private void PortNumericUpDn_ValueChanged(object sender, EventArgs e)
@@ -47,6 +61,7 @@ private void PortNumericUpDn_ValueChanged(object sender, EventArgs e)
     private void PortOKButton_Click(object sender, EventArgs e)
     {
         _parent.Server.ListenerPort = (int)portNumericUpDn.Value;
+        _parent.Server.ListenerIp = _localIP;
         Close();
     }
 
@@ -57,6 +72,7 @@ private void PortCancelButton_Click(object sender, EventArgs e)
 
     private void PortForm_Load(object sender, EventArgs e)
     {
+        interfaceComboBox.SelectedValue = _parent.Server.ListenerIp;
         portNumericUpDn.Value = _parent.Server.ListenerPort;
         PortNumericUpDn_ValueChanged(null, null);
     }
@@ -74,4 +90,10 @@ private void PortNumericUpDn_KeyUp(object sender, KeyEventArgs e)
     {
         PortNumericUpDn_ValueChanged(null, null);
     }
+
+    private void interfaceComboBox_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        _localIP = interfaceComboBox.SelectedItem as string;
+        PortNumericUpDn_ValueChanged(null, null);
+    }
 }