forked from freifunk-franken/firmware
Johannes Kimmel
f6c1e4da52
vxlan support in 19.07.5 is very limited. This set of patches adds - more flexible source ip selection - control over most options - multiple remote endpoint configuration List of patches backported: - 5222aadbf3 vxlan: remove mandatory peeraddr - 65e9de3c33 vxlan: add capability for multiple fdb entries - 036221ce5a vxlan: add extra config options - ad3044c424 vxlan: fix rsc config option - 3f5619f259 vxlan: allow for dynamic source ip selection (FS#3426) - a3c033e2af netifd: vxlan: handle srcport range - 226566b967 netifd: vxlan: refactor mapping of boolean attrs - 11223f5550 netifd: vxlan: add most missing boolean options - 55a7b6b7f2 netifd: vxlan: add aging and maxaddress options Signed-off-by: Johannes Kimmel <fff@bareminimum.eu> Reviewed-by: Robert Langhammer <rlanghammer@web.de> Tested-by: Robert Langhammer <rlanghammer@web.de> Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> [refresh patches and remove some bloat] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From: Johannes Kimmel <fff@bareminimum.eu>
|
|
Date: Mon, 20 Jul 2020 08:05:09 +0200
|
|
Subject: vxlan: remove mandatory peeraddr
|
|
|
|
vxlan can be configured without a peer address. This is used to prepare
|
|
an interface and add peers later.
|
|
|
|
Fixes: FS#2743
|
|
|
|
Signed-off-by: Johannes Kimmel <fff@bareminimum.eu>
|
|
Acked-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
(cherry picked from commit 5222aadbf353b7cc030c39aa816f33951b104552)
|
|
|
|
diff --git a/package/network/config/vxlan/files/vxlan.sh b/package/network/config/vxlan/files/vxlan.sh
|
|
index 7b1c7039551b7781f5f7a8e73b964db698f3697b..bdcaa628c4416cc83258dd38a6fc0978ea55a3bb 100755
|
|
--- a/package/network/config/vxlan/files/vxlan.sh
|
|
+++ b/package/network/config/vxlan/files/vxlan.sh
|
|
@@ -55,12 +55,6 @@ proto_vxlan_setup() {
|
|
local ipaddr peeraddr
|
|
json_get_vars ipaddr peeraddr tunlink
|
|
|
|
- [ -z "$peeraddr" ] && {
|
|
- proto_notify_error "$cfg" "MISSING_ADDRESS"
|
|
- proto_block_restart "$cfg"
|
|
- exit
|
|
- }
|
|
-
|
|
( proto_add_host_dependency "$cfg" '' "$tunlink" )
|
|
|
|
[ -z "$ipaddr" ] && {
|
|
@@ -85,12 +79,6 @@ proto_vxlan6_setup() {
|
|
local ip6addr peer6addr
|
|
json_get_vars ip6addr peer6addr tunlink
|
|
|
|
- [ -z "$peer6addr" ] && {
|
|
- proto_notify_error "$cfg" "MISSING_ADDRESS"
|
|
- proto_block_restart "$cfg"
|
|
- exit
|
|
- }
|
|
-
|
|
( proto_add_host_dependency "$cfg" '' "$tunlink" )
|
|
|
|
[ -z "$ip6addr" ] && {
|