From cfe1237f3859c0cb19b98a47870f49942d5537d9 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 16 Jan 2022 15:53:13 +0900 Subject: [PATCH] network: wireguard: do not add routes to AllowedIPs= by default As setting such routes may break existing setups. Closes #21964. --- man/systemd.netdev.xml | 2 +- src/network/netdev/wireguard.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 7d5c0ac729..051c45c748 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -1581,7 +1581,7 @@ networkd.conf5, or a number in the range 1…4294967295. When off the routes to the addresses specified in the AllowedIPs= setting will not be configured. - Defaults to main. This setting will be ignored when the same setting is + Defaults to off. This setting will be ignored when the same setting is specified in the [WireGuardPeer] section. diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c index af91dc6257..2b26a92f5d 100644 --- a/src/network/netdev/wireguard.c +++ b/src/network/netdev/wireguard.c @@ -895,13 +895,8 @@ int config_parse_wireguard_route_table( assert(data); assert(userdata); - if (isempty(rvalue)) { - *table = RT_TABLE_MAIN; - return 0; - } - - if (streq(rvalue, "off")) { - *table = 0; + if (isempty(rvalue) || streq(rvalue, "off")) { + *table = 0; /* Disabled. */ return 0; } @@ -1061,7 +1056,6 @@ static void wireguard_init(NetDev *netdev) { assert(w); w->flags = WGDEVICE_F_REPLACE_PEERS; - w->route_table = RT_TABLE_MAIN; } static void wireguard_done(NetDev *netdev) {