DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return sockaddr_in length from functions that have in/out addrlen

Browse Source 
Previously the socket funtions did not write the sockaddr_in struct fully and instead always returned
the "internal" length, which did not account for the zeroed padding.
This commit is contained in:
Andrea Ciliberti 2024-09-09 16:48:51 +02:00 committed by fincs
parent 04b9418dd9
commit 1b1762f872
4 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libctru/source/services/soc/soc_accept.c
View File

@ -61,9 +61,14 @@ int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
if(ret >= 0 && addr != NULL) { if(ret >= 0 && addr != NULL) {
addr->sa_family = tmpaddr[1]; addr->sa_family = tmpaddr[1];
if(*addrlen > tmpaddr[0])
*addrlen = tmpaddr[0]; socklen_t user_addrlen = tmpaddr[0];
memcpy(addr->sa_data, &tmpaddr[2], *addrlen - 2); if(addr->sa_family == AF_INET)
user_addrlen += 8; // Accounting for the 8 bytes of sin_zero padding, which must be written for compatibility.
if(*addrlen > user_addrlen)
*addrlen = user_addrlen;
memcpy(addr->sa_data, &tmpaddr[2], *addrlen - sizeof(addr->sa_family));
} }
if(ret < 0) { if(ret < 0) {

14
libctru/source/services/soc/soc_getpeername.c
View File

@ -16,6 +16,8 @@ int getpeername(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
return -1; return -1;
} }
memset(tmpaddr, 0, ADDR_STORAGE_LEN);
cmdbuf[0] = IPC_MakeHeader(0x18,2,2); // 0x180082 cmdbuf[0] = IPC_MakeHeader(0x18,2,2); // 0x180082
cmdbuf[1] = (u32)sockfd; cmdbuf[1] = (u32)sockfd;
cmdbuf[2] = ADDR_STORAGE_LEN; cmdbuf[2] = ADDR_STORAGE_LEN;
@ -47,11 +49,15 @@ int getpeername(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
return -1; return -1;
} }
if(*addrlen > tmpaddr[0])
*addrlen = tmpaddr[0];
memset(addr, 0, sizeof(struct sockaddr));
addr->sa_family = tmpaddr[1]; addr->sa_family = tmpaddr[1];
memcpy(addr->sa_data, &tmpaddr[2], *addrlen - 2);
socklen_t user_addrlen = tmpaddr[0];
if(addr->sa_family == AF_INET)
user_addrlen += 8;
if(*addrlen > user_addrlen)
*addrlen = user_addrlen;
memcpy(addr->sa_data, &tmpaddr[2], *addrlen - sizeof(addr->sa_family));
return ret; return ret;
} }

14
libctru/source/services/soc/soc_getsockname.c
View File

@ -16,6 +16,8 @@ int getsockname(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
return -1; return -1;
} }
memset(tmpaddr, 0, ADDR_STORAGE_LEN);
cmdbuf[0] = IPC_MakeHeader(0x17,2,2); // 0x170082 cmdbuf[0] = IPC_MakeHeader(0x17,2,2); // 0x170082
cmdbuf[1] = (u32)sockfd; cmdbuf[1] = (u32)sockfd;
cmdbuf[2] = ADDR_STORAGE_LEN; cmdbuf[2] = ADDR_STORAGE_LEN;
@ -47,11 +49,15 @@ int getsockname(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
return -1; return -1;
} }
if(*addrlen > tmpaddr[0])
*addrlen = tmpaddr[0];
memset(addr, 0, sizeof(struct sockaddr));
addr->sa_family = tmpaddr[1]; addr->sa_family = tmpaddr[1];
memcpy(addr->sa_data, &tmpaddr[2], *addrlen - 2);
socklen_t user_addrlen = tmpaddr[0];
if(addr->sa_family == AF_INET)
user_addrlen += 8;
if(*addrlen > user_addrlen)
*addrlen = user_addrlen;
memcpy(addr->sa_data, &tmpaddr[2], *addrlen - sizeof(addr->sa_family));
return ret; return ret;
} }

22
libctru/source/services/soc/soc_recvfrom.c
View File

@ -53,9 +53,14 @@ ssize_t socuipc_cmd7(int sockfd, void *buf, size_t len, int flags, struct sockad
if(src_addr != NULL) { if(src_addr != NULL) {
src_addr->sa_family = tmpaddr[1]; src_addr->sa_family = tmpaddr[1];
if(*addrlen > tmpaddr[0])
*addrlen = tmpaddr[0]; socklen_t user_addrlen = tmpaddr[0];
memcpy(src_addr->sa_data, &tmpaddr[2], *addrlen - 2); if(src_addr->sa_family == AF_INET)
user_addrlen += 8;
if(*addrlen > user_addrlen)
*addrlen = user_addrlen;
memcpy(src_addr->sa_data, &tmpaddr[2], *addrlen - sizeof(src_addr->sa_family));
} }
return ret; return ret;
@ -113,9 +118,14 @@ ssize_t socuipc_cmd8(int sockfd, void *buf, size_t len, int flags, struct sockad
if(src_addr != NULL) { if(src_addr != NULL) {
src_addr->sa_family = tmpaddr[1]; src_addr->sa_family = tmpaddr[1];
if(*addrlen > tmpaddr[0])
*addrlen = tmpaddr[0]; socklen_t user_addrlen = tmpaddr[0];
memcpy(src_addr->sa_data, &tmpaddr[2], *addrlen - 2); if(src_addr->sa_family == AF_INET)
user_addrlen += 8;
if(*addrlen > user_addrlen)
*addrlen = user_addrlen;
memcpy(src_addr->sa_data, &tmpaddr[2], *addrlen - sizeof(src_addr->sa_family));
} }
return ret; return ret;