MapToIPv4

NewLifeX · Aug 12, 2024 · 85752b3 · 85752b3
1 parent 0074541
commit 85752b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Stardust.Server/Controllers/AppController.cs b/Stardust.Server/Controllers/AppController.cs
@@ -201,7 +201,9 @@ private async Task Handle(WebSocket socket, App app, String clientId)
 
         var sid = Rand.Next();
         var connection = HttpContext.Connection;
-        var remote = new IPEndPoint(connection.RemoteIpAddress, connection.RemotePort);
+        var address = connection.RemoteIpAddress ?? IPAddress.Loopback;
+        if (address.IsIPv4MappedToIPv6) address = address.MapToIPv4();
+        var remote = new IPEndPoint(address, connection.RemotePort);
         WriteHistory("WebSocket连接", true, $"State={socket.State} sid={sid} Remote={remote}", clientId);
 
         var olt = AppOnline.FindByClient(clientId);

diff --git a/Stardust.Server/Controllers/NodeController.cs b/Stardust.Server/Controllers/NodeController.cs
@@ -328,7 +328,9 @@ private async Task Handle(WebSocket socket, String token, String ip)
 
         var sid = Rand.Next();
         var connection = HttpContext.Connection;
-        var remote = new IPEndPoint(connection.RemoteIpAddress, connection.RemotePort);
+        var address = connection.RemoteIpAddress ?? IPAddress.Loopback;
+        if (address.IsIPv4MappedToIPv6) address = address.MapToIPv4();
+        var remote = new IPEndPoint(address, connection.RemotePort);
         WriteHistory(node, "WebSocket连接", true, $"State={socket.State} sid={sid} Remote={remote}");
 
         var olt = _nodeService.GetOrAddOnline(node, token, ip);