Add logging in socket implementation (#661)

Adds logging to most Socket calls to help with debugging network
issues.

Shouldn't affect any functionality. There's a small chance it could spam
the log in some games.

src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs

@@ -34,6 +34,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
         {
             if (errorCode != LinuxError.SUCCESS)
             {
+                if (errorCode != LinuxError.EWOULDBLOCK)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Operation failed with error {errorCode}.");
+                }
                 result = -1;
             }
 
@@ -66,6 +70,8 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             BsdSocketType type = (BsdSocketType)context.RequestData.ReadInt32();
             ProtocolType protocol = (ProtocolType)context.RequestData.ReadInt32();
 
+            Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Creating socket with domain={domain}, type={type}, protocol={protocol}");
+
             BsdSocketCreationFlags creationFlags = (BsdSocketCreationFlags)((int)type >> (int)BsdSocketCreationFlags.FlagsShift);
             type &= BsdSocketType.TypeMask;
 
@@ -111,6 +117,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
 
             if (exempt)
             {
+                Logger.Info?.Print(LogClass.ServiceBsd, "Disconnecting exempt socket.");
                 newBsdSocket.Disconnect();
             }
 
@@ -797,6 +804,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             {
                 errno = socket.Listen(backlog);
             }
+            else
+            {
+                Logger.Warning?.PrintMsg(LogClass.ServiceBsd, $"Invalid socket fd '{socketFd}'.");
+            }
             
             return WriteBsdResult(context, 0, errno);
         }

src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/ManagedSocket.cs

@@ -92,18 +92,30 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 newSocket = new ManagedSocket(Socket.Accept());
 
