Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools: error if setconf fails

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-01-10 02:40:55 +01:00
parent 01faa9b358
commit b3e928c1bf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/tools/wg-quick.c
View File

@ -173,7 +173,7 @@ _printf_(1, 2) static void cmd(const char *cmd_fmt, ...)
if (ret < 0) if (ret < 0)
ret = ESRCH; ret = ESRCH;
else if (ret > 0) else if (ret > 0)
ret = WEXITSTATUS(ret); ret = WIFEXITED(ret) ? WEXITSTATUS(ret) : EIO;
if (ret && !is_exiting) if (ret && !is_exiting)
exit(ret); exit(ret);
@ -428,6 +428,7 @@ static void set_config(const char *iface, const char *config)
{ {
FILE *config_writer; FILE *config_writer;
_cleanup_free_ char *cmd = concat("wg setconf ", iface, " /proc/self/fd/0", NULL); _cleanup_free_ char *cmd = concat("wg setconf ", iface, " /proc/self/fd/0", NULL);
int ret;
printf("[#] %s\n", cmd); printf("[#] %s\n", cmd);
@ -440,7 +441,9 @@ static void set_config(const char *iface, const char *config)
perror("Error: fputs"); perror("Error: fputs");
exit(errno); exit(errno);
} }
pclose(config_writer); ret = pclose(config_writer);
if (ret)
exit(WIFEXITED(ret) ? WEXITSTATUS(ret) : EIO);
} }
static void print_search_paths(FILE *file, const char *prefix) static void print_search_paths(FILE *file, const char *prefix)