Merge pull request #4556 from zx2c4/master
wireguard: fix routing of allowed IPs when no CIDR is specified
This commit is contained in:
commit
eac93dcec8
2 changed files with 9 additions and 3 deletions
|
@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk
|
||||||
|
|
||||||
PKG_NAME:=wireguard
|
PKG_NAME:=wireguard
|
||||||
|
|
||||||
PKG_VERSION:=0.0.20170629
|
PKG_VERSION:=0.0.20170706
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
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/
|
||||||
PKG_HASH:=51c44624f20eaff96780845214f85491c0c7330598633cd180bb2a6547e5d2b2
|
PKG_HASH:=5763b9436265421a67f92cb82142042867fc87c573ecc18033d40c1476146c33
|
||||||
|
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
PKG_LICENSE_FILES:=COPYING
|
PKG_LICENSE_FILES:=COPYING
|
||||||
|
|
|
@ -82,9 +82,15 @@ proto_wireguard_setup_peer() {
|
||||||
*:*/*)
|
*:*/*)
|
||||||
proto_add_ipv6_route "${allowed_ip%%/*}" "${allowed_ip##*/}"
|
proto_add_ipv6_route "${allowed_ip%%/*}" "${allowed_ip##*/}"
|
||||||
;;
|
;;
|
||||||
*/*)
|
*.*/*)
|
||||||
proto_add_ipv4_route "${allowed_ip%%/*}" "${allowed_ip##*/}"
|
proto_add_ipv4_route "${allowed_ip%%/*}" "${allowed_ip##*/}"
|
||||||
;;
|
;;
|
||||||
|
*:*)
|
||||||
|
proto_add_ipv6_route "${allowed_ip%%/*}" "128"
|
||||||
|
;;
|
||||||
|
*.*)
|
||||||
|
proto_add_ipv4_route "${allowed_ip%%/*}" "32"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue