[DEBUG] Implemented NetLog logging type (#5)

Implemented a new debug log type called NetLog and added more verbose logging to the LDN service.
I'd like some feedback on what all should be logged under this category -- I'm likely going to be adding logs for sockets as well, but I want to know specifically if the logging should be more or less verbose and what would be the most helpful things to log.

![image](/attachments/70d5d467-2b57-436b-944f-7bf7a1f609af)

Reviewed-on: https://git.ryujinx.app/projects/Ryubing/pulls/5

assets/Locales/Root.json

@@ -6100,6 +6100,31 @@
         "zh_TW": "檔案系統全域存取日誌模式:"
       }
     },
+    {
+      "ID": "SettingsTabLoggingEnableNetLogs",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Enable Net Logs",
+        "es_ES": "Habilitar registros de red.",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "SettingsTabLoggingDeveloperOptions",
       "Translations": {
@@ -17075,6 +17100,31 @@
         "zh_TW": "啟用檔案系統存取日誌輸出到控制台中。可能的模式為 0 到 3。"
       }
     },
+    {
+      "ID": "NetLogTooltip",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Prints network log messages in the console.",
+        "es_ES": "Imprimir registros de red en la consola.",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "DeveloperOptionTooltip",
       "Translations": {

src/Ryujinx.Common/Logging/LogLevel.cs

@@ -12,6 +12,7 @@ namespace Ryujinx.Common.Logging
         Error,
         Guest,
         AccessLog,
+        NetLog,
         Notice,
         Trace,
     }

src/Ryujinx.Common/Logging/Logger.cs

@@ -119,6 +119,7 @@ namespace Ryujinx.Common.Logging
         public static Log? Error { get; private set; }
         public static Log? Guest { get; private set; }
         public static Log? AccessLog { get; private set; }
+        public static Log? NetLog { get; private set; }
         public static Log? Stub { get; private set; }
         public static Log? Trace { get; private set; }
         public static Log Notice { get; } // Always enabled
@@ -247,6 +248,7 @@ namespace Ryujinx.Common.Logging
                 case LogLevel.Error     : Error     = enabled ? new Log(LogLevel.Error)     : null; break;
                 case LogLevel.Guest     : Guest     = enabled ? new Log(LogLevel.Guest)     : null; break;
                 case LogLevel.AccessLog : AccessLog = enabled ? new Log(LogLevel.AccessLog) : null; break;
+                case LogLevel.NetLog    : NetLog    = enabled ? new Log(LogLevel.NetLog)    : null; break;
                 case LogLevel.Stub      : Stub      = enabled ? new Log(LogLevel.Stub)      : null; break;
                 case LogLevel.Trace     : Trace     = enabled ? new Log(LogLevel.Trace)     : null; break;
                 case LogLevel.Notice    : break;

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs

@@ -5,7 +5,6 @@ using Ryujinx.Common.Logging;
 using Ryujinx.Common.Memory;
 using Ryujinx.Common.Utilities;
 using Ryujinx.Cpu;
-using Ryujinx.HLE.Exceptions;
 using Ryujinx.HLE.HOS.Ipc;
 using Ryujinx.HLE.HOS.Kernel.Threading;
 using Ryujinx.HLE.HOS.Services.Ldn.Types;
@@ -15,7 +14,6 @@ using Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.Types;
 using Ryujinx.Horizon.Common;
 using Ryujinx.Memory;
 using System;
-using System.ComponentModel;
 using System.IO;
 using System.Net;
 using System.Net.NetworkInformation;
@@ -68,10 +66,11 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             {
                 if (localCommunicationId == localCommunicationIdChecked)
                 {
+                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,"CheckLocalCommumicationIdPermission: Checked!");
                     return true;
                 }
             }
-
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,"CheckLocalCommumicationIdPermission: Check failed!");
             return false;
         }
 
@@ -82,7 +81,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             if (_nifmResultCode != ResultCode.Success)
             {
                 context.ResponseData.Write((int)NetworkState.Error);
-
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,$"GetState: _nifmResultCode = {_nifmResultCode.ToString()}");
                 return ResultCode.Success;
             }
 
