From 87e6bc0b39d54589b1863f779e3c1103b183197a Mon Sep 17 00:00:00 2001 From: Andre Schmidt Date: Mon, 9 Mar 2020 16:51:05 +0100 Subject: [PATCH] VLANs angepasst. Moewe hinzugefuegt --- Richtfunk/bb-bierfass/etc/config/network | 52 ++++--- Richtfunk/bb-cko-kern/etc/config/network | 119 +++++++------- Richtfunk/bb-fux-kern/etc/config/network | 89 ++++++----- Richtfunk/bb-moewe-kern/etc/config/network | 173 +++++++++++++++++++++ 4 files changed, 312 insertions(+), 121 deletions(-) create mode 100644 Richtfunk/bb-moewe-kern/etc/config/network diff --git a/Richtfunk/bb-bierfass/etc/config/network b/Richtfunk/bb-bierfass/etc/config/network index 2d78995..e70796a 100644 --- a/Richtfunk/bb-bierfass/etc/config/network +++ b/Richtfunk/bb-bierfass/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' @@ -44,28 +45,28 @@ config interface 'bierhahn' option igmp_snooping '0' config switch_vlan - option device 'switch0' - option vlan '5' - option ports '0t 3t' + option device 'switch0' + option vlan '5' + option ports '0t 3t' config interface 'wartung' - option proto 'static' - option ifname 'eth0.5' - option ipaddr '192.168.112.59' - option netmask '255.255.255.0' + option proto 'static' + option ifname 'eth0.5' + option ipaddr '192.168.112.59' + option netmask '255.255.255.0' config switch_vlan - option device 'switch0' - option vlan '37' - option ports '0t 3t' - + option device 'switch0' + option vlan '39' + option ports '0t 3t' + config interface 'cko' - option ifname 'eth0.37' - option macaddr 'de:ad:be:ef:91:41' - option proto 'gluon_mesh' - option fixed_mtu '1' - option transitive '1' - option igmp_snooping '0' + option ifname 'eth0.39' + option macaddr 'de:ad:be:ef:91:41' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + option igmp_snooping '0' config interface 'wan' option ifname 'eth0.2' @@ -91,20 +92,20 @@ config route6 'wan6_unreachable' config interface 'mesh_wan' option ifname 'br-wan' - option auto '1' - option proto 'gluon_mesh' - option fixed_mtu '1' + option index '0' + option proto 'gluon_wired' + option disabled '0' + option transitive '1' config interface 'mesh_lan' - 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 'b2:ad:e3:cc:8f:8c' option ifname 'eth0.1' + option index '4' + option proto 'gluon_wired' + option disabled '1' config interface 'mesh_vpn' option ifname 'mesh-vpn' @@ -126,6 +127,7 @@ 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:5a:a3:e7' list ifname 'bat0' @@ -135,7 +137,7 @@ config interface 'client' option keep_ra_dnslifetime '1' option sourcefilter '0' option peerdns '1' - option robustness '3' + option robustness '9' option reqprefix 'no' option query_interval '2000' option query_response_interval '500' diff --git a/Richtfunk/bb-cko-kern/etc/config/network b/Richtfunk/bb-cko-kern/etc/config/network index 5a515cb..08ca4bc 100644 --- a/Richtfunk/bb-cko-kern/etc/config/network +++ b/Richtfunk/bb-cko-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' @@ -31,54 +32,54 @@ config switch_vlan option ports '5 6' config switch_vlan - option device 'switch0' - option vlan '5' - option ports '4t 0t' + option device 'switch0' + option vlan '5' + option ports '4t 0t' config interface 'wartung' - option proto 'static' - option ifname 'eth1.5' - option ipaddr '192.168.112.19' - option netmask '255.255.255.0' + option proto 'static' + option ifname 'eth1.5' + option ipaddr '192.168.112.19' + option netmask '255.255.255.0' -config switch_vlan - option device 'switch0' - option vlan '10' - option ports '4t 0t' +config switch_vlan + option device 'switch0' + option vlan '10' + option ports '4t 0t' config interface 'eingang' - option ifname 'eth1.10' - option macaddr 'de:ad:be:ef:90:00' - option proto 'gluon_mesh' - option fixed_mtu '1' - option transitive '1' - option igmp_snooping '0' + option ifname 'eth1.10' + option macaddr 'de:ad:be:ef:90:00' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + option igmp_snooping '0' -config switch_vlan - option device 'switch0' - option vlan '37' - option ports '4t 0t' - -config interface 'bierfass' - option ifname 'eth1.37' - option macaddr 'de:ad:be:ef:90:01' - option proto 'gluon_mesh' - option fixed_mtu '1' - option transitive '1' - option igmp_snooping '0' +config switch_vlan + option device 'switch0' + option vlan '39' + option ports '4t 0t' -config switch_vlan - option device 'switch0' - option vlan '38' - option ports '4t 0t' - -config interface 'schanzenstern' - option ifname 'eth1.38' - option macaddr 'de:ad:be:ef:90:02' - option proto 'gluon_mesh' - option fixed_mtu '1' - option transitive '1' - option igmp_snooping '0' +config interface 'bierfass' + option ifname 'eth1.39' + option macaddr 'de:ad:be:ef:90:01' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + option igmp_snooping '0' + +config switch_vlan + option device 'switch0' + option vlan '38' + option ports '4t 0t' + +config interface 'schanzenstern' + option ifname 'eth1.38' + option macaddr 'de:ad:be:ef:90:02' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + option igmp_snooping '0' config interface 'wan' option igmp_snooping '1' @@ -102,30 +103,38 @@ config route6 'wan6_unreachable' option gateway '::' option interface 'loopback' -config interface 'mesh_radio0' - option proto 'gluon_mesh' - config interface 'mesh_wan' option ifname 'br-wan' - option auto '0' option transitive '1' - option fixed_mtu '1' - option proto 'gluon_mesh' + option index '0' + option proto 'gluon_wired' + option disabled '1' config interface 'mesh_lan' option igmp_snooping '0' option ifname 'eth1' option transitive '1' + option macaddr 'ea:f8:c6:2d:35:74' + option index '4' + option proto 'gluon_wired' + option disabled '1' + +config interface 'mesh_vpn' + option ifname 'mesh-vpn' + option transitive '1' + option mtu '1312' + option macaddr 'ea:f8:c6:2d:35:77' option fixed_mtu '1' option proto 'gluon_mesh' - option type 'bridge' - option auto '0' - option macaddr 'ea:f8:c6:2d:35:74' + +config interface 'mesh_radio0' + option proto 'gluon_mesh' config interface 'client' option igmp_snooping '1' option type 'bridge' option auto '1' + option ra_holdoff '30' option multicast_querier '1' option macaddr '14:cc:20:4d:3d:82' list ifname 'eth1' @@ -135,7 +144,7 @@ config interface 'client' option keep_ra_dnslifetime '1' option sourcefilter '0' option peerdns '1' - option robustness '3' + option robustness '9' option reqprefix 'no' option query_interval '2000' option query_response_interval '500' @@ -171,11 +180,3 @@ config route6 'local_node_route6' option gateway '::' option interface 'client' -config interface 'mesh_vpn' - option ifname 'mesh-vpn' - option transitive '1' - option mtu '1312' - option macaddr 'ea:f8:c6:2d:35:77' - option fixed_mtu '1' - option proto 'gluon_mesh' - diff --git a/Richtfunk/bb-fux-kern/etc/config/network b/Richtfunk/bb-fux-kern/etc/config/network index 29c8ae8..a3929a8 100644 --- a/Richtfunk/bb-fux-kern/etc/config/network +++ b/Richtfunk/bb-fux-kern/etc/config/network @@ -43,7 +43,7 @@ config switch_vlan config interface 'ccchh' option ifname 'eth0.7' - option macaddr 'de:ad:be:ef:90:1a' + option macaddr 'de:ad:be:ef:90:10' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' @@ -56,7 +56,7 @@ config switch_vlan config interface 'bb_fux_mw_3g_tanz' option ifname 'eth0.8' - option macaddr 'de:ad:be:ef:90:1b' + option macaddr 'de:ad:be:ef:90:11' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' @@ -69,7 +69,7 @@ config switch_vlan config interface 'bb_fux_hof_1' option ifname 'eth0.9' - option macaddr 'de:ad:be:ef:90:1c' + option macaddr 'de:ad:be:ef:90:12' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' @@ -82,7 +82,7 @@ config switch_vlan config interface 'bb_fux_12' option ifname 'eth0.10' - option macaddr 'de:ad:be:ef:90:10' + option macaddr 'de:ad:be:ef:90:13' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' @@ -95,7 +95,7 @@ config switch_vlan config interface 'bb_fux_17' option ifname 'eth0.11' - option macaddr 'de:ad:be:ef:90:11' + option macaddr 'de:ad:be:ef:90:14' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' @@ -108,7 +108,7 @@ config switch_vlan config interface 'bb_fux_23' option ifname 'eth0.12' - option macaddr 'de:ad:be:ef:90:12' + option macaddr 'de:ad:be:ef:90:15' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' @@ -121,7 +121,7 @@ config switch_vlan config interface 'bb_fux_28' option ifname 'eth0.13' - option macaddr 'de:ad:be:ef:90:13' + option macaddr 'de:ad:be:ef:90:16' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' @@ -134,7 +134,7 @@ config switch_vlan config interface 'kuno' option ifname 'eth0.20' - option macaddr 'de:ad:be:ef:90:14' + option macaddr 'de:ad:be:ef:90:17' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' @@ -147,7 +147,7 @@ config switch_vlan config interface 'pgkaltona' option ifname 'eth0.21' - option macaddr 'de:ad:be:ef:90:15' + option macaddr 'de:ad:be:ef:90:18' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' @@ -160,7 +160,7 @@ config switch_vlan config interface 'werkhof' option ifname 'eth0.22' - option macaddr 'de:ad:be:ef:90:16' + option macaddr 'de:ad:be:ef:90:19' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' @@ -173,7 +173,7 @@ config switch_vlan config interface 'doormann22' option ifname 'eth0.23' - option macaddr 'de:ad:be:ef:90:17' + option macaddr 'de:ad:be:ef:90:1a' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' @@ -186,38 +186,51 @@ config switch_vlan config interface 'artfiles' option ifname 'eth0.26' - option macaddr 'de:ad:be:ef:90:18' + option macaddr 'de:ad:be:ef:90:1b' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' option igmp_snooping '0' config switch_vlan - option vlan '35' + option vlan '35' + option ports '0t 2t' + option device 'switch0' + +config interface 'moewe' + option ifname 'eth0.35' + option macaddr 'de:ad:be:ef:90:1c' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + option igmp_snooping '0' + +config switch_vlan + option vlan '36' option ports '0t 2t' option device 'switch0' -config interface 'fcsp' - option ifname 'eth0.35' - option macaddr 'de:ad:be:ef:90:19' +config interface 'sumo' + option ifname 'eth0.36' + option macaddr 'de:ad:be:ef:90:1d' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' option igmp_snooping '0' -config switch_vlan - option vlan '36' - option ports '0t 2t' - option device 'switch0' - -config interface 'sumo' - option ifname 'eth0.36' - option macaddr 'de:ad:be:ef:90:1a' - option proto 'gluon_mesh' - option fixed_mtu '1' - option transitive '1' - option igmp_snooping '0' - +config switch_vlan + option vlan '40' + option ports '0t 2t' + option device 'switch0' + +config interface 'gleis4a' + option ifname 'eth0.40' + option macaddr 'de:ad:be:ef:90:1e' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + option igmp_snooping '0' + config interface 'wan' option ifname 'eth0.2' option type 'bridge' @@ -243,6 +256,7 @@ config interface 'wan6' option peerdns '0' option ip6table '1' option sourcefilter '0' + option reqprefix 'no' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -258,9 +272,10 @@ config route6 'wan6_unreachable' config interface 'mesh_wan' option ifname 'br-wan' - option auto '1' - option proto 'gluon_mesh' - option fixed_mtu '1' + option index '0' + option proto 'gluon_wired' + option disabled '0' + option transitive '1' config route 'local_node_route4' option target '10.112.0.0' @@ -270,14 +285,13 @@ config route 'local_node_route4' config interface 'mesh_lan' option ifname 'eth0.1' - 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 'c2:0d:9f:de:d0:94' + option index '4' + option proto 'gluon_wired' + option disabled '1' config interface 'mesh_radio0' option proto 'gluon_mesh' @@ -289,6 +303,7 @@ 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:d8:df:d2' list ifname 'eth0.1' @@ -299,7 +314,7 @@ config interface 'client' option keep_ra_dnslifetime '1' option sourcefilter '0' option peerdns '1' - option robustness '3' + option robustness '9' option reqprefix 'no' option query_interval '2000' option query_response_interval '500' diff --git a/Richtfunk/bb-moewe-kern/etc/config/network b/Richtfunk/bb-moewe-kern/etc/config/network new file mode 100644 index 0000000..41405fa --- /dev/null +++ b/Richtfunk/bb-moewe-kern/etc/config/network @@ -0,0 +1,173 @@ + +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +config globals 'globals' + option ula_prefix 'fd47:5a59:76a2::/48' + +config interface 'wan6' + option proto 'dhcpv6' + option ifname 'br-wan' + option ip6table '1' + option sourcefilter '0' + option peerdns '0' + option reqprefix 'no' + +config switch + option name 'switch0' + option reset '1' + option enable_vlan '1' + +config switch_vlan + option device 'switch0' + option vlan '1' + option ports '3 4 5 0t' + +config switch_vlan + option device 'switch0' + option vlan '2' + option ports '1 0t' + +config switch_vlan + option vlan '5' + option ports '0t 2t' + option device 'switch0' + +config interface 'wartung' + option proto 'static' + option ifname 'eth0.5' + option ipaddr '192.168.112.73' + option netmask '255.255.255.0' + +config switch_vlan + option vlan '35' + option ports '0t 2t' + option device 'switch0' + +config interface 'fux' + option ifname 'eth0.35' + option macaddr 'de:ad:be:ef:91:50' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + option igmp_snooping '0' + +config switch_vlan + option vlan '37' + option ports '0t 2t' + option device 'switch0' + +config interface 'gleis4a' + option ifname 'eth0.37' + option macaddr 'de:ad:be:ef:91:51' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + option igmp_snooping '0' + + +config interface 'wan' + option igmp_snooping '1' + option ifname 'eth0.2' + option multicast_querier '0' + option peerdns '0' + option auto '1' + option type 'bridge' + option proto 'dhcp' + option macaddr 'f2:79:2f:fe:93:b0' + +config rule6 'wan6_lookup' + option mark '0x01/0x01' + option lookup '1' + +config route6 'wan6_unreachable' + option type 'unreachable' + option table '1' + option target '::/0' + option metric '65535' + option gateway '::' + option interface 'loopback' + +config interface 'mesh_wan' + option ifname 'br-wan' + option index '0' + option proto 'gluon_wired' + option disabled '1' + option transitive '1' + +config interface 'mesh_lan' + option igmp_snooping '0' + option ifname 'eth0.1' + option index '4' + option proto 'gluon_wired' + option disabled '1' + option transitive '1' + option macaddr 'f2:79:2f:fe:93:b4' + +config interface 'mesh_vpn' + option ifname 'mesh-vpn' + option transitive '1' + option mtu '1312' + option macaddr 'f2:79:2f:fe:93:b7' + option fixed_mtu '1' + option proto 'gluon_mesh' + +config interface 'mesh_radio0' + option proto 'gluon_mesh' + +config interface 'mesh_radio1' + option proto 'gluon_mesh' + +config interface 'client' + option igmp_snooping '1' + option type 'bridge' + option auto '1' + option ra_holdoff '30' + option multicast_querier '1' + option macaddr '60:e3:27:fb:45:f7' + list ifname 'eth0.1' + list ifname 'local-port' + list ifname 'bat0' + 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 type 'veth' + option name 'local-node' + option peer_name 'local-port' + option macaddr '16:41:95:40:f7:dc' + option peer_macaddr '60:e3:27:fb:45:f7' + +config interface 'local_node' + option ifname 'local-node' + option ipaddr '10.112.96.1/19' + option ip6addr '2a03:2267:2::1/128' + option ip6deprecated '1' + option proto 'static' + +config interface 'gluon_bat0' + option proto 'gluon_bat0' + +config interface 'bat0' + option multicast_router '2' + option ifname 'bat0' + option auto '1' + option macaddr '60:e3:27:fb:45:f7' + option learning '1' + option proto 'none' + +config route6 'local_node_route6' + option target '2a03:2267:2::/64' + option gateway '::' + option interface 'client' +