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

Corrections #1

Browse source
This commit is contained in:
AcK77 2018-03-12 01:36:02 +01:00
commit 386266de86
1 changed files with 104 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

108
Ryujinx.Core/OsHle/Services/Bsd/ServiceBsd.cs
View file

@ -10,7 +10,38 @@ using System.Threading.Tasks;
namespace Ryujinx.Core.OsHle.IpcServices.Bsd namespace Ryujinx.Core.OsHle.IpcServices.Bsd
{ {
class SocketBSD
//bsd_errno == (SocketException.ErrorCode - 10000)
//https://github.com/freebsd/freebsd/blob/master/sys/sys/errno.h
public enum BsdError
{
ENOTSOCK = 38, /* Socket operation on non-socket */
EDESTADDRREQ = 39, /* Destination address required */
EMSGSIZE = 40, /* Message too long */
EPROTOTYPE = 41, /* Protocol wrong type for socket */
ENOPROTOOPT = 42, /* Protocol not available */
EPROTONOSUPPORT = 43, /* Protocol not supported */
ESOCKTNOSUPPORT = 44, /* Socket type not supported */
EOPNOTSUPP = 45, /* Operation not supported */
EPFNOSUPPORT = 46, /* Protocol family not supported */
EAFNOSUPPORT = 47, /* Address family not supported by protocol family */
EADDRINUSE = 48, /* Address already in use */
EADDRNOTAVAIL = 49, /* Can't assign requested address */
ENETDOWN = 50, /* Network is down */
ENETUNREACH = 51, /* Network is unreachable */
ENETRESET = 52, /* Network dropped connection on reset */
ECONNABORTED = 53, /* Software caused connection abort */
ECONNRESET = 54, /* Connection reset by peer */
ENOBUFS = 55, /* No buffer space available */
EISCONN = 56, /* Socket is already connected */
ENOTCONN = 57, /* Socket is not connected */
ESHUTDOWN = 58, /* Can't send after socket shutdown */
ETOOMANYREFS = 59, /* Too many references: can't splice */
ETIMEDOUT = 60, /* Operation timed out */
ECONNREFUSED = 61, /* Connection refused */
}
class SocketBsd
{ {
public int Family; public int Family;
public int Type; public int Type;
@ -20,14 +51,13 @@ namespace Ryujinx.Core.OsHle.IpcServices.Bsd
public Socket Handle; public Socket Handle;
} }
//bsd_errno == (SocketException.ErrorCode - 10000)
class ServiceBsd : IIpcService class ServiceBsd : IIpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
private List<SocketBSD> Sockets = new List<SocketBSD>(); private List<SocketBsd> Sockets = new List<SocketBsd>();
public ServiceBsd() public ServiceBsd()
{ {
@ -88,7 +118,7 @@ namespace Ryujinx.Core.OsHle.IpcServices.Bsd
//(u32 domain, u32 type, u32 protocol) -> (i32 ret, u32 bsd_errno) //(u32 domain, u32 type, u32 protocol) -> (i32 ret, u32 bsd_errno)
public long Socket(ServiceCtx Context) public long Socket(ServiceCtx Context)
{ {
SocketBSD NewBSDSocket = new SocketBSD SocketBsd NewBSDSocket = new SocketBsd
{ {
Family = Context.RequestData.ReadInt32(), Family = Context.RequestData.ReadInt32(),
Type = Context.RequestData.ReadInt32(), Type = Context.RequestData.ReadInt32(),
@ -119,10 +149,12 @@ namespace Ryujinx.Core.OsHle.IpcServices.Bsd
//https://github.com/TuxSH/ftpd/blob/switch_pr/source/ftp.c#L1634 //https://github.com/TuxSH/ftpd/blob/switch_pr/source/ftp.c#L1634
//https://linux.die.net/man/2/poll //https://linux.die.net/man/2/poll
byte[] SendedBuffer = AMemoryHelper.ReadBytes(Context.Memory, Context.Request.SendBuff[0].Position, (int)Context.Request.SendBuff[0].Size); byte[] SentBuffer = AMemoryHelper.ReadBytes(Context.Memory,
int SocketId = BitConverter.ToInt32(SendedBuffer, 0); Context.Request.SendBuff[0].Position,
short RequestedEvents = BitConverter.ToInt16(SendedBuffer, 4); (int)Context.Request.SendBuff[0].Size);
short ReturnedEvents = BitConverter.ToInt16(SendedBuffer, 6); int SocketId = Get32(SentBuffer, 0);
short RequestedEvents = (short)Get16(SentBuffer, 4);
short ReturnedEvents = (short)Get16(SentBuffer, 6);
//Todo: Stub - Need to implemented the Type-22 buffer. //Todo: Stub - Need to implemented the Type-22 buffer.
@ -139,7 +171,6 @@ namespace Ryujinx.Core.OsHle.IpcServices.Bsd
{ {
int SocketId = Context.RequestData.ReadInt32(); int SocketId = Context.RequestData.ReadInt32();
int SocketFlags = Context.RequestData.ReadInt32(); int SocketFlags = Context.RequestData.ReadInt32();
byte[] ReceivedBuffer = new byte[Context.Request.ReceiveBuff[0].Size]; byte[] ReceivedBuffer = new byte[Context.Request.ReceiveBuff[0].Size];
int ReadedBytes = Sockets[SocketId].Handle.Receive(ReceivedBuffer); int ReadedBytes = Sockets[SocketId].Handle.Receive(ReceivedBuffer);
@ -164,14 +195,15 @@ namespace Ryujinx.Core.OsHle.IpcServices.Bsd
{ {
int SocketId = Context.RequestData.ReadInt32(); int SocketId = Context.RequestData.ReadInt32();
int SocketFlags = Context.RequestData.ReadInt32(); int SocketFlags = Context.RequestData.ReadInt32();
byte[] SentBuffer = AMemoryHelper.ReadBytes(Context.Memory,
byte[] SendedBuffer = AMemoryHelper.ReadBytes(Context.Memory, Context.Request.SendBuff[0].Position, (int)Context.Request.SendBuff[0].Size); Context.Request.SendBuff[0].Position,
(int)Context.Request.SendBuff[0].Size);
try try
{ {
//Logging.Debug("Sended Buffer:" + Environment.NewLine + Logging.HexDump(SendedBuffer)); //Logging.Debug("Sended Buffer:" + Environment.NewLine + Logging.HexDump(SendedBuffer));
int BytesSent = Sockets[SocketId].Handle.Send(SendedBuffer); int BytesSent = Sockets[SocketId].Handle.Send(SentBuffer);
Context.ResponseData.Write(BytesSent); Context.ResponseData.Write(BytesSent);
Context.ResponseData.Write(0); Context.ResponseData.Write(0);
@ -190,8 +222,12 @@ namespace Ryujinx.Core.OsHle.IpcServices.Bsd
{ {
int SocketId = Context.RequestData.ReadInt32(); int SocketId = Context.RequestData.ReadInt32();
int SocketFlags = Context.RequestData.ReadInt32(); int SocketFlags = Context.RequestData.ReadInt32();
byte[] SendedBuffer = AMemoryHelper.ReadBytes(Context.Memory, Context.Request.SendBuff[0].Position, (int)Context.Request.SendBuff[0].Size); byte[] SentBuffer = AMemoryHelper.ReadBytes(Context.Memory,
byte[] AddressBuffer = AMemoryHelper.ReadBytes(Context.Memory, Context.Request.SendBuff[1].Position, (int)Context.Request.SendBuff[1].Size); Context.Request.SendBuff[0].Position,
(int)Context.Request.SendBuff[0].Size);
byte[] AddressBuffer = AMemoryHelper.ReadBytes(Context.Memory,
Context.Request.SendBuff[1].Position,
(int)Context.Request.SendBuff[1].Size);
if (!Sockets[SocketId].Handle.Connected) if (!Sockets[SocketId].Handle.Connected)
{ {
@ -212,7 +248,7 @@ namespace Ryujinx.Core.OsHle.IpcServices.Bsd
{ {
//Logging.Debug("Sended Buffer:" + Environment.NewLine + Logging.HexDump(SendedBuffer)); //Logging.Debug("Sended Buffer:" + Environment.NewLine + Logging.HexDump(SendedBuffer));
int BytesSent = Sockets[SocketId].Handle.Send(SendedBuffer); int BytesSent = Sockets[SocketId].Handle.Send(SentBuffer);
Context.ResponseData.Write(BytesSent); Context.ResponseData.Write(BytesSent);
Context.ResponseData.Write(0); Context.ResponseData.Write(0);
@ -251,7 +287,7 @@ namespace Ryujinx.Core.OsHle.IpcServices.Bsd
if (HandleAccept != null) if (HandleAccept != null)
{ {
SocketBSD NewBSDSocket = new SocketBSD SocketBsd NewBSDSocket = new SocketBsd
{ {
IpAddress = ((IPEndPoint)Sockets[SocketId].Handle.LocalEndPoint).Address, IpAddress = ((IPEndPoint)Sockets[SocketId].Handle.LocalEndPoint).Address,
RemoteEP = ((IPEndPoint)Sockets[SocketId].Handle.LocalEndPoint), RemoteEP = ((IPEndPoint)Sockets[SocketId].Handle.LocalEndPoint),
@ -275,16 +311,16 @@ namespace Ryujinx.Core.OsHle.IpcServices.Bsd
Writer.Write(byte.Parse(IpAdress[3])); Writer.Write(byte.Parse(IpAdress[3]));
AMemoryHelper.WriteBytes(Context.Memory, AddrBufferPtr, MS.ToArray()); AMemoryHelper.WriteBytes(Context.Memory, AddrBufferPtr, MS.ToArray());
}
Context.ResponseData.Write(Sockets.Count - 1); Context.ResponseData.Write(Sockets.Count - 1);
Context.ResponseData.Write(0); Context.ResponseData.Write(0);
Context.ResponseData.Write(8); //Size of MS. Context.ResponseData.Write(MS.Length);
}
} }
else else
{ {
Context.ResponseData.Write(-1); Context.ResponseData.Write(-1);
Context.ResponseData.Write(60); //ETIMEDOUT Context.ResponseData.Write((int)BsdError.ETIMEDOUT);
} }
return 0; return 0;
@ -295,7 +331,9 @@ namespace Ryujinx.Core.OsHle.IpcServices.Bsd
{ {
int SocketId = Context.RequestData.ReadInt32(); int SocketId = Context.RequestData.ReadInt32();
byte[] AddressBuffer = AMemoryHelper.ReadBytes(Context.Memory, Context.Request.SendBuff[0].Position, (int)Context.Request.SendBuff[0].Size); byte[] AddressBuffer = AMemoryHelper.ReadBytes(Context.Memory,
Context.Request.SendBuff[0].Position,
(int)Context.Request.SendBuff[0].Size);
try try
{ {
@ -318,7 +356,9 @@ namespace Ryujinx.Core.OsHle.IpcServices.Bsd
{ {
int SocketId = Context.RequestData.ReadInt32(); int SocketId = Context.RequestData.ReadInt32();
byte[] AddressBuffer = AMemoryHelper.ReadBytes(Context.Memory, Context.Request.SendBuff[0].Position, (int)Context.Request.SendBuff[0].Size); byte[] AddressBuffer = AMemoryHelper.ReadBytes(Context.Memory,
Context.Request.SendBuff[0].Position,
(int)Context.Request.SendBuff[0].Size);
try try
{ {
@ -368,11 +408,15 @@ namespace Ryujinx.Core.OsHle.IpcServices.Bsd
int SocketLevel = Context.RequestData.ReadInt32(); int SocketLevel = Context.RequestData.ReadInt32();
int SocketOptionName = Context.RequestData.ReadInt32(); int SocketOptionName = Context.RequestData.ReadInt32();
byte[] SocketOptionValue = AMemoryHelper.ReadBytes(Context.Memory, Context.Request.PtrBuff[0].Position, (int)Context.Request.PtrBuff[0].Size); byte[] SocketOptionValue = AMemoryHelper.ReadBytes(Context.Memory,
Context.Request.PtrBuff[0].Position,
Context.Request.PtrBuff[0].Size);
try try
{ {
Sockets[SocketId].Handle.SetSocketOption((SocketOptionLevel)SocketLevel, (SocketOptionName)SocketOptionName, BitConverter.ToInt32(SocketOptionValue, 0)); Sockets[SocketId].Handle.SetSocketOption((SocketOptionLevel)SocketLevel,
(SocketOptionName)SocketOptionName,
Get32(SocketOptionValue, 0));
Context.ResponseData.Write(0); Context.ResponseData.Write(0);
Context.ResponseData.Write(0); Context.ResponseData.Write(0);
@ -394,7 +438,7 @@ namespace Ryujinx.Core.OsHle.IpcServices.Bsd
try try
{ {
Sockets[SocketId].Handle.Close(); Sockets[SocketId].Handle.Close();
Sockets[SocketId] = null; //Don't Remove() because other Sockets will change of Id. Sockets[SocketId] = null;
Context.ResponseData.Write(0); Context.ResponseData.Write(0);
Context.ResponseData.Write(0); Context.ResponseData.Write(0);
@ -428,5 +472,21 @@ namespace Ryujinx.Core.OsHle.IpcServices.Bsd
Sockets[SocketId].RemoteEP = new IPEndPoint(Sockets[SocketId].IpAddress, Port); Sockets[SocketId].RemoteEP = new IPEndPoint(Sockets[SocketId].IpAddress, Port);
} }
} }
private int Get16(byte[] Data, int Address)
{
return
Data[Address + 0] << 0 |
Data[Address + 1] << 8;
}
private int Get32(byte[] Data, int Address)
{
return
Data[Address + 0] << 0 |
Data[Address + 1] << 8 |
Data[Address + 2] << 16 |
Data[Address + 3] << 24;
}
} }
} }