@@ -114,12 +113,14 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,$"GetNetworkInfo: _nifmResultCode = {_nifmResultCode.ToString()}");
                 return _nifmResultCode;
             }
 
             ResultCode resultCode = GetNetworkInfoImpl(out NetworkInfo networkInfo);
             if (resultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,$"GetState: resultCode = {resultCode.ToString()}");
                 return resultCode;
             }
 
@@ -135,18 +136,22 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             if (_state == NetworkState.StationConnected)
             {
                 networkInfo = _station.NetworkInfo;
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,"GetNetworkInfoImpl: _station");
             }
             else if (_state == NetworkState.AccessPointCreated)
             {
                 networkInfo = _accessPoint.NetworkInfo;
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,"GetNetworkInfoImpl: _accessPoint");
             }
             else
             {
                 networkInfo = new NetworkInfo();
-
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,"GetNetworkInfoImpl: Invalid state!");
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,$"GetNetworkInfoImpl: networkInfo = {networkInfo}");
                 return ResultCode.InvalidState;
             }
 
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,$"GetNetworkInfoImpl: networkInfo = {networkInfo}");
             return ResultCode.Success;
         }
 
@@ -198,7 +203,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                     }
                     else
                     {
-                        Logger.Info?.Print(LogClass.ServiceLdn, $"Console's LDN IP is \"{unicastAddress.Address}\".");
+                        Logger.NetLog?.Print(LogClass.ServiceLdn, $"Console's LDN IP is \"{unicastAddress.Address}\".");
 
                         context.ResponseData.Write(NetworkHelpers.ConvertIpv4Address(unicastAddress.Address));
                         context.ResponseData.Write(NetworkHelpers.ConvertIpv4Address(unicastAddress.IPv4Mask));
@@ -206,7 +211,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 }
                 else
                 {
-                    Logger.Info?.Print(LogClass.ServiceLdn, $"LDN obtained proxy IP.");
+                    Logger.NetLog?.Print(LogClass.ServiceLdn, $"LDN obtained proxy IP.");
 
                     context.ResponseData.Write(config.ProxyIp);
                     context.ResponseData.Write(config.ProxySubnetMask);
@@ -227,7 +232,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             // NOTE: Returns ResultCode.InvalidArgument if _disconnectReason is null, doesn't occur in our case.
 
             context.ResponseData.Write((short)_disconnectReason);
-
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetDisconnectReason: {_disconnectReason}");
             return ResultCode.Success;
         }
 
@@ -247,12 +252,14 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetSecurityParameter: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             ResultCode resultCode = GetNetworkInfoImpl(out NetworkInfo networkInfo);
             if (resultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetSecurityParameter: resultCode = {resultCode}");
                 return resultCode;
             }
 
@@ -264,6 +271,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
             context.ResponseData.WriteStruct(securityParameter);
             
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetSecurityParameter: securityParameter = {securityParameter}");
             return ResultCode.Success;
         }
 
@@ -273,12 +281,14 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetNetworkConfig: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             ResultCode resultCode = GetNetworkInfoImpl(out NetworkInfo networkInfo);
             if (resultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetNetworkConfig: resultCode = {resultCode}");
                 return resultCode;
             }
 
@@ -293,6 +303,8 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
             context.ResponseData.WriteStruct(networkConfig);
             
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetNetworkConfig: networkConfig = {networkConfig}");
+
             return ResultCode.Success;
         }
 
@@ -322,12 +334,14 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetNetworkInfoLatestUpdate: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             ResultCode resultCode = GetNetworkInfoImpl(out NetworkInfo networkInfo);
             if (resultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"GetNetworkInfoLatestUpdate: resultCode = {resultCode}");
                 return resultCode;
             }
 
@@ -378,6 +392,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ScanImpl: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -400,6 +415,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                         {
                             if (scanFilter.Ssid.Length <= 31)
                             {
+                                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ScanImpl: resultCode = {resultCode}");
                                 return resultCode;
                             }
                         }
