upstream/wireguard-tools
1
0
Fork 0
mirror of https://git.zx2c4.com/wireguard-tools synced 2026-02-03 20:29:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wg-quick: use addconf instead of setconf

Browse source 
The example in the man page at some point changed:

-    \fBPostUp = wg set %i private-key <(pass WireGuard/private-keys/%i)\fP
+    \fBPreUp = wg set %i private-key <(pass WireGuard/private-keys/%i)\fP

This is actually wrong because PreUp is followed by set_config(), which
calls `wg setconf`, which in turn deletes the private key from the
interface because it is missing from the configuration. Replacing this
with `wg addconf` is safe to do because the interface is newly created.

Suggested-by: Matthias Dressel <code@deadcode.eu>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2025-06-19 16:58:39 +02:00
parent d3b40aff96
commit 0b7d9821f2
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/wg-quick/android.c
View file

@ -1047,7 +1047,7 @@ static void set_routes(const char *iface, unsigned int netid)
static void set_config(const char *iface, const char *config)
{
FILE *config_writer;
_cleanup_free_ char *cmd = concat("wg setconf ", iface, " /proc/self/fd/0", NULL);
_cleanup_free_ char *cmd = concat("wg addconf ", iface, " /proc/self/fd/0", NULL);
int ret;
printf("[#] %s\n", cmd);

2
src/wg-quick/darwin.bash
View file

@ -370,7 +370,7 @@ add_route() {
}
set_config() {
cmd wg setconf "$REAL_INTERFACE" <(echo "$WG_CONFIG")
cmd wg addconf "$REAL_INTERFACE" <(echo "$WG_CONFIG")
}
save_config() {

2
src/wg-quick/freebsd.bash
View file

@ -338,7 +338,7 @@ add_route() {
}
set_config() {
echo "$WG_CONFIG" | cmd wg setconf "$INTERFACE" /dev/stdin
echo "$WG_CONFIG" | cmd wg addconf "$INTERFACE" /dev/stdin
}
save_config() {

2
src/wg-quick/linux.bash
View file

@ -249,7 +249,7 @@ add_default() {
}
set_config() {
cmd wg setconf "$INTERFACE" <(echo "$WG_CONFIG")
cmd wg addconf "$INTERFACE" <(echo "$WG_CONFIG")
}
save_config() {

2
src/wg-quick/openbsd.bash
View file

@ -338,7 +338,7 @@ add_route() {
}
set_config() {
cmd wg setconf "$REAL_INTERFACE" <(echo "$WG_CONFIG")
cmd wg addconf "$REAL_INTERFACE" <(echo "$WG_CONFIG")
}
save_config() {