ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-20 06:08:08 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

vxlan: allow for dynamic source ip selection (FS#3426)

Browse Source 
By setting 'auto', the zero address or the empty string as source
address (option ipaddr, option ip6addr), vxlan will choose one
dynamically. This helps in setups where a wan ip or prefix changes.

This corresponse to setting up an vxlan tunnel with:

proto vxlan6:
    # ip link add vx0 type vxlan id ID local :: ...
proto vxlan:
    # ip link add vx0 type vxlan id ID local 0.0.0.0 ...

While it is possible to not specify a source ip at all, the kernel will
default to setting up a ipv4 tunnel. The kernel will take any hint from
source and peer ips to figure out, what tunnel type to use. To make sure
we setup an ipv6 tunnel for proto vxlan6, this workaround is needed.

This will not change the behaviour of currently working configurations.
However this will allow former broken configurations, namely those not
specifying both a source address and tunnel interface, to setup a
tunnel interface. Previously those configurations weren't reporting an
error and were stueck in a setup loop like in Bug FS#3426.

This change lifts the currently very strict behaviour and should fix the
following bug:

Fixes: FS#3426
Ref: https://bugs.openwrt.org/index.php?do=details&task_id=3426

Signed-off-by: Johannes Kimmel <fff@bareminimum.eu>
This commit is contained in:
Johannes Kimmel 2020-12-15 00:31:52 +01:00 committed by Hans Dedecker
parent 31554e50d2
commit 3f5619f259
2 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/config/vxlan/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=vxlan PKG_NAME:=vxlan
PKG_RELEASE:=6 PKG_RELEASE:=7
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

35
package/network/config/vxlan/files/vxlan.sh
View File

@ -114,18 +114,11 @@ proto_vxlan_setup() {
( proto_add_host_dependency "$cfg" '' "$tunlink" ) ( proto_add_host_dependency "$cfg" '' "$tunlink" )
[ -z "$ipaddr" ] && { case "$ipaddr" in
local wanif="$tunlink" "auto"|"")
if [ -z "$wanif" ] && ! network_find_wan wanif; then ipaddr="0.0.0.0"
proto_notify_error "$cfg" "NO_WAN_LINK" ;;
exit esac
fi
if ! network_get_ipaddr ipaddr "$wanif"; then
proto_notify_error "$cfg" "NO_WAN_LINK"
exit
fi
}
vxlan_generic_setup "$cfg" 'vxlan' "$ipaddr" "$peeraddr" vxlan_generic_setup "$cfg" 'vxlan' "$ipaddr" "$peeraddr"
} }
@ -138,18 +131,12 @@ proto_vxlan6_setup() {
( proto_add_host_dependency "$cfg" '' "$tunlink" ) ( proto_add_host_dependency "$cfg" '' "$tunlink" )
[ -z "$ip6addr" ] && { case "$ip6addr" in
local wanif="$tunlink" "auto"|"")
if [ -z "$wanif" ] && ! network_find_wan6 wanif; then # ensure tunnel via ipv6
proto_notify_error "$cfg" "NO_WAN_LINK" ip6addr="::"
exit ;;
fi esac
if ! network_get_ipaddr6 ip6addr "$wanif"; then
proto_notify_error "$cfg" "NO_WAN_LINK"
exit
fi
}
vxlan_generic_setup "$cfg" 'vxlan6' "$ip6addr" "$peer6addr" vxlan_generic_setup "$cfg" 'vxlan6' "$ip6addr" "$peer6addr"
} }