only start HttpServer on WLAN interface type

UltraStar-Deluxe · Apr 11, 2021 · c3e0789 · c3e0789
1 parent 8a84161
commit c3e0789
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/UltraStar Play/Assets/Common/Network/UltraStarPlayHttpServer.cs b/UltraStar Play/Assets/Common/Network/UltraStarPlayHttpServer.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Net.NetworkInformation;
 using SimpleHttpServerForUnity;
 
 public class UltraStarPlayHttpServer : HttpServer
@@ -19,7 +20,7 @@ protected override void Awake()
             return;
         }
 
-        host = IpAddressUtils.GetIpAddress(AddressFamily.IPv4);
+        host = IpAddressUtils.GetIpAddress(AddressFamily.IPv4, NetworkInterfaceType.Wireless80211);
         NoEndpointFoundCallback = SendNoEndpointFound;
         StartHttpListener();
 

diff --git a/UltraStar Play/Assets/Plugins/SimpleHttpServerForUnity/IpAddressUtils.cs b/UltraStar Play/Assets/Plugins/SimpleHttpServerForUnity/IpAddressUtils.cs
@@ -1,14 +1,16 @@
-using System.Net.NetworkInformation;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.NetworkInformation;
 using System.Net.Sockets;
 
 namespace SimpleHttpServerForUnity
 {
-// https://stackoverflow.com/questions/51975799/how-to-get-ip-address-of-device-in-unity-2018
+    // https://stackoverflow.com/questions/51975799/how-to-get-ip-address-of-device-in-unity-2018
     public class IpAddressUtils
     {
-        public static string GetIpAddress(AddressFamily addressFamily)
+        public static string GetIpAddress(AddressFamily addressFamily, params NetworkInterfaceType[] networkInterfaceTypes)
         {
-            // Return null if AddressFamily is Ipv6 but Os does not support it
+            // Return null if AddressFamily is Ipv6 but OS does not support it
             if (addressFamily == AddressFamily.IPv6 && !Socket.OSSupportsIPv6)
             {
                 return null;
@@ -18,11 +20,8 @@ public static string GetIpAddress(AddressFamily addressFamily)
             foreach (NetworkInterface item in NetworkInterface.GetAllNetworkInterfaces())
             {
 #if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
-                NetworkInterfaceType type1 = NetworkInterfaceType.Wireless80211;
-                NetworkInterfaceType type2 = NetworkInterfaceType.Ethernet;
-
-                if ((item.NetworkInterfaceType == type1 || item.NetworkInterfaceType == type2) &&
-                    item.OperationalStatus == OperationalStatus.Up)
+                if (networkInterfaceTypes.Contains(item.NetworkInterfaceType)
+                    && item.OperationalStatus == OperationalStatus.Up)
 #endif
                 {
                     foreach (UnicastIPAddressInformation ip in item.GetIPProperties().UnicastAddresses)