From cdc04b1ec61fd8477f1c84ad5f71b253482b213f Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 19 Sep 2018 21:16:38 +0200 Subject: [PATCH] net/wireguard: add similar to "don't pull routes" in OpenVPN (#860) --- net/wireguard/Makefile | 2 +- .../OPNsense/Wireguard/forms/dialogEditWireguardClient.xml | 6 ++++++ .../opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml | 4 ++++ .../templates/OPNsense/Wireguard/wireguard-server.conf | 3 +++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/net/wireguard/Makefile b/net/wireguard/Makefile index df3d46b5e..cba15e7e4 100644 --- a/net/wireguard/Makefile +++ b/net/wireguard/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= wireguard -PLUGIN_VERSION= 0.4 +PLUGIN_VERSION= 0.5 PLUGIN_COMMENT= WireGuard VPN service PLUGIN_DEPENDS= wireguard PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardClient.xml b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardClient.xml index 29a2a48d2..ab39839db 100644 --- a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardClient.xml +++ b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardClient.xml @@ -37,4 +37,10 @@ text Set port the endpoint listens to. + + client.disableroutes + + checkbox + This will prevent installing routes. Usually you only enable this to do own routing decisions via a local gateway and gateway rules. + diff --git a/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml b/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml index 41c6ba7c6..46dc183bc 100644 --- a/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml +++ b/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml @@ -30,6 +30,10 @@ N + + 0 + Y + diff --git a/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf b/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf index ebd19b18a..cb2fd55bd 100644 --- a/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf +++ b/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard-server.conf @@ -14,6 +14,9 @@ ListenPort = {{ server_list.port }} {% for peerlist in server_list.peers.split(",") %} {% set peerlist2_data = helpers.getUUID(peerlist) %} {% if peerlist2_data != {} and peerlist2_data.enabled == '1' %} +{% if peerlist2_data != {} and peerlist2_data.disableroutes == '1' %} +Table = off +{% endif %} PrivateKey = {{ server_list.privkey }} [Peer] PublicKey = {{ peerlist2_data.pubkey }}