bb-flora-kern VLANs aufgeräumt

Richtfunk/bb-flora-kern/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'
@@ -23,7 +24,7 @@ config switch
 config switch_vlan
 	option device 'switch0'
 	option vlan '1'
-	option ports '0t 3 5'
+	option ports '0t 3'
 
 config switch_vlan
 	option device 'switch0'
@@ -35,37 +36,49 @@ config switch_vlan
 	option ports '0t 2t'
 	option device 'switch0'
 
-config switch_vlan
-	option vlan '24'
-	option ports '0t 2t'
-	option device 'switch0'
-
-config switch_vlan
-	option vlan '12'
-	option ports '0t 4'
-	option device 'switch0'
-
 config interface 'vlan5'
 	option proto 'static'
 	option ifname 'eth0.5'
 	option ipaddr '192.168.112.32'
 	option netmask '255.255.255.0'
 
-config interface 'vlan24'
+config switch_vlan
+        option vlan '10'              
+        option ports '0t 5'           
+        option device 'switch0'       
+                                      
+config interface 'flora12'            
+        option ifname 'eth0.10'       
+        option macaddr 'de:ad:be:ef:90:60'
+        option proto 'gluon_mesh'         
+        option fixed_mtu '1'              
+        option igmp_snooping '0'
+
+config switch_vlan             
+        option vlan '11'       
+        option ports '0t 4'    
+        option device 'switch0'
+
+config interface 'flora35'                 
+        option ifname 'eth0.11'           
+        option macaddr 'de:ad:be:ef:90:61'
+        option proto 'gluon_mesh'         
+        option fixed_mtu '1'              
+        option igmp_snooping '0'          
+
+config switch_vlan             
+        option vlan '24'       
+        option ports '0t 2t'   
+        option device 'switch0'
+
+config interface 'doormann22'
 	option ifname 'eth0.24'
-	option macaddr 'de:ad:be:ef:90:60'
+	option macaddr 'de:ad:be:ef:90:62'
 	option proto 'gluon_mesh'
 	option fixed_mtu '1'
 	option transitive '1'
 	option igmp_snooping '0'
 
-config interface 'vlan12'
-	option ifname 'eth0.12'
-	option macaddr 'de:ad:be:ef:90:61'
-	option proto 'gluon_mesh'
-	option fixed_mtu '1'
-	option igmp_snooping '0'
-
 config interface 'wan'
 	option peerdns '0'
 	option ifname 'eth0.2'
@@ -74,6 +87,7 @@ config interface 'wan'
 	option proto 'dhcp'
 	option multicast_querier '0'
 	option macaddr '16:e3:c2:3a:e5:58'
+	option igmp_snooping '1'
 
 config rule6 'wan6_lookup'
 	option mark '0x01/0x01'
@@ -87,25 +101,13 @@ config route6 'wan6_unreachable'
 	option gateway '::'
 	option interface 'loopback'
 
-config interface 'client'
-	option reqprefix 'no'
-	option proto 'dhcpv6'
-	option type 'bridge'
-	option macaddr 'e8:94:f6:cd:6c:66'
-	option peerdns '1'
-	option robustness '3'
-	option query_interval '2000'
-	option query_response_interval '500'
-	option sourcefilter '0'
-	list ifname 'bat0'
-
 config interface 'mesh_wan'
 	option ifname 'br-wan'
-	option auto '1'
-	option proto 'gluon_mesh'
-	option fixed_mtu '1'
 	option igmp_snooping '0'
 	option transitive '1'
+	option index '0'
+	option proto 'gluon_wired'
+	option disabled '0'
 
 config interface 'mesh_vpn'
 	option ifname 'mesh-vpn'
@@ -115,6 +117,7 @@ config interface 'mesh_vpn'
 	option macaddr '16:e3:c2:3a:e5:5f'
 	option fixed_mtu '1'
 	option proto 'gluon_mesh'
+	option mtu '1312'
 
 config route 'local_node_route4'
 	option target '10.112.0.0'
@@ -125,13 +128,12 @@ config route 'local_node_route4'
 config interface 'mesh_lan'
 	option ifname 'eth0.1'
 	option mesh 'bat0'
-	option auto '1'
 	option igmp_snooping '0'
 	option transitive '1'
-	option fixed_mtu '1'
-	option proto 'gluon_mesh'
-	option type 'bridge'
 	option macaddr '16:e3:c2:3a:e5:5c'
+	option index '4'
+	option proto 'gluon_wired'
+	option disabled '1'
 
 config interface 'mesh_radio0'
 	option proto 'gluon_mesh'
@@ -139,26 +141,51 @@ config interface 'mesh_radio0'
 config interface 'mesh_radio1'
 	option proto 'gluon_mesh'
 
-config interface 'bat0'
+config interface 'client'
-	option multicast_router '2'
+	option igmp_snooping '1'
-	option ifname 'bat0'
+	option type 'bridge'
+	option auto '1'
+	option ra_holdoff '30'
+	option multicast_querier '1'
 	option macaddr 'e8:94:f6:cd:6c:66'
-	option learning '1'
+	list ifname 'bat0'
-	option proto 'none'
+	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 type 'veth'
-	option ifname 'br-client'
 	option name 'local-node'
-	option type 'macvlan'
+	option peer_name 'local-port'
+	option macaddr '16:41:95:40:f7:dc'
+	option peer_macaddr 'e8:94:f6:cd:6c:66'
 
 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 'e8:94:f6:cd:6c:66'
+	option learning '1'
+	option proto 'none'
+
 config route6 'local_node_route6'
 	option target '2a03:2267:2::/64'
 	option gateway '::'