wutsocket/ioctl: Remove unimplemented requests

This commit is contained in:
GaryOderNichts 2025-05-11 19:35:59 +02:00
parent b35e595a6e
commit 0fe459a25d
4 changed files with 36 additions and 84 deletions

View File

@ -1,21 +0,0 @@
#pragma once
#include <sys/ioccom.h>
/* Generic file-descriptor ioctl's. */
#define FIOCLEX _IO('f', 1) /* set close on exec on fd */
#define FIONCLEX _IO('f', 2) /* remove close on exec */
#define FIONREAD _IOR('f', 127, int) /* get # bytes to read */
#define FIONWRITE _IOR('f', 119, int) /* get # bytes (yet) to write */
#define FIONBIO _IOW('f', 126, int) /* set/clear non-blocking i/o */
#define FIOASYNC _IOW('f', 125, int) /* set/clear async i/o */
#define FIOSETOWN _IOW('f', 124, int) /* set owner */
#define FIOGETOWN _IOR('f', 123, int) /* get owner */
#define FIODTYPE _IOR('f', 122, int) /* get d_flags type part */
#define FIOGETLBA _IOR('f', 121, int) /* get start blk # */
struct fiodgname_arg {
int len;
void *buf;
};
#define FIODGNAME _IOW('f', 120, struct fiodgname_arg) /* get dev. name */
#define FIONSPACE _IOR('f', 118, int) /* get space in send queue */

View File

@ -1,40 +0,0 @@
#pragma once
/*
* Ioctl's have the command encoded in the lower word, and the size of
* any in or out parameters in the upper word. The high 3 bits of the
* upper word are used to encode the in/out status of the parameter.
*/
#define IOCPARM_SHIFT 13 /* number of bits for ioctl size */
#define IOCPARM_MASK ((1 << IOCPARM_SHIFT) - 1) /* parameter length mask */
#define IOCPARM_LEN(x) (((x) >> 16) & IOCPARM_MASK)
#define IOCBASECMD(x) ((x) & ~(IOCPARM_MASK << 16))
#define IOCGROUP(x) (((x) >> 8) & 0xff)
#define IOCPARM_MAX (1 << IOCPARM_SHIFT) /* max size of ioctl */
#define IOC_VOID 0x20000000 /* no parameters */
#define IOC_OUT 0x40000000 /* copy out parameters */
#define IOC_IN 0x80000000 /* copy in parameters */
#define IOC_INOUT (IOC_IN|IOC_OUT)
#define IOC_DIRMASK (IOC_VOID|IOC_OUT|IOC_IN)
#define _IOC(inout,group,num,len) ((int) \
((inout) | (((len) & IOCPARM_MASK) << 16) | ((group) << 8) | (num)))
#define _IO(g,n) _IOC(IOC_VOID, (g), (n), 0)
#define _IOWINT(g,n) _IOC(IOC_VOID, (g), (n), sizeof(int))
#define _IOR(g,n,t) _IOC(IOC_OUT, (g), (n), sizeof(t))
#define _IOW(g,n,t) _IOC(IOC_IN, (g), (n), sizeof(t))
/* this should be _IORW, but stdio got there first */
#define _IOWR(g,n,t) _IOC(IOC_INOUT, (g), (n), sizeof(t))
#ifdef __cplusplus
extern "C" {
#endif
int ioctl(int fd,
int request,
...);
#ifdef __cplusplus
}
#endif

View File

@ -1,5 +1,17 @@
#pragma once
#include <sys/ioccom.h>
#define FIONBIO (0x8004667E)
#define FIONREAD (0x4004667F)
#define FIONWRITE (0x40046677)
#include <sys/filio.h>
#ifdef __cplusplus
extern "C" {
#endif
int ioctl(int fd,
int request,
...);
#ifdef __cplusplus
}
#endif

View File

@ -6,20 +6,10 @@ ioctl(int fd,
int request,
...)
{
void *data;
va_list args;
int sockfd;
int rc;
va_start(args, request);
data = (request & IOC_INOUT) ? va_arg(args, void *) : NULL;
va_end(args);
if(data == NULL && (request & IOC_INOUT) && IOCPARM_LEN(request) != 0) {
errno = EFAULT;
return -1;
}
sockfd = __wut_get_nsysnet_fd(fd);
if (sockfd == -1) {
return -1;
@ -27,32 +17,43 @@ ioctl(int fd,
switch(request) {
case FIONBIO: {
va_start(args, request);
int *data = va_arg(args, int *);
va_end(args);
if(data == NULL) {
errno = EFAULT;
return -1;
}
int flags = fcntl(fd, F_GETFL, 0);
if(flags == -1) {
return -1;
}
flags = *(int *)data != 0 ? (flags | O_NONBLOCK) : (flags & ~O_NONBLOCK);
flags = (*data != 0) ? (flags | O_NONBLOCK) : (flags & ~O_NONBLOCK);
return fcntl(fd, F_SETFL, flags);
}
case FIONREAD: {
socklen_t optlen = sizeof(int32_t);
rc = RPLWRAP(getsockopt)(sockfd,
SOL_SOCKET,
SO_RXDATA,
data,
&optlen);
return __wut_get_nsysnet_result(NULL, rc);
}
case FIONREAD:
case FIONWRITE: {
socklen_t optlen = sizeof(int32_t);
va_start(args, request);
int32_t *data = va_arg(args, int32_t *);
va_end(args);
if(data == NULL) {
errno = EFAULT;
return -1;
}
rc = RPLWRAP(getsockopt)(sockfd,
SOL_SOCKET,
SO_TXDATA,
(request == FIONREAD) ? SO_RXDATA : SO_TXDATA,
data,
&optlen);
return __wut_get_nsysnet_result(NULL, rc);
}
default:
errno = ENOTTY;
break;
}