From 00a894c21b8aae9d130ba40d413d258b2d9014fc Mon Sep 17 00:00:00 2001
From: Johannes Kimmel <fff@bareminimum.eu>
Date: Wed, 27 Jan 2021 13:06:44 +0100
Subject: [PATCH] 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>
---
 .../fff/fff-babeld/files/etc/layer3.d/40-babel     |  2 --
 .../fff/fff-babeld/files/lib/functions/fff/babel   | 14 --------------
 .../fff-wireguard/files/etc/layer3.d/50-wireguard  |  1 -
 3 files changed, 17 deletions(-)

diff --git a/src/packages/fff/fff-babeld/files/etc/layer3.d/40-babel b/src/packages/fff/fff-babeld/files/etc/layer3.d/40-babel
index 9e7e77e..4675e98 100644
--- a/src/packages/fff/fff-babeld/files/etc/layer3.d/40-babel
+++ b/src/packages/fff/fff-babeld/files/etc/layer3.d/40-babel
@@ -70,9 +70,7 @@ configure() {
 
 		# peer_ip
 		uci -q delete "network.$prefixname.ipaddr"
-		uci -q delete "network.$prefixname.ip6addr"
 		babel_add_peeraddr "network.$prefixname.ipaddr"
-		babel_add_peer6addr "network.$prefixname.ip6addr"
 
 		# add babel interface
 		babel_add_interface "$prefixname" "$iface" "$type" "$rxcost" || { echo "Could not add babeld interface for babelpeer $name"; exit 1; }
diff --git a/src/packages/fff/fff-babeld/files/lib/functions/fff/babel b/src/packages/fff/fff-babeld/files/lib/functions/fff/babel
index 3b2c7da..4650617 100644
--- a/src/packages/fff/fff-babeld/files/lib/functions/fff/babel
+++ b/src/packages/fff/fff-babeld/files/lib/functions/fff/babel
@@ -47,20 +47,6 @@ babel_add_peeraddr() {
 	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() {
 	[ "$#" -ne "4" ] && return 1
 
diff --git a/src/packages/fff/fff-wireguard/files/etc/layer3.d/50-wireguard b/src/packages/fff/fff-wireguard/files/etc/layer3.d/50-wireguard
index d95d522..0426452 100644
--- a/src/packages/fff/fff-wireguard/files/etc/layer3.d/50-wireguard
+++ b/src/packages/fff/fff-wireguard/files/etc/layer3.d/50-wireguard
@@ -120,7 +120,6 @@ configure() {
 
 		# add peer_ip
 		babel_add_peeraddr "network.$prefixname.addresses"
-		babel_add_peer6addr "network.$prefixname.addresses"
 
 		# add iif-rules
 		babel_add_iifrules "$prefixname" || { echo "ERROR: Could not add iif-rules for wgpeer $name"; exit 1; }