From 256aaa9d2369890ce0ea03852e83c2a8379fa6d0 Mon Sep 17 00:00:00 2001 From: Weston Blieden Date: Fri, 17 Apr 2026 18:31:19 +0200 Subject: [PATCH] Fix param_bridge.c build errors: move g_ax_handle declaration before watchdog_cb, add missing TRUE arg to ax_parameter_set --- aarch64/app/param_bridge.c | 5 ++--- aarch64_ROOT/app/param_bridge.c | 5 ++--- arm/app/param_bridge.c | 5 ++--- arm_ROOT/app/param_bridge.c | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/aarch64/app/param_bridge.c b/aarch64/app/param_bridge.c index 315bb2a..e2bd24a 100644 --- a/aarch64/app/param_bridge.c +++ b/aarch64/app/param_bridge.c @@ -35,6 +35,7 @@ #define CONFIG_FILE "/usr/local/packages/Tailscale_VPN/localdata/params.conf" #define RUN_SCRIPT "/usr/local/packages/Tailscale_VPN/Tailscale_VPN_run" +static AXParameter *g_ax_handle = NULL; static pid_t child_pid = -1; static guint reload_timer_id = 0; @@ -102,7 +103,7 @@ static gboolean watchdog_cb(gpointer G_GNUC_UNUSED data) { /* If child exited 0, auth succeeded — clear AuthKey via axparameter */ if (exit_code == 0 && g_ax_handle && cfg_auth_key && *cfg_auth_key) { GError *err = NULL; - if (ax_parameter_set(g_ax_handle, "AuthKey", "", &err)) { + if (ax_parameter_set(g_ax_handle, "AuthKey", "", TRUE, &err)) { free(cfg_auth_key); cfg_auth_key = strdup(""); syslog(LOG_INFO, "AuthKey cleared after successful auth"); } else { @@ -162,8 +163,6 @@ static void write_config_file(void) { /* ── ACAP parameter callback ─────────────────────────────────────────────── */ -static AXParameter *g_ax_handle = NULL; - static gboolean debounced_restart(gpointer G_GNUC_UNUSED data) { reload_timer_id = 0; if (g_ax_handle) diff --git a/aarch64_ROOT/app/param_bridge.c b/aarch64_ROOT/app/param_bridge.c index add6c4f..5337f79 100644 --- a/aarch64_ROOT/app/param_bridge.c +++ b/aarch64_ROOT/app/param_bridge.c @@ -25,6 +25,7 @@ #define CONFIG_FILE "/usr/local/packages/Tailscale_VPN/localdata/params.conf" #define RUN_SCRIPT "/usr/local/packages/Tailscale_VPN/Tailscale_VPN_run" +static AXParameter *g_ax_handle = NULL; static pid_t child_pid = -1; static guint reload_timer_id = 0; @@ -86,7 +87,7 @@ static gboolean watchdog_cb(gpointer G_GNUC_UNUSED data) { /* If child exited 0, auth succeeded — clear AuthKey via axparameter */ if (exit_code == 0 && g_ax_handle && cfg_auth_key && *cfg_auth_key) { GError *err = NULL; - if (ax_parameter_set(g_ax_handle, "AuthKey", "", &err)) { + if (ax_parameter_set(g_ax_handle, "AuthKey", "", TRUE, &err)) { free(cfg_auth_key); cfg_auth_key = strdup(""); syslog(LOG_INFO, "AuthKey cleared after successful auth"); } else { @@ -136,8 +137,6 @@ static void write_config_file(void) { cache_get(&cfg_custom_server, "(default)")); } -static AXParameter *g_ax_handle = NULL; - static gboolean debounced_restart(gpointer G_GNUC_UNUSED data) { reload_timer_id = 0; if (g_ax_handle) diff --git a/arm/app/param_bridge.c b/arm/app/param_bridge.c index 315bb2a..06c038c 100644 --- a/arm/app/param_bridge.c +++ b/arm/app/param_bridge.c @@ -37,6 +37,7 @@ static pid_t child_pid = -1; static guint reload_timer_id = 0; +static AXParameter *g_ax_handle = NULL; static char *cfg_custom_server = NULL; static char *cfg_auth_key = NULL; @@ -102,7 +103,7 @@ static gboolean watchdog_cb(gpointer G_GNUC_UNUSED data) { /* If child exited 0, auth succeeded — clear AuthKey via axparameter */ if (exit_code == 0 && g_ax_handle && cfg_auth_key && *cfg_auth_key) { GError *err = NULL; - if (ax_parameter_set(g_ax_handle, "AuthKey", "", &err)) { + if (ax_parameter_set(g_ax_handle, "AuthKey", "", TRUE, &err)) { free(cfg_auth_key); cfg_auth_key = strdup(""); syslog(LOG_INFO, "AuthKey cleared after successful auth"); } else { @@ -162,8 +163,6 @@ static void write_config_file(void) { /* ── ACAP parameter callback ─────────────────────────────────────────────── */ -static AXParameter *g_ax_handle = NULL; - static gboolean debounced_restart(gpointer G_GNUC_UNUSED data) { reload_timer_id = 0; if (g_ax_handle) diff --git a/arm_ROOT/app/param_bridge.c b/arm_ROOT/app/param_bridge.c index add6c4f..a842e82 100644 --- a/arm_ROOT/app/param_bridge.c +++ b/arm_ROOT/app/param_bridge.c @@ -27,6 +27,7 @@ static pid_t child_pid = -1; static guint reload_timer_id = 0; +static AXParameter *g_ax_handle = NULL; static char *cfg_custom_server = NULL; static char *cfg_auth_key = NULL; @@ -86,7 +87,7 @@ static gboolean watchdog_cb(gpointer G_GNUC_UNUSED data) { /* If child exited 0, auth succeeded — clear AuthKey via axparameter */ if (exit_code == 0 && g_ax_handle && cfg_auth_key && *cfg_auth_key) { GError *err = NULL; - if (ax_parameter_set(g_ax_handle, "AuthKey", "", &err)) { + if (ax_parameter_set(g_ax_handle, "AuthKey", "", TRUE, &err)) { free(cfg_auth_key); cfg_auth_key = strdup(""); syslog(LOG_INFO, "AuthKey cleared after successful auth"); } else { @@ -136,8 +137,6 @@ static void write_config_file(void) { cache_get(&cfg_custom_server, "(default)")); } -static AXParameter *g_ax_handle = NULL; - static gboolean debounced_restart(gpointer G_GNUC_UNUSED data) { reload_timer_id = 0; if (g_ax_handle)