OpenPunk/citra
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use IPC:MakeHeader instead of hardcoded raw values for IPC command tables. (#6453)

Browse Source 
* Use IPC:MakeHeader instead of hardcoded values for IPC command tables.

* Use u32 instead of unsigned int in MakeHeader function

Co-authored-by: SachinVin <26602104+SachinVin@users.noreply.github.com>

* Fix clang format

---------

Co-authored-by: SachinVin <26602104+SachinVin@users.noreply.github.com>
This commit is contained in:
PabloMK7
2023-04-28 07:31:03 +02:00
committed by GitHub
parent 9bd8c9290b
commit 63bc0b59bb
74 changed files with 1983 additions and 1896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/core/hle/service/http_c.cpp
View File

@@ -868,62 +868,64 @@ void HTTP_C::DecryptClCertA() {
HTTP_C::HTTP_C() : ServiceFramework("http:C", 32) {
static const FunctionInfo functions[] = {
{0x00010044, &HTTP_C::Initialize, "Initialize"},
{0x00020082, &HTTP_C::CreateContext, "CreateContext"},
{0x00030040, &HTTP_C::CloseContext, "CloseContext"},
{0x00040040, nullptr, "CancelConnection"},
{0x00050040, nullptr, "GetRequestState"},
{0x00060040, nullptr, "GetDownloadSizeState"},
{0x00070040, nullptr, "GetRequestError"},
{0x00080042, &HTTP_C::InitializeConnectionSession, "InitializeConnectionSession"},
{0x00090040, &HTTP_C::BeginRequest, "BeginRequest"},
{0x000A0040, &HTTP_C::BeginRequestAsync, "BeginRequestAsync"},
{0x000B0082, nullptr, "ReceiveData"},
{0x000C0102, nullptr, "ReceiveDataTimeout"},
{0x000D0146, nullptr, "SetProxy"},
{0x000E0040, nullptr, "SetProxyDefault"},
{0x000F00C4, nullptr, "SetBasicAuthorization"},
{0x00100080, nullptr, "SetSocketBufferSize"},
{0x001100C4, &HTTP_C::AddRequestHeader, "AddRequestHeader"},
{0x001200C4, &HTTP_C::AddPostDataAscii, "AddPostDataAscii"},
{0x001300C4, nullptr, "AddPostDataBinary"},
{0x00140082, nullptr, "AddPostDataRaw"},
{0x00150080, nullptr, "SetPostDataType"},
{0x001600C4, nullptr, "SendPostDataAscii"},
{0x00170144, nullptr, "SendPostDataAsciiTimeout"},
{0x001800C4, nullptr, "SendPostDataBinary"},
{0x00190144, nullptr, "SendPostDataBinaryTimeout"},
{0x001A0082, nullptr, "SendPostDataRaw"},
{0x001B0102, nullptr, "SendPOSTDataRawTimeout"},
{0x001C0080, nullptr, "SetPostDataEncoding"},
{0x001D0040, nullptr, "NotifyFinishSendPostData"},
{0x001E00C4, nullptr, "GetResponseHeader"},
{0x001F0144, nullptr, "GetResponseHeaderTimeout"},
{0x00200082, nullptr, "GetResponseData"},
{0x00210102, nullptr, "GetResponseDataTimeout"},
{0x00220040, nullptr, "GetResponseStatusCode"},
{0x002300C0, nullptr, "GetResponseStatusCodeTimeout"},
{0x00240082, nullptr, "AddTrustedRootCA"},
{0x00250080, nullptr, "AddDefaultCert"},
{0x00260080, nullptr, "SelectRootCertChain"},
{0x002700C4, nullptr, "SetClientCert"},
{0x00290080, &HTTP_C::SetClientCertContext, "SetClientCertContext"},
{0x002A0040, &HTTP_C::GetSSLError, "GetSSLError"},
{0x002B0080, nullptr, "SetSSLOpt"},
{0x002C0080, nullptr, "SetSSLClearOpt"},
{0x002D0000, nullptr, "CreateRootCertChain"},
{0x002E0040, nullptr, "DestroyRootCertChain"},
{0x002F0082, nullptr, "RootCertChainAddCert"},
{0x00300080, nullptr, "RootCertChainAddDefaultCert"},
{0x00310080, nullptr, "RootCertChainRemoveCert"},
{0x00320084, &HTTP_C::OpenClientCertContext, "OpenClientCertContext"},
{0x00330040, &HTTP_C::OpenDefaultClientCertContext, "OpenDefaultClientCertContext"},
{0x00340040, &HTTP_C::CloseClientCertContext, "CloseClientCertContext"},
{0x00350186, nullptr, "SetDefaultProxy"},
{0x00360000, nullptr, "ClearDNSCache"},
{0x00370080, nullptr, "SetKeepAlive"},
{0x003800C0, nullptr, "SetPostDataTypeSize"},
{0x00390000, &HTTP_C::Finalize, "Finalize"},
// clang-format off
{IPC::MakeHeader(0x0001, 1, 4), &HTTP_C::Initialize, "Initialize"},
{IPC::MakeHeader(0x0002, 2, 2), &HTTP_C::CreateContext, "CreateContext"},
{IPC::MakeHeader(0x0003, 1, 0), &HTTP_C::CloseContext, "CloseContext"},
{IPC::MakeHeader(0x0004, 1, 0), nullptr, "CancelConnection"},
{IPC::MakeHeader(0x0005, 1, 0), nullptr, "GetRequestState"},
{IPC::MakeHeader(0x0006, 1, 0), nullptr, "GetDownloadSizeState"},
{IPC::MakeHeader(0x0007, 1, 0), nullptr, "GetRequestError"},
{IPC::MakeHeader(0x0008, 1, 2), &HTTP_C::InitializeConnectionSession, "InitializeConnectionSession"},
{IPC::MakeHeader(0x0009, 1, 0), &HTTP_C::BeginRequest, "BeginRequest"},
{IPC::MakeHeader(0x000A, 1, 0), &HTTP_C::BeginRequestAsync, "BeginRequestAsync"},
{IPC::MakeHeader(0x000B, 2, 2), nullptr, "ReceiveData"},
{IPC::MakeHeader(0x000C, 4, 2), nullptr, "ReceiveDataTimeout"},
{IPC::MakeHeader(0x000D, 5, 6), nullptr, "SetProxy"},
{IPC::MakeHeader(0x000E, 1, 0), nullptr, "SetProxyDefault"},
{IPC::MakeHeader(0x000F, 3, 4), nullptr, "SetBasicAuthorization"},
{IPC::MakeHeader(0x0010, 2, 0), nullptr, "SetSocketBufferSize"},
{IPC::MakeHeader(0x0011, 3, 4), &HTTP_C::AddRequestHeader, "AddRequestHeader"},
{IPC::MakeHeader(0x0012, 3, 4), &HTTP_C::AddPostDataAscii, "AddPostDataAscii"},
{IPC::MakeHeader(0x0013, 3, 4), nullptr, "AddPostDataBinary"},
{IPC::MakeHeader(0x0014, 2, 2), nullptr, "AddPostDataRaw"},
{IPC::MakeHeader(0x0015, 2, 0), nullptr, "SetPostDataType"},
{IPC::MakeHeader(0x0016, 3, 4), nullptr, "SendPostDataAscii"},
{IPC::MakeHeader(0x0017, 5, 4), nullptr, "SendPostDataAsciiTimeout"},
{IPC::MakeHeader(0x0018, 3, 4), nullptr, "SendPostDataBinary"},
{IPC::MakeHeader(0x0019, 5, 4), nullptr, "SendPostDataBinaryTimeout"},
{IPC::MakeHeader(0x001A, 2, 2), nullptr, "SendPostDataRaw"},
{IPC::MakeHeader(0x001B, 4, 2), nullptr, "SendPOSTDataRawTimeout"},
{IPC::MakeHeader(0x001C, 2, 0), nullptr, "SetPostDataEncoding"},
{IPC::MakeHeader(0x001D, 1, 0), nullptr, "NotifyFinishSendPostData"},
{IPC::MakeHeader(0x001E, 3, 4), nullptr, "GetResponseHeader"},
{IPC::MakeHeader(0x001F, 5, 4), nullptr, "GetResponseHeaderTimeout"},
{IPC::MakeHeader(0x0020, 2, 2), nullptr, "GetResponseData"},
{IPC::MakeHeader(0x0021, 4, 2), nullptr, "GetResponseDataTimeout"},
{IPC::MakeHeader(0x0022, 1, 0), nullptr, "GetResponseStatusCode"},
{IPC::MakeHeader(0x0023, 3, 0), nullptr, "GetResponseStatusCodeTimeout"},
{IPC::MakeHeader(0x0024, 2, 2), nullptr, "AddTrustedRootCA"},
{IPC::MakeHeader(0x0025, 2, 0), nullptr, "AddDefaultCert"},
{IPC::MakeHeader(0x0026, 2, 0), nullptr, "SelectRootCertChain"},
{IPC::MakeHeader(0x0027, 3, 4), nullptr, "SetClientCert"},
{IPC::MakeHeader(0x0029, 2, 0), &HTTP_C::SetClientCertContext, "SetClientCertContext"},
{IPC::MakeHeader(0x002A, 1, 0), &HTTP_C::GetSSLError, "GetSSLError"},
{IPC::MakeHeader(0x002B, 2, 0), nullptr, "SetSSLOpt"},
{IPC::MakeHeader(0x002C, 2, 0), nullptr, "SetSSLClearOpt"},
{IPC::MakeHeader(0x002D, 0, 0), nullptr, "CreateRootCertChain"},
{IPC::MakeHeader(0x002E, 1, 0), nullptr, "DestroyRootCertChain"},
{IPC::MakeHeader(0x002F, 2, 2), nullptr, "RootCertChainAddCert"},
{IPC::MakeHeader(0x0030, 2, 0), nullptr, "RootCertChainAddDefaultCert"},
{IPC::MakeHeader(0x0031, 2, 0), nullptr, "RootCertChainRemoveCert"},
{IPC::MakeHeader(0x0032, 2, 4), &HTTP_C::OpenClientCertContext, "OpenClientCertContext"},
{IPC::MakeHeader(0x0033, 1, 0), &HTTP_C::OpenDefaultClientCertContext, "OpenDefaultClientCertContext"},
{IPC::MakeHeader(0x0034, 1, 0), &HTTP_C::CloseClientCertContext, "CloseClientCertContext"},
{IPC::MakeHeader(0x0035, 6, 6), nullptr, "SetDefaultProxy"},
{IPC::MakeHeader(0x0036, 0, 0), nullptr, "ClearDNSCache"},
{IPC::MakeHeader(0x0037, 2, 0), nullptr, "SetKeepAlive"},
{IPC::MakeHeader(0x0038, 3, 0), nullptr, "SetPostDataTypeSize"},
{IPC::MakeHeader(0x0039, 0, 0), &HTTP_C::Finalize, "Finalize"},
// clang-format on
};
RegisterHandlers(functions);