53bd4c9f60
* Impl first attempt to LDN * Make this work. - Endianness swap on all IPs. - Use local network IP for connections, rather than 127.0.0.1. This is to be changed when tunnelling or whatever. - Mac addresses are now randomly assigned on the server. (fixes joining lobbies) - Fixed the "connected" handler for stations to actually find a - Added info retrieval when connected to a station. - Users that disconnect are now removed from rooms they were in. (still need to broadcast tho) - The communication service does a bit better with being closed now. - Some locking around the game instance dictionary. * We may just be "initialized". Ignore this for now. * Lots of WIP * Add Disconnect packet * Improve signalling of internal events. * Fix scan. * Fix some more stupid things. * Enable NoDelay on all sockets. * Add station accept policy, disconnect function. * Limit max number of games. * Split out networking stuff from HLE, so it can be swapped. * Update logging calls. * Missed a spot. * Call SignalDisconnect instead of SetState * Add comment to GetNetworkInfo * Update configuration + UI Now has its own tab, more options. * Refactoring IUserLocalCommunicationService ( Expected new issues :'( ) * some cleanup * More fix * Correctly handle errors when connecting. * Disable *Private call and clean symbols * Structs cleanup * Big cleanup * Fix InvalidHandle (in MK8D and other games) * Add Reject and Private Network support (v1) RyuLdn Version bumped to 1. * Add Initialize Packet Allows users to keep Mac Addresses assigned by the server. * Add SetWirelessControllerRestriction and some cleanup * LDN-2 Initial Rebase Make this work. - Endianness swap on all IPs. - Use local network IP for connections, rather than 127.0.0.1. This is to be changed when tunnelling or whatever. - Fixed the "connected" handler for stations to actually find a - The communication service does a bit better with being closed now. - Some locking around the game instance dictionary. We may just be "initialized". Ignore this for now. Lots of WIP Implement scan filter. Improve signalling of internal events. Fix scan. Fix 0 width data, scan reply end delay removed. Fix some more stupid things. Enable NoDelay on all sockets. Add station accept policy, disconnect function. Limit max number of games. Split out networking stuff from HLE, so it can be swapped. Update logging calls. Missed a spot. SetAdvertiseData when open, don't return games that have accept policy 1 Update configuration + UI Now has its own tab, more options. Don't Keepalive, it causes problems. Refactoring IUserLocalCommunicationService ( Expected new issues :'( ) some cleanup More fix Correctly handle errors when connecting. Disable *Private call and clean symbols Structs cleanup Big cleanup Fix InvalidHandle (in MK8D and other games) Add Reject and Private Network support (v1) Disable TcpNoDelay option on linux. Add SetWirelessControllerRestriction and some cleanup Misc cleanup, implement broadcast flag. * Misc Changes * Fix GetNetworkInfo * Fix some small issues * Implement GetNetworkInfoLatestUpdate * Hotfix when LocalCommunicationId = 0xFFFFFFFFFFFFFFFF * Fix ARMS Scan (and other games using wrong LocalCommunicationId * Fix latest update when host leaves * Revert "Fix ARMS Scan (and other games using wrong LocalCommunicationId" This reverts commit 519c283d3993e2fdfafb8ac6b4e0a98231f6fb75. * Fix the localCommunicationId = -1 * Don't set Connect flag for nodes already in the room before joining. * Make IUserLocalCommunicationService disposable * Don't dispose if there's no client. * LDN-2-2 Rebase Make this work. - Endianness swap on all IPs. - Use local network IP for connections, rather than 127.0.0.1. This is to be changed when tunnelling or whatever. - Fixed the "connected" handler for stations to actually find a - The communication service does a bit better with being closed now. - Some locking around the game instance dictionary. We may just be "initialized". Ignore this for now. Put sockets behind an interface, so that they can be swapped for something proxyable Lots of WIP Implement scan filter. Improve signalling of internal events. Fix scan. Fix 0 width data, scan reply end delay removed. Fix some more stupid things. Enable NoDelay on all sockets. Add station accept policy, disconnect function. Limit max number of games. Split out networking stuff from HLE, so it can be swapped. Update logging calls. Missed a spot. SetAdvertiseData when open, don't return games that have accept policy 1 Update configuration + UI Now has its own tab, more options. Don't Keepalive, it causes problems. Refactoring IUserLocalCommunicationService ( Expected new issues :'( ) some cleanup More fix Correctly handle errors when connecting. Disable *Private call and clean symbols Structs cleanup Big cleanup Fix InvalidHandle (in MK8D and other games) Add Reject and Private Network support (v1) Disable TcpNoDelay option on linux. Add SetWirelessControllerRestriction and some cleanup Misc cleanup, implement broadcast flag. Misc Changes Fix GetNetworkInfo Fix some small issues Disable LAN by default til the config is added. Fix Splatoon 2 - Stub nfp IUser::StartDetection / IUser::StopDetection. - Stub ntc IEnsureNetworkClockAvailabilityService and needed calls. Cleanup previous fixes Stub IAudioInManager/IAudioIn for Splatoon 2 LAN Add LAN settings to multiplayer tab LAN Play > LAN Mode Implement GetNetworkInfoLatestUpdate Hotfix when LocalCommunicationId = 0xFFFFFFFFFFFFFFFF Fix ARMS Scan (and other games using wrong LocalCommunicationId Fix latest update when host leaves Revert "Fix ARMS Scan (and other games using wrong LocalCommunicationId" This reverts commit 519c283d3993e2fdfafb8ac6b4e0a98231f6fb75. Fix the localCommunicationId = -1 Don't set Connect flag for nodes already in the room before joining. Make IUserLocalCommunicationService disposable Fix crash when using LAN mode on linux. Actually use that call Don't dispose if there's no client. Fix the settings window crash Fix configurationFileUpdated * Make LDN compatible with Ryujinx/Ryujinx#3805 * Ava: Add Ldn options to SettingsNetworkTab * Ava: Add update events for multiplayer options * Apply formatting * Remove LdnHelper * ldn: Fix hardcoded /24 subnet mask * Fix naming rule violations * Add missing summary doc tag * Remove NetCoreServer dependency * Address code style issues and typos Co-authored-by: gdkchan <gab.dark.100@gmail.com> * Call CloseStation/CloseAccessPoint to reduce code duplication * Fix typo Co-authored-by: gdkchan <gab.dark.100@gmail.com> * Fix missing trailing commas * Extract AddressList from AddressEntry * Use AcceptPolicy as a type for LdnNetworkInfo.StationAcceptPolicy * Add Flags attribute to ScanFilterFlag * Rename struct members for LdnNetworkInfo * Remove extra line Co-authored-by: Ac_K <Acoustik666@gmail.com> * Extract NetworkErrorMessage from NetworkError * Fix missing trailing commas --------- Co-authored-by: Ac_K <Acoustik666@gmail.com> Co-authored-by: riperiperi <rhy3756547@hotmail.com> Co-authored-by: gdkchan <gab.dark.100@gmail.com>
227 lines
9.4 KiB
C#
227 lines
9.4 KiB
C#
using LibHac.Tools.FsSystem;
|
|
using Ryujinx.Audio.Integration;
|
|
using Ryujinx.Common.Configuration;
|
|
using Ryujinx.Common.Configuration.Multiplayer;
|
|
using Ryujinx.Graphics.GAL;
|
|
using Ryujinx.HLE.FileSystem;
|
|
using Ryujinx.HLE.HOS;
|
|
using Ryujinx.HLE.HOS.Services.Account.Acc;
|
|
using Ryujinx.HLE.HOS.SystemState;
|
|
using Ryujinx.HLE.Ui;
|
|
using System;
|
|
|
|
namespace Ryujinx.HLE
|
|
{
|
|
/// <summary>
|
|
/// HLE configuration.
|
|
/// </summary>
|
|
public class HLEConfiguration
|
|
{
|
|
/// <summary>
|
|
/// The virtual file system used by the FS service.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly VirtualFileSystem VirtualFileSystem;
|
|
|
|
/// <summary>
|
|
/// The manager for handling a LibHac Horizon instance.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly LibHacHorizonManager LibHacHorizonManager;
|
|
|
|
/// <summary>
|
|
/// The account manager used by the account service.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly AccountManager AccountManager;
|
|
|
|
/// <summary>
|
|
/// The content manager used by the NCM service.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly ContentManager ContentManager;
|
|
|
|
/// <summary>
|
|
/// The persistent information between run for multi-application capabilities.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
public readonly UserChannelPersistence UserChannelPersistence;
|
|
|
|
/// <summary>
|
|
/// The GPU renderer to use for all GPU operations.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly IRenderer GpuRenderer;
|
|
|
|
/// <summary>
|
|
/// The audio device driver to use for all audio operations.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly IHardwareDeviceDriver AudioDeviceDriver;
|
|
|
|
/// <summary>
|
|
/// The handler for various UI related operations needed outside of HLE.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly IHostUiHandler HostUiHandler;
|
|
|
|
/// <summary>
|
|
/// Control the memory configuration used by the emulation context.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly MemoryConfiguration MemoryConfiguration;
|
|
|
|
/// <summary>
|
|
/// The system language to use in the settings service.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly SystemLanguage SystemLanguage;
|
|
|
|
/// <summary>
|
|
/// The system region to use in the settings service.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly RegionCode Region;
|
|
|
|
/// <summary>
|
|
/// Control the initial state of the vertical sync in the SurfaceFlinger service.
|
|
/// </summary>
|
|
internal readonly bool EnableVsync;
|
|
|
|
/// <summary>
|
|
/// Control the initial state of the docked mode.
|
|
/// </summary>
|
|
internal readonly bool EnableDockedMode;
|
|
|
|
/// <summary>
|
|
/// Control if the Profiled Translation Cache (PTC) should be used.
|
|
/// </summary>
|
|
internal readonly bool EnablePtc;
|
|
|
|
/// <summary>
|
|
/// Control if the guest application should be told that there is a Internet connection available.
|
|
/// </summary>
|
|
internal readonly bool EnableInternetAccess;
|
|
|
|
/// <summary>
|
|
/// Control LibHac's integrity check level.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly IntegrityCheckLevel FsIntegrityCheckLevel;
|
|
|
|
/// <summary>
|
|
/// Control LibHac's global access logging level. Value must be between 0 and 3.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly int FsGlobalAccessLogMode;
|
|
|
|
/// <summary>
|
|
/// The system time offset to apply to the time service steady and local clocks.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly long SystemTimeOffset;
|
|
|
|
/// <summary>
|
|
/// The system timezone used by the time service.
|
|
/// </summary>
|
|
/// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
|
|
internal readonly string TimeZone;
|
|
|
|
/// <summary>
|
|
/// Type of the memory manager used on CPU emulation.
|
|
/// </summary>
|
|
public MemoryManagerMode MemoryManagerMode { internal get; set; }
|
|
|
|
/// <summary>
|
|
/// Control the initial state of the ignore missing services setting.
|
|
/// If this is set to true, when a missing service is encountered, it will try to automatically handle it instead of throwing an exception.
|
|
/// </summary>
|
|
/// TODO: Update this again.
|
|
public bool IgnoreMissingServices { internal get; set; }
|
|
|
|
/// <summary>
|
|
/// Aspect Ratio applied to the renderer window by the SurfaceFlinger service.
|
|
/// </summary>
|
|
public AspectRatio AspectRatio { get; set; }
|
|
|
|
/// <summary>
|
|
/// The audio volume level.
|
|
/// </summary>
|
|
public float AudioVolume { get; set; }
|
|
|
|
/// <summary>
|
|
/// Use Hypervisor over JIT if available.
|
|
/// </summary>
|
|
internal readonly bool UseHypervisor;
|
|
|
|
/// <summary>
|
|
/// Multiplayer LAN Interface ID (device GUID)
|
|
/// </summary>
|
|
public string MultiplayerLanInterfaceId { internal get; set; }
|
|
|
|
/// <summary>
|
|
/// Multiplayer Mode
|
|
/// </summary>
|
|
public MultiplayerMode MultiplayerMode { internal get; set; }
|
|
|
|
/// <summary>
|
|
/// An action called when HLE force a refresh of output after docked mode changed.
|
|
/// </summary>
|
|
public Action RefreshInputConfig { internal get; set; }
|
|
|
|
public HLEConfiguration(VirtualFileSystem virtualFileSystem,
|
|
LibHacHorizonManager libHacHorizonManager,
|
|
ContentManager contentManager,
|
|
AccountManager accountManager,
|
|
UserChannelPersistence userChannelPersistence,
|
|
IRenderer gpuRenderer,
|
|
IHardwareDeviceDriver audioDeviceDriver,
|
|
MemoryConfiguration memoryConfiguration,
|
|
IHostUiHandler hostUiHandler,
|
|
SystemLanguage systemLanguage,
|
|
RegionCode region,
|
|
bool enableVsync,
|
|
bool enableDockedMode,
|
|
bool enablePtc,
|
|
bool enableInternetAccess,
|
|
IntegrityCheckLevel fsIntegrityCheckLevel,
|
|
int fsGlobalAccessLogMode,
|
|
long systemTimeOffset,
|
|
string timeZone,
|
|
MemoryManagerMode memoryManagerMode,
|
|
bool ignoreMissingServices,
|
|
AspectRatio aspectRatio,
|
|
float audioVolume,
|
|
bool useHypervisor,
|
|
string multiplayerLanInterfaceId,
|
|
MultiplayerMode multiplayerMode)
|
|
{
|
|
VirtualFileSystem = virtualFileSystem;
|
|
LibHacHorizonManager = libHacHorizonManager;
|
|
AccountManager = accountManager;
|
|
ContentManager = contentManager;
|
|
UserChannelPersistence = userChannelPersistence;
|
|
GpuRenderer = gpuRenderer;
|
|
AudioDeviceDriver = audioDeviceDriver;
|
|
MemoryConfiguration = memoryConfiguration;
|
|
HostUiHandler = hostUiHandler;
|
|
SystemLanguage = systemLanguage;
|
|
Region = region;
|
|
EnableVsync = enableVsync;
|
|
EnableDockedMode = enableDockedMode;
|
|
EnablePtc = enablePtc;
|
|
EnableInternetAccess = enableInternetAccess;
|
|
FsIntegrityCheckLevel = fsIntegrityCheckLevel;
|
|
FsGlobalAccessLogMode = fsGlobalAccessLogMode;
|
|
SystemTimeOffset = systemTimeOffset;
|
|
TimeZone = timeZone;
|
|
MemoryManagerMode = memoryManagerMode;
|
|
IgnoreMissingServices = ignoreMissingServices;
|
|
AspectRatio = aspectRatio;
|
|
AudioVolume = audioVolume;
|
|
UseHypervisor = useHypervisor;
|
|
MultiplayerLanInterfaceId = multiplayerLanInterfaceId;
|
|
MultiplayerMode = multiplayerMode;
|
|
}
|
|
}
|
|
}
|