@@ -408,11 +424,13 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                         {
                             if (scanFilterFlag > ScanFilterFlag.All)
                             {
+                                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ScanImpl: resultCode = {resultCode}");
                                 return resultCode;
                             }
 
                             if (_state - 3 >= NetworkState.AccessPoint)
                             {
+                                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "ScanImpl: Invalid state!");
                                 resultCode = ResultCode.InvalidState;
                             }
                             else
@@ -438,6 +456,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 }
             }
             
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ScanImpl: resultCode = {resultCode}");
             return resultCode;
         }
 
@@ -462,6 +481,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 }
             }
 
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ScanInternal: availableGames = {availableGames}");
             return ResultCode.Success;
         }
 
@@ -502,7 +522,8 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 throw new ArgumentException($"{GetType().FullName}: Protocol value is not 1 or 3!! Protocol value: {protocolValue}");
             }
             
-            Logger.Stub?.PrintStub(LogClass.ServiceLdn, $"Protocol value:  {protocolValue}");
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"SetProtocol: protocolValue = {protocolValue}");
+            Logger.Stub?.PrintStub(LogClass.ServiceLdn, new { protocolValue});
             return ResultCode.Success;
         }
 
@@ -512,11 +533,13 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"OpenAccessPoint: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             if (_state != NetworkState.Initialized)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "OpenAccessPoint: Invalid state!");
                 return ResultCode.InvalidState;
             }
 
@@ -538,6 +561,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"CloseAccessPoint: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -547,6 +571,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             }
             else
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "CloseAccessPoint: Invalid state!");
                 return ResultCode.InvalidState;
             }
 
@@ -596,11 +621,13 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             bool isLocalCommunicationIdValid = CheckLocalCommunicationIdPermission(context, (ulong)networkConfig.IntentId.LocalCommunicationId);
             if (!isLocalCommunicationIdValid && NetworkClient.NeedsRealId)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "CreateNetworkImpl: Invalid object!");
                 return ResultCode.InvalidObject;
             }
 
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"CreateNetworkImpl: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -629,16 +656,22 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                                     AddressList addressList = MemoryMarshal.Cast<byte, AddressList>(addressListBytes)[0];
 
                                     _accessPoint.CreateNetworkPrivate(securityConfig, securityParameter, userConfig, networkConfig, addressList);
+                                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"CreateNetworkImpl: Created private network! " +
+                                        $"| securityConfig = {securityConfig} | securityParameter = {securityParameter} " +
+                                        $"| userConfig = {userConfig} | networkConfig = {networkConfig} | addressList = {addressList}");
                                 }
                                 else
                                 {
                                     _accessPoint.CreateNetwork(securityConfig, userConfig, networkConfig);
+                                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"CreateNetworkImpl: Created network! " +
+                                        $"| securityConfig = {securityConfig} | userConfig = {userConfig} | networkConfig = {networkConfig}");
                                 }
 
                                 return ResultCode.Success;
                             }
                             else
                             {
+                                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "CreateNetworkImpl: Invalid state!");
                                 return ResultCode.InvalidState;
                             }
                         }
@@ -660,6 +693,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"DestroyNetworkImpl: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -676,9 +710,11 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
                 CloseAccessPoint();
 
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "DestroyNetworkImpl: Invalid state!");
                 return ResultCode.InvalidState;
             }
 
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "DestroyNetworkImpl: Invalid argument!");
             return ResultCode.InvalidArgument;
         }
 
@@ -695,14 +731,17 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"RejectImpl: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             if (_state != NetworkState.AccessPointCreated)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "RejectImpl: Invalid state!");
                 return ResultCode.InvalidState; // Must be network host to reject nodes.
             }
 
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"RejectImpl: disconnectReason = {disconnectReason} | nodeId = {nodeId}");
             return NetworkClient.Reject(disconnectReason, nodeId);
         }
 
@@ -714,11 +753,13 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"SetAdvertiseData: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             if (bufferSize is 0 or > LdnConst.AdvertiseDataSizeMax)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "SetAdvertiseData: Invalid argument!");
                 return ResultCode.InvalidArgument;
             }
 
