Merge pull request #4068 from danrl/wg

net/wireguard: add support for fwmark option
This commit is contained in:
Hannu Nyman 2017-02-27 21:48:26 +02:00 committed by GitHub
commit 03bc8947f5
2 changed files with 6 additions and 1 deletions

View file

@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=wireguard PKG_NAME:=wireguard
PKG_VERSION:=0.0.20170223 PKG_VERSION:=0.0.20170223
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/ PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/

View file

@ -22,6 +22,7 @@ proto_wireguard_init_config() {
proto_config_add_int "listen_port" proto_config_add_int "listen_port"
proto_config_add_int "mtu" proto_config_add_int "mtu"
proto_config_add_string "preshared_key" proto_config_add_string "preshared_key"
proto_config_add_string "fwmark"
available=1 available=1
no_proto_task=1 no_proto_task=1
} }
@ -103,6 +104,7 @@ proto_wireguard_setup() {
config_get addresses "${config}" "addresses" config_get addresses "${config}" "addresses"
config_get mtu "${config}" "mtu" config_get mtu "${config}" "mtu"
config_get preshared_key "${config}" "preshared_key" config_get preshared_key "${config}" "preshared_key"
config_get fwmark "${config}" "fwmark"
# create interface # create interface
ip link del dev "${config}" 2>/dev/null ip link del dev "${config}" 2>/dev/null
@ -125,6 +127,9 @@ proto_wireguard_setup() {
if [ "${preshared_key}" ]; then if [ "${preshared_key}" ]; then
echo "PresharedKey=${preshared_key}" >> "${wg_cfg}" echo "PresharedKey=${preshared_key}" >> "${wg_cfg}"
fi fi
if [ "${fwmark}" ]; then
echo "FwMark=${fwmark}" >> "${wg_cfg}"
fi
config_foreach proto_wireguard_setup_peer "wireguard_${config}" config_foreach proto_wireguard_setup_peer "wireguard_${config}"
# apply configuration file # apply configuration file