From 0c5219b225d938dbeb5e1e08f8bddc2fb6924e1b Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 9 Nov 2026 13:36:38 -0500 Subject: [PATCH] feat(native): guests see the session hostname from uname and gethostname --- .../droiddeck/launcher/runtime/NativeGuest.kt | 3 ++- tools/nativeguest/ddnatv-hook.c | 1 + tools/nativeguest/hook/env.c | 11 +++++++- tools/nativeguest/hook/identity.c | 26 +++++++++++++++++++ tools/nativeguest/hook/paths.c | 2 ++ tools/nativeguest/hook/setup.c | 2 ++ 6 files changed, 43 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt b/app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt index a221f1605..2b7fc3ce0 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/NativeGuest.kt @@ -59,10 +59,11 @@ object NativeGuest { } /** The environment of the session process: the hook's root, the mounts proot used to make, the preload list. */ - fun sessionEnvironment(root: File, binds: List): Map { + fun sessionEnvironment(root: File, binds: List, hostname: String? = null): Map { val preload = preloadList(root) return linkedMapOf( "DDNATV_ROOT" to root.path, + "DDNATV_HOSTNAME" to hostname.orEmpty(), "DDNATV_BINDS" to binds.joinToString("|") { if (it.contains(':')) it else "$it:$it" }, "DDNATV_PRELOAD" to preload.joinToString(":"), "LD_LIBRARY_PATH" to libraryPath(root), diff --git a/tools/nativeguest/ddnatv-hook.c b/tools/nativeguest/ddnatv-hook.c index 8d4f31117..531fb227d 100644 --- a/tools/nativeguest/ddnatv-hook.c +++ b/tools/nativeguest/ddnatv-hook.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/tools/nativeguest/hook/env.c b/tools/nativeguest/hook/env.c index a1b03f017..d0a0f3e3d 100644 --- a/tools/nativeguest/hook/env.c +++ b/tools/nativeguest/hook/env.c @@ -92,6 +92,7 @@ static char **prepare_ddnatv_env(char *const envp[], const char *real_exe) { // are compared (this was 13 strncmp() calls for each of the 30 or so variables) int has_nt = 0; int has_binds = 0; + int has_hostname = 0; int has_preload_list = 0; const char *preload_value = NULL; while (envp && envp[count]) { @@ -119,6 +120,7 @@ static char **prepare_ddnatv_env(char *const envp[], const char *real_exe) { else if (strncmp(e, "DDNATV_NT=", 10) == 0) has_nt = 1; else if (strncmp(e, "DDNATV_BINDS=", 13) == 0) has_binds = 1; else if (strncmp(e, "DDNATV_PRELOAD=", 15) == 0) has_preload_list = 1; + else if (strncmp(e, "DDNATV_HOSTNAME=", 16) == 0) has_hostname = 1; else if (strncmp(e, "DPKG_DEB_THREADS_MAX=", 21) == 0) has_threads_max = 1; else if (strncmp(e, "DEBIAN_FRONTEND=", 16) == 0) has_frontend = 1; else if (strncmp(e, "DEBCONF_FRONTEND=", 17) == 0) has_debconf_frontend = 1; @@ -130,7 +132,7 @@ static char **prepare_ddnatv_env(char *const envp[], const char *real_exe) { count++; } - char **new_env = calloc(count + 22, sizeof(char *)); + char **new_env = calloc(count + 23, sizeof(char *)); int dst = 0; for (int i = 0; i < count; i++) { if (has_preload && envp[i][0] == 'L' && strncmp(envp[i], "LD_PRELOAD=", 11) == 0) { @@ -215,6 +217,13 @@ static char **prepare_ddnatv_env(char *const envp[], const char *real_exe) { new_env[dst++] = str; } } + if (!has_hostname && g_hostname[0]) { + char *str = malloc(16 + sizeof(g_hostname)); + if (str) { + snprintf(str, 16 + sizeof(g_hostname), "DDNATV_HOSTNAME=%s", g_hostname); + new_env[dst++] = str; + } + } if (!has_binds && g_binds_raw) { size_t len = strlen(g_binds_raw); char *str = malloc(13 + len + 1); diff --git a/tools/nativeguest/hook/identity.c b/tools/nativeguest/hook/identity.c index c53d0ad84..9599d7e0b 100644 --- a/tools/nativeguest/hook/identity.c +++ b/tools/nativeguest/hook/identity.c @@ -51,6 +51,32 @@ int getgrouplist(const char *user, gid_t group, gid_t *groups, int *ngroups) { return -1; } +// The session's host name, as proot's --kernel-release gave it: Steam names the device after it +int uname(struct utsname *buf) { + static int (*orig_uname)(struct utsname *) = NULL; + if (!orig_uname) orig_uname = (int (*)(struct utsname *))dlsym(RTLD_NEXT, "uname"); + int ret = orig_uname ? orig_uname(buf) : -1; + if (ret == 0 && buf && g_hostname[0]) { + ddnatv_copy_cstr(buf->nodename, sizeof(buf->nodename), g_hostname); + ddnatv_copy_cstr(buf->domainname, sizeof(buf->domainname), "localdomain"); + } + return ret; +} + +int gethostname(char *name, size_t len) { + static int (*orig_gethostname)(char *, size_t) = NULL; + if (!orig_gethostname) orig_gethostname = (int (*)(char *, size_t))dlsym(RTLD_NEXT, "gethostname"); + if (!g_hostname[0]) return orig_gethostname ? orig_gethostname(name, len) : -1; + size_t n = strlen(g_hostname) + 1; + if (!name || n > len) { + if (name && len) memcpy(name, g_hostname, len); + errno = ENAMETOOLONG; + return -1; + } + memcpy(name, g_hostname, n); + return 0; +} + #endif /* !DDNATV_HOST_TEST */ static uid_t real_uid(void) { diff --git a/tools/nativeguest/hook/paths.c b/tools/nativeguest/hook/paths.c index 975d108ba..9b585ce9d 100644 --- a/tools/nativeguest/hook/paths.c +++ b/tools/nativeguest/hook/paths.c @@ -32,6 +32,8 @@ struct ddnatv_bind { static struct ddnatv_bind *g_binds = NULL; static int g_nbinds = 0; static char *g_binds_raw = NULL; +// The session's host name (DDNATV_HOSTNAME), what proot put in uname(): Android's kernel says "localhost" +static char g_hostname[65]; static int ddnatv_bind_longer_first(const void *a, const void *b) { const struct ddnatv_bind *x = a, *y = b; diff --git a/tools/nativeguest/hook/setup.c b/tools/nativeguest/hook/setup.c index 1cc00a857..4512c8a98 100644 --- a/tools/nativeguest/hook/setup.c +++ b/tools/nativeguest/hook/setup.c @@ -34,6 +34,8 @@ static void init_ddnatv_hook(void) { } } ddnatv_load_binds(getenv("DDNATV_BINDS")); + const char *hostname = getenv("DDNATV_HOSTNAME"); + if (hostname && hostname[0] && strlen(hostname) < sizeof(g_hostname)) ddnatv_copy_cstr(g_hostname, sizeof(g_hostname), hostname); const char *preload = getenv("DDNATV_PRELOAD"); if (preload && preload[0] && g_ddnatv_root_len > 0) { size_t cap = strlen(preload) + (g_ddnatv_root_len + 1) * 16 + 1;