From 511867cde6de44b8c2f793972710d94695b4d9c0 Mon Sep 17 00:00:00 2001 From: TuxSH Date: Wed, 27 Mar 2019 23:58:32 +0100 Subject: [PATCH] IPC_Desc_CurProcessHandle => IPC_Desc_CurProcessId --- libctru/include/3ds/ipc.h | 13 +++++++++---- libctru/source/services/apt.c | 2 +- libctru/source/services/boss.c | 2 +- libctru/source/services/frd.c | 2 +- libctru/source/services/fs.c | 4 ++-- libctru/source/services/httpc.c | 6 +++--- libctru/source/services/ndm.c | 8 ++++---- libctru/source/services/news.c | 4 ++-- libctru/source/services/nfc.c | 10 +++++----- libctru/source/services/nim.c | 6 +++--- libctru/source/services/soc/soc_accept.c | 2 +- libctru/source/services/soc/soc_bind.c | 2 +- libctru/source/services/soc/soc_closesockets.c | 2 +- libctru/source/services/soc/soc_connect.c | 2 +- libctru/source/services/soc/soc_fcntl.c | 2 +- libctru/source/services/soc/soc_getpeername.c | 2 +- libctru/source/services/soc/soc_getsockname.c | 2 +- libctru/source/services/soc/soc_getsockopt.c | 2 +- libctru/source/services/soc/soc_init.c | 4 ++-- libctru/source/services/soc/soc_listen.c | 2 +- libctru/source/services/soc/soc_poll.c | 2 +- libctru/source/services/soc/soc_recvfrom.c | 2 +- libctru/source/services/soc/soc_sendto.c | 4 ++-- libctru/source/services/soc/soc_setsockopt.c | 2 +- libctru/source/services/soc/soc_shutdown.c | 2 +- libctru/source/services/soc/soc_sockatmark.c | 2 +- libctru/source/services/soc/soc_socket.c | 2 +- libctru/source/services/sslc.c | 4 ++-- libctru/source/srv.c | 2 +- 29 files changed, 53 insertions(+), 48 deletions(-) diff --git a/libctru/include/3ds/ipc.h b/libctru/include/3ds/ipc.h index c26dc16..e3a44b4 100644 --- a/libctru/include/3ds/ipc.h +++ b/libctru/include/3ds/ipc.h @@ -60,16 +60,21 @@ static inline u32 IPC_Desc_MoveHandles(unsigned number) } /** - * @brief Returns the code to ask the kernel to fill the handle with the current process handle. - * @return The code to request the current process handle. + * @brief Returns the code to ask the kernel to fill the handle with the current process ID. + * @return The code to request the current process ID. * - * The next value is a placeholder that will be replaced by the current process handle by the kernel. + * The next value is a placeholder that will be replaced by the current process ID by the kernel. */ -static inline u32 IPC_Desc_CurProcessHandle(void) +static inline u32 IPC_Desc_CurProcessId(void) { return 0x20; } +static inline DEPRECATED u32 IPC_Desc_CurProcessHandle(void) +{ + return IPC_Desc_CurProcessId(); +} + /** * @brief Creates a header describing a static buffer. * @param size Size of the buffer. Max ?0x03FFFF?. diff --git a/libctru/source/services/apt.c b/libctru/source/services/apt.c index 9cbfca6..8daae03 100644 --- a/libctru/source/services/apt.c +++ b/libctru/source/services/apt.c @@ -689,7 +689,7 @@ Result APT_GetProgramID(u64* pProgramID) { u32 cmdbuf[16]; cmdbuf[0] = IPC_MakeHeader(0x58,0,2); // 0x580002 - cmdbuf[1] = IPC_Desc_CurProcessHandle(); + cmdbuf[1] = IPC_Desc_CurProcessId(); Result ret = aptSendCommand(cmdbuf); if (R_SUCCEEDED(ret)) diff --git a/libctru/source/services/boss.c b/libctru/source/services/boss.c index 1d669fc..df2da15 100644 --- a/libctru/source/services/boss.c +++ b/libctru/source/services/boss.c @@ -79,7 +79,7 @@ static Result bossipc_InitializeSession(u64 programID) if(bossPriv)cmdbuf[0] = IPC_MakeHeader(0x0401,2,2); // 0x04010082 cmdbuf[1] = (u32) programID; cmdbuf[2] = (u32) (programID >> 32); - cmdbuf[3] = IPC_Desc_CurProcessHandle(); + cmdbuf[3] = IPC_Desc_CurProcessId(); if(R_FAILED(ret = svcSendSyncRequest(bossHandle)))return ret; diff --git a/libctru/source/services/frd.c b/libctru/source/services/frd.c index 76ec808..df3ba2c 100644 --- a/libctru/source/services/frd.c +++ b/libctru/source/services/frd.c @@ -445,7 +445,7 @@ Result FRD_SetClientSdkVersion(u32 sdkVer) cmdbuf[0] = IPC_MakeHeader(0x32,1,2); // 0x320042 cmdbuf[1] = sdkVer; - cmdbuf[2] = IPC_Desc_CurProcessHandle(); + cmdbuf[2] = IPC_Desc_CurProcessId(); if (R_FAILED(ret = svcSendSyncRequest(frdHandle))) return ret; diff --git a/libctru/source/services/fs.c b/libctru/source/services/fs.c index db1a75f..cb99692 100644 --- a/libctru/source/services/fs.c +++ b/libctru/source/services/fs.c @@ -152,7 +152,7 @@ Result FSUSER_Initialize(Handle session) u32 *cmdbuf = getThreadCommandBuffer(); cmdbuf[0] = IPC_MakeHeader(0x801,0,2); // 0x8010002 - cmdbuf[1] = IPC_Desc_CurProcessHandle(); + cmdbuf[1] = IPC_Desc_CurProcessId(); Result ret = 0; if(R_FAILED(ret = svcSendSyncRequest(session))) return ret; @@ -1512,7 +1512,7 @@ Result FSUSER_InitializeWithSdkVersion(Handle session, u32 version) cmdbuf[0] = IPC_MakeHeader(0x861,1,2); // 0x8610042 cmdbuf[1] = version; - cmdbuf[2] = IPC_Desc_CurProcessHandle(); + cmdbuf[2] = IPC_Desc_CurProcessId(); Result ret = 0; if(R_FAILED(ret = svcSendSyncRequest(session))) return ret; diff --git a/libctru/source/services/httpc.c b/libctru/source/services/httpc.c index afd6b64..cc06439 100644 --- a/libctru/source/services/httpc.c +++ b/libctru/source/services/httpc.c @@ -178,7 +178,7 @@ static Result HTTPC_Initialize(Handle handle, u32 sharedmem_size, Handle sharedm cmdbuf[0]=IPC_MakeHeader(0x1,1,4); // 0x10044 cmdbuf[1]=sharedmem_size; // POST buffer size (page aligned) - cmdbuf[2]=IPC_Desc_CurProcessHandle(); + cmdbuf[2]=IPC_Desc_CurProcessId(); cmdbuf[4]=IPC_Desc_SharedHandles(1); cmdbuf[5]=sharedmem_handle;// POST buffer memory block handle @@ -225,7 +225,7 @@ static Result HTTPC_InitializeConnectionSession(Handle handle, Handle contextHan cmdbuf[0]=IPC_MakeHeader(0x8,1,2); // 0x80042 cmdbuf[1]=contextHandle; - cmdbuf[2]=IPC_Desc_CurProcessHandle(); + cmdbuf[2]=IPC_Desc_CurProcessId(); Result ret=0; if(R_FAILED(ret=svcSendSyncRequest(handle)))return ret; @@ -308,7 +308,7 @@ Result httpcAddPostDataBinary(httpcContext *context, const char* name, const u8* u32* cmdbuf=getThreadCommandBuffer(); int name_len=strlen(name)+1; - + cmdbuf[0]=IPC_MakeHeader(0x13, 3, 4); // 0x1300C4 cmdbuf[1]=context->httphandle; cmdbuf[2]=name_len; diff --git a/libctru/source/services/ndm.c b/libctru/source/services/ndm.c index 9330935..40ae658 100644 --- a/libctru/source/services/ndm.c +++ b/libctru/source/services/ndm.c @@ -39,7 +39,7 @@ Result NDMU_EnterExclusiveState(ndmExclusiveState state) cmdbuf[0]=IPC_MakeHeader(0x1,1,2); // 0x10042 cmdbuf[1]=state; - cmdbuf[2]=IPC_Desc_CurProcessHandle(); + cmdbuf[2]=IPC_Desc_CurProcessId(); Result ret=0; if(R_FAILED(ret=svcSendSyncRequest(ndmuHandle)))return ret; @@ -52,7 +52,7 @@ Result NDMU_LeaveExclusiveState(void) u32* cmdbuf=getThreadCommandBuffer(); cmdbuf[0]=IPC_MakeHeader(0x2,0,2); // 0x20002 - cmdbuf[1]=IPC_Desc_CurProcessHandle(); + cmdbuf[1]=IPC_Desc_CurProcessId(); Result ret=0; if(R_FAILED(ret=svcSendSyncRequest(ndmuHandle)))return ret; @@ -79,7 +79,7 @@ Result NDMU_LockState(void) u32* cmdbuf=getThreadCommandBuffer(); cmdbuf[0]=IPC_MakeHeader(0x4,0,2); // 0x40002 - cmdbuf[1]=IPC_Desc_CurProcessHandle(); + cmdbuf[1]=IPC_Desc_CurProcessId(); Result ret=0; if(R_FAILED(ret=svcSendSyncRequest(ndmuHandle)))return ret; @@ -92,7 +92,7 @@ Result NDMU_UnlockState(void) u32* cmdbuf=getThreadCommandBuffer(); cmdbuf[0]=IPC_MakeHeader(0x5,0,2); // 0x50002 - cmdbuf[1]=IPC_Desc_CurProcessHandle(); + cmdbuf[1]=IPC_Desc_CurProcessId(); Result ret=0; if(R_FAILED(ret=svcSendSyncRequest(ndmuHandle)))return ret; diff --git a/libctru/source/services/news.c b/libctru/source/services/news.c index 35fc26a..5ab3313 100644 --- a/libctru/source/services/news.c +++ b/libctru/source/services/news.c @@ -48,7 +48,7 @@ Result NEWS_AddNotification(const u16* title, u32 titleLength, const u16* messag u32 baseIndex = 4; if (!useNewsS) { - cmdbuf[baseIndex] = IPC_Desc_CurProcessHandle(); + cmdbuf[baseIndex] = IPC_Desc_CurProcessId(); cmdbuf[baseIndex + 1] = 0; // Process ID, Filled automatically by the ARM11 kernel. baseIndex += 2; } @@ -168,4 +168,4 @@ Result NEWS_GetNotificationImage(u32 news_id, void* buffer, u32* size) if(R_FAILED(ret = svcSendSyncRequest(newsHandle))) return ret; if(size) *size = cmdbuf[2]; return (Result)cmdbuf[1]; -} \ No newline at end of file +} diff --git a/libctru/source/services/nfc.c b/libctru/source/services/nfc.c index e62e9ea..aa568c0 100644 --- a/libctru/source/services/nfc.c +++ b/libctru/source/services/nfc.c @@ -74,7 +74,7 @@ static Result NFC_StartCommsAdapter(void) APT_CheckNew3DS(&new3ds_flag); if(new3ds_flag) return 0; - + ret = NFC_StartCommunication(); if(R_FAILED(ret))return ret; @@ -117,8 +117,8 @@ Result nfcStartOtherTagScanning(u16 unk0, u32 unk1) { Result ret = NFC_StartCommsAdapter(); if(R_FAILED(ret)) return ret; - - return NFC_StartOtherTagScanning(unk0, unk1); + + return NFC_StartOtherTagScanning(unk0, unk1); } void nfcStopScanning(void) @@ -248,7 +248,7 @@ Result nfcUpdateStoredAmiiboData(void) u32* cmdbuf=getThreadCommandBuffer(); cmdbuf[0]=IPC_MakeHeader(0x9,0,2); // 0x90002 - cmdbuf[1]=IPC_Desc_CurProcessHandle(); + cmdbuf[1]=IPC_Desc_CurProcessId(); if(R_FAILED(ret=svcSendSyncRequest(nfcHandle)))return ret; ret = cmdbuf[1]; @@ -349,7 +349,7 @@ static Result NFC_InitializeWriteAppData(u32 amiibo_appid, NFC_AppDataInitStruct cmdbuf[1]=amiibo_appid; cmdbuf[2]=size; memcpy(&cmdbuf[3], initstruct->data_xc, sizeof(initstruct->data_xc)); - cmdbuf[15]=IPC_Desc_CurProcessHandle(); + cmdbuf[15]=IPC_Desc_CurProcessId(); cmdbuf[17]=IPC_Desc_StaticBuffer(size, 0); cmdbuf[18]=(u32)buf; diff --git a/libctru/source/services/nim.c b/libctru/source/services/nim.c index 1e26448..e4b8221 100644 --- a/libctru/source/services/nim.c +++ b/libctru/source/services/nim.c @@ -31,7 +31,7 @@ static Result NIMS_RegisterSelf(void) u32 *cmdbuf = getThreadCommandBuffer(); cmdbuf[0] = IPC_MakeHeader(0x3c, 0, 2); // 0x003c0002 - cmdbuf[1] = IPC_Desc_CurProcessHandle(); + cmdbuf[1] = IPC_Desc_CurProcessId(); cmdbuf[2] = IPC_Desc_MoveHandles(1); if (R_FAILED(ret = svcSendSyncRequest(nimsHandle))) return ret; @@ -160,7 +160,7 @@ Result NIMS_RegisterTask(const NIM_TitleConfig *cfg, const char *name, const cha memcpy(&cmdbuf[1], cfg, sizeof(*cfg)); // unused: cmdbuf[7], cmdbuf[8] cmdbuf[9] = 0; // always 0? At least it is for eShop - cmdbuf[10] = IPC_Desc_CurProcessHandle(); + cmdbuf[10] = IPC_Desc_CurProcessId(); // unused: cmdbuf[11] cmdbuf[12] = IPC_Desc_StaticBuffer(sizeof(name16), 1); cmdbuf[13] = (unsigned int)name16; @@ -195,7 +195,7 @@ Result NIMS_UnregisterTask(u64 titleId) cmdbuf[0] = IPC_MakeHeader(0x5, 2, 2); // 0x00050082 cmdbuf[1] = titleId & 0xFFFFFFFF; cmdbuf[2] = (u32) ((titleId >> 32) & 0xFFFFFFFF); - cmdbuf[3] = IPC_Desc_CurProcessHandle(); + cmdbuf[3] = IPC_Desc_CurProcessId(); if (R_FAILED(ret = svcSendSyncRequest(nimsHandle))) return ret; diff --git a/libctru/source/services/soc/soc_accept.c b/libctru/source/services/soc/soc_accept.c index 0826277..67b80d4 100644 --- a/libctru/source/services/soc/soc_accept.c +++ b/libctru/source/services/soc/soc_accept.c @@ -32,7 +32,7 @@ int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) cmdbuf[0] = IPC_MakeHeader(0x4,2,2); // 0x40082 cmdbuf[1] = (u32)sockfd; cmdbuf[2] = (u32)tmp_addrlen; - cmdbuf[3] = IPC_Desc_CurProcessHandle(); + cmdbuf[3] = IPC_Desc_CurProcessId(); u32 * staticbufs = getThreadStaticBuffers(); saved_threadstorage[0] = staticbufs[0]; diff --git a/libctru/source/services/soc/soc_bind.c b/libctru/source/services/soc/soc_bind.c index b452992..94b2ac5 100644 --- a/libctru/source/services/soc/soc_bind.c +++ b/libctru/source/services/soc/soc_bind.c @@ -35,7 +35,7 @@ int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen) cmdbuf[0] = IPC_MakeHeader(0x5,2,4); // 0x50084 cmdbuf[1] = (u32)sockfd; cmdbuf[2] = (u32)tmp_addrlen; - cmdbuf[3] = IPC_Desc_CurProcessHandle(); + cmdbuf[3] = IPC_Desc_CurProcessId(); cmdbuf[5] = IPC_Desc_StaticBuffer(tmp_addrlen,0); cmdbuf[6] = (u32)tmpaddr; diff --git a/libctru/source/services/soc/soc_closesockets.c b/libctru/source/services/soc/soc_closesockets.c index 27261df..d5bb1e4 100644 --- a/libctru/source/services/soc/soc_closesockets.c +++ b/libctru/source/services/soc/soc_closesockets.c @@ -7,7 +7,7 @@ int SOCU_CloseSockets(void) u32 *cmdbuf = getThreadCommandBuffer(); cmdbuf[0] = IPC_MakeHeader(0x21,0,2); // 0x210002; - cmdbuf[1] = IPC_Desc_CurProcessHandle(); + cmdbuf[1] = IPC_Desc_CurProcessId(); int ret = svcSendSyncRequest(SOCU_handle); if(R_FAILED(ret))return ret; diff --git a/libctru/source/services/soc/soc_connect.c b/libctru/source/services/soc/soc_connect.c index 5778858..e48f35d 100644 --- a/libctru/source/services/soc/soc_connect.c +++ b/libctru/source/services/soc/soc_connect.c @@ -35,7 +35,7 @@ int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen) cmdbuf[0] = IPC_MakeHeader(0x6,2,4); // 0x60084 cmdbuf[1] = (u32)sockfd; cmdbuf[2] = (u32)addrlen; - cmdbuf[3] = IPC_Desc_CurProcessHandle(); + cmdbuf[3] = IPC_Desc_CurProcessId(); cmdbuf[5] = IPC_Desc_StaticBuffer(tmp_addrlen,0); cmdbuf[6] = (u32)tmpaddr; diff --git a/libctru/source/services/soc/soc_fcntl.c b/libctru/source/services/soc/soc_fcntl.c index 824fea0..7748a2d 100644 --- a/libctru/source/services/soc/soc_fcntl.c +++ b/libctru/source/services/soc/soc_fcntl.c @@ -68,7 +68,7 @@ int fcntl(int sockfd, int cmd, ...) cmdbuf[1] = (u32)sockfd; cmdbuf[2] = (u32)cmd; cmdbuf[3] = (u32)arg; - cmdbuf[4] = IPC_Desc_CurProcessHandle(); + cmdbuf[4] = IPC_Desc_CurProcessId(); ret = svcSendSyncRequest(SOCU_handle); if(ret != 0) { diff --git a/libctru/source/services/soc/soc_getpeername.c b/libctru/source/services/soc/soc_getpeername.c index 2a55dbf..269a781 100644 --- a/libctru/source/services/soc/soc_getpeername.c +++ b/libctru/source/services/soc/soc_getpeername.c @@ -19,7 +19,7 @@ int getpeername(int sockfd, struct sockaddr *addr, socklen_t *addrlen) cmdbuf[0] = IPC_MakeHeader(0x18,2,2); // 0x180082 cmdbuf[1] = (u32)sockfd; cmdbuf[2] = 0x1c; - cmdbuf[3] = IPC_Desc_CurProcessHandle(); + cmdbuf[3] = IPC_Desc_CurProcessId(); u32 * staticbufs = getThreadStaticBuffers(); saved_threadstorage[0] = staticbufs[0]; diff --git a/libctru/source/services/soc/soc_getsockname.c b/libctru/source/services/soc/soc_getsockname.c index 8a2b3c5..eef6bf4 100644 --- a/libctru/source/services/soc/soc_getsockname.c +++ b/libctru/source/services/soc/soc_getsockname.c @@ -19,7 +19,7 @@ int getsockname(int sockfd, struct sockaddr *addr, socklen_t *addrlen) cmdbuf[0] = IPC_MakeHeader(0x17,2,2); // 0x170082 cmdbuf[1] = (u32)sockfd; cmdbuf[2] = 0x1c; - cmdbuf[3] = IPC_Desc_CurProcessHandle(); + cmdbuf[3] = IPC_Desc_CurProcessId(); u32 * staticbufs = getThreadStaticBuffers(); saved_threadstorage[0] = staticbufs[0]; diff --git a/libctru/source/services/soc/soc_getsockopt.c b/libctru/source/services/soc/soc_getsockopt.c index 7014d92..e3fe64a 100644 --- a/libctru/source/services/soc/soc_getsockopt.c +++ b/libctru/source/services/soc/soc_getsockopt.c @@ -20,7 +20,7 @@ int getsockopt(int sockfd, int level, int optname, void *optval, socklen_t *optl cmdbuf[2] = (u32)level; cmdbuf[3] = (u32)optname; cmdbuf[4] = (u32)*optlen; - cmdbuf[5] = IPC_Desc_CurProcessHandle(); + cmdbuf[5] = IPC_Desc_CurProcessId(); u32 * staticbufs = getThreadStaticBuffers(); saved_threadstorage[0] = staticbufs[0]; diff --git a/libctru/source/services/soc/soc_init.c b/libctru/source/services/soc/soc_init.c index 790042c..9b1abee 100644 --- a/libctru/source/services/soc/soc_init.c +++ b/libctru/source/services/soc/soc_init.c @@ -45,7 +45,7 @@ static Result SOCU_Initialize(Handle memhandle, u32 memsize) cmdbuf[0] = IPC_MakeHeader(0x1,1,4); // 0x10044 cmdbuf[1] = memsize; - cmdbuf[2] = IPC_Desc_CurProcessHandle(); + cmdbuf[2] = IPC_Desc_CurProcessId(); cmdbuf[4] = IPC_Desc_SharedHandles(1); cmdbuf[5] = memhandle; @@ -160,7 +160,7 @@ soc_close(struct _reent *r, cmdbuf[0] = IPC_MakeHeader(0xB,1,2); // 0xB0042 cmdbuf[1] = (u32)sockfd; - cmdbuf[2] = IPC_Desc_CurProcessHandle(); + cmdbuf[2] = IPC_Desc_CurProcessId(); ret = svcSendSyncRequest(SOCU_handle); if(ret != 0) { diff --git a/libctru/source/services/soc/soc_listen.c b/libctru/source/services/soc/soc_listen.c index 542fa02..25883d6 100644 --- a/libctru/source/services/soc/soc_listen.c +++ b/libctru/source/services/soc/soc_listen.c @@ -17,7 +17,7 @@ int listen(int sockfd, int max_connections) cmdbuf[0] = IPC_MakeHeader(0x3,2,2); // 0x30082 cmdbuf[1] = (u32)sockfd; cmdbuf[2] = (u32)max_connections; - cmdbuf[3] = IPC_Desc_CurProcessHandle(); + cmdbuf[3] = IPC_Desc_CurProcessId(); ret = svcSendSyncRequest(SOCU_handle); if(ret != 0) { diff --git a/libctru/source/services/soc/soc_poll.c b/libctru/source/services/soc/soc_poll.c index 664ee43..22cbe43 100644 --- a/libctru/source/services/soc/soc_poll.c +++ b/libctru/source/services/soc/soc_poll.c @@ -39,7 +39,7 @@ int poll(struct pollfd *fds, nfds_t nfds, int timeout) cmdbuf[0] = IPC_MakeHeader(0x14,2,4); // 0x140084 cmdbuf[1] = (u32)nfds; cmdbuf[2] = (u32)timeout; - cmdbuf[3] = IPC_Desc_CurProcessHandle(); + cmdbuf[3] = IPC_Desc_CurProcessId(); cmdbuf[5] = IPC_Desc_StaticBuffer(size,10); cmdbuf[6] = (u32)tmp_fds; diff --git a/libctru/source/services/soc/soc_recvfrom.c b/libctru/source/services/soc/soc_recvfrom.c index e0a25f1..30ffd57 100644 --- a/libctru/source/services/soc/soc_recvfrom.c +++ b/libctru/source/services/soc/soc_recvfrom.c @@ -21,7 +21,7 @@ ssize_t socuipc_cmd7(int sockfd, void *buf, size_t len, int flags, struct sockad cmdbuf[2] = (u32)len; cmdbuf[3] = (u32)flags; cmdbuf[4] = (u32)tmp_addrlen; - cmdbuf[5] = IPC_Desc_CurProcessHandle(); + cmdbuf[5] = IPC_Desc_CurProcessId(); cmdbuf[7] = IPC_Desc_Buffer(len,IPC_BUFFER_W); cmdbuf[8] = (u32)buf; diff --git a/libctru/source/services/soc/soc_sendto.c b/libctru/source/services/soc/soc_sendto.c index 5c0f3a5..fe7b5ba 100644 --- a/libctru/source/services/soc/soc_sendto.c +++ b/libctru/source/services/soc/soc_sendto.c @@ -33,7 +33,7 @@ ssize_t socuipc_cmd9(int sockfd, const void *buf, size_t len, int flags, const s cmdbuf[2] = (u32)len; cmdbuf[3] = (u32)flags; cmdbuf[4] = (u32)tmp_addrlen; - cmdbuf[5] = IPC_Desc_CurProcessHandle(); + cmdbuf[5] = IPC_Desc_CurProcessId(); cmdbuf[7] = IPC_Desc_StaticBuffer(tmp_addrlen,1); cmdbuf[8] = (u32)tmpaddr; cmdbuf[9] = IPC_Desc_Buffer(len,IPC_BUFFER_R); @@ -87,7 +87,7 @@ ssize_t socuipc_cmda(int sockfd, const void *buf, size_t len, int flags, const s cmdbuf[2] = (u32)len; cmdbuf[3] = (u32)flags; cmdbuf[4] = (u32)tmp_addrlen; - cmdbuf[5] = IPC_Desc_CurProcessHandle(); + cmdbuf[5] = IPC_Desc_CurProcessId(); cmdbuf[7] = IPC_Desc_StaticBuffer(len,2); cmdbuf[8] = (u32)buf; cmdbuf[9] = IPC_Desc_StaticBuffer(tmp_addrlen,1); diff --git a/libctru/source/services/soc/soc_setsockopt.c b/libctru/source/services/soc/soc_setsockopt.c index b2386d2..75cfa2a 100644 --- a/libctru/source/services/soc/soc_setsockopt.c +++ b/libctru/source/services/soc/soc_setsockopt.c @@ -19,7 +19,7 @@ int setsockopt(int sockfd, int level, int optname, const void *optval, socklen_t cmdbuf[2] = (u32)level; cmdbuf[3] = (u32)optname; cmdbuf[4] = (u32)optlen; - cmdbuf[5] = IPC_Desc_CurProcessHandle(); + cmdbuf[5] = IPC_Desc_CurProcessId(); cmdbuf[7] = IPC_Desc_StaticBuffer(optlen,9); cmdbuf[8] = (u32)optval; diff --git a/libctru/source/services/soc/soc_shutdown.c b/libctru/source/services/soc/soc_shutdown.c index 0af20a8..fc6461b 100644 --- a/libctru/source/services/soc/soc_shutdown.c +++ b/libctru/source/services/soc/soc_shutdown.c @@ -17,7 +17,7 @@ int shutdown(int sockfd, int shutdown_type) cmdbuf[0] = IPC_MakeHeader(0xC,2,2); // 0xC0082 cmdbuf[1] = (u32)sockfd; cmdbuf[2] = (u32)shutdown_type; - cmdbuf[3] = IPC_Desc_CurProcessHandle(); + cmdbuf[3] = IPC_Desc_CurProcessId(); ret = svcSendSyncRequest(SOCU_handle); if(ret != 0) { diff --git a/libctru/source/services/soc/soc_sockatmark.c b/libctru/source/services/soc/soc_sockatmark.c index ea44543..e489d2d 100644 --- a/libctru/source/services/soc/soc_sockatmark.c +++ b/libctru/source/services/soc/soc_sockatmark.c @@ -16,7 +16,7 @@ int sockatmark(int sockfd) cmdbuf[0] = IPC_MakeHeader(0x15,1,2); // 0x150042 cmdbuf[1] = (u32)sockfd; - cmdbuf[2] = IPC_Desc_CurProcessHandle(); + cmdbuf[2] = IPC_Desc_CurProcessId(); ret = svcSendSyncRequest(SOCU_handle); if(ret != 0) { diff --git a/libctru/source/services/soc/soc_socket.c b/libctru/source/services/soc/soc_socket.c index dcff6bf..17832d1 100644 --- a/libctru/source/services/soc/soc_socket.c +++ b/libctru/source/services/soc/soc_socket.c @@ -29,7 +29,7 @@ int socket(int domain, int type, int protocol) cmdbuf[1] = domain; cmdbuf[2] = type; cmdbuf[3] = protocol; - cmdbuf[4] = IPC_Desc_CurProcessHandle(); + cmdbuf[4] = IPC_Desc_CurProcessId(); dev = FindDevice("soc:"); if(dev < 0) { diff --git a/libctru/source/services/sslc.c b/libctru/source/services/sslc.c index 96773ba..7307b91 100644 --- a/libctru/source/services/sslc.c +++ b/libctru/source/services/sslc.c @@ -44,7 +44,7 @@ static Result sslcipc_Initialize(void) u32* cmdbuf=getThreadCommandBuffer(); cmdbuf[0]=IPC_MakeHeader(0x1,0,2); // 0x10002 - cmdbuf[1]=IPC_Desc_CurProcessHandle(); + cmdbuf[1]=IPC_Desc_CurProcessId(); Result ret=0; if(R_FAILED(ret=svcSendSyncRequest(__sslc_servhandle)))return ret; @@ -234,7 +234,7 @@ static Result sslcipc_InitializeConnectionSession(sslcContext *context) cmdbuf[0]=IPC_MakeHeader(0x12,1,2); // 0x120042 cmdbuf[1]=context->sslchandle; - cmdbuf[2]=IPC_Desc_CurProcessHandle(); + cmdbuf[2]=IPC_Desc_CurProcessId(); Result ret=0; if(R_FAILED(ret=svcSendSyncRequest(context->servhandle)))return ret; diff --git a/libctru/source/srv.c b/libctru/source/srv.c index 9336db6..6954914 100644 --- a/libctru/source/srv.c +++ b/libctru/source/srv.c @@ -82,7 +82,7 @@ Result srvRegisterClient(void) u32* cmdbuf = getThreadCommandBuffer(); cmdbuf[0] = IPC_MakeHeader(0x1,0,2); // 0x10002 - cmdbuf[1] = IPC_Desc_CurProcessHandle(); + cmdbuf[1] = IPC_Desc_CurProcessId(); if(R_FAILED(rc = svcSendSyncRequest(srvHandle)))return rc;