From 28afaefc49153e9a67a0b3a93d23e239b9fc170b Mon Sep 17 00:00:00 2001
From: 4ndr3 <andre@hamburg.freifunk.net>
Date: Fri, 5 Feb 2021 10:23:47 +0100
Subject: [PATCH] =?UTF-8?q?bb-flora-uplink=20firmware=20update=20=C3=A4nde?=
 =?UTF-8?q?rungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Richtfunk/bb-flora-uplink/etc/config/network | 77 ++++++++++++--------
 1 file changed, 46 insertions(+), 31 deletions(-)

diff --git a/Richtfunk/bb-flora-uplink/etc/config/network b/Richtfunk/bb-flora-uplink/etc/config/network
index f0d2fa0..494048d 100644
--- a/Richtfunk/bb-flora-uplink/etc/config/network
+++ b/Richtfunk/bb-flora-uplink/etc/config/network
@@ -14,6 +14,7 @@ config interface 'wan6'
 	option ip6table '1'
 	option peerdns '0'
 	option sourcefilter '0'
+	option reqprefix 'no'
 
 config switch
 	option name 'switch0'
@@ -82,7 +83,6 @@ config interface 'bb_flora_saal_unten'
 	option macaddr 'de:ad:be:ef:90:f3'
 	option igmp_snooping '0'
 
-
 config interface 'wan'
 	option ifname 'eth0.2'
 	option auto '1'
@@ -91,6 +91,7 @@ config interface 'wan'
 	option proto 'dhcp'
 	option multicast_querier '0'
 	option macaddr '5e:aa:00:a5:99:70'
+	option igmp_snooping '1'
 
 config rule6 'wan6_lookup'
 	option mark '0x01/0x01'
@@ -104,35 +105,22 @@ config route6 'wan6_unreachable'
 	option gateway '::'
 	option interface 'loopback'
 
-config interface 'client'
-	option reqprefix 'no'
-	option proto 'dhcpv6'
-	option type 'bridge'
-	option macaddr 'f8:1a:67:a6:04:79'
-	option peerdns '1'
-	option robustness '3'
-	option query_interval '2000'
-	option query_response_interval '500'
-	option sourcefilter '0'
-	list ifname 'bat0'
-	list ifname 'eth0.1'
-
 config interface 'mesh_wan'
-	option auto '0'
 	option ifname 'br-wan'
-	option proto 'gluon_mesh'
-	option fixed_mtu '1'
+	option index '0'
+	option proto 'gluon_wired'
+	option disabled '1'
+	option transitive '1'
 
 config interface 'mesh_lan'
 	option ifname 'eth0.1'
 	option mesh 'bat0'
-	option auto '0'
 	option igmp_snooping '0'
 	option transitive '1'
-	option fixed_mtu '1'
-	option proto 'gluon_mesh'
-	option type 'bridge'
 	option macaddr '5e:aa:00:a5:99:74'
+	option index '4'
+	option proto 'gluon_wired'
+	option disabled '1'
 
 config interface 'mesh_vpn'
 	option ifname 'mesh-vpn'
@@ -141,6 +129,7 @@ config interface 'mesh_vpn'
 	option macaddr '5e:aa:00:a5:99:77'
 	option fixed_mtu '1'
 	option proto 'gluon_mesh'
+	option mtu '1312'
 
 config interface 'mesh_radio0'
 	option proto 'gluon_mesh'
@@ -148,26 +137,52 @@ config interface 'mesh_radio0'
 config interface 'mesh_radio1'
 	option proto 'gluon_mesh'
 
-config interface 'bat0'
-	option multicast_router '2'
-	option ifname 'bat0'
+config interface 'client'
+	option igmp_snooping '1'
+	option type 'bridge'
+	option auto '1'
+	option ra_holdoff '30'
+	option multicast_querier '1'
 	option macaddr 'f8:1a:67:a6:04:79'
-	option learning '1'
-	option proto 'none'
+	list ifname 'bat0'
+	list ifname 'eth0.1'
+	list ifname 'local-port'
+	option ipv6 '1'
+	option keep_ra_dnslifetime '1'
+	option sourcefilter '0'
+	option peerdns '1'
+	option robustness '9'
+	option reqprefix 'no'
+	option query_interval '2000'
+	option query_response_interval '500'
+	option proto 'dhcpv6'
 
 config device 'local_node_dev'
-	option macaddr '16:41:95:40:f7:dc'
-	option ifname 'br-client'
+	option type 'veth'
 	option name 'local-node'
-	option type 'macvlan'
+	option peer_name 'local-port'
+	option macaddr '16:41:95:40:f7:dc'
+	option peer_macaddr 'f8:1a:67:a6:04:79'
 
 config interface 'local_node'
 	option ifname 'local-node'
-	option ipaddr '10.112.96.1'
+	option ipaddr '10.112.96.1/19'
 	option ip6addr '2a03:2267:2::1/128'
-	option netmask '255.255.224.0'
+	option ip6deprecated '1'
 	option proto 'static'
 
+config interface 'gluon_bat0'
+	option gw_mode 'client'
+	option proto 'gluon_bat0'
+
+config interface 'bat0'
+	option multicast_router '2'
+	option ifname 'bat0'
+	option auto '1'
+	option macaddr 'f8:1a:67:a6:04:79'
+	option learning '1'
+	option proto 'none'
+
 config route6 'local_node_route6'
 	option target '2a03:2267:2::/64'
 	option gateway '::'