From ca627801477d4e7f2bf5f3b260b290f1efbf43b8 Mon Sep 17 00:00:00 2001 From: percyff Date: Sat, 6 Jan 2018 14:02:20 +0100 Subject: [PATCH] update flora-uplink, add flora-cafe --- Richtfunk/bb-flora-cafe/etc/config/network | 128 ++++++++++++++++++ Richtfunk/bb-flora-cafe/etc/config/wireless | 71 ++++++++++ Richtfunk/bb-flora-uplink/etc/config/network | 19 ++- Richtfunk/bb-flora-uplink/etc/config/wireless | 34 ++--- 4 files changed, 233 insertions(+), 19 deletions(-) create mode 100644 Richtfunk/bb-flora-cafe/etc/config/network create mode 100644 Richtfunk/bb-flora-cafe/etc/config/wireless diff --git a/Richtfunk/bb-flora-cafe/etc/config/network b/Richtfunk/bb-flora-cafe/etc/config/network new file mode 100644 index 0000000..dbe19a4 --- /dev/null +++ b/Richtfunk/bb-flora-cafe/etc/config/network @@ -0,0 +1,128 @@ + +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +config globals 'globals' + option ula_prefix 'fd9e:7853:40c5::/48' + +config interface 'wan6' + option proto 'dhcpv6' + option sourcefilter '0' + option ifname 'br-wan' + option ip6table '1' + option peerdns '0' + +config switch + option name 'switch0' + option reset '1' + option enable_vlan '1' + + +config switch_vlan + option device 'switch0' + option vlan '4' + option ports '1t 6' + +config switch_vlan + option device 'switch0' + option vlan '3' + option ports '0t 3 4 5' + +config switch_vlan + option device 'switch0' + option vlan '8' + option ports '1t 2' + + +config interface 'wan' + option ifname 'eth0' + option multicast_querier '0' + option peerdns '0' + option auto '1' + option type 'bridge' + option proto 'dhcp' + option macaddr 'ca:3b:45:16:4c:e8' + +config rule6 'wan6_lookup' + option mark '0x01/0x01' + option lookup '1' + +config route6 'wan6_unreachable' + option type 'unreachable' + option table '1' + option target '::/0' + option metric '65535' + option gateway '::' + option interface 'loopback' + +config interface 'mesh_wan' + option ifname 'br-wan' + option transitive '1' + option fixed_mtu '1' + option proto 'gluon_mesh' + option auto '1' + +config interface 'mesh_lan' + option igmp_snooping '0' + option transitive '1' + option fixed_mtu '1' + option proto 'gluon_mesh' + option type 'bridge' + option macaddr 'ca:3b:45:16:4c:ec' + option ifname 'eth1' + option auto '0' + +config interface 'client' + option type 'bridge' + option macaddr 'e8:de:27:8c:33:16' + option proto 'dhcpv6' + option reqprefix 'no' + option robustness '3' + option query_interval '2000' + option query_response_interval '500' + option peerdns '1' + option sourcefilter '0' + list ifname 'bat0' + list ifname 'eth1.3' + +config interface 'mesh_vpn' + option ifname 'mesh-vpn' + option transitive '1' + option macaddr 'ca:3b:45:16:4c:ef' + option fixed_mtu '1' + option proto 'gluon_mesh' + +config interface 'mesh_radio0' + option proto 'gluon_mesh' + +config interface 'mesh_radio1' + option proto 'gluon_mesh' + +config interface 'bat0' + option multicast_router '2' + option ifname 'bat0' + option macaddr 'e8:de:27:8c:33:16' + option learning '1' + option proto 'none' + +config device 'local_node_dev' + option macaddr '16:41:95:40:f7:dc' + option ifname 'br-client' + option name 'local-node' + option type 'macvlan' + +config interface 'local_node' + option ifname 'local-node' + 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:2::/64' + option gateway '::' + option interface 'client' + diff --git a/Richtfunk/bb-flora-cafe/etc/config/wireless b/Richtfunk/bb-flora-cafe/etc/config/wireless new file mode 100644 index 0000000..f8372a4 --- /dev/null +++ b/Richtfunk/bb-flora-cafe/etc/config/wireless @@ -0,0 +1,71 @@ + +config wifi-device 'radio0' + option type 'mac80211' + option hwmode '11a' + option path 'pci0000:01/0000:01:00.0' + option country 'DE' + option channel '48' + option htmode 'HT20' + +config wifi-device 'radio1' + option type 'mac80211' + option hwmode '11g' + option path 'platform/qca955x_wmac' + option htmode 'HT20' + option country 'DE' + option channel '9' + option txpower '14' + list supported_rates '6000' + list supported_rates '9000' + list supported_rates '12000' + list supported_rates '18000' + list supported_rates '24000' + list supported_rates '36000' + list supported_rates '48000' + list supported_rates '54000' + list basic_rate '6000' + list basic_rate '9000' + list basic_rate '18000' + list basic_rate '36000' + list basic_rate '54000' + +config wifi-iface 'mesh_radio0' + option ifname 'mesh0' + option network 'mesh_radio0' + option device 'radio0' + option mesh_fwding '0' + option mesh_id '6668682D77657374' + option mcast_rate '12000' + option mode 'mesh' + option disabled '1' + option macaddr 'ca:3b:45:16:4c:e9' + +config wifi-iface 'mesh_radio1' + option ifname 'mesh1' + option network 'mesh_radio1' + option device 'radio1' + option mesh_fwding '0' + option mesh_id '6668682D77657374' + option mcast_rate '12000' + option mode 'mesh' + option disabled '1' + option macaddr 'ca:3b:45:16:4c:ed' + +config wifi-iface 'client_radio0' + option ifname 'client0' + option network 'client' + option disabled '0' + option device 'radio0' + option mode 'ap' + option macaddr 'e8:de:27:8c:33:14' + option ssid 'hamburg.freifunk.net' + +config wifi-iface 'client_radio1' + option ifname 'client1' + option network 'client' + option disabled '0' + option device 'radio1' + option mode 'ap' + option macaddr 'e8:de:27:8c:33:15' + option ssid 'hamburg.freifunk.net' + diff --git a/Richtfunk/bb-flora-uplink/etc/config/network b/Richtfunk/bb-flora-uplink/etc/config/network index 2686a73..f0d2fa0 100644 --- a/Richtfunk/bb-flora-uplink/etc/config/network +++ b/Richtfunk/bb-flora-uplink/etc/config/network @@ -33,7 +33,7 @@ config switch_vlan config switch_vlan option device 'switch0' option vlan '4' - option ports '0t 3' + option ports '0t 3t' config interface 'bb_flora_cafe' option ifname 'eth0.4' @@ -69,6 +69,20 @@ config interface 'bb_flora_kern' option macaddr 'de:ad:be:ef:90:f2' option igmp_snooping '0' +config switch_vlan + option device 'switch0' + option vlan '8' + option ports '0t 3t' + +config interface 'bb_flora_saal_unten' + option ifname 'eth0.8' + option transitive '1' + option fixed_mtu '1' + option proto 'gluon_mesh' + option macaddr 'de:ad:be:ef:90:f3' + option igmp_snooping '0' + + config interface 'wan' option ifname 'eth0.2' option auto '1' @@ -101,6 +115,7 @@ config interface 'client' option query_response_interval '500' option sourcefilter '0' list ifname 'bat0' + list ifname 'eth0.1' config interface 'mesh_wan' option auto '0' @@ -111,7 +126,7 @@ config interface 'mesh_wan' config interface 'mesh_lan' option ifname 'eth0.1' option mesh 'bat0' - option auto '1' + option auto '0' option igmp_snooping '0' option transitive '1' option fixed_mtu '1' diff --git a/Richtfunk/bb-flora-uplink/etc/config/wireless b/Richtfunk/bb-flora-uplink/etc/config/wireless index ba6ec4c..d520660 100644 --- a/Richtfunk/bb-flora-uplink/etc/config/wireless +++ b/Richtfunk/bb-flora-uplink/etc/config/wireless @@ -14,6 +14,7 @@ config wifi-device 'radio1' option htmode 'HT20' option channel '5' option country 'DE' + option txpower '14' list supported_rates '6000' list supported_rates '9000' list supported_rates '12000' @@ -27,29 +28,28 @@ config wifi-device 'radio1' list basic_rate '18000' list basic_rate '36000' list basic_rate '54000' - option txpower '14' -config wifi-iface 'ibss_radio0' - option ifname 'ibss0' - option network 'ibss_radio0' +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 mesh_fwding '0' + option mesh_id '6668682D77657374' option mcast_rate '12000' - option mode 'adhoc' - option macaddr '5e:aa:00:a5:99:72' - option ssid 'f8:d1:11:87:52:2e' + option mode 'mesh' + option disabled '1' + option macaddr '5e:aa:00:a5:99:71' -config wifi-iface 'ibss_radio1' - option ifname 'ibss1' - option network 'ibss_radio1' +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 mesh_fwding '0' + option mesh_id '6668682D77657374' option mcast_rate '12000' - option mode 'adhoc' - option macaddr '5e:aa:00:a5:99:76' - option ssid 'f8:d1:11:87:52:2e' + option mode 'mesh' + option disabled '1' + option macaddr '5e:aa:00:a5:99:75' config wifi-iface 'client_radio0' option ifname 'client0'