fff-babeld, fff-wiregaurd: don't add peer_ip6 address to interfaces
It is not required for the `peer_ip6` to be configured on babel interfaces. IPv6 link local addresses are sufficient for routing. However, setting `peer_ip` is still required until IPv4 routing with a IPv6 nexthop is working. For this, a newer Kernel and support from Babel is still required. Signed-off-by: Johannes Kimmel <fff@bareminimum.eu>
This commit is contained in:
parent
60051fb4a7
commit
00a894c21b
|
@ -70,9 +70,7 @@ configure() {
|
||||||
|
|
||||||
# peer_ip
|
# peer_ip
|
||||||
uci -q delete "network.$prefixname.ipaddr"
|
uci -q delete "network.$prefixname.ipaddr"
|
||||||
uci -q delete "network.$prefixname.ip6addr"
|
|
||||||
babel_add_peeraddr "network.$prefixname.ipaddr"
|
babel_add_peeraddr "network.$prefixname.ipaddr"
|
||||||
babel_add_peer6addr "network.$prefixname.ip6addr"
|
|
||||||
|
|
||||||
# add babel interface
|
# add babel interface
|
||||||
babel_add_interface "$prefixname" "$iface" "$type" "$rxcost" || { echo "Could not add babeld interface for babelpeer $name"; exit 1; }
|
babel_add_interface "$prefixname" "$iface" "$type" "$rxcost" || { echo "Could not add babeld interface for babelpeer $name"; exit 1; }
|
||||||
|
|
|
@ -47,20 +47,6 @@ babel_add_peeraddr() {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
babel_add_peer6addr() {
|
|
||||||
[ "$#" -ne "1" ] && return 1
|
|
||||||
|
|
||||||
local option="$1"
|
|
||||||
|
|
||||||
if peer_ip6=$(uci -q get gateway.@gateway[0].peer_ip6); then
|
|
||||||
uci add_list "$option"="$peer_ip6"
|
|
||||||
else
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
babel_add_interface() {
|
babel_add_interface() {
|
||||||
[ "$#" -ne "4" ] && return 1
|
[ "$#" -ne "4" ] && return 1
|
||||||
|
|
||||||
|
|
|
@ -120,7 +120,6 @@ configure() {
|
||||||
|
|
||||||
# add peer_ip
|
# add peer_ip
|
||||||
babel_add_peeraddr "network.$prefixname.addresses"
|
babel_add_peeraddr "network.$prefixname.addresses"
|
||||||
babel_add_peer6addr "network.$prefixname.addresses"
|
|
||||||
|
|
||||||
# add iif-rules
|
# add iif-rules
|
||||||
babel_add_iifrules "$prefixname" || { echo "ERROR: Could not add iif-rules for wgpeer $name"; exit 1; }
|
babel_add_iifrules "$prefixname" || { echo "ERROR: Could not add iif-rules for wgpeer $name"; exit 1; }
|
||||||
|
|
Loading…
Reference in New Issue