+                IPEndPoint remoteEndPoint = newSocket.RemoteEndPoint;
+                bool isPrivateIp = remoteEndPoint.Address.ToString().StartsWith("192.168.");
+                Logger.Info?.PrintMsg(LogClass.ServiceBsd,
+                    isPrivateIp
+                        ? $"Accepted connection from {ProtocolType}/{remoteEndPoint.Address}:{remoteEndPoint.Port}"
+                        : $"Accepted connection from {ProtocolType}/***:{remoteEndPoint.Port}");
+
                 return LinuxError.SUCCESS;
             }
             catch (SocketException exception)
             {
                 newSocket = null;
 
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }
 
         public LinuxError Bind(IPEndPoint localEndPoint)
         {
+            Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Socket binding to: {ProtocolType}/{localEndPoint.Port}");
             try
             {
                 Socket.Bind(localEndPoint);
@@ -112,6 +124,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }
@@ -123,6 +139,15 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
 
         public LinuxError Connect(IPEndPoint remoteEndPoint)
         {
+            bool isLDNPrivateIP = remoteEndPoint.Address.ToString().StartsWith("192.168.");
+            if (isLDNPrivateIP)
+            {
+                Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Connecting to: {ProtocolType}/{remoteEndPoint.Address}:{remoteEndPoint.Port}");
+            }
+            else
+            {
+                Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Connecting to: {ProtocolType}/***:{remoteEndPoint.Port}");
+            }
             try
             {
                 Socket.Connect(remoteEndPoint);
@@ -137,6 +162,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
                 }
                 else
                 {
+                    if (exception.SocketErrorCode != SocketError.WouldBlock)
+                    {
+                        Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                    }
                     return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
                 }
             }
@@ -144,11 +173,13 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
 
         public void Disconnect()
         {
+            Logger.Info?.Print(LogClass.ServiceBsd, "Socket disconnecting");
             Socket.Disconnect(true);
         }
 
         public void Dispose()
         {
+            Logger.Info?.Print(LogClass.ServiceBsd, "Socket closed");
             Socket.Close();
             Socket.Dispose();
         }
@@ -159,10 +190,16 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 Socket.Listen(backlog);
 
+                Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Socket listening: {ProtocolType}/{(Socket.LocalEndPoint as IPEndPoint).Port}");
+
                 return LinuxError.SUCCESS;
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }
@@ -182,11 +219,15 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }
 
-        bool hasEmittedBlockingWarning = false;
+        private bool _hasEmittedBlockingWarning;
 
         public LinuxError Receive(out int receiveSize, Span<byte> buffer, BsdSocketFlags flags)
         {
@@ -202,10 +243,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
                     shouldBlockAfterOperation = true;
                 }
 
-                if (Blocking && !hasEmittedBlockingWarning)
+                if (Blocking && !_hasEmittedBlockingWarning)
                 {
                     Logger.Warning?.PrintMsg(LogClass.ServiceBsd, "Blocking socket operations are not yet working properly. Expect network errors.");
-                    hasEmittedBlockingWarning = true;
+                    _hasEmittedBlockingWarning = true;
                 }
 
                 receiveSize = Socket.Receive(buffer, ConvertBsdSocketFlags(flags));
@@ -214,6 +255,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 receiveSize = -1;
 
                 result = WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
@@ -245,10 +290,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
                     shouldBlockAfterOperation = true;
                 }
 
-                if (Blocking && !hasEmittedBlockingWarning)
+                if (Blocking && !_hasEmittedBlockingWarning)
                 {
                     Logger.Warning?.PrintMsg(LogClass.ServiceBsd, "Blocking socket operations are not yet working properly. Expect network errors.");
-                    hasEmittedBlockingWarning = true;
+                    _hasEmittedBlockingWarning = true;
                 }
 
                 if (!Socket.IsBound)
@@ -265,6 +310,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 receiveSize = -1;
 
                 result = WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
@@ -288,6 +337,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 sendSize = -1;
 
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
@@ -304,6 +357,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 sendSize = -1;
 
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
@@ -341,6 +398,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }
@@ -387,6 +448,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }
@@ -519,6 +584,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }
@@ -557,6 +626,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             }
             catch (SocketException exception)
             {
+                if (exception.SocketErrorCode != SocketError.WouldBlock)
+                {
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }

src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Proxy/SocketHelpers.cs

@@ -1,4 +1,6 @@
+using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy;
+using Ryujinx.HLE.HOS.Services.Sockets.Bsd.Types;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -64,10 +66,18 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Proxy
             {
                 if (_proxy.Supported(domain, type, protocol))
                 {
+                    Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Socket is using LDN proxy");
                     return new LdnProxySocket(domain, type, protocol, _proxy);
                 }
+                else
+                {
+                    Logger.Warning?.PrintMsg(LogClass.ServiceBsd, $"LDN proxy does not support socket {domain}, {type}, {protocol}");
+                }
+            }
+            else
+            {
+                Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Opening socket using host networking stack");
             }
-
             return new DefaultSocket(domain, type, protocol, lanInterfaceId);
         }
     }

src/Ryujinx/DiscordIntegrationModule.cs

@@ -24,7 +24,7 @@ namespace Ryujinx.Ava
 
         private static readonly string _description =
             ReleaseInformation.IsValid
-                ? $"{VersionString} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelSourceRepo}@{ReleaseInformation.BuildGitHash}"
+                ? $"{VersionString} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelSourceRepo}"
                 : "dev build";
 
         private const string ApplicationId = "1293250299716173864";

src/Ryujinx/Utilities/PlayReport/PlayReports.cs

@@ -12,85 +12,86 @@ namespace Ryujinx.Ava.Utilities.PlayReport
 
         public static Analyzer Analyzer => _analyzerLazy.Value;
 
-        private static readonly Lazy<Analyzer> _analyzerLazy = new(() =>
+        private static readonly Lazy<Analyzer> _analyzerLazy = new(() => new Analyzer()
-            new Analyzer()
+            .AddSpec(
-                .AddSpec(
+                "01007ef00011e000",
-                    "01007ef00011e000",
+                spec => spec
-                    spec => spec
+                    .WithDescription("based on being in Master Mode.")
-                        .WithDescription("based on being in Master Mode.")
+                    .AddValueFormatter("IsHardMode", BreathOfTheWild_MasterMode)
-                        .AddValueFormatter("IsHardMode", BreathOfTheWild_MasterMode)
+                    // reset to normal status when switching between normal & master mode in title screen
-                        // reset to normal status when switching between normal & master mode in title screen
+                    .AddValueFormatter("AoCVer", FormattedValue.SingleAlwaysResets)
-                        .AddValueFormatter("AoCVer", FormattedValue.SingleAlwaysResets)
+            )
-                )
+            .AddSpec(
-                .AddSpec(
+                "0100f2c0115b6000",
-                    "0100f2c0115b6000",
+                spec => spec
-                    spec => spec
+                    .WithDescription("based on where you are in Hyrule (Depths, Surface, Sky).")
-                        .WithDescription("based on where you are in Hyrule (Depths, Surface, Sky).")
+                    .AddValueFormatter("PlayerPosY", TearsOfTheKingdom_CurrentField))
-                        .AddValueFormatter("PlayerPosY", TearsOfTheKingdom_CurrentField))
+            .AddSpec(
-                .AddSpec(
+                "01002da013484000",
-                    "01002da013484000", 
+                spec => spec
-                    spec => spec
+                    .WithDescription("based on how many Rupees you have.")
-                        .WithDescription("based on how many Rupees you have.")
+                    .AddValueFormatter("rupees", SkywardSwordHD_Rupees))
-                        .AddValueFormatter("rupees", SkywardSwordHD_Rupees))
+            .AddSpec(
-                .AddSpec(
+                "0100000000010000",
-                    "0100000000010000",
+                spec => spec
-                    spec => spec
+                    .WithDescription("based on if you're playing with Assist Mode.")
-                        .WithDescription("based on if you're playing with Assist Mode.")
+                    .AddValueFormatter("is_kids_mode", SuperMarioOdyssey_AssistMode)
-                        .AddValueFormatter("is_kids_mode", SuperMarioOdyssey_AssistMode)
+            )
-                )
+            .AddSpec(
-                .AddSpec(
+                "010075000ecbe000",
-                    "010075000ecbe000",
+                spec => spec
-                    spec => spec
+                    .WithDescription("based on if you're playing with Assist Mode.")
-                        .WithDescription("based on if you're playing with Assist Mode.")
+                    .AddValueFormatter("is_kids_mode", SuperMarioOdysseyChina_AssistMode)
-                        .AddValueFormatter("is_kids_mode", SuperMarioOdysseyChina_AssistMode)
+            )
-                )
+            .AddSpec(
-                .AddSpec(
+                "010028600ebda000",
-                    "010028600ebda000",
+                spec => spec
-                    spec => spec
+                    .WithDescription("based on being in either Super Mario 3D World or Bowser's Fury.")
-                        .WithDescription("based on being in either Super Mario 3D World or Bowser's Fury.")
+                    .AddValueFormatter("mode", SuperMario3DWorldOrBowsersFury)
-                        .AddValueFormatter("mode", SuperMario3DWorldOrBowsersFury)
+            )
-                )
+            .AddSpec( // Global & China IDs
-                .AddSpec( // Global & China IDs
+                ["0100152000022000", "010075100e8ec000"],
-                    ["0100152000022000", "010075100e8ec000"],
+                spec => spec
-                    spec => spec
+                    .WithDescription(
-                        .WithDescription("based on what modes you're selecting in the menu & whether or not you're in a race.")
+                        "based on what modes you're selecting in the menu & whether or not you're in a race.")
-                        .AddValueFormatter("To", MarioKart8Deluxe_Mode)
+                    .AddValueFormatter("To", MarioKart8Deluxe_Mode)
-                )
+            )
-                .AddSpec(
+            .AddSpec(
-                    ["0100a3d008c5c000", "01008f6008c5e000"],
+                ["0100a3d008c5c000", "01008f6008c5e000"],
-                    spec => spec
+                spec => spec
-                        .WithDescription("based on what area of Paldea you're exploring.")
+                    .WithDescription("based on what area of Paldea you're exploring.")
-                        .AddValueFormatter("area_no", PokemonSVArea)
+                    .AddValueFormatter("area_no", PokemonSVArea)
-                        .AddValueFormatter("team_circle", PokemonSVUnionCircle)
+                    .AddValueFormatter("team_circle", PokemonSVUnionCircle)
-                )
+            )
-                .AddSpec(
+            .AddSpec(
-                    "01006a800016e000",
+                "01006a800016e000",
-                    spec => spec
+                spec => spec
-                        .WithDescription("based on what mode you're playing, who won, and what characters were present.")
+                    .WithDescription("based on what mode you're playing, who won, and what characters were present.")
-                        .AddSparseMultiValueFormatter(
+                    .AddSparseMultiValueFormatter(
-                            [
+                        [
-                                // Metadata to figure out what PlayReport we have.
+                            // Metadata to figure out what PlayReport we have.
-                                "match_mode", "match_submode", "anniversary", "fighter", "reason", "challenge_count",
+                            "match_mode", "match_submode", "anniversary", "fighter", "reason", "challenge_count",
-                                "adv_slot",
+                            "adv_slot",
-                                // List of Fighters
+                            // List of Fighters
-                                "player_1_fighter", "player_2_fighter", "player_3_fighter", "player_4_fighter",
+                            "player_1_fighter", "player_2_fighter", "player_3_fighter", "player_4_fighter",
-                                "player_5_fighter", "player_6_fighter", "player_7_fighter", "player_8_fighter",
+                            "player_5_fighter", "player_6_fighter", "player_7_fighter", "player_8_fighter",
-                                // List of rankings/placements
+                            // List of rankings/placements
-                                "player_1_rank", "player_2_rank", "player_3_rank", "player_4_rank", "player_5_rank",
+                            "player_1_rank", "player_2_rank", "player_3_rank", "player_4_rank", "player_5_rank",
-                                "player_6_rank", "player_7_rank", "player_8_rank"
+                            "player_6_rank", "player_7_rank", "player_8_rank"
-                            ],
+                        ],
-                            SuperSmashBrosUltimate_Mode
+                        SuperSmashBrosUltimate_Mode
-                        )
+                    )
-                )
+            )
-                .AddSpec(
+            .AddSpec(
-                    [
+                [
-                        "0100c9a00ece6000", "01008d300c50c000", "0100d870045b6000",
+                    "0100c9a00ece6000", "01008d300c50c000", "0100d870045b6000",
-                        "010012f017576000", "0100c62011050000", "0100b3c014bda000"
+                    "010012f017576000", "0100c62011050000", "0100b3c014bda000"
-                    ],
+                ],
-                    spec => spec
+                spec => spec
-                        .WithDescription("based on what game you first launch.\n\nNSO emulators do not print any Play Report information past the first game launch so it's all we got.")
+                    .WithDescription(
-                        .AddValueFormatter("launch_title_id", NsoEmulator_LaunchedGame)
+                        "based on what game you first launch.\n\nNSO emulators do not print any Play Report information past the first game launch so it's all we got.")
-                )
+                    .AddValueFormatter("launch_title_id", NsoEmulator_LaunchedGame)
+            )
         );
 
         private static string Playing(string game) => $"Playing {game}";