diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-24 13:12:40 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-24 18:15:17 +0200 |
| commit | aa3854e54871c6fbe00b9acc264b1246fb7f2a82 (patch) | |
| tree | 8b8564fd217df3a3f14ac527b906939939c1a80b | |
| parent | qemu: show log if process crashes (diff) | |
| download | wireguard-monolithic-historical-aa3854e54871c6fbe00b9acc264b1246fb7f2a82.tar.xz wireguard-monolithic-historical-aa3854e54871c6fbe00b9acc264b1246fb7f2a82.zip | |
wg-quick: android: allow package to be overridden
| -rw-r--r-- | src/tools/wg-quick/android.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/tools/wg-quick/android.c b/src/tools/wg-quick/android.c index 12108c0..610e99c 100644 --- a/src/tools/wg-quick/android.c +++ b/src/tools/wg-quick/android.c @@ -7,6 +7,7 @@ */ #define _GNU_SOURCE +#include <stddef.h> #include <stdlib.h> #include <stdio.h> #include <stdbool.h> @@ -24,8 +25,11 @@ #include <sys/wait.h> #include <sys/param.h> +#ifndef WG_PACKAGE_NAME +#define WG_PACKAGE_NAME "com.wireguard.android" +#endif #ifndef WG_CONFIG_SEARCH_PATHS -#define WG_CONFIG_SEARCH_PATHS "/data/misc/wireguard /data/data/com.wireguard.android/files" +#define WG_CONFIG_SEARCH_PATHS "/data/misc/wireguard /data/data/" WG_PACKAGE_NAME "/files" #endif #define _printf_(x, y) __attribute__((format(printf, x, y))) @@ -34,7 +38,7 @@ static bool is_exiting = false; -/* TODO: remove this once the NDK supports it. */ +#if defined(__ANDROID_API__) && __ANDROID_API__ < 24 static char *strchrnul(const char *s, int c) { char *x = strchr(s, c); @@ -42,6 +46,7 @@ static char *strchrnul(const char *s, int c) return (char *)s + strlen(s); return x; } +#endif static void *xmalloc(size_t size) { @@ -598,8 +603,8 @@ static void broadcast_change(void) { const char *pkg = getenv("CALLING_PACKAGE"); - if (!pkg || strcmp(pkg, "com.wireguard.android")) - cmd("am broadcast -a com.wireguard.android.action.REFRESH_TUNNEL_STATES com.wireguard.android"); + if (!pkg || strcmp(pkg, WG_PACKAGE_NAME)) + cmd("am broadcast -a com.wireguard.android.action.REFRESH_TUNNEL_STATES " WG_PACKAGE_NAME); } static void print_search_paths(FILE *file, const char *prefix) |