From 9ec7c69dcde70356622a3026014d3942d7ddff17 Mon Sep 17 00:00:00 2001 From: 4ndr3 Date: Fri, 21 Apr 2017 21:58:29 +0200 Subject: [PATCH] =?UTF-8?q?network=20configs=20aktualisiert=20f=C3=BCr=20f?= =?UTF-8?q?irmware=200.8.2=20und=20=C3=BCberfl=C3=BCssige,=20da=20persiste?= =?UTF-8?q?nte,=20configs=20entfernt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../Brachvogelweg_Kern/etc/config/network | 73 +++--- .../Brachvogelweg_Kern/etc/config/wireless | 59 ----- .../Kampnagel_Uplink/etc/config/wireless | 69 ----- Kampnagel/README | 1 - .../Nochtspeicher_01/etc/config/wireless | 55 ---- .../Nochtspeicher_02/etc/config/wireless | 55 ---- Nochtspeicher/README | 1 - .../bb-artfiles-kern/etc/config/batman-adv | 4 +- Richtfunk/bb-artfiles-kern/etc/config/network | 110 ++++---- .../bb-artfiles-kern/etc/config/wireless | 57 ----- Richtfunk/bb-bue-kern/etc/config/network | 120 +++++---- .../bb-chemnitz03-kern/etc/config/network | 86 ++++--- .../bb-doormann22-kern/etc/config/network | 114 +++++---- .../bb-doormann22-kern/etc/config/wireless | 57 ----- Richtfunk/bb-flora-kern/etc/config/network | 70 +++-- Richtfunk/bb-flora-kern/etc/config/snmpd | 43 ---- Richtfunk/bb-flora-kern/etc/config/wireless | 58 ----- Richtfunk/bb-fux-kern/etc/config/network | 240 +++++++++--------- Richtfunk/bb-fux-kern/etc/config/wireless | 63 ----- .../etc/config/network | 92 ++++--- .../bb-pgkaltona-kern/etc/config/network | 159 ++++++------ .../bb-pgkaltona-kern/etc/config/wireless | 29 --- .../bb-schnacke100-kern/etc/config/network | 115 ++++++--- .../bb-schnacke100-kern/etc/config/wireless | 29 --- .../bb-stpaulikirche-kern/etc/config/network | 158 ++++++------ .../bb-stpaulikirche-kern/etc/config/wireless | 59 ----- Richtfunk/bb-werkhof-kern/etc/config/network | 130 +++++----- .../bb-winfrid12-kern/etc/config/network | 88 ++++--- 29 files changed, 853 insertions(+), 1342 deletions(-) delete mode 100644 Brachvogelweg/Brachvogelweg_Kern/etc/config/wireless delete mode 100644 Kampnagel/Kampnagel_Uplink/etc/config/wireless delete mode 100644 Kampnagel/README delete mode 100644 Nochtspeicher/Nochtspeicher_01/etc/config/wireless delete mode 100644 Nochtspeicher/Nochtspeicher_02/etc/config/wireless delete mode 100644 Nochtspeicher/README delete mode 100644 Richtfunk/bb-artfiles-kern/etc/config/wireless delete mode 100644 Richtfunk/bb-doormann22-kern/etc/config/wireless delete mode 100644 Richtfunk/bb-flora-kern/etc/config/snmpd delete mode 100644 Richtfunk/bb-flora-kern/etc/config/wireless delete mode 100644 Richtfunk/bb-fux-kern/etc/config/wireless delete mode 100644 Richtfunk/bb-pgkaltona-kern/etc/config/wireless delete mode 100644 Richtfunk/bb-schnacke100-kern/etc/config/wireless delete mode 100644 Richtfunk/bb-stpaulikirche-kern/etc/config/wireless diff --git a/.gitignore b/.gitignore index f935021..330e188 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ !.gitignore +.DS_Store diff --git a/Brachvogelweg/Brachvogelweg_Kern/etc/config/network b/Brachvogelweg/Brachvogelweg_Kern/etc/config/network index bdd0c8f..f5e2fd6 100644 --- a/Brachvogelweg/Brachvogelweg_Kern/etc/config/network +++ b/Brachvogelweg/Brachvogelweg_Kern/etc/config/network @@ -13,6 +13,7 @@ config interface 'wan6' option ifname 'br-wan' option ip6table '1' option peerdns '0' + option sourcefilter '0' config switch option name 'switch0' @@ -30,18 +31,18 @@ config switch_vlan option ports '0t 1' config switch_vlan - option device 'switch0' - option vlan '3' - option ports '0t 2' + option device 'switch0' + option vlan '3' + option ports '0t 2' config interface 'wan' - option igmp_snooping '0' option ifname 'eth0.2' option auto '1' option peerdns '0' option type 'bridge' option proto 'dhcp' - option macaddr 'fa:1b:67:ca:84:86' + option multicast_querier '0' + option macaddr 'aa:f5:d1:67:7b:50' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -57,47 +58,59 @@ config route6 'wan6_unreachable' config interface 'client' option reqprefix 'no' - option ifname 'eth0.1 bat0' option proto 'dhcpv6' option type 'bridge' - option igmp_snooping '0' option macaddr 'f8:1a:67:ca:84:86' option peerdns '1' - -config interface 'bat0' - option ifname 'bat0' - option macaddr 'f8:1a:67:ca:84:86' - option proto 'none' - -config interface 'mesh_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - -config interface 'mesh_radio1' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' + list ifname 'eth0.1' + list ifname 'bat0' + option robustness '3' + option query_interval '2000' + option query_response_interval '500' + option sourcefilter '0' config interface 'mesh_wan' option auto '0' option ifname 'br-wan' - option mesh 'bat0' - option proto 'batadv' + option proto 'gluon_mesh' + option fixed_mtu '1' config interface 'mesh_lan' - option ifname 'eth0.3' - option macaddr 'fa:1b:68:ca:84:86' option mesh 'bat0' - option proto 'batadv' - option auto '1' + option auto '1' + option igmp_snooping '0' + option ifname 'eth0.3' + option transitive '1' + option fixed_mtu '1' + option proto 'gluon_mesh' + option type 'bridge' + option macaddr 'aa:f5:d1:67:7b:54' config interface 'mesh_vpn' option ifname 'mesh-vpn' option mesh_no_rebroadcast '1' - option macaddr 'fa:1e:67:ca:84:86' option mesh 'bat0' - option proto 'batadv' + option transitive '1' + option macaddr 'aa:f5:d1:67:7b:57' + option fixed_mtu '1' + option proto 'gluon_mesh' + +config interface 'ibss_radio0' + option proto 'gluon_mesh' + +config interface 'ibss_radio1' + option proto 'gluon_mesh' + +config interface 'bat0' + option multicast_router '2' + option ifname 'bat0' + option macaddr 'f8:1a:67:ca:84:86' + option learning '0' + 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' diff --git a/Brachvogelweg/Brachvogelweg_Kern/etc/config/wireless b/Brachvogelweg/Brachvogelweg_Kern/etc/config/wireless deleted file mode 100644 index 3d5359a..0000000 --- a/Brachvogelweg/Brachvogelweg_Kern/etc/config/wireless +++ /dev/null @@ -1,59 +0,0 @@ - -config wifi-device 'radio0' - option type 'mac80211' - option hwmode '11g' - option path 'platform/ar934x_wmac' - option htmode 'HT20' - option channel '1' - option country 'DE' - option disabled '1' - -config wifi-device 'radio1' - option type 'mac80211' - option hwmode '11a' - option path 'pci0000:00/0000:00:00.0' - option channel '44' - option htmode 'HT40+' - option country 'DE' - option disabled '1' - -config wifi-iface 'client_radio0' - option ifname 'client0' - option network 'client' - option disabled '0' - option device 'radio0' - option mode 'ap' - option macaddr 'fa:1c:68:ca:84:86' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio0' - option ifname 'mesh0' - option network 'mesh_radio0' - option device 'radio0' - option bssid 'f8:d1:11:87:52:2e' - option disabled '0' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr 'fa:1d:68:ca:84:86' - option ssid 'f8:d1:11:87:52:2e' - -config wifi-iface 'client_radio1' - option ifname 'client1' - option network 'client' - option disabled '0' - option device 'radio1' - option mode 'ap' - option macaddr 'fa:1c:69:ca:84:86' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio1' - option ifname 'mesh1' - option network 'mesh_radio1' - option device 'radio1' - option bssid 'f8:d1:11:87:52:2e' - option disabled '0' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr 'fa:1d:69:ca:84:86' - option ssid 'f8:d1:11:87:52:2e' - diff --git a/Kampnagel/Kampnagel_Uplink/etc/config/wireless b/Kampnagel/Kampnagel_Uplink/etc/config/wireless deleted file mode 100644 index b64a188..0000000 --- a/Kampnagel/Kampnagel_Uplink/etc/config/wireless +++ /dev/null @@ -1,69 +0,0 @@ -config wifi-device 'radio0' - option type 'mac80211' - option hwmode '11ng' - option path 'platform/ar934x_wmac' - list ht_capab 'LDPC' - list ht_capab 'SHORT-GI-20' - list ht_capab 'SHORT-GI-40' - list ht_capab 'TX-STBC' - list ht_capab 'RX-STBC1' - list ht_capab 'DSSS_CCK-40' - option channel '1' - option country 'DE' - option htmode 'HT20' - option disabled '1' - -config wifi-device 'radio1' - option type 'mac80211' - option hwmode '11na' - option path 'pci0000:00/0000:00:00.0' - list ht_capab 'LDPC' - list ht_capab 'SHORT-GI-20' - list ht_capab 'SHORT-GI-40' - list ht_capab 'TX-STBC' - list ht_capab 'RX-STBC1' - list ht_capab 'DSSS_CCK-40' - option channel '44' - option htmode 'HT40+' - option country 'DE' - option disabled '1' - -config wifi-iface 'client_radio0' - option ifname 'client0' - option network 'client' - option disabled '0' - option device 'radio0' - option mode 'ap' - option macaddr 'ea:96:f7:d4:53:c0' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio0' - option ifname 'mesh0' - option network 'mesh_radio0' - option device 'radio0' - option bssid 'f8:d1:11:87:52:2e' - option disabled '0' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr 'ea:97:f7:d4:53:c0' - option ssid 'f8:d1:11:87:52:2e' - -config wifi-iface 'client_radio1' - option ifname 'client1' - option network 'client' - option disabled '0' - option device 'radio1' - option mode 'ap' - option macaddr 'ea:96:f8:d4:53:c0' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio1' - option ifname 'mesh1' - option network 'mesh_radio1' - option device 'radio1' - option bssid 'f8:d1:11:87:52:2e' - option disabled '0' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr 'ea:97:f8:d4:53:c0' - option ssid 'f8:d1:11:87:52:2e' diff --git a/Kampnagel/README b/Kampnagel/README deleted file mode 100644 index f8e237e..0000000 --- a/Kampnagel/README +++ /dev/null @@ -1 +0,0 @@ -Zur Konfiguration ist auch https://wiki.freifunk.net/Freifunk_Hamburg/Projekt_Kampnagel zu beachten. \ No newline at end of file diff --git a/Nochtspeicher/Nochtspeicher_01/etc/config/wireless b/Nochtspeicher/Nochtspeicher_01/etc/config/wireless deleted file mode 100644 index 8193888..0000000 --- a/Nochtspeicher/Nochtspeicher_01/etc/config/wireless +++ /dev/null @@ -1,55 +0,0 @@ -config wifi-device 'radio0' - option type 'mac80211' - option hwmode '11g' - option path 'platform/ar934x_wmac' - option htmode 'HT20' - option country 'DE' - option channel '6' - -config wifi-device 'radio1' - option type 'mac80211' - option hwmode '11a' - option path 'pci0000:00/0000:00:00.0' - option country 'DE' - option channel '40' - option htmode 'HT20' - -config wifi-iface 'client_radio0' - option ifname 'client0' - option network 'client' - option disabled '0' - option device 'radio0' - option mode 'ap' - option macaddr '16:ce:21:b5:01:43' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio0' - option ifname 'mesh0' - option network 'mesh_radio0' - option device 'radio0' - option bssid 'f8:d1:11:87:52:2e' - option disabled '1' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr '16:cf:21:b5:01:43' - option ssid 'f8:d1:11:87:52:2e' - -config wifi-iface 'client_radio1' - option ifname 'client1' - option network 'client' - option disabled '0' - option device 'radio1' - option mode 'ap' - option macaddr '16:ce:22:b5:01:43' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio1' - option ifname 'mesh1' - option network 'mesh_radio1' - option device 'radio1' - option bssid 'f8:d1:11:87:52:2e' - option disabled '1' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr '16:cf:22:b5:01:43' - option ssid 'f8:d1:11:87:52:2e' diff --git a/Nochtspeicher/Nochtspeicher_02/etc/config/wireless b/Nochtspeicher/Nochtspeicher_02/etc/config/wireless deleted file mode 100644 index 85e4a30..0000000 --- a/Nochtspeicher/Nochtspeicher_02/etc/config/wireless +++ /dev/null @@ -1,55 +0,0 @@ -config wifi-device 'radio0' - option type 'mac80211' - option hwmode '11g' - option path 'platform/ar934x_wmac' - option htmode 'HT20' - option country 'DE' - option channel '11' - -config wifi-device 'radio1' - option type 'mac80211' - option hwmode '11a' - option path 'pci0000:00/0000:00:00.0' - option country 'DE' - option channel '36' - option htmode 'HT20' - -config wifi-iface 'client_radio0' - option ifname 'client0' - option network 'client' - option disabled '0' - option device 'radio0' - option mode 'ap' - option macaddr '16:ce:21:b5:01:49' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio0' - option ifname 'mesh0' - option network 'mesh_radio0' - option device 'radio0' - option bssid 'f8:d1:11:87:52:2e' - option disabled '1' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr '16:cf:21:b5:01:49' - option ssid 'f8:d1:11:87:52:2e' - -config wifi-iface 'client_radio1' - option ifname 'client1' - option network 'client' - option disabled '0' - option device 'radio1' - option mode 'ap' - option macaddr '16:ce:22:b5:01:49' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio1' - option ifname 'mesh1' - option network 'mesh_radio1' - option device 'radio1' - option bssid 'f8:d1:11:87:52:2e' - option disabled '1' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr '16:cf:22:b5:01:49' - option ssid 'f8:d1:11:87:52:2e' diff --git a/Nochtspeicher/README b/Nochtspeicher/README deleted file mode 100644 index 44c70e9..0000000 --- a/Nochtspeicher/README +++ /dev/null @@ -1 +0,0 @@ -Zur Konfiguration ist auch https://wiki.freifunk.net/Hamburg/Nochtspeicher zu beachten. \ No newline at end of file diff --git a/Richtfunk/bb-artfiles-kern/etc/config/batman-adv b/Richtfunk/bb-artfiles-kern/etc/config/batman-adv index 4d64220..19e44e0 100644 --- a/Richtfunk/bb-artfiles-kern/etc/config/batman-adv +++ b/Richtfunk/bb-artfiles-kern/etc/config/batman-adv @@ -1,7 +1,7 @@ config mesh 'bat0' - option multicast_mode '0' - option hop_penalty '1' option gw_mode 'client' option orig_interval '5000' + option hop_penalty '5' + option multicast_mode '0' diff --git a/Richtfunk/bb-artfiles-kern/etc/config/network b/Richtfunk/bb-artfiles-kern/etc/config/network index bb59b6e..950e289 100644 --- a/Richtfunk/bb-artfiles-kern/etc/config/network +++ b/Richtfunk/bb-artfiles-kern/etc/config/network @@ -13,6 +13,7 @@ config interface 'wan6' option ip6table '1' option peerdns '0' option proto 'none' + option sourcefilter '0' config switch option name 'switch0' @@ -22,7 +23,7 @@ config switch config switch_vlan option device 'switch0' option vlan '1' - option ports '0t 2 3' + option ports '0t 3' config switch_vlan option device 'switch0' @@ -32,22 +33,27 @@ config switch_vlan config switch_vlan option device 'switch0' option vlan '5' - option ports '0t 4t 5t' + option ports '0t 2 4t 5t' config switch_vlan option device 'switch0' option vlan '26' option ports '0t 5t' -config switch_vlan - option device 'switch0' - option vlan '29' - option ports '0t 5t' - config switch_vlan - option device 'switch0' - option vlan '32' - option ports '0t 4t' + option device 'switch0' + option vlan '29' + option ports '0t 5t' + +config switch_vlan + option device 'switch0' + option vlan '32' + option ports '0t 4t' + +config switch_vlan + option device 'switch0' + option vlan '111' + option ports '4t 5t' config interface 'vlan5' option proto 'static' @@ -56,34 +62,34 @@ config interface 'vlan5' option netmask '255.255.255.0' config interface 'vlan26' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' option ifname 'eth0.26' option macaddr 'de:ad:be:ef:90:70' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + +config interface 'vlan29' + option ifname 'eth0.29' + option macaddr 'de:ad:be:ef:90:71' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + +config interface 'vlan32' + option ifname 'eth0.32' + option macaddr 'de:ad:be:ef:90:72' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' -config interface 'vlan29' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.29' - option macaddr 'de:ad:be:ef:90:71' - -config interface 'vlan32' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.32' - option macaddr 'de:ad:be:ef:90:72' - config interface 'wan' - option igmp_snooping '0' option ifname 'eth0.2' option auto '1' option peerdns '0' option type 'bridge' - option macaddr 'ea:95:f6:cd:6d:46' option proto 'static' + option multicast_querier '0' + option macaddr 'ae:6f:55:c5:2c:20' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -99,47 +105,59 @@ config route6 'wan6_unreachable' config interface 'client' option reqprefix 'no' - option ifname 'eth0.1 bat0' option proto 'dhcpv6' option type 'bridge' - option igmp_snooping '0' 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' config interface 'mesh_wan' option ifname 'br-wan' - option mesh 'bat0' - option proto 'batadv' option auto '1' + option proto 'gluon_mesh' + option fixed_mtu '1' config interface 'mesh_lan' option ifname 'eth0.1' option auto '0' - option macaddr 'ea:95:f7:cd:6d:46' option mesh 'bat0' - option proto 'batadv' + option igmp_snooping '0' + option transitive '1' + option fixed_mtu '1' + option proto 'gluon_mesh' + option type 'bridge' + option macaddr 'ae:6f:55:c5:2c:24' config interface 'mesh_vpn' option ifname 'mesh-vpn' option mesh_no_rebroadcast '1' - option macaddr 'ea:98:f6:cd:6d:46' option mesh 'bat0' - option proto 'batadv' + option transitive '1' + option macaddr 'ae:6f:55:c5:2c:27' + option fixed_mtu '1' + option proto 'gluon_mesh' + +config interface 'ibss_radio0' + option proto 'gluon_mesh' + +config interface 'ibss_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 proto 'none' -config interface 'mesh_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - -config interface 'mesh_radio1' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' +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' diff --git a/Richtfunk/bb-artfiles-kern/etc/config/wireless b/Richtfunk/bb-artfiles-kern/etc/config/wireless deleted file mode 100644 index 26195c8..0000000 --- a/Richtfunk/bb-artfiles-kern/etc/config/wireless +++ /dev/null @@ -1,57 +0,0 @@ - -config wifi-device 'radio0' - option type 'mac80211' - option hwmode '11g' - option path 'platform/ar934x_wmac' - option htmode 'HT20' - option channel '1' - option country 'DE' - -config wifi-device 'radio1' - option type 'mac80211' - option hwmode '11a' - option path 'pci0000:00/0000:00:00.0' - option channel '44' - option htmode 'HT40+' - option country 'DE' - -config wifi-iface 'client_radio0' - option ifname 'client0' - option network 'client' - option disabled '1' - option device 'radio0' - option mode 'ap' - option macaddr 'ea:96:f7:cd:6d:46' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio0' - option ifname 'mesh0' - option network 'mesh_radio0' - option device 'radio0' - option bssid 'f8:d1:11:87:52:2e' - option disabled '1' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr 'ea:97:f7:cd:6d:46' - option ssid 'f8:d1:11:87:52:2e' - -config wifi-iface 'client_radio1' - option ifname 'client1' - option network 'client' - option disabled '1' - option device 'radio1' - option mode 'ap' - option macaddr 'ea:96:f8:cd:6d:46' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio1' - option ifname 'mesh1' - option network 'mesh_radio1' - option device 'radio1' - option bssid 'f8:d1:11:87:52:2e' - option disabled '1' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr 'ea:97:f8:cd:6d:46' - option ssid 'f8:d1:11:87:52:2e' - diff --git a/Richtfunk/bb-bue-kern/etc/config/network b/Richtfunk/bb-bue-kern/etc/config/network index 2e0c723..0fee69b 100644 --- a/Richtfunk/bb-bue-kern/etc/config/network +++ b/Richtfunk/bb-bue-kern/etc/config/network @@ -36,60 +36,60 @@ config switch_vlan option ports '4t 0t' config switch_vlan - option device 'switch0' - option vlan '6' - option ports '0t 4t' + option device 'switch0' + option vlan '6' + option ports '0t 4t' config switch_vlan - option device 'switch0' - option vlan '11' - option ports '0t 4t' + option device 'switch0' + option vlan '11' + option ports '0t 4t' config switch_vlan - option device 'switch0' - option vlan '32' - option ports '0t 4t' + option device 'switch0' + option vlan '32' + option ports '0t 4t' config switch_vlan - option device 'switch0' - option vlan '33' - option ports '0t 4t' + option device 'switch0' + option vlan '33' + option ports '0t 4t' config interface 'wan' - option igmp_snooping '0' option ifname 'eth0' option auto '1' option peerdns '0' option type 'bridge' option proto 'dhcp' - option macaddr 'f6:f3:6d:2a:16:3c' + option multicast_querier '0' + option macaddr 'ca:a5:ce:ee:f9:68' config interface 'vlan5' - option proto 'static' - option ifname 'eth1.5' - option ipaddr '192.168.112.54' - option netmask '255.255.255.0' + option proto 'static' + option ifname 'eth1.5' + option ipaddr '192.168.112.54' + option netmask '255.255.255.0' -config interface 'vlan11' - option proto 'batadv' - option mesh 'bat0' - option mesh_no_rebroadcast '1' - option ifname 'eth1.11' - option macaddr 'de:ad:be:ef:90:c0' +config interface 'vlan11' + option ifname 'eth1.11' + option macaddr 'de:ad:be:ef:90:c0' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config interface 'vlan32' - option proto 'batadv' - option mesh 'bat0' - option mesh_no_rebroadcast '1' - option ifname 'eth1.32' - option macaddr 'de:ad:be:ef:90:c1' + option ifname 'eth1.32' + option macaddr 'de:ad:be:ef:90:c1' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config interface 'vlan33' - option proto 'batadv' - option mesh 'bat0' - option mesh_no_rebroadcast '1' - option ifname 'eth1.33' - option macaddr 'de:ad:be:ef:90:c2' + option ifname 'eth1.33' + option macaddr 'de:ad:be:ef:90:c2' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -106,44 +106,56 @@ config route6 'wan6_unreachable' config interface 'client' option type 'bridge' option macaddr 'f4:f2:6d:2a:16:3c' - list ifname 'bat0' - list ifname 'eth1.1' - list ifname 'eth1.6' option proto 'dhcpv6' option reqprefix 'no' - option igmp_snooping '0' option peerdns '1' option sourcefilter '0' - -config interface 'bat0' - option ifname 'bat0' - option macaddr 'f4:f2:6d:2a:16:3c' - option proto 'none' - -config interface 'ibss_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' + list ifname 'eth1.1' + list ifname 'eth1.6' + list ifname 'bat0' + option robustness '3' + option query_interval '2000' + option query_response_interval '500' config interface 'mesh_wan' option auto '0' option ifname 'br-wan' - option mesh 'bat0' - option proto 'batadv' + option proto 'gluon_mesh' + option fixed_mtu '1' config interface 'mesh_lan' option ifname 'eth1' option auto '0' - option macaddr 'f6:f3:6e:2a:16:3c' option mesh 'bat0' - option proto 'batadv' + option igmp_snooping '0' + option transitive '1' + option fixed_mtu '1' + option proto 'gluon_mesh' + option type 'bridge' + option macaddr 'ca:a5:ce:ee:f9:6c' config interface 'mesh_vpn' option ifname 'mesh-vpn' option mesh_no_rebroadcast '1' - option macaddr 'f6:f6:6d:2a:16:3c' option mesh 'bat0' - option proto 'batadv' + option transitive '1' + option macaddr 'ca:a5:ce:ee:f9:6f' + option fixed_mtu '1' + option proto 'gluon_mesh' + +config interface 'ibss_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 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' diff --git a/Richtfunk/bb-chemnitz03-kern/etc/config/network b/Richtfunk/bb-chemnitz03-kern/etc/config/network index 833799f..8e6c368 100644 --- a/Richtfunk/bb-chemnitz03-kern/etc/config/network +++ b/Richtfunk/bb-chemnitz03-kern/etc/config/network @@ -13,6 +13,7 @@ config interface 'wan6' option ifname 'br-wan' option ip6table '1' option peerdns '0' + option sourcefilter '0' config switch option name 'switch0' @@ -30,36 +31,36 @@ config switch_vlan option ports '0t 1' config switch_vlan - option device 'switch0' - option vlan '5' - option ports '0t 2t' + option device 'switch0' + option vlan '5' + option ports '0t 2t' config switch_vlan - option device 'switch0' - option vlan '29' - option ports '0t 2t' + option device 'switch0' + option vlan '29' + option ports '0t 2t' -config interface 'vlan5' - option proto 'static' - option ifname 'eth0.5' - option ipaddr '192.168.112.41' - option netmask '255.255.255.0' - -config interface 'vlan29' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.29' - option macaddr 'de:ad:be:ef:90:80' +config interface 'vlan5' + option proto 'static' + option ifname 'eth0.5' + option ipaddr '192.168.112.41' + option netmask '255.255.255.0' + +config interface 'vlan29' + option ifname 'eth0.29' + option macaddr 'de:ad:be:ef:90:80' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config interface 'wan' - option igmp_snooping '0' option ifname 'eth0.2' option auto '1' option peerdns '0' option type 'bridge' option proto 'dhcp' - option macaddr 'fa:1b:67:a5:f8:ee' + option multicast_querier '0' + option macaddr 'ce:fd:ec:cc:48:00' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -77,45 +78,56 @@ config interface 'client' option reqprefix 'no' option proto 'dhcpv6' option type 'bridge' - option igmp_snooping '0' option macaddr 'f8:1a:67:a5:f8:ee' option peerdns '1' - option ifname 'bat0' + list ifname 'bat0' + option robustness '3' + option query_interval '2000' + option query_response_interval '500' + option sourcefilter '0' config interface 'mesh_wan' option auto '0' option ifname 'br-wan' - option mesh 'bat0' - option proto 'batadv' + option proto 'gluon_mesh' + option fixed_mtu '1' config interface 'mesh_lan' option ifname 'eth0.1' - option macaddr 'fa:1b:68:a5:f8:ee' option mesh 'bat0' - option proto 'batadv' option auto '1' + option igmp_snooping '0' + option transitive '1' + option fixed_mtu '1' + option proto 'gluon_mesh' + option type 'bridge' + option macaddr 'ce:fd:ec:cc:48:04' config interface 'mesh_vpn' option ifname 'mesh-vpn' option mesh_no_rebroadcast '1' - option macaddr 'fa:1e:67:a5:f8:ee' option mesh 'bat0' - option proto 'batadv' + option transitive '1' + option macaddr 'ce:fd:ec:cc:48:07' + option fixed_mtu '1' + option proto 'gluon_mesh' + +config interface 'ibss_radio0' + option proto 'gluon_mesh' + +config interface 'ibss_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 proto 'none' -config interface 'mesh_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - -config interface 'mesh_radio1' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' +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' diff --git a/Richtfunk/bb-doormann22-kern/etc/config/network b/Richtfunk/bb-doormann22-kern/etc/config/network index 02cd42e..46eb3c6 100644 --- a/Richtfunk/bb-doormann22-kern/etc/config/network +++ b/Richtfunk/bb-doormann22-kern/etc/config/network @@ -13,6 +13,7 @@ config interface 'wan6' option ifname 'br-wan' option ip6table '1' option peerdns '0' + option sourcefilter '0' config switch option name 'switch0' @@ -48,17 +49,17 @@ config switch_vlan option vlan '25' option ports '0t 2t' option device 'switch0' - -config switch_vlan - option vlan '28' - option ports '0t 2t' - option device 'switch0' -config switch_vlan - option vlan '30' - option ports '0t 2t' - option device 'switch0' - +config switch_vlan + option vlan '28' + option ports '0t 2t' + option device 'switch0' + +config switch_vlan + option vlan '30' + option ports '0t 2t' + option device 'switch0' + config interface 'vlan5' option proto 'static' option ifname 'eth0.5' @@ -66,43 +67,48 @@ config interface 'vlan5' option netmask '255.255.255.0' config interface 'vlan23' - option proto 'batadv' - option mesh 'bat0' option ifname 'eth0.23' option macaddr 'de:ad:be:ef:90:41' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config interface 'vlan24' - option proto 'batadv' - option mesh 'bat0' option ifname 'eth0.24' option macaddr 'de:ad:be:ef:90:42' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config interface 'vlan25' - option proto 'batadv' - option mesh 'bat0' option ifname 'eth0.25' option macaddr 'de:ad:be:ef:90:43' - -config interface 'vlan28' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.28' - option macaddr 'de:ad:be:ef:90:44' - -config interface 'vlan30' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.30' - option macaddr 'de:ad:be:ef:90:45' - + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + +config interface 'vlan28' + option ifname 'eth0.28' + option macaddr 'de:ad:be:ef:90:44' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + +config interface 'vlan30' + option ifname 'eth0.30' + option macaddr 'de:ad:be:ef:90:45' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + config interface 'wan' - option igmp_snooping '0' option ifname 'eth0.2' option auto '1' option peerdns '0' option type 'bridge' option proto 'dhcp' - option macaddr 'ea:95:f6:cd:66:74' + option multicast_querier '0' + option macaddr '66:a9:1d:c1:c2:b0' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -118,47 +124,59 @@ config route6 'wan6_unreachable' config interface 'client' option reqprefix 'no' - option ifname 'eth0.1 bat0' option proto 'dhcpv6' option type 'bridge' - option igmp_snooping '0' 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' config interface 'mesh_wan' option auto '0' option ifname 'br-wan' - option mesh 'bat0' - option proto 'batadv' + option proto 'gluon_mesh' + option fixed_mtu '1' config interface 'mesh_lan' option ifname 'eth0.1' option auto '0' - option macaddr 'ea:95:f7:cd:66:74' option mesh 'bat0' - option proto 'batadv' + option igmp_snooping '0' + option transitive '1' + option fixed_mtu '1' + option proto 'gluon_mesh' + option type 'bridge' + option macaddr '66:a9:1d:c1:c2:b4' config interface 'mesh_vpn' option ifname 'mesh-vpn' option mesh_no_rebroadcast '1' - option macaddr 'ea:98:f6:cd:66:74' option mesh 'bat0' - option proto 'batadv' + option transitive '1' + option macaddr '66:a9:1d:c1:c2:b7' + option fixed_mtu '1' + option proto 'gluon_mesh' + +config interface 'ibss_radio0' + option proto 'gluon_mesh' + +config interface 'ibss_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 proto 'none' -config interface 'mesh_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - -config interface 'mesh_radio1' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' +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' diff --git a/Richtfunk/bb-doormann22-kern/etc/config/wireless b/Richtfunk/bb-doormann22-kern/etc/config/wireless deleted file mode 100644 index c19030e..0000000 --- a/Richtfunk/bb-doormann22-kern/etc/config/wireless +++ /dev/null @@ -1,57 +0,0 @@ - -config wifi-device 'radio0' - option type 'mac80211' - option hwmode '11g' - option path 'platform/ar934x_wmac' - option htmode 'HT20' - option channel '1' - option country 'DE' - -config wifi-device 'radio1' - option type 'mac80211' - option hwmode '11a' - option path 'pci0000:00/0000:00:00.0' - option channel '44' - option htmode 'HT40+' - option country 'DE' - -config wifi-iface 'client_radio0' - option ifname 'client0' - option network 'client' - option disabled '1' - option device 'radio0' - option mode 'ap' - option macaddr 'ea:96:f7:cd:66:74' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio0' - option ifname 'mesh0' - option network 'mesh_radio0' - option device 'radio0' - option bssid 'f8:d1:11:87:52:2e' - option disabled '1' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr 'ea:97:f7:cd:66:74' - option ssid 'f8:d1:11:87:52:2e' - -config wifi-iface 'client_radio1' - option ifname 'client1' - option network 'client' - option disabled '0' - option device 'radio1' - option mode 'ap' - option macaddr 'ea:96:f8:cd:66:74' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio1' - option ifname 'mesh1' - option network 'mesh_radio1' - option device 'radio1' - option bssid 'f8:d1:11:87:52:2e' - option disabled '1' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr 'ea:97:f8:cd:66:74' - option ssid 'f8:d1:11:87:52:2e' - diff --git a/Richtfunk/bb-flora-kern/etc/config/network b/Richtfunk/bb-flora-kern/etc/config/network index 7d56456..140c8b3 100644 --- a/Richtfunk/bb-flora-kern/etc/config/network +++ b/Richtfunk/bb-flora-kern/etc/config/network @@ -13,6 +13,7 @@ config interface 'wan6' option ifname 'br-wan' option ip6table '1' option peerdns '0' + option sourcefilter '0' config switch option name 'switch0' @@ -22,7 +23,7 @@ config switch config switch_vlan option device 'switch0' option vlan '1' - option ports '0t 3 4 5' + option ports '0t 3 5' config switch_vlan option device 'switch0' @@ -39,6 +40,11 @@ config switch_vlan 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' @@ -46,11 +52,17 @@ config interface 'vlan5' option netmask '255.255.255.0' config interface 'vlan24' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' option ifname 'eth0.24' option macaddr 'de:ad:be:ef:90:60' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + +config interface 'vlan12' + option ifname 'eth0.12' + option macaddr 'de:ad:be:ef:90:61' + option proto 'gluon_mesh' + option fixed_mtu '1' config interface 'wan' option peerdns '0' @@ -58,8 +70,8 @@ config interface 'wan' option auto '1' option type 'bridge' option proto 'dhcp' - option macaddr 'ea:95:f6:cd:6c:66' - option igmp_snooping '0' + option multicast_querier '0' + option macaddr '16:e3:c2:3a:e5:58' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -77,23 +89,28 @@ config interface 'client' option reqprefix 'no' option proto 'dhcpv6' option type 'bridge' - option igmp_snooping '0' option macaddr 'e8:94:f6:cd:6c:66' option peerdns '1' - option ifname 'bat0' + list ifname 'bat0' + option robustness '3' + option query_interval '2000' + option query_response_interval '500' + option sourcefilter '0' config interface 'mesh_wan' option ifname 'br-wan' - option mesh 'bat0' - option proto 'batadv' option auto '1' + option proto 'gluon_mesh' + option fixed_mtu '1' config interface 'mesh_vpn' option ifname 'mesh-vpn' option mesh_no_rebroadcast '1' - option macaddr 'ea:98:f6:cd:6c:66' option mesh 'bat0' - option proto 'batadv' + option transitive '1' + option macaddr '16:e3:c2:3a:e5:5f' + option fixed_mtu '1' + option proto 'gluon_mesh' config route 'local_node_route4' option target '10.112.0.0' @@ -102,26 +119,33 @@ config route 'local_node_route4' option interface 'client' config interface 'mesh_lan' - option mesh_no_rebroadcast '1' + option mesh_no_rebroadcast '1' option ifname 'eth0.1' option mesh 'bat0' - option proto 'batadv' 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' + +config interface 'ibss_radio0' + option proto 'gluon_mesh' + +config interface 'ibss_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 proto 'none' -config interface 'mesh_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - -config interface 'mesh_radio1' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' +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' diff --git a/Richtfunk/bb-flora-kern/etc/config/snmpd b/Richtfunk/bb-flora-kern/etc/config/snmpd deleted file mode 100644 index 11f6df5..0000000 --- a/Richtfunk/bb-flora-kern/etc/config/snmpd +++ /dev/null @@ -1,43 +0,0 @@ -config agent - option agentaddress UDP6:161 - -config com2sec6 readonly - option secname ro - option source default - option community ffrichtfunk - -config group public_v2c - option group MyROGroup - option version v2c - option secname ro - -config group public_usm - option group MyROGroup - option version usm - option secname ro - -config view all - option viewname all - option type included - option oid .1 - option mask 80 - -config access public_access - option group MyROGroup - option context none - option version any - option level noauth - option prefix exact - option read all - option write none - option notify none - -config system - option sysLocation 'null' - option sysContact 'richtfunk@hamburg.freifunk.net' - -config exec - option name filedescriptors - option prog /bin/cat - option args /proc/sys/fs/file-nr -# option miboid 1.2.3.4 diff --git a/Richtfunk/bb-flora-kern/etc/config/wireless b/Richtfunk/bb-flora-kern/etc/config/wireless deleted file mode 100644 index c55ba5f..0000000 --- a/Richtfunk/bb-flora-kern/etc/config/wireless +++ /dev/null @@ -1,58 +0,0 @@ - -config wifi-device 'radio0' - option type 'mac80211' - option hwmode '11g' - option path 'platform/ar934x_wmac' - option htmode 'HT20' - option channel '6' - option country 'DE' - -config wifi-device 'radio1' - option type 'mac80211' - option hwmode '11a' - option path 'pci0000:00/0000:00:00.0' - option channel '40' - option htmode 'HT20' - option country 'DE' - option txpower '15' - -config wifi-iface 'client_radio0' - option ifname 'client0' - option network 'client' - option disabled '0' - option device 'radio0' - option mode 'ap' - option macaddr 'ea:96:f7:cd:6c:66' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio0' - option ifname 'mesh0' - option network 'mesh_radio0' - option device 'radio0' - option bssid 'f8:d1:11:87:52:2e' - option disabled '1' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr 'ea:97:f7:cd:6c:66' - option ssid 'f8:d1:11:87:52:2e' - -config wifi-iface 'client_radio1' - option ifname 'client1' - option network 'client' - option disabled '0' - option device 'radio1' - option mode 'ap' - option macaddr 'ea:96:f8:cd:6c:66' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio1' - option ifname 'mesh1' - option network 'mesh_radio1' - option device 'radio1' - option bssid 'f8:d1:11:87:52:2e' - option disabled '1' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr 'ea:97:f8:cd:6c:66' - option ssid 'f8:d1:11:87:52:2e' - diff --git a/Richtfunk/bb-fux-kern/etc/config/network b/Richtfunk/bb-fux-kern/etc/config/network index 92676de..bd34a28 100644 --- a/Richtfunk/bb-fux-kern/etc/config/network +++ b/Richtfunk/bb-fux-kern/etc/config/network @@ -20,156 +20,129 @@ config switch_vlan option ports '0t 1' option device 'switch0' - -#Wartungsnetz - config switch_vlan option vlan '5' option ports '0t 2t' option device 'switch0' -config interface 'vlan5' - option proto 'static' - option ifname 'eth0.5' - option ipaddr '192.168.112.7' - option netmask '255.255.255.0' - - -#Client fuer fux +config interface 'vlan5' + option proto 'static' + option ifname 'eth0.5' + option ipaddr '192.168.112.7' + option netmask '255.255.255.0' config switch_vlan option vlan '6' option ports '0t 2t' option device 'switch0' +config switch_vlan + option vlan '7' + option ports '0t 2t' + option device 'switch0' -#mesh fux-ccchh - -config switch_vlan - option vlan '7' - option ports '0t 2t' - option device 'switch0' - -config interface 'vlan7' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.7' - option macaddr 'de:ad:be:ef:90:16' - - -#mesh fux turm +config interface 'vlan7' + option ifname 'eth0.7' + option macaddr 'de:ad:be:ef:90:16' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config switch_vlan option vlan '10' option ports '0t 2t' option device 'switch0' -config interface 'vlan10' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.10' - option macaddr 'de:ad:be:ef:90:10' +config interface 'vlan10' + option ifname 'eth0.10' + option macaddr 'de:ad:be:ef:90:10' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' -config switch_vlan - option vlan '11' - option ports '0t 2t' - option device 'switch0' - -config interface 'vlan11' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.11' - option macaddr 'de:ad:be:ef:90:17' - -config switch_vlan - option vlan '12' - option ports '0t 2t' - option device 'switch0' - -config interface 'vlan12' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.12' - option macaddr 'de:ad:be:ef:90:18' +config switch_vlan + option vlan '11' + option ports '0t 2t' + option device 'switch0' -config switch_vlan - option vlan '13' - option ports '0t 2t' - option device 'switch0' - -config interface 'vlan13' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.13' - option macaddr 'de:ad:be:ef:90:19' +config interface 'vlan11' + option ifname 'eth0.11' + option macaddr 'de:ad:be:ef:90:17' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' +config switch_vlan + option vlan '12' + option ports '0t 2t' + option device 'switch0' -#mesh fux-zeise26 +config interface 'vlan12' + option ifname 'eth0.12' + option macaddr 'de:ad:be:ef:90:18' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + +config switch_vlan + option vlan '13' + option ports '0t 2t' + option device 'switch0' + +config interface 'vlan13' + option ifname 'eth0.13' + option macaddr 'de:ad:be:ef:90:19' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config switch_vlan option vlan '20' option ports '0t 2t' option device 'switch0' -config interface 'vlan20' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.20' - option macaddr 'de:ad:be:ef:90:11' - - -#mesh fux-pgk-altona +config interface 'vlan20' + option ifname 'eth0.20' + option macaddr 'de:ad:be:ef:90:11' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config switch_vlan option vlan '21' option ports '0t 2t' option device 'switch0' -config interface 'vlan21' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.21' - option macaddr 'de:ad:be:ef:90:12' - - -#mesh fux-werkhof +config interface 'vlan21' + option ifname 'eth0.21' + option macaddr 'de:ad:be:ef:90:12' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config switch_vlan option vlan '22' option ports '0t 2t' option device 'switch0' -config interface 'vlan22' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.22' - option macaddr 'de:ad:be:ef:90:13' - - -#mesh fux-doormann22 +config interface 'vlan22' + option ifname 'eth0.22' + option macaddr 'de:ad:be:ef:90:13' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config switch_vlan option vlan '23' option ports '0t 2t' option device 'switch0' -config interface 'vlan23' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.23' - option macaddr 'de:ad:be:ef:90:14' - - -#mesh fux-artfiles +config interface 'vlan23' + option ifname 'eth0.23' + option macaddr 'de:ad:be:ef:90:14' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config switch_vlan option vlan '26' @@ -177,12 +150,11 @@ config switch_vlan option device 'switch0' config interface 'vlan26' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' option ifname 'eth0.26' option macaddr 'de:ad:be:ef:90:15' - + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config interface 'wan' option ifname 'eth0.2' @@ -190,30 +162,38 @@ config interface 'wan' option proto 'dhcp' option peerdns '0' option auto '1' - option macaddr 'fa:1b:67:d8:df:d2' - option igmp_snooping '0' + option multicast_querier '0' + option macaddr 'c2:0d:9f:de:d0:90' config interface 'client' - option ifname 'eth0.1 eth0.6 bat0' option type 'bridge' option proto 'dhcpv6' option reqprefix 'no' option macaddr 'f8:1a:67:d8:df:d2' option peerdns '1' - option igmp_snooping '0' + list ifname 'eth0.1' + list ifname 'eth0.6' + list ifname 'bat0' + option robustness '3' + option query_interval '2000' + option query_response_interval '500' + option sourcefilter '0' config interface 'mesh_vpn' option ifname 'mesh-vpn' - option proto 'batadv' option mesh 'bat0' option mesh_no_rebroadcast '1' - option macaddr 'fa:1e:67:d8:df:d2' + option transitive '1' + option macaddr 'c2:0d:9f:de:d0:97' + option fixed_mtu '1' + option proto 'gluon_mesh' config interface 'wan6' option proto 'dhcpv6' option ifname 'br-wan' option peerdns '0' option ip6table '1' + option sourcefilter '0' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -229,9 +209,9 @@ config route6 'wan6_unreachable' config interface 'mesh_wan' option ifname 'br-wan' - option mesh 'bat0' - option proto 'batadv' option auto '1' + option proto 'gluon_mesh' + option fixed_mtu '1' config route 'local_node_route4' option target '10.112.0.0' @@ -242,24 +222,30 @@ config route 'local_node_route4' config interface 'mesh_lan' option ifname 'eth0.1' option auto '0' - option macaddr 'fa:1b:68:d8:df:d2' option mesh 'bat0' - option proto 'batadv' + 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' + +config interface 'ibss_radio0' + option proto 'gluon_mesh' + +config interface 'ibss_radio1' + option proto 'gluon_mesh' config interface 'bat0' + option multicast_router '2' option ifname 'bat0' option macaddr 'f8:1a:67:d8:df:d2' + option learning '0' option proto 'none' -config interface 'mesh_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - -config interface 'mesh_radio1' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' +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' diff --git a/Richtfunk/bb-fux-kern/etc/config/wireless b/Richtfunk/bb-fux-kern/etc/config/wireless deleted file mode 100644 index 1476442..0000000 --- a/Richtfunk/bb-fux-kern/etc/config/wireless +++ /dev/null @@ -1,63 +0,0 @@ - -config wifi-device 'radio0' - option type 'mac80211' - option hwmode '11ng' - option path 'platform/ar934x_wmac' - list ht_capab 'LDPC' - list ht_capab 'SHORT-GI-20' - list ht_capab 'SHORT-GI-40' - list ht_capab 'TX-STBC' - list ht_capab 'RX-STBC1' - list ht_capab 'DSSS_CCK-40' - option channel '1' - option country 'DE' - option htmode 'HT20' - option disabled '1' - -config wifi-device 'radio1' - option type 'mac80211' - option hwmode '11na' - option path 'pci0000:00/0000:00:00.0' - list ht_capab 'LDPC' - list ht_capab 'SHORT-GI-20' - list ht_capab 'SHORT-GI-40' - list ht_capab 'TX-STBC' - list ht_capab 'RX-STBC1' - list ht_capab 'DSSS_CCK-40' - option channel '44' - option htmode 'HT40+' - option country 'DE' - option disabled '1' - -config wifi-iface 'client_radio0' - option network 'client' - option device 'radio0' - option mode 'ap' - option macaddr 'fa:1c:68:d8:df:d2' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio0' - option mcast_rate '6000' - option network 'mesh_radio0' - option macaddr 'fa:1d:68:d8:df:d2' - option device 'radio0' - option mode 'adhoc' - option bssid 'f8:d1:11:87:52:2e' - option ssid 'f8:d1:11:87:52:2e' - -config wifi-iface 'client_radio1' - option network 'client' - option device 'radio1' - option mode 'ap' - option macaddr 'fa:1c:69:d8:df:d2' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio1' - option mcast_rate '6000' - option network 'mesh_radio1' - option macaddr 'fa:1d:69:d8:df:d2' - option device 'radio1' - option mode 'adhoc' - option bssid 'f8:d1:11:87:52:2e' - option ssid 'f8:d1:11:87:52:2e' - diff --git a/Richtfunk/bb-pgkaltona-gemeindehaus/etc/config/network b/Richtfunk/bb-pgkaltona-gemeindehaus/etc/config/network index 621ec8f..937c51a 100644 --- a/Richtfunk/bb-pgkaltona-gemeindehaus/etc/config/network +++ b/Richtfunk/bb-pgkaltona-gemeindehaus/etc/config/network @@ -31,36 +31,36 @@ config switch_vlan option ports '0t 1' config switch_vlan - option vlan '5' - option ports '0t 2t' - option device 'switch0' + option vlan '5' + option ports '0t 2t' + option device 'switch0' config switch_vlan - option vlan '31' - option ports '0t 2t' - option device 'switch0' + option vlan '31' + option ports '0t 2t' + option device 'switch0' config interface 'vlan5' - option proto 'static' - option ifname 'eth0.5' - option ipaddr '192.168.112.50' - option netmask '255.255.255.0' + option proto 'static' + option ifname 'eth0.5' + option ipaddr '192.168.112.50' + option netmask '255.255.255.0' config interface 'vlan31' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.31' - option macaddr 'de:ad:be:ef:90:b0' + option ifname 'eth0.31' + option macaddr 'de:ad:be:ef:90:b0' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config interface 'wan' - option igmp_snooping '0' option ifname 'eth0.2' option auto '1' option peerdns '0' option type 'bridge' option proto 'dhcp' - option macaddr 'a2:f4:c1:99:30:da' + option multicast_querier '0' + option macaddr 'a6:9f:d0:1e:cb:e0' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -77,48 +77,58 @@ config route6 'wan6_unreachable' config interface 'client' option type 'bridge' option macaddr 'a0:f3:c1:99:30:da' - list ifname 'bat0' - list ifname 'eth0.1' option proto 'dhcpv6' option reqprefix 'no' - option igmp_snooping '0' option peerdns '1' option sourcefilter '0' - -config interface 'bat0' - option ifname 'bat0' - option macaddr 'a0:f3:c1:99:30:da' - option proto 'none' - -config interface 'ibss_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - -config interface 'ibss_radio1' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' + list ifname 'bat0' + list ifname 'eth0.1' + option robustness '3' + option query_interval '2000' + option query_response_interval '500' config interface 'mesh_wan' option auto '0' option ifname 'br-wan' - option mesh 'bat0' - option proto 'batadv' + option proto 'gluon_mesh' + option fixed_mtu '1' config interface 'mesh_lan' option ifname 'eth0.1' option auto '0' - option macaddr 'a2:f4:c2:99:30:da' option mesh 'bat0' - option proto 'batadv' + option igmp_snooping '0' + option transitive '1' + option fixed_mtu '1' + option proto 'gluon_mesh' + option type 'bridge' + option macaddr 'a6:9f:d0:1e:cb:e4' config interface 'mesh_vpn' option ifname 'mesh-vpn' option mesh_no_rebroadcast '1' - option macaddr 'a2:f7:c1:99:30:da' option mesh 'bat0' - option proto 'batadv' + option transitive '1' + option macaddr 'a6:9f:d0:1e:cb:e7' + option fixed_mtu '1' + option proto 'gluon_mesh' + +config interface 'ibss_radio0' + option proto 'gluon_mesh' + +config interface 'ibss_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 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' diff --git a/Richtfunk/bb-pgkaltona-kern/etc/config/network b/Richtfunk/bb-pgkaltona-kern/etc/config/network index c3fee2f..71e7f18 100644 --- a/Richtfunk/bb-pgkaltona-kern/etc/config/network +++ b/Richtfunk/bb-pgkaltona-kern/etc/config/network @@ -30,84 +30,73 @@ config switch_vlan option vlan '2' option ports '5 6' - -#Wartungsnetz config switch_vlan - option device 'switch0' - option vlan '5' - option ports '0t 4t' + option device 'switch0' + option vlan '5' + option ports '0t 4t' -config interface 'vlan5' - option proto 'static' - option ifname 'eth1.5' - option ipaddr '192.168.112.48' - option netmask '255.255.255.0' - +config interface 'vlan5' + option proto 'static' + option ifname 'eth1.5' + option ipaddr '192.168.112.48' + option netmask '255.255.255.0' -#Sektorantennen -#bb-pgkaltona-00-nsm2 config switch_vlan - option device 'switch0' - option vlan '10' - option ports '0t 4t' + option device 'switch0' + option vlan '10' + option ports '0t 4t' -config interface 'vlan10' - option proto 'batadv' - option mesh 'bat0' - option mesh_no_rebroadcast '1' - option ifname 'eth1.10' - option macaddr 'de:ad:be:ef:90:20' - -#bb-pgkaltona-09-nsm2 -config switch_vlan - option device 'switch0' - option vlan '11' - option ports '0t 4t' - -config interface 'vlan11' - option proto 'batadv' - option mesh 'bat0' - option mesh_no_rebroadcast '1' - option ifname 'eth1.11' - option macaddr 'de:ad:be:ef:90:23' +config interface 'vlan10' + option ifname 'eth1.10' + option macaddr 'de:ad:be:ef:90:20' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' - -#fux-pgkaltona config switch_vlan - option device 'switch0' - option vlan '21' - option ports '0t 4t' + option device 'switch0' + option vlan '11' + option ports '0t 4t' -config interface 'vlan21' - option proto 'batadv' - option mesh 'bat0' - option mesh_no_rebroadcast '1' - option ifname 'eth1.21' - option macaddr 'de:ad:be:ef:90:21' - +config interface 'vlan11' + option ifname 'eth1.11' + option macaddr 'de:ad:be:ef:90:23' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' -#pgkaltona-gemeindehaus -config switch_vlan - option device 'switch0' - option vlan '31' - option ports '0t 4t' +config switch_vlan + option device 'switch0' + option vlan '21' + option ports '0t 4t' -config interface 'vlan31' - option proto 'batadv' - option mesh 'bat0' - option mesh_no_rebroadcast '1' - option ifname 'eth1.31' - option macaddr 'de:ad:be:ef:90:22' +config interface 'vlan21' + option ifname 'eth1.21' + option macaddr 'de:ad:be:ef:90:21' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' +config switch_vlan + option device 'switch0' + option vlan '31' + option ports '0t 4t' + +config interface 'vlan31' + option ifname 'eth1.31' + option macaddr 'de:ad:be:ef:90:22' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config interface 'wan' - option igmp_snooping '0' option ifname 'eth0' option auto '1' option peerdns '0' option type 'bridge' option proto 'dhcp' - option macaddr 'ee:09:6b:a4:d0:76' + option multicast_querier '0' + option macaddr '7a:f1:37:4b:34:b8' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -124,43 +113,55 @@ config route6 'wan6_unreachable' config interface 'client' option type 'bridge' option macaddr 'ec:08:6b:a4:d0:76' - list ifname 'bat0' - list ifname 'eth1.1' option proto 'dhcpv6' option reqprefix 'no' - option igmp_snooping '0' option peerdns '1' option sourcefilter '0' - -config interface 'bat0' - option ifname 'bat0' - option macaddr 'ec:08:6b:a4:d0:76' - option proto 'none' - -config interface 'ibss_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' + list ifname 'bat0' + list ifname 'eth1.1' + option robustness '3' + option query_interval '2000' + option query_response_interval '500' config interface 'mesh_wan' option auto '0' option ifname 'br-wan' - option mesh 'bat0' - option proto 'batadv' + option proto 'gluon_mesh' + option fixed_mtu '1' config interface 'mesh_lan' option ifname 'eth1' option auto '0' - option macaddr 'ee:09:6c:a4:d0:76' option mesh 'bat0' - option proto 'batadv' + 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' config interface 'mesh_vpn' option ifname 'mesh-vpn' option mesh_no_rebroadcast '1' - option macaddr 'ee:0c:6b:a4:d0:76' option mesh 'bat0' - option proto 'batadv' + option transitive '1' + option macaddr '7a:f1:37:4b:34:bf' + option fixed_mtu '1' + option proto 'gluon_mesh' + +config interface 'ibss_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 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' diff --git a/Richtfunk/bb-pgkaltona-kern/etc/config/wireless b/Richtfunk/bb-pgkaltona-kern/etc/config/wireless deleted file mode 100644 index f2fbe3a..0000000 --- a/Richtfunk/bb-pgkaltona-kern/etc/config/wireless +++ /dev/null @@ -1,29 +0,0 @@ - -config wifi-device 'radio0' - option type 'mac80211' - option hwmode '11g' - option path 'platform/qca955x_wmac' - option htmode 'HT20' - option channel '1' - option country 'DE' - -config wifi-iface 'client_radio0' - option ifname 'client0' - option network 'client' - option disabled '1' - option device 'radio0' - option mode 'ap' - option macaddr 'ee:0a:6c:a4:d0:76' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'ibss_radio0' - option ifname 'ibss0' - option network 'ibss_radio0' - option device 'radio0' - option bssid 'f8:d1:11:87:52:2e' - option disabled '1' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr 'ee:0b:6c:a4:d0:76' - option ssid 'f8:d1:11:87:52:2e' - diff --git a/Richtfunk/bb-schnacke100-kern/etc/config/network b/Richtfunk/bb-schnacke100-kern/etc/config/network index e16dfb4..2a14669 100644 --- a/Richtfunk/bb-schnacke100-kern/etc/config/network +++ b/Richtfunk/bb-schnacke100-kern/etc/config/network @@ -13,6 +13,7 @@ config interface 'wan6' option ifname 'br-wan' option ip6table '1' option peerdns '0' + option sourcefilter '0' config switch option name 'switch0' @@ -29,37 +30,53 @@ config switch_vlan option vlan '2' option ports '5 6' -config switch_vlan - option device 'switch0' - option vlan '5' - option ports '0t 4t' - -config switch_vlan - option device 'switch0' - option vlan '28' - option ports '0t 4t' - -config interface 'vlan5' - option proto 'static' - option ifname 'eth1.5' - option ipaddr '192.168.112.4' - option netmask '255.255.255.0' - -config interface 'vlan28' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth1.28' - option macaddr 'de:ad:be:ef:90:90' +config switch_vlan + option device 'switch0' + option vlan '5' + option ports '0t 4t' + +config switch_vlan + option device 'switch0' + option vlan '28' + option ports '0t 4t' + +config switch_vlan + option device 'switch0' + option vlan '6' + option ports '0t 4t' + +config switch_vlan + option device 'switch0' + option vlan '7' + option ports '0t 4t' + +config interface 'vlan5' + option proto 'static' + option ifname 'eth1.5' + option ipaddr '192.168.112.4' + option netmask '255.255.255.0' + +config interface 'pups' + option proto 'static' + option ifname 'eth1.5' + option ipaddr '192.168.200.140' + option netmask '255.255.255.0' + +config interface 'vlan28' + option ifname 'eth1.28' + option macaddr 'de:ad:be:ef:90:90' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config interface 'wan' - option igmp_snooping '0' option ifname 'eth0' option auto '1' option peerdns '0' option type 'bridge' option proto 'dhcp' - option macaddr '12:ff:ed:57:ea:90' + option multicast_querier '0' + option macaddr 'd2:e5:0c:ca:2d:b0' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -75,42 +92,56 @@ config route6 'wan6_unreachable' config interface 'client' option reqprefix 'no' - option ifname 'eth1.1 bat0' option proto 'dhcpv6' option type 'bridge' - option igmp_snooping '0' option macaddr '10:fe:ed:57:ea:90' option peerdns '1' - -config interface 'bat0' - option ifname 'bat0' - option macaddr '10:fe:ed:57:ea:90' - option proto 'none' - -config interface 'mesh_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' + list ifname 'eth1.1' + list ifname 'bat0' + option robustness '3' + option query_interval '2000' + option query_response_interval '500' + option sourcefilter '0' config interface 'mesh_wan' option ifname 'br-wan' - option mesh 'bat0' - option proto 'batadv' option auto '1' + option proto 'gluon_mesh' + option fixed_mtu '1' config interface 'mesh_lan' option ifname 'eth1' option auto '0' - option macaddr '12:ff:ee:57:ea:90' option mesh 'bat0' - option proto 'batadv' + option igmp_snooping '0' + option transitive '1' + option fixed_mtu '1' + option proto 'gluon_mesh' + option type 'bridge' + option macaddr 'd2:e5:0c:ca:2d:b4' config interface 'mesh_vpn' option ifname 'mesh-vpn' option mesh_no_rebroadcast '1' - option macaddr '12:02:ed:57:ea:90' option mesh 'bat0' - option proto 'batadv' + option transitive '1' + option macaddr 'd2:e5:0c:ca:2d:b7' + option fixed_mtu '1' + option proto 'gluon_mesh' + +config interface 'ibss_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 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' diff --git a/Richtfunk/bb-schnacke100-kern/etc/config/wireless b/Richtfunk/bb-schnacke100-kern/etc/config/wireless deleted file mode 100644 index a04fe3e..0000000 --- a/Richtfunk/bb-schnacke100-kern/etc/config/wireless +++ /dev/null @@ -1,29 +0,0 @@ - -config wifi-device 'radio0' - option type 'mac80211' - option hwmode '11g' - option path 'platform/qca955x_wmac' - option htmode 'HT20' - option channel '1' - option country 'DE' - -config wifi-iface 'client_radio0' - option ifname 'client0' - option network 'client' - option disabled '1' - option device 'radio0' - option mode 'ap' - option macaddr '12:00:ee:57:ea:90' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio0' - option ifname 'mesh0' - option network 'mesh_radio0' - option device 'radio0' - option bssid 'f8:d1:11:87:52:2e' - option disabled '1' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr '12:01:ee:57:ea:90' - option ssid 'f8:d1:11:87:52:2e' - diff --git a/Richtfunk/bb-stpaulikirche-kern/etc/config/network b/Richtfunk/bb-stpaulikirche-kern/etc/config/network index 08febd4..404e233 100644 --- a/Richtfunk/bb-stpaulikirche-kern/etc/config/network +++ b/Richtfunk/bb-stpaulikirche-kern/etc/config/network @@ -13,6 +13,7 @@ config interface 'wan6' option ifname 'br-wan' option ip6table '1' option peerdns '0' + option sourcefilter '0' config switch option name 'switch0' @@ -29,94 +30,85 @@ config switch_vlan option vlan '2' option ports '0t 1' -#Wartungsnetz config switch_vlan option vlan '5' option ports '0t 2t' option device 'switch0' -config interface 'vlan5' - option proto 'static' - option ifname 'eth0.5' - option ipaddr '192.168.112.24' - option netmask '255.255.255.0' - -#Sektorantennen -#stpaulikirche-0 +config interface 'vlan5' + option proto 'static' + option ifname 'eth0.5' + option ipaddr '192.168.112.24' + option netmask '255.255.255.0' + config switch_vlan option vlan '10' option ports '0t 2t' option device 'switch0' -config interface 'vlan10' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.10' - option macaddr 'de:ad:be:ef:90:50' +config interface 'vlan10' + option ifname 'eth0.10' + option macaddr 'de:ad:be:ef:90:50' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' -#stpaulikirche-9 -config switch_vlan - option vlan '11' - option ports '0t 2t' - option device 'switch0' - -config interface 'vlan11' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.11' - option macaddr 'de:ad:be:ef:90:52' - -#stpaulikirche-18 -config switch_vlan - option vlan '12' - option ports '0t 2t' - option device 'switch0' - -config interface 'vlan12' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.12' - option macaddr 'de:ad:be:ef:90:53' +config switch_vlan + option vlan '11' + option ports '0t 2t' + option device 'switch0' -#stpaulikirche-27 -config switch_vlan - option vlan '13' - option ports '0t 2t' - option device 'switch0' - -config interface 'vlan13' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.13' - option macaddr 'de:ad:be:ef:90:54' - +config interface 'vlan11' + option ifname 'eth0.11' + option macaddr 'de:ad:be:ef:90:52' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + +config switch_vlan + option vlan '12' + option ports '0t 2t' + option device 'switch0' + +config interface 'vlan12' + option ifname 'eth0.12' + option macaddr 'de:ad:be:ef:90:53' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' + +config switch_vlan + option vlan '13' + option ports '0t 2t' + option device 'switch0' + +config interface 'vlan13' + option ifname 'eth0.13' + option macaddr 'de:ad:be:ef:90:54' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' -#doormann22-stpaulikirche config switch_vlan option vlan '25' option ports '0t 2t' option device 'switch0' config interface 'vlan25' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' option ifname 'eth0.25' option macaddr 'de:ad:be:ef:90:51' - + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config interface 'wan' - option igmp_snooping '0' option ifname 'eth0.2' option auto '1' option peerdns '0' option type 'bridge' option proto 'dhcp' - option macaddr 'fa:1b:67:ca:92:24' + option multicast_querier '0' + option macaddr '7e:fe:cc:ae:f9:d0' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -132,47 +124,59 @@ config route6 'wan6_unreachable' config interface 'client' option reqprefix 'no' - option ifname 'eth0.1 bat0' option proto 'dhcpv6' option type 'bridge' - option igmp_snooping '0' 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' config interface 'mesh_wan' option auto '0' option ifname 'br-wan' - option mesh 'bat0' - option proto 'batadv' + option proto 'gluon_mesh' + option fixed_mtu '1' config interface 'mesh_lan' option ifname 'eth0.1' option auto '0' - option macaddr 'fa:1b:68:ca:92:24' option mesh 'bat0' - option proto 'batadv' + option igmp_snooping '0' + option transitive '1' + option fixed_mtu '1' + option proto 'gluon_mesh' + option type 'bridge' + option macaddr '7e:fe:cc:ae:f9:d4' config interface 'mesh_vpn' option ifname 'mesh-vpn' option mesh_no_rebroadcast '1' - option macaddr 'fa:1e:67:ca:92:24' option mesh 'bat0' - option proto 'batadv' + option transitive '1' + option macaddr '7e:fe:cc:ae:f9:d7' + option fixed_mtu '1' + option proto 'gluon_mesh' + +config interface 'ibss_radio0' + option proto 'gluon_mesh' + +config interface 'ibss_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 proto 'none' -config interface 'mesh_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - -config interface 'mesh_radio1' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' +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' diff --git a/Richtfunk/bb-stpaulikirche-kern/etc/config/wireless b/Richtfunk/bb-stpaulikirche-kern/etc/config/wireless deleted file mode 100644 index ff34903..0000000 --- a/Richtfunk/bb-stpaulikirche-kern/etc/config/wireless +++ /dev/null @@ -1,59 +0,0 @@ - -config wifi-device 'radio0' - option type 'mac80211' - option hwmode '11g' - option path 'platform/ar934x_wmac' - option htmode 'HT20' - option channel '1' - option country 'DE' - option disabled '1' - -config wifi-device 'radio1' - option type 'mac80211' - option hwmode '11a' - option path 'pci0000:00/0000:00:00.0' - option channel '44' - option htmode 'HT40+' - option country 'DE' - option disabled '1' - -config wifi-iface 'client_radio0' - option ifname 'client0' - option network 'client' - option disabled '0' - option device 'radio0' - option mode 'ap' - option macaddr 'fa:1c:68:ca:92:24' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio0' - option ifname 'mesh0' - option network 'mesh_radio0' - option device 'radio0' - option bssid 'f8:d1:11:87:52:2e' - option disabled '0' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr 'fa:1d:68:ca:92:24' - option ssid 'f8:d1:11:87:52:2e' - -config wifi-iface 'client_radio1' - option ifname 'client1' - option network 'client' - option disabled '0' - option device 'radio1' - option mode 'ap' - option macaddr 'fa:1c:69:ca:92:24' - option ssid 'hamburg.freifunk.net' - -config wifi-iface 'mesh_radio1' - option ifname 'mesh1' - option network 'mesh_radio1' - option device 'radio1' - option bssid 'f8:d1:11:87:52:2e' - option disabled '0' - option mcast_rate '12000' - option mode 'adhoc' - option macaddr 'fa:1d:69:ca:92:24' - option ssid 'f8:d1:11:87:52:2e' - diff --git a/Richtfunk/bb-werkhof-kern/etc/config/network b/Richtfunk/bb-werkhof-kern/etc/config/network index 8ea469a..c1848ab 100644 --- a/Richtfunk/bb-werkhof-kern/etc/config/network +++ b/Richtfunk/bb-werkhof-kern/etc/config/network @@ -13,6 +13,7 @@ config interface 'wan6' option ifname 'br-wan' option ip6table '1' option peerdns '0' + option sourcefilter '0' config switch option name 'switch0' @@ -29,84 +30,73 @@ config switch_vlan option vlan '2' option ports '5 6' - -#Wartungsnetz config switch_vlan option device 'switch0' option vlan '5' option ports '0t 4t' -config interface 'vlan5' - option proto 'static' - option ifname 'eth1.5' - option ipaddr '192.168.112.17' - option netmask '255.255.255.0' +config interface 'vlan5' + option proto 'static' + option ifname 'eth1.5' + option ipaddr '192.168.112.17' + option netmask '255.255.255.0' - -#Sektorantennen -#bb-werkhof-0 config switch_vlan option device 'switch0' option vlan '10' option ports '0t 4t' -config interface 'vlan10' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth1.10' - option macaddr 'de:ad:be:ef:90:30' - -#bb-werkhof-18 -config switch_vlan - option device 'switch0' - option vlan '11' - option ports '0t 4t' - -config interface 'vlan11' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth1.11' - option macaddr 'de:ad:be:ef:90:33' +config interface 'vlan10' + option ifname 'eth1.10' + option macaddr 'de:ad:be:ef:90:30' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' +config switch_vlan + option device 'switch0' + option vlan '11' + option ports '0t 4t' + +config interface 'vlan11' + option ifname 'eth1.11' + option macaddr 'de:ad:be:ef:90:33' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' -#fux-werkhof config switch_vlan option device 'switch0' option vlan '22' option ports '0t 4t' -config interface 'vlan22' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth1.22' - option macaddr 'de:ad:be:ef:90:31' +config interface 'vlan22' + option ifname 'eth1.22' + option macaddr 'de:ad:be:ef:90:31' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' +config switch_vlan + option device 'switch0' + option vlan '27' + option ports '0t 4t' -#werkhof-vogelfrei -config switch_vlan - option device 'switch0' - option vlan '27' - option ports '0t 4t' - -config interface 'vlan27' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth1.27' - option macaddr 'de:ad:be:ef:90:32' +config interface 'vlan27' + option ifname 'eth1.27' + option macaddr 'de:ad:be:ef:90:32' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' - config interface 'wan' - option igmp_snooping '0' option ifname 'eth0' option auto '1' option peerdns '0' option type 'bridge' option proto 'dhcp' - option macaddr '16:cd:20:4d:3d:68' + option multicast_querier '0' + option macaddr '96:78:f6:ee:5b:e8' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -122,42 +112,56 @@ config route6 'wan6_unreachable' config interface 'client' option reqprefix 'no' - option ifname 'eth1.1 bat0' option proto 'dhcpv6' option type 'bridge' - option igmp_snooping '0' 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' config interface 'mesh_wan' option auto '0' option ifname 'br-wan' - option mesh 'bat0' - option proto 'batadv' + option proto 'gluon_mesh' + option fixed_mtu '1' config interface 'mesh_lan' option ifname 'eth1' option auto '0' - option macaddr '16:cd:21:4d:3d:68' option mesh 'bat0' - option proto 'batadv' + option igmp_snooping '0' + option transitive '1' + option fixed_mtu '1' + option proto 'gluon_mesh' + option type 'bridge' + option macaddr '96:78:f6:ee:5b:ec' config interface 'mesh_vpn' option ifname 'mesh-vpn' option mesh_no_rebroadcast '1' - option macaddr '16:d0:20:4d:3d:68' option mesh 'bat0' - option proto 'batadv' + option transitive '1' + option macaddr '96:78:f6:ee:5b:ef' + option fixed_mtu '1' + option proto 'gluon_mesh' + +config interface 'ibss_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 proto 'none' -config interface 'mesh_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' +config interface 'client_lan' + option unicast_flood '0' + option ifname 'eth1' config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' diff --git a/Richtfunk/bb-winfrid12-kern/etc/config/network b/Richtfunk/bb-winfrid12-kern/etc/config/network index 8ef6e9f..0eef6f8 100644 --- a/Richtfunk/bb-winfrid12-kern/etc/config/network +++ b/Richtfunk/bb-winfrid12-kern/etc/config/network @@ -12,8 +12,8 @@ config interface 'wan' option accept_ra '0' option auto '1' option peerdns '0' - option macaddr 'c2:4b:00:38:ad:5c' - option igmp_snooping '0' + option multicast_querier '0' + option macaddr '3e:b8:a0:7f:ce:d0' config switch option reset '1' @@ -31,27 +31,27 @@ config switch_vlan option device 'switch0' config switch_vlan - option vlan '5' - option ports '0t 2t' - option device 'switch0' + option vlan '5' + option ports '0t 2t' + option device 'switch0' config switch_vlan - option vlan '30' - option ports '0t 2t' - option device 'switch0' + option vlan '30' + option ports '0t 2t' + option device 'switch0' config interface 'vlan5' - option proto 'static' - option ifname 'eth0.5' - option ipaddr '192.168.112.42' - option netmask '255.255.255.0' + option proto 'static' + option ifname 'eth0.5' + option ipaddr '192.168.112.42' + option netmask '255.255.255.0' config interface 'vlan30' - option mesh_no_rebroadcast '1' - option proto 'batadv' - option mesh 'bat0' - option ifname 'eth0.30' - option macaddr 'de:ad:be:ef:90:a0' + option ifname 'eth0.30' + option macaddr 'de:ad:be:ef:90:a0' + option proto 'gluon_mesh' + option fixed_mtu '1' + option transitive '1' config interface 'client' option type 'bridge' @@ -59,31 +59,37 @@ config interface 'client' option proto 'dhcpv6' option reqprefix 'no' option peerdns '1' - option igmp_snooping '0' - option ifname 'bat0' + list ifname 'bat0' + option robustness '3' + option query_interval '2000' + option query_response_interval '500' + option sourcefilter '0' config interface 'mesh' - option proto 'batadv' option mtu '1528' - option mesh 'bat0' + option proto 'gluon_mesh' + option fixed_mtu '1' config interface 'mesh5' - option proto 'batadv' option mtu '1528' - option mesh 'bat0' + option proto 'gluon_mesh' + option fixed_mtu '1' config interface 'mesh_vpn' option ifname 'mesh-vpn' - option proto 'batadv' option mesh 'bat0' option mesh_no_rebroadcast '1' - option macaddr 'c2:4e:00:38:ad:5c' + option transitive '1' + option macaddr '3e:b8:a0:7f:ce:d7' + option fixed_mtu '1' + option proto 'gluon_mesh' config interface 'wan6' option proto 'dhcpv6' option ifname 'br-wan' option peerdns '0' option ip6table '1' + option sourcefilter '0' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -100,8 +106,8 @@ config route6 'wan6_unreachable' config interface 'mesh_wan' option auto '0' option ifname 'br-wan' - option mesh 'bat0' - option proto 'batadv' + option proto 'gluon_mesh' + option fixed_mtu '1' config route 'local_node_route4' option target '10.112.0.0' @@ -111,25 +117,31 @@ config route 'local_node_route4' config interface 'mesh_lan' option ifname 'eth0.1' - option macaddr 'c2:4b:01:38:ad:5c' option mesh 'bat0' - option proto 'batadv' option auto '1' + option igmp_snooping '0' + option transitive '1' + option fixed_mtu '1' + option proto 'gluon_mesh' + option type 'bridge' + option macaddr '3e:b8:a0:7f:ce:d4' + +config interface 'ibss_radio0' + option proto 'gluon_mesh' + +config interface 'ibss_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 proto 'none' -config interface 'mesh_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - -config interface 'mesh_radio1' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' +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'