From 8527713f7230468b43d707c5a65a5a3001d996ee Mon Sep 17 00:00:00 2001
From: 4ndr3 <andre@hamburg.freifunk.net>
Date: Wed, 3 Feb 2021 20:22:59 +0100
Subject: [PATCH] bb-pgkaltona-kern VLANs benannt

---
 .../bb-pgkaltona-kern/etc/config/network      | 87 +++++++++++--------
 1 file changed, 52 insertions(+), 35 deletions(-)

diff --git a/Richtfunk/bb-pgkaltona-kern/etc/config/network b/Richtfunk/bb-pgkaltona-kern/etc/config/network
index 0792605..b38f4bc 100644
--- a/Richtfunk/bb-pgkaltona-kern/etc/config/network
+++ b/Richtfunk/bb-pgkaltona-kern/etc/config/network
@@ -14,6 +14,7 @@ config interface 'wan6'
 	option ifname 'br-wan'
 	option ip6table '1'
 	option peerdns '0'
+	option reqprefix 'no'
 
 config switch
 	option name 'switch0'
@@ -61,7 +62,7 @@ config switch_vlan
 
 config interface 'vlan11'
 	option ifname 'eth1.11'
-	option macaddr 'de:ad:be:ef:90:23'
+	option macaddr 'de:ad:be:ef:90:21'
 	option proto 'gluon_mesh'
 	option fixed_mtu '1'
 	option transitive '1'
@@ -72,9 +73,9 @@ config switch_vlan
 	option vlan '21'
 	option ports '0t 4t'
 
-config interface 'vlan21'
+config interface 'gleis4a'
 	option ifname 'eth1.21'
-	option macaddr 'de:ad:be:ef:90:21'
+	option macaddr 'de:ad:be:ef:90:22'
 	option proto 'gluon_mesh'
 	option fixed_mtu '1'
 	option transitive '1'
@@ -85,9 +86,9 @@ config switch_vlan
 	option vlan '31'
 	option ports '0t 4t'
 
-config interface 'vlan31'
+config interface 'gemeindehaus'
 	option ifname 'eth1.31'
-	option macaddr 'de:ad:be:ef:90:22'
+	option macaddr 'de:ad:be:ef:90:23'
 	option proto 'gluon_mesh'
 	option fixed_mtu '1'
 	option transitive '1'
@@ -101,6 +102,7 @@ config interface 'wan'
 	option proto 'dhcp'
 	option multicast_querier '0'
 	option macaddr '7a:f1:37:4b:34:b8'
+	option igmp_snooping '1'
 
 config rule6 'wan6_lookup'
 	option mark '0x01/0x01'
@@ -114,35 +116,22 @@ config route6 'wan6_unreachable'
 	option gateway '::'
 	option interface 'loopback'
 
-config interface 'client'
-	option type 'bridge'
-	option macaddr 'ec:08:6b:a4:d0:76'
-	option proto 'dhcpv6'
-	option reqprefix 'no'
-	option peerdns '1'
-	option sourcefilter '0'
-	option robustness '3'
-	option query_interval '2000'
-	option query_response_interval '500'
-	list ifname 'bat0'
-	list ifname 'eth1.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 'eth1'
-	option auto '0'
 	option mesh 'bat0'
 	option igmp_snooping '0'
 	option transitive '1'
-	option fixed_mtu '1'
-	option proto 'gluon_mesh'
-	option type 'bridge'
 	option macaddr '7a:f1:37:4b:34:bc'
+	option index '4'
+	option proto 'gluon_wired'
+	option disabled '1'
 
 config interface 'mesh_vpn'
 	option ifname 'mesh-vpn'
@@ -152,30 +141,58 @@ config interface 'mesh_vpn'
 	option macaddr '7a:f1:37:4b:34:bf'
 	option fixed_mtu '1'
 	option proto 'gluon_mesh'
+	option mtu '1312'
 
 config interface 'mesh_radio0'
 	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 'ec:08:6b:a4:d0:76'
-	option learning '1'
-	option proto 'none'
+	list ifname 'bat0'
+	list ifname 'eth1.1'
+	list ifname 'eth1'
+	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 'ec:08:6b:a4:d0:76'
 
 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 'ec:08:6b:a4:d0:76'
+	option learning '1'
+	option proto 'none'
+
 config route6 'local_node_route6'
 	option target '2a03:2267:2::/64'
 	option gateway '::'