wireguard: bump to v0.0.20191012 (#1819)

package/network/services/wireguard/Makefile

@@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=wireguard
 
-PKG_VERSION:=0.0.20181218
+PKG_VERSION:=0.0.20191012
 PKG_RELEASE:=1
 
 PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/
-PKG_HASH:=2e9f86acefa49dbfb7fa6f5e10d543f1885a2d5460cd5e102696901107675735
+PKG_HASH:=93573193c9c1c22fde31eb1729ad428ca39da77a603a3d81561a9816ccecfa8e
 
 PKG_LICENSE:=GPL-2.0 Apache-2.0
 PKG_LICENSE_FILES:=COPYING

package/network/services/wireguard/files/wireguard.sh

@@ -2,21 +2,18 @@
 # Copyright 2016-2017 Dan Luedtke <mail@danrl.com>
 # Licensed to the public under the Apache License 2.0.
 
-
 WG=/usr/bin/wg
 if [ ! -x $WG ]; then
 	logger -t "wireguard" "error: missing wireguard-tools (${WG})"
 	exit 0
 fi
 
-
 [ -n "$INCLUDE_ONLY" ] || {
 	. /lib/functions.sh
 	. ../netifd-proto.sh
 	init_proto "$@"
 }
 
-
 proto_wireguard_init_config() {
 	proto_config_add_string "private_key"
 	proto_config_add_int "listen_port"
@@ -26,7 +23,6 @@ proto_wireguard_init_config() {
 	no_proto_task=1
 }
 
-
 proto_wireguard_setup_peer() {
 	local peer_config="$1"
 
@@ -46,7 +42,6 @@ proto_wireguard_setup_peer() {
 	config_get endpoint_port "${peer_config}" "endpoint_port"
 	config_get persistent_keepalive "${peer_config}" "persistent_keepalive"
 
-  # peer configuration
 	echo "[Peer]" >> "${wg_cfg}"
 	echo "PublicKey=${public_key}" >> "${wg_cfg}"
 	if [ "${preshared_key}" ]; then
@@ -75,7 +70,6 @@ proto_wireguard_setup_peer() {
 		echo "PersistentKeepalive=${persistent_keepalive}" >> "${wg_cfg}"
 	fi
 
-  # add routes for allowed ips
 	if [ ${route_allowed_ips} -ne 0 ]; then
 		for allowed_ip in ${allowed_ips}; do
 			case "${allowed_ip}" in
@@ -96,7 +90,6 @@ proto_wireguard_setup_peer() {
 	fi
 }
 
-
 proto_wireguard_setup() {
 	local config="$1"
 	local wg_dir="/tmp/wireguard"
@@ -106,7 +99,6 @@ proto_wireguard_setup() {
 	local listen_port
 	local mtu
 
-  # load configuration
 	config_load network
 	config_get private_key "${config}" "private_key"
 	config_get listen_port "${config}" "listen_port"
@@ -114,8 +106,8 @@ proto_wireguard_setup() {
 	config_get mtu "${config}" "mtu"
 	config_get fwmark "${config}" "fwmark"
 	config_get ip6prefix "${config}" "ip6prefix"
+	config_get nohostroute "${config}" "nohostroute"
 
-  # create interface
 	ip link del dev "${config}" 2>/dev/null
 	ip link add dev "${config}" type wireguard
 
@@ -125,7 +117,6 @@ proto_wireguard_setup() {
 
 	proto_init_update "${config}" 1
 
-  # generate configuration file
 	umask 077
 	mkdir -p "${wg_dir}"
 	echo "[Interface]" > "${wg_cfg}"
@@ -142,17 +133,14 @@ proto_wireguard_setup() {
 	${WG} setconf ${config} "${wg_cfg}"
 	WG_RETURN=$?
 
-  # delete configuration file
 	rm -f "${wg_cfg}"
 
-  # check status
 	if [ ${WG_RETURN} -ne 0 ]; then
 		sleep 5
 		proto_setup_failed "${config}"
 		exit 1
 	fi
 
-  # add ip addresses
 	for address in ${addresses}; do
 		case "${address}" in
 			*:*/*)
@@ -170,29 +158,28 @@ proto_wireguard_setup() {
 		esac
 	done
 
-  # support ip6 prefixes
 	for prefix in ${ip6prefix}; do
 		proto_add_ipv6_prefix "$prefix"
 	done
 
 	# endpoint dependency
+	if [ "${nohostroute}" != "1" ]; then
 		wg show "${config}" endpoints | \
 		sed -E 's/\[?([0-9.:a-f]+)\]?:([0-9]+)/\1 \2/' | \
 		while IFS=$'\t ' read -r key address port; do
 			[ -n "${port}" ] || continue
 			proto_add_host_dependency "${config}" "${address}"
 		done
+	fi
 
 	proto_send_update "${config}"
 }
 
-
 proto_wireguard_teardown() {
 	local config="$1"
 	ip link del dev "${config}" >/dev/null 2>&1
 }
 
-
 [ -n "$INCLUDE_ONLY" ] || {
 	add_protocol wireguard
 }