Unstable v0.19.5.0

2022-09-14 12:47:17 -03:00
parent 3f2c843247
commit 1fd2a51bbb
158 changed files with 5702 additions and 4813 deletions
@@ -7,7 +7,7 @@ namespace Barotrauma.Networking
        public abstract string StringRepresentation { get; }

        public static Option<Address> Parse(string str)
-            => ReflectionUtils.ParseDerived<Address>(str);
+            => ReflectionUtils.ParseDerived<Address, string>(str);

        public abstract bool IsLocalHost { get; }

@@ -17,31 +17,27 @@ namespace Barotrauma.Networking

        public LidgrenAddress(IPAddress netAddress)
        {
-            NetAddress = netAddress;
+            if (IPAddress.IsLoopback(netAddress))
+            {
+                NetAddress = IPAddress.Loopback;
+            }
+            else
+            {
+                NetAddress = netAddress;
+            }
        }

        public new static Option<LidgrenAddress> Parse(string endpointStr)
        {
-            if (IPAddress.TryParse(endpointStr, out IPAddress? netEndpoint))
+            if (endpointStr.Equals("localhost", StringComparison.OrdinalIgnoreCase))
+            {
+                return Option<LidgrenAddress>.Some(new LidgrenAddress(IPAddress.Loopback));
+            }
+            else if (IPAddress.TryParse(endpointStr, out IPAddress? netEndpoint))
            {
                return Option<LidgrenAddress>.Some(new LidgrenAddress(netEndpoint!));
            }
-
-            try
-            {
-                var resolvedAddresses = Dns.GetHostAddresses(endpointStr);
-                return resolvedAddresses.Any()
-                    ? Option<LidgrenAddress>.Some(new LidgrenAddress(resolvedAddresses.First()))
-                    : Option<LidgrenAddress>.None();
-            }
-            catch (SocketException)
-            {
-                return Option<LidgrenAddress>.None();
-            }
-            catch (ArgumentOutOfRangeException)
-            {
-                return Option<LidgrenAddress>.None();
-            }
+            return Option<LidgrenAddress>.None();            
        }

        public override bool Equals(object? obj)