mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-22 13:02:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve IpcParsedCommand domain message info. (#112)

Browse Source 
* Improve IpcParsedCommand domain message info.
This commit is contained in:
SciresM 2018-06-25 08:08:48 -07:00 committed by yellows8
parent c26e410ed8
commit 773ff46543
2 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
nx/include/switch/kernel/ipc.h
View File

@ -45,9 +45,24 @@ typedef enum {
IpcCommandType_Request = 4, IpcCommandType_Request = 4,
IpcCommandType_Control = 5, IpcCommandType_Control = 5,
IpcCommandType_RequestWithContext = 6, IpcCommandType_RequestWithContext = 6,
IpcCommandType_ControlWithContext = 7 IpcCommandType_ControlWithContext = 7,
} IpcCommandType; } IpcCommandType;
typedef enum {
DomainMessageType_Invalid = 0,
DomainMessageType_SendMessage = 1,
DomainMessageType_Close = 2,
} DomainMessageType;
/// IPC domain message header.
typedef struct {
u8 Type;
u8 NumObjectIds;
u16 Length;
u32 ThisObjectId;
u32 Pad[2];
} DomainMessageHeader;
typedef struct { typedef struct {
size_t NumSend; // A size_t NumSend; // A
size_t NumRecv; // B size_t NumRecv; // B
@ -348,6 +363,9 @@ typedef struct {
Handle Handles[IPC_MAX_OBJECTS]; ///< Handles. Handle Handles[IPC_MAX_OBJECTS]; ///< Handles.
bool WasHandleCopied[IPC_MAX_OBJECTS]; ///< true if the handle was moved, false if it was copied. bool WasHandleCopied[IPC_MAX_OBJECTS]; ///< true if the handle was moved, false if it was copied.
bool IsDomainMessage; ///< true if the the message is a Domain message.
DomainMessageType MessageType; ///< Type of the domain message.
u32 MessageLength; ///< Size of rawdata (for domain messages).
u32 ThisObjectId; ///< Object ID to call the command on (for domain messages). u32 ThisObjectId; ///< Object ID to call the command on (for domain messages).
size_t NumObjectIds; ///< Number of object IDs (for domain messages). size_t NumObjectIds; ///< Number of object IDs (for domain messages).
u32 ObjectIds[IPC_MAX_OBJECTS]; ///< Object IDs (for domain messages). u32 ObjectIds[IPC_MAX_OBJECTS]; ///< Object IDs (for domain messages).
@ -381,6 +399,8 @@ static inline Result ipcParse(IpcParsedCommand* r) {
u32 ctrl1 = *buf++; u32 ctrl1 = *buf++;
size_t i; size_t i;
r->IsDomainMessage = false;
r->CommandType = (IpcCommandType) (ctrl0 & 0xffff); r->CommandType = (IpcCommandType) (ctrl0 & 0xffff);
r->HasPid = false; r->HasPid = false;
r->RawSize = (ctrl1 & 0x1ff) * 4; r->RawSize = (ctrl1 & 0x1ff) * 4;
@ -570,15 +590,6 @@ static inline void ipcSendObjectId(IpcCommand* cmd, u32 object_id) {
cmd->ObjectIds[cmd->NumObjectIds++] = object_id; cmd->ObjectIds[cmd->NumObjectIds++] = object_id;
} }
/// IPC domain message header.
typedef struct {
u8 Type;
u8 NumObjectIds;
u16 Length;
u32 ThisObjectId;
u32 Pad[2];
} DomainMessageHeader;
/** /**
* @brief Prepares the header of an IPC command structure (domain version). * @brief Prepares the header of an IPC command structure (domain version).
* @param cmd IPC command structure. * @param cmd IPC command structure.
@ -591,7 +602,7 @@ static inline void* ipcPrepareHeaderForDomain(IpcCommand* cmd, size_t sizeof_raw
DomainMessageHeader* hdr = (DomainMessageHeader*) raw; DomainMessageHeader* hdr = (DomainMessageHeader*) raw;
u32 *object_ids = (u32*)(((uintptr_t) raw) + sizeof(DomainMessageHeader) + sizeof_raw); u32 *object_ids = (u32*)(((uintptr_t) raw) + sizeof(DomainMessageHeader) + sizeof_raw);
hdr->Type = 1; hdr->Type = DomainMessageType_SendMessage;
hdr->NumObjectIds = (u8)cmd->NumObjectIds; hdr->NumObjectIds = (u8)cmd->NumObjectIds;
hdr->Length = sizeof_raw; hdr->Length = sizeof_raw;
hdr->ThisObjectId = object_id; hdr->ThisObjectId = object_id;
@ -618,8 +629,20 @@ static inline Result ipcParseForDomain(IpcParsedCommand* r) {
object_ids = (u32*)(((uintptr_t) hdr) + sizeof(DomainMessageHeader) + hdr->Length); object_ids = (u32*)(((uintptr_t) hdr) + sizeof(DomainMessageHeader) + hdr->Length);
r->Raw = (void*)(((uintptr_t) r->Raw) + sizeof(DomainMessageHeader)); r->Raw = (void*)(((uintptr_t) r->Raw) + sizeof(DomainMessageHeader));
r->IsDomainMessage = true;
r->MessageType = (DomainMessageType)(hdr->Type);
switch (r->MessageType) {
case DomainMessageType_SendMessage:
case DomainMessageType_Close:
break;
default:
return MAKERESULT(Module_Libnx, LibnxError_DomainMessageUnknownType);
}
r->ThisObjectId = hdr->ThisObjectId; r->ThisObjectId = hdr->ThisObjectId;
r->NumObjectIds = hdr->NumObjectIds > 8 ? 8 : hdr->NumObjectIds; r->NumObjectIds = hdr->NumObjectIds > 8 ? 8 : hdr->NumObjectIds;
if ((uintptr_t)object_ids + sizeof(u32) * r->NumObjectIds - (uintptr_t)armGetTls() >= 0x100) {
return MAKERESULT(Module_Libnx, LibnxError_DomainMessageTooManyObjectIds);
}
for(size_t i = 0; i < r->NumObjectIds; i++) for(size_t i = 0; i < r->NumObjectIds; i++)
r->ObjectIds[i] = object_ids[i]; r->ObjectIds[i] = object_ids[i];

2
nx/include/switch/result.h
View File

@ -72,6 +72,8 @@ enum {
LibnxError_IncompatSysVer, LibnxError_IncompatSysVer,
LibnxError_InitFail_Time, LibnxError_InitFail_Time,
LibnxError_TooManyDevOpTabs, LibnxError_TooManyDevOpTabs,
LibnxError_DomainMessageUnknownType,
LibnxError_DomainMessageTooManyObjectIds,
}; };
/// libnx nvidia error codes /// libnx nvidia error codes