Mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sfdnsres: Implement NSD resolution (#2962)

Browse source 
This fix a missing implementation usage of NSD on IResolver when
requested on GetAddrInfoRequest* and GetHostByNameRequest*.
This commit is contained in:
Mary 2022-01-03 22:12:50 +01:00 • committed by GitHub
parent e24be5edfc
commit 60f03cb78a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Ryujinx.HLE/HOS/Services/Sockets/Nsd/Manager/FqdnResolver.cs
View file

@ -6,16 +6,9 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd.Manager
{
private const string _dummyAddress = "unknown.dummy.nintendo.net";
private NsdSettings _nsdSettings;
public FqdnResolver(NsdSettings nsdSettings)
{
_nsdSettings = nsdSettings;
}
public ResultCode GetEnvironmentIdentifier(out string identifier)
{
if (_nsdSettings.TestMode)
if (IManager.NsdSettings.TestMode)
{
identifier = "err";
@ -23,13 +16,13 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd.Manager
}
else
{
identifier = _nsdSettings.Environment;
identifier = IManager.NsdSettings.Environment;
}
return ResultCode.Success;
}
public ResultCode Resolve(ServiceCtx context, string address, out string resolvedAddress)
public static ResultCode Resolve(string address, out string resolvedAddress)
{
if (address == "api.sect.srv.nintendo.net" ||
address == "ctest.cdn.nintendo.net" ||
@ -41,16 +34,16 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd.Manager
else
{
// TODO: Load Environment from the savedata.
address = address.Replace("%", _nsdSettings.Environment);
address = address.Replace("%", IManager.NsdSettings.Environment);
resolvedAddress = "";
if (_nsdSettings == null)
if (IManager.NsdSettings == null)
{
return ResultCode.SettingsNotInitialized;
}
if (!_nsdSettings.Initialized)
if (!IManager.NsdSettings.Initialized)
{
return ResultCode.SettingsNotLoaded;
}
@ -84,14 +77,14 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd.Manager
string address = Encoding.UTF8.GetString(addressBuffer).TrimEnd('\0');
resultCode = Resolve(context, address, out resolvedAddress);
resultCode = Resolve(address, out resolvedAddress);
if (resultCode != ResultCode.Success)
{
resolvedAddress = _dummyAddress;
}
if (_nsdSettings.TestMode)
if (IManager.NsdSettings.TestMode)
{
return ResultCode.Success;
}