@@ -727,11 +768,12 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 byte[] advertiseData = new byte[bufferSize];
 
                 context.Memory.Read(bufferPosition, advertiseData);
-
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"SetAdvertiseData: advertiseData = {advertiseData}");
                 return _accessPoint.SetAdvertiseData(advertiseData);
             }
             else
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "SetAdvertiseData: Invalid state!");
                 return ResultCode.InvalidState;
             }
         }
@@ -744,20 +786,24 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"SetStationAcceptPolicy: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             if (acceptPolicy > AcceptPolicy.WhiteList)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "SetStationAcceptPolicy: Invalid argument!");
                 return ResultCode.InvalidArgument;
             }
 
             if (_state is NetworkState.AccessPoint or NetworkState.AccessPointCreated)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"SetStationAcceptPolicy: acceptPolicy = {acceptPolicy}");
                 return _accessPoint.SetStationAcceptPolicy(acceptPolicy);
             }
             else
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "SetStationAcceptPolicy: Invalid state!");
                 return ResultCode.InvalidState;
             }
         }
@@ -768,6 +814,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"AddAcceptFilterEntry: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -782,6 +829,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ClearAcceptFilter: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -796,11 +844,13 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"OpenStation: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
             if (_state != NetworkState.Initialized)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "OpenStation: Invalid state!");
                 return ResultCode.InvalidState;
             }
 
@@ -814,6 +864,8 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             // NOTE: Calls nifm service and returns related result codes.
             //       Since we use our own implementation we can return ResultCode.Success.
             
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"OpenStation: _station = {_station}");
+
             return ResultCode.Success;
         }
 
@@ -823,6 +875,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"CloseStation: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -832,11 +885,13 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             }
             else
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "CloseStation: Invalid state!");
                 return ResultCode.InvalidState;
             }
 
             SetState(NetworkState.Initialized);
             
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "CloseStation: Closed.");
             return ResultCode.Success;
         }
 
@@ -901,11 +956,13 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
             bool isLocalCommunicationIdValid = CheckLocalCommunicationIdPermission(context, (ulong)networkInfo.NetworkId.IntentId.LocalCommunicationId);
             if (!isLocalCommunicationIdValid && NetworkClient.NeedsRealId)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "ConnectImpl: Invalid object!");
                 return ResultCode.InvalidObject;
             }
 
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ConnectImpl: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -925,6 +982,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                         {
                             if (_state != NetworkState.Station)
                             {
+                                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "ConnectImpl: Invalid state!");
                                 resultCode = ResultCode.InvalidState;
                             }
                             else
@@ -932,10 +990,16 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                                 if (isPrivate)
                                 {
                                     resultCode = _station.ConnectPrivate(securityConfig, securityParameter, userConfig, localCommunicationVersion, optionUnknown, networkConfig);
+                                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ConnectImpl: Private connection established! " +
+                                        $"| securityConfig = {securityConfig} | securityParameter = {securityParameter} | userConfig = {userConfig} " +
+                                        $"| localCommunicationVersion = {localCommunicationVersion} | optionUnknown = {optionUnknown} | networkConfig = {networkConfig}");
                                 }
                                 else
                                 {
                                     resultCode = _station.Connect(securityConfig, userConfig, localCommunicationVersion, optionUnknown, networkInfo);
+                                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ConnectImpl: Connection established! " +
+                                        $"| securityConfig = {securityConfig} | userConfig = {userConfig} " +
+                                        $"| localCommunicationVersion = {localCommunicationVersion} | optionUnknown = {optionUnknown} | networkConfig = {networkConfig}");
                                 }
                             }
                         }
@@ -943,6 +1007,8 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 }
             }
 
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"ConnectImpl: resultCode = {resultCode}");
+
             return resultCode;
         }
 
@@ -957,6 +1023,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"DisconnectImpl: _nifmResultCode = {_nifmResultCode}");
                 return _nifmResultCode;
             }
 
