From 64c6c395dac0d976a7b9799759105bf04c0810d5 Mon Sep 17 00:00:00 2001 From: 4ndr3 Date: Mon, 4 Dec 2017 23:00:03 +0100 Subject: [PATCH] Update network auf 0.8.5 --- Richtfunk/bb-artfiles-kern/etc/config/network | 28 ++++----- Richtfunk/bb-bue-kern/etc/config/network | 41 ++++++++----- .../bb-chemnitz03-kern/etc/config/network | 54 ++++++++-------- .../bb-doormann22-kern/etc/config/network | 32 +++++----- Richtfunk/bb-flora-kern/etc/config/network | 28 ++++----- Richtfunk/bb-flora-uplink/etc/config/network | 50 +++++++-------- .../etc/config/network | 24 +++----- .../bb-pgkaltona-kern/etc/config/network | 28 ++++----- .../bb-schanzenstern-kern/etc/config/network | 61 +++++++++---------- .../bb-schnacke100-kern/etc/config/network | 26 ++++---- .../bb-stpaulikirche-kern/etc/config/network | 44 ++++++------- Richtfunk/bb-werkhof-kern/etc/config/network | 28 ++++----- .../bb-winfrid12-kern/etc/config/network | 22 +++---- 13 files changed, 214 insertions(+), 252 deletions(-) diff --git a/Richtfunk/bb-artfiles-kern/etc/config/network b/Richtfunk/bb-artfiles-kern/etc/config/network index 2f57063..1a2fff7 100644 --- a/Richtfunk/bb-artfiles-kern/etc/config/network +++ b/Richtfunk/bb-artfiles-kern/etc/config/network @@ -67,7 +67,7 @@ config interface 'vlan26' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'vlan29' option ifname 'eth0.29' @@ -75,7 +75,7 @@ config interface 'vlan29' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'vlan32' option ifname 'eth0.32' @@ -83,7 +83,7 @@ config interface 'vlan32' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'wan' option ifname 'eth0.2' @@ -112,12 +112,12 @@ config interface 'client' option type 'bridge' option macaddr 'e8:94:f6:cd:6d:46' option peerdns '1' - list ifname 'eth0.1' - list ifname 'bat0' option robustness '3' option query_interval '2000' option query_response_interval '500' option sourcefilter '0' + list ifname 'eth0.1' + list ifname 'bat0' config interface 'mesh_wan' option ifname 'br-wan' @@ -144,23 +144,19 @@ config interface 'mesh_vpn' option fixed_mtu '1' option proto 'gluon_mesh' -config interface 'ibss_radio0' +config interface 'mesh_radio0' option proto 'gluon_mesh' -config interface 'ibss_radio1' +config interface 'mesh_radio1' option proto 'gluon_mesh' config interface 'bat0' option multicast_router '2' option ifname 'bat0' option macaddr 'e8:94:f6:cd:6d:46' - option learning '0' + option learning '1' option proto 'none' -config interface 'client_lan' - option unicast_flood '0' - option ifname 'eth0.1' - config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' @@ -169,13 +165,13 @@ config device 'local_node_dev' config interface 'local_node' option ifname 'local-node' - option ipaddr '10.112.0.1' - option ip6addr '2a03:2267::1/128' - option netmask '255.255.192.0' + option ipaddr '10.112.96.1' + option ip6addr '2a03:2267:2::1/128' + option netmask '255.255.224.0' option proto 'static' config route6 'local_node_route6' - option target '2a03:2267::/64' + option target '2a03:2267:2::/64' option gateway '::' option interface 'client' diff --git a/Richtfunk/bb-bue-kern/etc/config/network b/Richtfunk/bb-bue-kern/etc/config/network index d0eb9a0..0f6ba7f 100644 --- a/Richtfunk/bb-bue-kern/etc/config/network +++ b/Richtfunk/bb-bue-kern/etc/config/network @@ -45,6 +45,11 @@ config switch_vlan option vlan '11' option ports '0t 4t' +config switch_vlan + option device 'switch0' + option vlan '7' + option ports '0t 4t' + config switch_vlan option device 'switch0' option vlan '32' @@ -76,7 +81,7 @@ config interface 'vlan11' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'vlan32' option ifname 'eth1.32' @@ -84,7 +89,7 @@ config interface 'vlan32' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'vlan33' option ifname 'eth1.33' @@ -92,7 +97,15 @@ config interface 'vlan33' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' + +config interface 'vlan7' + option ifname 'eth1.7' + option macaddr 'de:ad:be:ef:90:c3' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + option igmp_snooping '0' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -113,12 +126,12 @@ config interface 'client' option reqprefix 'no' option peerdns '1' option sourcefilter '0' - list ifname 'eth1.1' - list ifname 'eth1.6' - list ifname 'bat0' option robustness '3' option query_interval '2000' option query_response_interval '500' + list ifname 'eth1.1' + list ifname 'eth1.6' + list ifname 'bat0' config interface 'mesh_wan' option auto '0' @@ -146,20 +159,16 @@ config interface 'mesh_vpn' option fixed_mtu '1' option proto 'gluon_mesh' -config interface 'ibss_radio0' +config interface 'mesh_radio0' option proto 'gluon_mesh' config interface 'bat0' option multicast_router '2' option ifname 'bat0' option macaddr 'f4:f2:6d:2a:16:3c' - option learning '0' + option learning '1' option proto 'none' -config interface 'client_lan' - option unicast_flood '0' - option ifname 'eth1' - config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' @@ -168,13 +177,13 @@ config device 'local_node_dev' config interface 'local_node' option ifname 'local-node' - option ipaddr '10.112.0.1' - option ip6addr '2a03:2267::1/128' - option netmask '255.255.192.0' + option ipaddr '10.112.96.1' + option ip6addr '2a03:2267:2::1/128' + option netmask '255.255.224.0' option proto 'static' config route6 'local_node_route6' - option target '2a03:2267::/64' + option target '2a03:2267:2::/64' option gateway '::' option interface 'client' diff --git a/Richtfunk/bb-chemnitz03-kern/etc/config/network b/Richtfunk/bb-chemnitz03-kern/etc/config/network index 14814d9..77a8f1c 100644 --- a/Richtfunk/bb-chemnitz03-kern/etc/config/network +++ b/Richtfunk/bb-chemnitz03-kern/etc/config/network @@ -41,23 +41,23 @@ config interface 'vlan5' option ipaddr '192.168.112.41' option netmask '255.255.255.0' -config switch_vlan - option device 'switch0' - option vlan '10' - option ports '0t 3' - -config interface 'vlan10' - option ifname 'eth0.10' - option macaddr 'de:ad:be:ef:90:81' - option proto 'gluon_mesh' - option fixed_mtu '1' - option transitive '1' - option igmp_snooping '0' +config switch_vlan + option device 'switch0' + option vlan '10' + option ports '0t 3' -config switch_vlan - option device 'switch0' - option vlan '29' - option ports '0t 2t' +config interface 'vlan10' + option ifname 'eth0.10' + option macaddr 'de:ad:be:ef:90:81' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + option igmp_snooping '0' + +config switch_vlan + option device 'switch0' + option vlan '29' + option ports '0t 2t' config interface 'vlan29' option ifname 'eth0.29' @@ -65,7 +65,7 @@ config interface 'vlan29' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'wan' option ifname 'eth0.2' @@ -94,11 +94,11 @@ config interface 'client' option type 'bridge' option macaddr 'f8:1a:67:a5:f8:ee' option peerdns '1' - list ifname 'bat0' option robustness '3' option query_interval '2000' option query_response_interval '500' option sourcefilter '0' + list ifname 'bat0' config interface 'mesh_wan' option auto '0' @@ -126,23 +126,19 @@ config interface 'mesh_vpn' option fixed_mtu '1' option proto 'gluon_mesh' -config interface 'ibss_radio0' +config interface 'mesh_radio0' option proto 'gluon_mesh' -config interface 'ibss_radio1' +config interface 'mesh_radio1' option proto 'gluon_mesh' config interface 'bat0' option multicast_router '2' option ifname 'bat0' option macaddr 'f8:1a:67:a5:f8:ee' - option learning '0' + option learning '1' option proto 'none' -config interface 'client_lan' - option unicast_flood '0' - option ifname 'eth0.1' - config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' @@ -151,13 +147,13 @@ config device 'local_node_dev' config interface 'local_node' option ifname 'local-node' - option ipaddr '10.112.0.1' - option ip6addr '2a03:2267::1/128' - option netmask '255.255.192.0' + option ipaddr '10.112.96.1' + option ip6addr '2a03:2267:2::1/128' + option netmask '255.255.224.0' option proto 'static' config route6 'local_node_route6' - option target '2a03:2267::/64' + option target '2a03:2267:2::/64' option gateway '::' option interface 'client' diff --git a/Richtfunk/bb-doormann22-kern/etc/config/network b/Richtfunk/bb-doormann22-kern/etc/config/network index 2fbc726..a8b18e7 100644 --- a/Richtfunk/bb-doormann22-kern/etc/config/network +++ b/Richtfunk/bb-doormann22-kern/etc/config/network @@ -72,7 +72,7 @@ config interface 'vlan23' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'vlan24' option ifname 'eth0.24' @@ -80,7 +80,7 @@ config interface 'vlan24' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'vlan25' option ifname 'eth0.25' @@ -88,7 +88,7 @@ config interface 'vlan25' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'vlan28' option ifname 'eth0.28' @@ -96,7 +96,7 @@ config interface 'vlan28' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'vlan30' option ifname 'eth0.30' @@ -104,7 +104,7 @@ config interface 'vlan30' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'wan' option ifname 'eth0.2' @@ -133,12 +133,12 @@ config interface 'client' option type 'bridge' option macaddr 'e8:94:f6:cd:66:74' option peerdns '1' - list ifname 'eth0.1' - list ifname 'bat0' option robustness '3' option query_interval '2000' option query_response_interval '500' option sourcefilter '0' + list ifname 'eth0.1' + list ifname 'bat0' config interface 'mesh_wan' option auto '0' @@ -166,23 +166,19 @@ config interface 'mesh_vpn' option fixed_mtu '1' option proto 'gluon_mesh' -config interface 'ibss_radio0' +config interface 'mesh_radio0' option proto 'gluon_mesh' -config interface 'ibss_radio1' +config interface 'mesh_radio1' option proto 'gluon_mesh' config interface 'bat0' option multicast_router '2' option ifname 'bat0' option macaddr 'e8:94:f6:cd:66:74' - option learning '0' + option learning '1' option proto 'none' -config interface 'client_lan' - option unicast_flood '0' - option ifname 'eth0.1' - config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' @@ -191,13 +187,13 @@ config device 'local_node_dev' config interface 'local_node' option ifname 'local-node' - option ipaddr '10.112.0.1' - option ip6addr '2a03:2267::1/128' - option netmask '255.255.192.0' + option ipaddr '10.112.96.1' + option ip6addr '2a03:2267:2::1/128' + option netmask '255.255.224.0' option proto 'static' config route6 'local_node_route6' - option target '2a03:2267::/64' + option target '2a03:2267:2::/64' option gateway '::' option interface 'client' diff --git a/Richtfunk/bb-flora-kern/etc/config/network b/Richtfunk/bb-flora-kern/etc/config/network index b9cf5d8..e6182ed 100644 --- a/Richtfunk/bb-flora-kern/etc/config/network +++ b/Richtfunk/bb-flora-kern/etc/config/network @@ -57,14 +57,14 @@ config interface 'vlan24' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + 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' + option igmp_snooping '0' config interface 'wan' option peerdns '0' @@ -93,19 +93,19 @@ config interface 'client' option type 'bridge' option macaddr 'e8:94:f6:cd:6c:66' option peerdns '1' - list ifname 'bat0' 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 igmp_snooping '0' + option transitive '1' config interface 'mesh_vpn' option ifname 'mesh-vpn' @@ -133,23 +133,19 @@ config interface 'mesh_lan' option type 'bridge' option macaddr '16:e3:c2:3a:e5:5c' -config interface 'ibss_radio0' +config interface 'mesh_radio0' option proto 'gluon_mesh' -config interface 'ibss_radio1' +config interface 'mesh_radio1' option proto 'gluon_mesh' config interface 'bat0' option multicast_router '2' option ifname 'bat0' option macaddr 'e8:94:f6:cd:6c:66' - option learning '0' + option learning '1' option proto 'none' -config interface 'client_lan' - option unicast_flood '0' - option ifname 'eth0.1' - config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' @@ -158,13 +154,13 @@ config device 'local_node_dev' config interface 'local_node' option ifname 'local-node' - option ipaddr '10.112.0.1' - option ip6addr '2a03:2267::1/128' - option netmask '255.255.192.0' + option ipaddr '10.112.96.1' + option ip6addr '2a03:2267:2::1/128' + option netmask '255.255.224.0' option proto 'static' config route6 'local_node_route6' - option target '2a03:2267::/64' + option target '2a03:2267:2::/64' option gateway '::' option interface 'client' diff --git a/Richtfunk/bb-flora-uplink/etc/config/network b/Richtfunk/bb-flora-uplink/etc/config/network index 352dc2c..2686a73 100644 --- a/Richtfunk/bb-flora-uplink/etc/config/network +++ b/Richtfunk/bb-flora-uplink/etc/config/network @@ -41,7 +41,7 @@ config interface 'bb_flora_cafe' option fixed_mtu '1' option proto 'gluon_mesh' option macaddr 'de:ad:be:ef:90:f0' - option igmp_snooping '0' + option igmp_snooping '0' config switch_vlan option device 'switch0' @@ -54,21 +54,21 @@ config interface 'bb_flora_saal_oben' option fixed_mtu '1' option proto 'gluon_mesh' option macaddr 'de:ad:be:ef:90:f1' - option igmp_snooping '0' + option igmp_snooping '0' + +config switch_vlan + option device 'switch0' + option vlan '7' + option ports '0t 5' + +config interface 'bb_flora_kern' + option ifname 'eth0.7' + option transitive '1' + option fixed_mtu '1' + option proto 'gluon_mesh' + option macaddr 'de:ad:be:ef:90:f2' + option igmp_snooping '0' -config switch_vlan - option device 'switch0' - option vlan '7' - option ports '0t 5' - -config interface 'bb_flora_kern' - option ifname 'eth0.7' - option transitive '1' - option fixed_mtu '1' - option proto 'gluon_mesh' - option macaddr 'de:ad:be:ef:90:f2' - option igmp_snooping '0' - config interface 'wan' option ifname 'eth0.2' option auto '1' @@ -96,11 +96,11 @@ config interface 'client' option type 'bridge' option macaddr 'f8:1a:67:a6:04:79' option peerdns '1' - list ifname 'bat0' option robustness '3' option query_interval '2000' option query_response_interval '500' option sourcefilter '0' + list ifname 'bat0' config interface 'mesh_wan' option auto '0' @@ -127,23 +127,19 @@ config interface 'mesh_vpn' option fixed_mtu '1' option proto 'gluon_mesh' -config interface 'ibss_radio0' +config interface 'mesh_radio0' option proto 'gluon_mesh' -config interface 'ibss_radio1' +config interface 'mesh_radio1' option proto 'gluon_mesh' config interface 'bat0' option multicast_router '2' option ifname 'bat0' option macaddr 'f8:1a:67:a6:04:79' - option learning '0' + option learning '1' option proto 'none' -config interface 'client_lan' - option unicast_flood '0' - option ifname 'eth0.1' - config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' @@ -152,13 +148,13 @@ config device 'local_node_dev' config interface 'local_node' option ifname 'local-node' - option ipaddr '10.112.0.1' - option ip6addr '2a03:2267::1/128' - option netmask '255.255.192.0' + option ipaddr '10.112.96.1' + option ip6addr '2a03:2267:2::1/128' + option netmask '255.255.224.0' option proto 'static' config route6 'local_node_route6' - option target '2a03:2267::/64' + option target '2a03:2267:2::/64' option gateway '::' option interface 'client' diff --git a/Richtfunk/bb-pgkaltona-gemeindehaus/etc/config/network b/Richtfunk/bb-pgkaltona-gemeindehaus/etc/config/network index c22864d..63528ca 100644 --- a/Richtfunk/bb-pgkaltona-gemeindehaus/etc/config/network +++ b/Richtfunk/bb-pgkaltona-gemeindehaus/etc/config/network @@ -52,7 +52,7 @@ config interface 'vlan31' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'wan' option ifname 'eth0.2' @@ -82,11 +82,11 @@ config interface 'client' option reqprefix 'no' option peerdns '1' option sourcefilter '0' - list ifname 'bat0' - list ifname 'eth0.1' option robustness '3' option query_interval '2000' option query_response_interval '500' + list ifname 'bat0' + list ifname 'eth0.1' config interface 'mesh_wan' option auto '0' @@ -114,23 +114,19 @@ config interface 'mesh_vpn' option fixed_mtu '1' option proto 'gluon_mesh' -config interface 'ibss_radio0' +config interface 'mesh_radio0' option proto 'gluon_mesh' -config interface 'ibss_radio1' +config interface 'mesh_radio1' option proto 'gluon_mesh' config interface 'bat0' option multicast_router '2' option ifname 'bat0' option macaddr 'a0:f3:c1:99:30:da' - option learning '0' + option learning '1' option proto 'none' -config interface 'client_lan' - option unicast_flood '0' - option ifname 'eth0.1' - config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' @@ -139,13 +135,13 @@ config device 'local_node_dev' config interface 'local_node' option ifname 'local-node' - option ipaddr '10.112.0.1' - option ip6addr '2a03:2267::1/128' - option netmask '255.255.192.0' + option ipaddr '10.112.96.1' + option ip6addr '2a03:2267:2::1/128' + option netmask '255.255.224.0' option proto 'static' config route6 'local_node_route6' - option target '2a03:2267::/64' + option target '2a03:2267:2::/64' option gateway '::' option interface 'client' diff --git a/Richtfunk/bb-pgkaltona-kern/etc/config/network b/Richtfunk/bb-pgkaltona-kern/etc/config/network index 705cb6b..0792605 100644 --- a/Richtfunk/bb-pgkaltona-kern/etc/config/network +++ b/Richtfunk/bb-pgkaltona-kern/etc/config/network @@ -52,7 +52,7 @@ config interface 'vlan10' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config switch_vlan option device 'switch0' @@ -65,7 +65,7 @@ config interface 'vlan11' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config switch_vlan option device 'switch0' @@ -78,7 +78,7 @@ config interface 'vlan21' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config switch_vlan option device 'switch0' @@ -91,7 +91,7 @@ config interface 'vlan31' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'wan' option ifname 'eth0' @@ -121,11 +121,11 @@ config interface 'client' option reqprefix 'no' option peerdns '1' option sourcefilter '0' - list ifname 'bat0' - list ifname 'eth1.1' 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' @@ -153,20 +153,16 @@ config interface 'mesh_vpn' option fixed_mtu '1' option proto 'gluon_mesh' -config interface 'ibss_radio0' +config interface 'mesh_radio0' option proto 'gluon_mesh' config interface 'bat0' option multicast_router '2' option ifname 'bat0' option macaddr 'ec:08:6b:a4:d0:76' - option learning '0' + option learning '1' option proto 'none' -config interface 'client_lan' - option unicast_flood '0' - option ifname 'eth1' - config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' @@ -175,13 +171,13 @@ config device 'local_node_dev' config interface 'local_node' option ifname 'local-node' - option ipaddr '10.112.0.1' - option ip6addr '2a03:2267::1/128' - option netmask '255.255.192.0' + option ipaddr '10.112.96.1' + option ip6addr '2a03:2267:2::1/128' + option netmask '255.255.224.0' option proto 'static' config route6 'local_node_route6' - option target '2a03:2267::/64' + option target '2a03:2267:2::/64' option gateway '::' option interface 'client' diff --git a/Richtfunk/bb-schanzenstern-kern/etc/config/network b/Richtfunk/bb-schanzenstern-kern/etc/config/network index b0a2a7b..44f06f4 100644 --- a/Richtfunk/bb-schanzenstern-kern/etc/config/network +++ b/Richtfunk/bb-schanzenstern-kern/etc/config/network @@ -73,17 +73,37 @@ config interface 'mesh_vpn' option fixed_mtu '1' option proto 'gluon_mesh' +config interface 'management_Schanzenstern' + option ifname 'eth0.222' + option proto 'static' + option ipaddr '192.168.121.1' + option netmask '255.255.255.0' + option enabled '1' + +config interface 'wartung_richtfunk' + option ifname 'eth0.5' + option proto 'static' + option ipaddr '192.168.112.2' + option netmask '255.255.255.0' + option enabled '1' + +config interface 'werkhof' + option ifname 'eth0.27' + option igmp_snooping '0' + option transitive '1' + option fixed_mtu '1' + option proto 'gluon_mesh' + option type 'bridge' + option macaddr 'de:ad:be:ef:90:e0' + option enabled '1' + config interface 'bat0' option multicast_router '2' option ifname 'bat0' option macaddr '00:19:99:5c:dc:c5' - option learning '0' + option learning '1' option proto 'none' -config interface 'client_lan' - option unicast_flood '0' - option ifname 'eth0' - config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' @@ -92,36 +112,13 @@ config device 'local_node_dev' config interface 'local_node' option ifname 'local-node' - option ipaddr '10.112.0.1' - option ip6addr '2a03:2267::1/128' - option netmask '255.255.192.0' + option ipaddr '10.112.96.1' + option ip6addr '2a03:2267:2::1/128' + option netmask '255.255.224.0' option proto 'static' config route6 'local_node_route6' - option target '2a03:2267::/64' + option target '2a03:2267:2::/64' option gateway '::' option interface 'client' -config interface 'management_Schanzenstern' - option ifname 'eth0.222' - option proto 'static' - option ipaddr '192.168.121.1' - option netmask '255.255.255.0' - option enabled '1' - -config interface 'wartung_richtfunk' - option ifname 'eth0.5' - option proto 'static' - option ipaddr '192.168.112.2' - option netmask '255.255.255.0' - option enabled '1' - -config interface 'werkhof' - option ifname 'eth0.27' - option igmp_snooping '0' - option transitive '1' - option fixed_mtu '1' - option proto 'gluon_mesh' - option type 'bridge' - option macaddr 'de:ad:be:ef:90:e0' - option enabled '1' diff --git a/Richtfunk/bb-schnacke100-kern/etc/config/network b/Richtfunk/bb-schnacke100-kern/etc/config/network index 23e3dbd..ba93627 100644 --- a/Richtfunk/bb-schnacke100-kern/etc/config/network +++ b/Richtfunk/bb-schnacke100-kern/etc/config/network @@ -68,7 +68,7 @@ config interface 'vlan28' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'wan' option ifname 'eth0' @@ -97,20 +97,20 @@ config interface 'client' option type 'bridge' option macaddr '10:fe:ed:57:ea:90' option peerdns '1' - list ifname 'eth1.1' - list ifname 'bat0' option robustness '3' option query_interval '2000' option query_response_interval '500' option sourcefilter '0' + list ifname 'eth1.1' + 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 igmp_snooping '0' + option transitive '1' config interface 'mesh_lan' option ifname 'eth1' @@ -132,20 +132,16 @@ config interface 'mesh_vpn' option fixed_mtu '1' option proto 'gluon_mesh' -config interface 'ibss_radio0' +config interface 'mesh_radio0' option proto 'gluon_mesh' config interface 'bat0' option multicast_router '2' option ifname 'bat0' option macaddr '10:fe:ed:57:ea:90' - option learning '0' + option learning '1' option proto 'none' -config interface 'client_lan' - option unicast_flood '0' - option ifname 'eth1' - config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' @@ -154,13 +150,13 @@ config device 'local_node_dev' config interface 'local_node' option ifname 'local-node' - option ipaddr '10.112.0.1' - option ip6addr '2a03:2267::1/128' - option netmask '255.255.192.0' + option ipaddr '10.112.96.1' + option ip6addr '2a03:2267:2::1/128' + option netmask '255.255.224.0' option proto 'static' config route6 'local_node_route6' - option target '2a03:2267::/64' + option target '2a03:2267:2::/64' option gateway '::' option interface 'client' diff --git a/Richtfunk/bb-stpaulikirche-kern/etc/config/network b/Richtfunk/bb-stpaulikirche-kern/etc/config/network index 3ff7599..5c8e1ad 100644 --- a/Richtfunk/bb-stpaulikirche-kern/etc/config/network +++ b/Richtfunk/bb-stpaulikirche-kern/etc/config/network @@ -101,17 +101,17 @@ config interface 'doormann22' option fixed_mtu '1' option transitive '1' -config switch_vlan - option vlan '34' - option ports '0t 2t' - option device 'switch0' - -config interface 'hafen122' - option ifname 'eth0.34' - option macaddr 'de:ad:be:ef:90:55' - option proto 'gluon_mesh' - option fixed_mtu '1' - option transitive '1' +config switch_vlan + option vlan '34' + option ports '0t 2t' + option device 'switch0' + +config interface 'hafen122' + option ifname 'eth0.34' + option macaddr 'de:ad:be:ef:90:55' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config interface 'wan' option ifname 'eth0.2' @@ -140,12 +140,12 @@ config interface 'client' option type 'bridge' option macaddr 'f8:1a:67:ca:92:24' option peerdns '1' - list ifname 'eth0.1' - list ifname 'bat0' option robustness '3' option query_interval '2000' option query_response_interval '500' option sourcefilter '0' + list ifname 'eth0.1' + list ifname 'bat0' config interface 'mesh_wan' option auto '0' @@ -173,23 +173,19 @@ config interface 'mesh_vpn' option fixed_mtu '1' option proto 'gluon_mesh' -config interface 'ibss_radio0' +config interface 'mesh_radio0' option proto 'gluon_mesh' -config interface 'ibss_radio1' +config interface 'mesh_radio1' option proto 'gluon_mesh' config interface 'bat0' option multicast_router '2' option ifname 'bat0' option macaddr 'f8:1a:67:ca:92:24' - option learning '0' + option learning '1' option proto 'none' -config interface 'client_lan' - option unicast_flood '0' - option ifname 'eth0.1' - config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' @@ -198,13 +194,13 @@ config device 'local_node_dev' config interface 'local_node' option ifname 'local-node' - option ipaddr '10.112.0.1' - option ip6addr '2a03:2267::1/128' - option netmask '255.255.192.0' + option ipaddr '10.112.96.1' + option ip6addr '2a03:2267:2::1/128' + option netmask '255.255.224.0' option proto 'static' config route6 'local_node_route6' - option target '2a03:2267::/64' + option target '2a03:2267:2::/64' option gateway '::' option interface 'client' diff --git a/Richtfunk/bb-werkhof-kern/etc/config/network b/Richtfunk/bb-werkhof-kern/etc/config/network index 76eff15..05be0f7 100644 --- a/Richtfunk/bb-werkhof-kern/etc/config/network +++ b/Richtfunk/bb-werkhof-kern/etc/config/network @@ -52,7 +52,7 @@ config interface 'vlan10' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config switch_vlan option device 'switch0' @@ -65,7 +65,7 @@ config interface 'vlan11' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config switch_vlan option device 'switch0' @@ -78,7 +78,7 @@ config interface 'vlan22' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config switch_vlan option device 'switch0' @@ -91,7 +91,7 @@ config interface 'vlan27' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'wan' option ifname 'eth0' @@ -120,12 +120,12 @@ config interface 'client' option type 'bridge' option macaddr '14:cc:20:4d:3d:68' option peerdns '1' - list ifname 'eth1.1' - list ifname 'bat0' option robustness '3' option query_interval '2000' option query_response_interval '500' option sourcefilter '0' + list ifname 'eth1.1' + list ifname 'bat0' config interface 'mesh_wan' option auto '0' @@ -153,20 +153,16 @@ config interface 'mesh_vpn' option fixed_mtu '1' option proto 'gluon_mesh' -config interface 'ibss_radio0' +config interface 'mesh_radio0' option proto 'gluon_mesh' config interface 'bat0' option multicast_router '2' option ifname 'bat0' option macaddr '14:cc:20:4d:3d:68' - option learning '0' + option learning '1' option proto 'none' -config interface 'client_lan' - option unicast_flood '0' - option ifname 'eth1' - config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' @@ -175,13 +171,13 @@ config device 'local_node_dev' config interface 'local_node' option ifname 'local-node' - option ipaddr '10.112.0.1' - option ip6addr '2a03:2267::1/128' - option netmask '255.255.192.0' + option ipaddr '10.112.96.1' + option ip6addr '2a03:2267:2::1/128' + option netmask '255.255.224.0' option proto 'static' config route6 'local_node_route6' - option target '2a03:2267::/64' + option target '2a03:2267:2::/64' option gateway '::' option interface 'client' diff --git a/Richtfunk/bb-winfrid12-kern/etc/config/network b/Richtfunk/bb-winfrid12-kern/etc/config/network index 129b439..c59877e 100644 --- a/Richtfunk/bb-winfrid12-kern/etc/config/network +++ b/Richtfunk/bb-winfrid12-kern/etc/config/network @@ -52,7 +52,7 @@ config interface 'vlan30' option proto 'gluon_mesh' option fixed_mtu '1' option transitive '1' - option igmp_snooping '0' + option igmp_snooping '0' config interface 'client' option type 'bridge' @@ -60,11 +60,11 @@ config interface 'client' option proto 'dhcpv6' option reqprefix 'no' option peerdns '1' - list ifname 'bat0' option robustness '3' option query_interval '2000' option query_response_interval '500' option sourcefilter '0' + list ifname 'bat0' config interface 'mesh' option mtu '1528' @@ -127,23 +127,19 @@ config interface 'mesh_lan' option type 'bridge' option macaddr '3e:b8:a0:7f:ce:d4' -config interface 'ibss_radio0' +config interface 'mesh_radio0' option proto 'gluon_mesh' -config interface 'ibss_radio1' +config interface 'mesh_radio1' option proto 'gluon_mesh' config interface 'bat0' option multicast_router '2' option ifname 'bat0' option macaddr 'c0:4a:00:38:ad:5c' - option learning '0' + option learning '1' option proto 'none' -config interface 'client_lan' - option unicast_flood '0' - option ifname 'eth0.1' - config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' @@ -152,13 +148,13 @@ config device 'local_node_dev' config interface 'local_node' option ifname 'local-node' - option ipaddr '10.112.0.1' - option ip6addr '2a03:2267::1/128' - option netmask '255.255.192.0' + option ipaddr '10.112.96.1' + option ip6addr '2a03:2267:2::1/128' + option netmask '255.255.224.0' option proto 'static' config route6 'local_node_route6' - option target '2a03:2267::/64' + option target '2a03:2267:2::/64' option gateway '::' option interface 'client'