revert(input): restore pre-overhaul controls (#2958)

This commit is contained in:
Kurt Himebauch authored and GitHub committed 2026-11-20 19:43:09 -05:00
1 parent 33761c30ab
commit 9925873764
170 files changed
+3980 -4927

No files matched your search

+3 -13
View File
@@ -572,15 +572,6 @@ const char *udev_device_get_devtype(void *device) {
return real_get(device);
}
const char *udev_device_get_driver(void *device) {
static const char *(*real_get)(void *);
if (device_pad(device) != NULL) return NULL;
if (real_get == NULL) real_get = next_symbol("udev_device_get_driver");
if (real_get == NULL) return NULL;
return real_get(device);
}
const char *udev_device_get_action(void *device) {
static const char *(*real_get)(void *);
struct pad *pad = device_pad(device);
@@ -1019,7 +1010,6 @@ static const struct udev_symbol udev_symbols[] = {
{"udev_device_get_sysnum", (void *)udev_device_get_sysnum},
{"udev_device_get_subsystem", (void *)udev_device_get_subsystem},
{"udev_device_get_devtype", (void *)udev_device_get_devtype},
{"udev_device_get_driver", (void *)udev_device_get_driver},
{"udev_device_get_action", (void *)udev_device_get_action},
{"udev_device_get_devnum", (void *)udev_device_get_devnum},
{"udev_device_get_sysattr_value", (void *)udev_device_get_sysattr_value},
@@ -1083,7 +1073,7 @@ static int steam_runtime_path(const char *path) {
const char *name = strrchr(path, '/');
size_t i;
if (name == NULL || (strcmp(name + 1, "steam") != 0 && strcmp(name + 1, "streaming_client") != 0)) return 0;
if (name == NULL || strcmp(name + 1, "steam") != 0) return 0;
for (i = 0; i < sizeof(runtimes) / sizeof(runtimes[0]); i++) {
size_t length = strlen(runtimes[i]);
@@ -1094,8 +1084,8 @@ static int steam_runtime_path(const char *path) {
return 0;
}
/* The Steam client and its Remote Play client (streaming_client) read the pads straight from /dev/input
* and hidraw themselves, so they keep the real libudev. */
/* The Steam client reads the pads straight from /dev/input and hands whatever the udev enumeration
* gives it back to the real libudev, which cannot read these synthetic devices. */
static int steam_client_process(void) {
static _Atomic int cached = -1;
char path[PATH_MAX];
-4
View File
@@ -111,9 +111,6 @@ typedef int (*accept4_fn)(int, struct sockaddr *, socklen_t *, int);
static unsigned guarded_port(void);
__attribute__((visibility("hidden"))) int dd_udevmon_stand_in(int fd);
__attribute__((visibility("hidden"))) int dd_udevmon_bind(int fd, const struct sockaddr *addr, socklen_t len,
int (*real_bind)(int, const struct sockaddr *, socklen_t),
int *rc);
__attribute__((visibility("hidden"))) int dd_nl_bind(int fd, const struct sockaddr *addr,
socklen_t len, int *rc);
__attribute__((visibility("hidden"))) int dd_nl_connect(int fd, const struct sockaddr *addr,
@@ -124,7 +121,6 @@ int bind(int fd, const struct sockaddr *addr, socklen_t len) {
int nl_rc;
if (!real) real = (bind_fn)dlsym(RTLD_NEXT, "bind");
if (dd_nl_bind(fd, addr, len, &nl_rc)) return nl_rc;
if (dd_udevmon_bind(fd, addr, len, real, &nl_rc)) return nl_rc;
if (dd_udevmon_stand_in(fd)) {
if (addr == NULL || len < sizeof(struct sockaddr_nl) || addr->sa_family != AF_NETLINK) {
errno = EINVAL;
-56
View File
@@ -14,7 +14,6 @@
#include <sys/stat.h>
#include <endian.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
struct stand_in {
@@ -147,61 +146,6 @@ __attribute__((visibility("hidden"))) int dd_udevmon_stand_in(int fd) {
return is_stand_in(fd);
}
static int subscribed(int fd) {
#ifdef UDEVMON_TEST
if (getenv("DD_UDEVMON_REFUSE") != NULL) return 0;
#endif
struct sockaddr_nl nl;
socklen_t len = sizeof(nl);
memset(&nl, 0, sizeof(nl));
return getsockname(fd, (struct sockaddr *)&nl, &len) == 0 && nl.nl_groups != 0;
}
/* Android lets an app open a uevent socket but not join its multicast groups, and libudev joins none
when no udev daemon runs, so a monitor bound there hears nothing. Such a socket is replaced, under
the same descriptor, by a stand-in. */
__attribute__((visibility("hidden"))) int dd_udevmon_bind(int fd, const struct sockaddr *addr, socklen_t len,
int (*real_bind)(int, const struct sockaddr *, socklen_t),
int *rc) {
int protocol = -1;
socklen_t protocol_len = sizeof(protocol);
if (addr == NULL || len < sizeof(struct sockaddr_nl) || addr->sa_family != AF_NETLINK) return 0;
if (is_stand_in(fd) || is_wine_process()) return 0;
if (getsockopt(fd, SOL_SOCKET, SO_PROTOCOL, &protocol, &protocol_len) != 0 || protocol != NETLINK_KOBJECT_UEVENT)
return 0;
*rc = real_bind(fd, addr, len);
int refused = errno;
if (*rc == 0 && subscribed(fd)) return 1;
int status = fcntl(fd, F_GETFL);
int descriptor = fcntl(fd, F_GETFD);
int sv[2];
if (status < 0 || descriptor < 0 || socketpair(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0, sv) != 0) {
errno = refused;
return 1;
}
pthread_mutex_lock(&lock);
size_t slot = sizeof(stand_ins) / sizeof(stand_ins[0]);
for (size_t i = 0; i < sizeof(stand_ins) / sizeof(stand_ins[0]); i++) {
if (stand_ins[i].fd == -1) { slot = i; break; }
}
if (slot == sizeof(stand_ins) / sizeof(stand_ins[0]) ||
dup3(sv[0], fd, (descriptor & FD_CLOEXEC) ? O_CLOEXEC : 0) < 0) {
pthread_mutex_unlock(&lock);
close(sv[0]);
close(sv[1]);
errno = refused;
return 1;
}
close(sv[0]);
if (status & O_NONBLOCK) fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
stand_ins[slot].fd = fd;
stand_ins[slot].peer = sv[1];
stand_ins[slot].inode = socket_inode(fd);
pthread_mutex_unlock(&lock);
*rc = 0;
return 1;
}
int getsockname(int fd, struct sockaddr *addr, socklen_t *len) {
static int (*real_getsockname)(int, struct sockaddr *, socklen_t *);
struct sockaddr_nl nl;