@@ -970,14 +1037,17 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
 
                     _disconnectReason = disconnectReason;
 
+                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"DisconnectImpl: _disconnectReason = {_disconnectReason}");
                     return ResultCode.Success;
                 }
 
                 CloseStation();
 
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "DisconnectImpl: Invalid state!");
                 return ResultCode.InvalidState;
             }
 
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "DisconnectImpl: Invalid argument!");
             return ResultCode.InvalidArgument;
         }
 
@@ -994,6 +1064,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
         {
             if (_nifmResultCode != ResultCode.Success)
             {
+                Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"Finalize: _disconnectReason = {_disconnectReason}");
                 return _nifmResultCode;
             }
 
@@ -1010,11 +1081,13 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 _stateChangeEventHandle = 0;
             }
 
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"Finalize: resultCode = {resultCode}");
             return resultCode;
         }
 
         private ResultCode FinalizeImpl(bool isCausedBySystem)
         {
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, "FinalizeImpl");
             DisconnectReason disconnectReason;
 
             switch (_state)
@@ -1138,7 +1211,6 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                         NetworkClient.SetGameVersion(context.Device.Processes.ActiveApplication.ApplicationControlProperties.DisplayVersion);
 
                         resultCode = ResultCode.Success;
-
                         _nifmResultCode = resultCode;
 
                         SetState(NetworkState.Initialized);
@@ -1152,6 +1224,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 }
             }
 
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"InitializeImpl: resultCode = {resultCode}");
             return resultCode;
         }
 

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/LdnMasterProxyClient.cs

@@ -132,7 +132,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
 
         protected override void OnConnected()
         {
-            Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"LDN TCP client connected a new session with Id {Id}");
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"LDN TCP client connected a new session with Id {Id}");
 
             UpdatePassphraseIfNeeded();
 
@@ -141,7 +141,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
 
         protected override void OnDisconnected()
         {
-            Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"LDN TCP client disconnected a session with Id {Id}");
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"LDN TCP client disconnected a session with Id {Id}");
 
             _passphrase = null;
 
@@ -174,7 +174,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
 
         protected override void OnError(SocketError error)
         {
-            Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"LDN TCP client caught an error with code {error}");
+            Logger.NetLog?.PrintMsg(LogClass.ServiceLdn, $"LDN TCP client caught an error with code {error}");
 
             _error.Set();
         }
@@ -428,7 +428,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
                     }
                     else
                     {
-                        Logger.Info?.Print(LogClass.ServiceLdn, $"Created a wireless P2P network on port {request.ExternalProxyPort}.");
+                        Logger.NetLog?.Print(LogClass.ServiceLdn, $"Created a wireless P2P network on port {request.ExternalProxyPort}.");
                         _hostedProxy.Start();
 
                         (_, UnicastIPAddressInformation unicastAddress) = NetworkHelpers.GetLocalInterface();

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/Station.cs

@@ -1,3 +1,4 @@
+using Ryujinx.Common.Logging;
 using Ryujinx.Common.Memory;
 using Ryujinx.HLE.HOS.Services.Ldn.Types;
 using Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.Types;
@@ -36,10 +37,12 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
                 if (Connected)
                 {
                     _parent.SetState(NetworkState.StationConnected);
+                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,$"NetworkChanged: {NetworkInfo}");
                 }
                 else
                 {
                     _parent.SetDisconnectReason(e.DisconnectReasonOrDefault(DisconnectReason.DestroyedByUser));
+                    Logger.NetLog?.PrintMsg(LogClass.ServiceLdn,"NetworkChanged: Disconnected (DestroyedByUser)");
                 }
             }
             else

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -254,6 +254,7 @@ namespace Ryujinx.Headless
             Logger.SetEnable(LogLevel.Trace, option.LoggingEnableTrace);
             Logger.SetEnable(LogLevel.Guest, !option.LoggingDisableGuest);
             Logger.SetEnable(LogLevel.AccessLog, option.LoggingEnableFsAccessLog);
