From 68dc81e36799fd78602df72857a7be9f088fda05 Mon Sep 17 00:00:00 2001 From: 4ndr3 Date: Sun, 12 Apr 2015 15:24:01 +0200 Subject: [PATCH] kernrouter getauscht --- Richtfunk/bb-fux-kern/etc/config/network | 171 +++++++++++----------- Richtfunk/bb-fux-kern/etc/config/wireless | 12 +- 2 files changed, 93 insertions(+), 90 deletions(-) diff --git a/Richtfunk/bb-fux-kern/etc/config/network b/Richtfunk/bb-fux-kern/etc/config/network index 2ccbea9..f68e4a0 100644 --- a/Richtfunk/bb-fux-kern/etc/config/network +++ b/Richtfunk/bb-fux-kern/etc/config/network @@ -6,90 +6,108 @@ config interface 'loopback' option netmask '255.0.0.0' config switch - option name 'eth0' option reset '1' option enable_vlan '1' + option name 'switch0' config switch_vlan - option device 'eth0' option vlan '1' option ports '0t 3 4 5' + option device 'switch0' config switch_vlan - option device 'eth0' option vlan '2' option ports '0t 1' + option device 'switch0' config switch_vlan - option device 'eth0' - option vlan '5' - option ports '0t 2t' - option vid '5' - -config switch_vlan - option device 'eth0' - option vlan '10' - option ports '0t 2t' - option vid '10' - -config switch_vlan - option device 'eth0' - option vlan '20' - option ports '0t 2t' - option vid '20' + option vlan '5' + option ports '0t 2t' + option vid '5' + option device 'switch0' config switch_vlan - option device 'eth0' - option vlan '21' - option ports '0t 2t' - option vid '21' + option vlan '10' + option ports '0t 2t' + option vid '10' + option device 'switch0' + +config switch_vlan + option vlan '20' + option ports '0t 2t' + option vid '20' + option device 'switch0' config switch_vlan - option device 'eth0' - option vlan '22' - option ports '0t 2t' - option vid '22' - -config interface 'vlan5' - option proto 'static' - option ifname 'eth0.5' - option ipaddr '192.168.112.7' - option netmask '255.255.255.0' - -config interface 'vlan10' - option proto 'batadv' - option mesh 'bat0' - option mtu '1500' - option ifname 'eth0.10' - option macaddr 'de:ad:be:ef:90:10' - + option vlan '11' + option ports '0t 2t' + option vid '11' + option device 'switch0' + +config switch_vlan + option vlan '22' + option ports '0t 2t' + option vid '22' + 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' + +config interface 'vlan10' + option proto 'batadv' + option mesh 'bat0' + option mtu '1500' + option ifname 'eth0.10' + option macaddr 'de:ad:be:ef:90:10' + config interface 'vlan20' - option proto 'batadv' - option mesh 'bat0' - option mtu '1500' - option ifname 'eth0.20' - option macaddr 'de:ad:be:ef:90:11' + option proto 'batadv' + option mesh 'bat0' + option mtu '1500' + option ifname 'eth0.20' + option macaddr 'de:ad:be:ef:90:11' -config interface 'vlan21' - option proto 'batadv' - option mesh 'bat0' - option mtu '1500' - option ifname 'eth0.21' - option macaddr 'de:ad:be:ef:90:12' - -config interface 'vlan22' - option proto 'batadv' - option mesh 'bat0' - option mtu '1500' - option ifname 'eth0.22' - option macaddr 'de:ad:be:ef:90:13' +config interface 'vlan11' + option proto 'batadv' + option mesh 'bat0' + option mtu '1500' + option ifname 'eth0.11' + option macaddr 'de:ad:be:ef:90:12' + +config interface 'vlan22' + option proto 'batadv' + option mesh 'bat0' + option mtu '1500' + option ifname 'eth0.22' + option macaddr 'de:ad:be:ef:90:13' config interface 'wan' option ifname 'eth0.2' - option proto 'dhcp' option type 'bridge' + option proto 'dhcp' option peerdns '0' - option macaddr 'ea:94:f6:ce:66:75' + option auto '1' + option macaddr 'fa:1b:67:d8:df:d2' + +config interface 'client' + option ifname 'eth0.1 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' + +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' config interface 'wan6' option proto 'dhcpv6' @@ -109,17 +127,15 @@ config route6 'wan6_unreachable' option gateway '::' option interface 'loopback' -config interface 'client' - option reqprefix 'no' - option ifname 'eth0.1 bat0' - option proto 'dhcpv6' - option type 'bridge' - option macaddr 'e8:94:f6:cd:66:74' - option peerdns '1' +config interface 'mesh_wan' + option ifname 'br-wan' + option mesh 'bat0' + option proto 'batadv' + option auto '0' config interface 'bat0' option ifname 'bat0' - option macaddr 'e8:94:f6:cd:66:74' + option macaddr 'f8:1a:67:d8:df:d2' option proto 'none' config interface 'mesh_radio0' @@ -132,19 +148,6 @@ config interface 'mesh_radio1' option mesh 'bat0' option mtu '1528' -config interface 'mesh_wan' - option auto '0' - option ifname 'br-wan' - option mesh 'bat0' - option proto 'batadv' - -config interface 'mesh_vpn' - option ifname 'mesh-vpn' - option mesh_no_rebroadcast '1' - option macaddr 'ea:94:f6:ce:66:74' - option mesh 'bat0' - option proto 'batadv' - config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' @@ -154,7 +157,7 @@ config device 'local_node_dev' config interface 'local_node' option ifname 'local-node' option ipaddr '10.112.0.1' - option ip6addr 'fd51:2bb2:fd0d::1/128' + option ip6addr '2a03:2267::1/128' option netmask '255.255.255.255' option proto 'static' @@ -165,7 +168,7 @@ config route 'local_node_route4' option interface 'client' config route6 'local_node_route6' - option target 'fd51:2bb2:fd0d::/64' + option target '2a03:2267::/64' option gateway '::' option interface 'client' diff --git a/Richtfunk/bb-fux-kern/etc/config/wireless b/Richtfunk/bb-fux-kern/etc/config/wireless index 2595ebd..1476442 100644 --- a/Richtfunk/bb-fux-kern/etc/config/wireless +++ b/Richtfunk/bb-fux-kern/etc/config/wireless @@ -1,6 +1,5 @@ config wifi-device 'radio0' - option disabled '1' option type 'mac80211' option hwmode '11ng' option path 'platform/ar934x_wmac' @@ -13,9 +12,9 @@ config wifi-device 'radio0' option channel '1' option country 'DE' option htmode 'HT20' + option disabled '1' config wifi-device 'radio1' - option disabled '1' option type 'mac80211' option hwmode '11na' option path 'pci0000:00/0000:00:00.0' @@ -28,18 +27,19 @@ config wifi-device 'radio1' 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 'ea:96:f7:cd:66:74' + 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 'ea:97:f7:cd:66:74' + option macaddr 'fa:1d:68:d8:df:d2' option device 'radio0' option mode 'adhoc' option bssid 'f8:d1:11:87:52:2e' @@ -49,13 +49,13 @@ config wifi-iface 'client_radio1' option network 'client' option device 'radio1' option mode 'ap' - option macaddr 'ea:96:f8:cd:66:74' + 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 'ea:97:f8:cd:66:74' + option macaddr 'fa:1d:69:d8:df:d2' option device 'radio1' option mode 'adhoc' option bssid 'f8:d1:11:87:52:2e'