+            Logger.SetEnable(LogLevel.NetLog, option.LoggingEnableFsAccessLog);
 
             if (!option.DisableFileLog)
             {

src/Ryujinx/Headless/Options.cs

@@ -109,6 +109,9 @@ namespace Ryujinx.Headless
             if (NeedsOverride(nameof(LoggingEnableFsAccessLog)))
                 LoggingEnableFsAccessLog = configurationState.Logger.EnableFsAccessLog;
             
+            if (NeedsOverride(nameof(LoggingEnableNetLog)))
+                LoggingEnableNetLog = configurationState.Logger.EnableNetLog;
+
             if (NeedsOverride(nameof(LoggingGraphicsDebugLevel)))
                 LoggingGraphicsDebugLevel = configurationState.Logger.GraphicsDebugLevel;
 
@@ -371,6 +374,9 @@ namespace Ryujinx.Headless
         [Option("enable-fs-access-logs", Required = false, Default = false, HelpText = "Enables printing FS access log messages.")]
         public bool LoggingEnableFsAccessLog { get; set; }
         
+        [Option("enable-net-logs", Required = false, Default = false, HelpText = "Enables printing net log messages.")]
+        public bool LoggingEnableNetLog { get; set; }
+
         [Option("graphics-debug-level", Required = false, Default = GraphicsDebugLevel.None, HelpText = "Change Graphics API debug log level.")]
         public GraphicsDebugLevel LoggingGraphicsDebugLevel { get; set; }
 

src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.Ava.Systems.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 71;
+        public const int CurrentVersion = 72;
 
         /// <summary>
         /// Version of the configuration file format
@@ -114,6 +114,11 @@ namespace Ryujinx.Ava.Systems.Configuration
         /// </summary>
         public bool LoggingEnableFsAccessLog { get; set; }
         
+        /// <summary>
+        /// Enables printing network log messages
+        /// </summary>
+        public bool LoggingEnableNetLog { get; set; }
+
         /// <summary>
         /// Enables log messages from Avalonia
         /// </summary>

src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs

@@ -1,4 +1,4 @@
-using Avalonia.Media;
+    using Avalonia.Media;
 using Gommon;
 using Ryujinx.Ava.Systems.Configuration.System;
 using Ryujinx.Ava.Systems.Configuration.UI;
@@ -68,6 +68,7 @@ namespace Ryujinx.Ava.Systems.Configuration
             Logger.EnableTrace.Value = cff.LoggingEnableTrace;
             Logger.EnableGuest.Value = cff.LoggingEnableGuest;
             Logger.EnableFsAccessLog.Value = cff.LoggingEnableFsAccessLog;
+            Logger.EnableNetLog.Value = cff.LoggingEnableNetLog;
             Logger.FilteredClasses.Value = cff.LoggingFilteredClasses;
             Logger.GraphicsDebugLevel.Value = cff.LoggingGraphicsDebugLevel;
 

src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs

@@ -258,6 +258,11 @@ namespace Ryujinx.Ava.Systems.Configuration
             /// </summary>
             public ReactiveObject<bool> EnableFsAccessLog { get; private set; }
             
+            /// <summary>
+            /// Enables printing network log messages
+            /// </summary>
+            public ReactiveObject<bool> EnableNetLog { get; private set; }
+
             /// <summary>
             /// Enables log messages from Avalonia
             /// </summary>
@@ -289,6 +294,7 @@ namespace Ryujinx.Ava.Systems.Configuration
                 EnableTrace = new ReactiveObject<bool>();
                 EnableGuest = new ReactiveObject<bool>();
                 EnableFsAccessLog = new ReactiveObject<bool>();
+                EnableNetLog = new ReactiveObject<bool>();
                 EnableAvaloniaLog = new ReactiveObject<bool>();
                 FilteredClasses = new ReactiveObject<LogClass[]>();
                 EnableFileLog = new ReactiveObject<bool>();

src/Ryujinx/Systems/Configuration/ConfigurationState.cs

@@ -47,6 +47,7 @@ namespace Ryujinx.Ava.Systems.Configuration
                 LoggingEnableTrace = Logger.EnableTrace,
                 LoggingEnableGuest = Logger.EnableGuest,
                 LoggingEnableFsAccessLog = Logger.EnableFsAccessLog,
+                LoggingEnableNetLog = Logger.EnableNetLog,
                 LoggingEnableAvalonia = Logger.EnableAvaloniaLog,
                 LoggingFilteredClasses = Logger.FilteredClasses,
                 LoggingGraphicsDebugLevel = Logger.GraphicsDebugLevel,
@@ -176,6 +177,7 @@ namespace Ryujinx.Ava.Systems.Configuration
             Logger.EnableTrace.Value = false;
             Logger.EnableGuest.Value = true;
             Logger.EnableFsAccessLog.Value = false;
+            Logger.EnableNetLog.Value = false;
             Logger.EnableAvaloniaLog.Value = false;
             Logger.FilteredClasses.Value = [];
             Logger.GraphicsDebugLevel.Value = GraphicsDebugLevel.None;

src/Ryujinx/Systems/Configuration/LoggerModule.cs

@@ -26,6 +26,8 @@ namespace Ryujinx.Ava.Systems.Configuration
                 (_, e) => Logger.SetEnable(LogLevel.Guest, e.NewValue);
             ConfigurationState.Instance.Logger.EnableFsAccessLog.Event +=
                 (_, e) => Logger.SetEnable(LogLevel.AccessLog, e.NewValue);
+            ConfigurationState.Instance.Logger.EnableNetLog.Event +=
+                (_, e) => Logger.SetEnable(LogLevel.NetLog, e.NewValue);
 
             ConfigurationState.Instance.Logger.FilteredClasses.Event += (_, e) =>
             {

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -273,6 +273,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         public bool EnableTrace { get; set; }
         public bool EnableGuest { get; set; }
         public bool EnableFsAccessLog { get; set; }
+        public bool EnableNetLog { get; set; }
         public bool EnableAvaloniaLog { get; set; }
         public bool EnableDebug { get; set; }
         public bool IsOpenAlEnabled { get; set; }
@@ -725,6 +726,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             EnableGuest = config.Logger.EnableGuest;
             EnableDebug = config.Logger.EnableDebug;
             EnableFsAccessLog = config.Logger.EnableFsAccessLog;
+            EnableNetLog = config.Logger.EnableNetLog;
             EnableAvaloniaLog = config.Logger.EnableAvaloniaLog;
             FsGlobalAccessLogMode = config.System.FsGlobalAccessLogMode;
             OpenglDebugLevel = (int)config.Logger.GraphicsDebugLevel.Value;
@@ -848,6 +850,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.Logger.EnableGuest.Value = EnableGuest;
             config.Logger.EnableDebug.Value = EnableDebug;
             config.Logger.EnableFsAccessLog.Value = EnableFsAccessLog;
+            config.Logger.EnableNetLog.Value = EnableNetLog;
             config.Logger.EnableAvaloniaLog.Value = EnableAvaloniaLog;
             config.System.FsGlobalAccessLogMode.Value = FsGlobalAccessLogMode;
             config.Logger.GraphicsDebugLevel.Value = (GraphicsDebugLevel)OpenglDebugLevel;

src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml

@@ -70,6 +70,10 @@
                                 ToolTip.Tip="{ext:Locale FileAccessLogTooltip}">
                         <TextBlock Text="{ext:Locale SettingsTabLoggingEnableFsAccessLogs}" />
                         </CheckBox>
+                        <CheckBox IsChecked="{Binding EnableNetLog}"
+                                  ToolTip.Tip="{ext:Locale NetLogTooltip}">
+                            <TextBlock Text="{ext:Locale SettingsTabLoggingEnableNetLogs}" />
+                        </CheckBox>
                         <CheckBox IsChecked="{Binding EnableDebug}"
                                   ToolTip.Tip="{ext:Locale DebugLogTooltip}">
                             <TextBlock Text="{ext:Locale SettingsTabLoggingEnableDebugLogs}" />