Index: /nodes/CNodeHofland/wleiden.conf
===================================================================
--- /nodes/CNodeHofland/wleiden.conf	(revision 7990)
+++ /nodes/CNodeHofland/wleiden.conf	(revision 7991)
@@ -1,5 +1,2 @@
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeHofland
@@ -8,68 +5,51 @@
 $nodetype='CNode';
 $nodename='Hofland';
-$release="2.6.19.2-pyramid.metrix.net";
-
-
+$release="8.0-RELEASE";
 $status='up';
-
-# edugis x,y 92035,462384
 $X='92035';
 $Y='462384';
 
-# * Linux expirimental
-# * NOT routing
-# * ath0, ath1?
-# * Specs of machine?
+$config{'ath0'}=sprintf <<ATH0;  # ap 
+TYPE=wireless
+IP=$master_ip/26
+DESC=AP voor de buurt
+SDESC=ap
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-Hofland
+CHANNEL=3
+ATH0
 
-
-$config{'eth0'}=sprintf <<ETH0;  # Ethernet
+$config{'vr0'}=sprintf <<VR0;  # Ethernet
 TYPE=ethernet
 IP=10.0.0.1/24
-
 DESC=Ethernet naar Alan 
 SDESC=eth
 DHCP=no
-ETH0
+VR0
 
-
-
-$config{'eth1'}=sprintf <<ETH1;  # link AJSoft2
+$config{'vr1'}=sprintf <<VR1;  # link AJSoft2
 TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
 IP=172.16.3.54/30
 DESC=Link naar AJSoft2
 SDESC=2ajsoft2
 DHCP=no
+#MODE=bridge managed
+#ESSID=il-w.ajsoft2.wleiden.net
+#CHANNEL=100
+#NSMAC=00:15:6D:
+VR1
 
 
-MODE=managed
-ESSID=il-w.ajsoft2.wleiden.net
-#CHANNEL=13
-
-ETH1
-
-
-$config{'wlan0'}=sprintf <<WLAN0;
-TYPE=wireless
+$config{'vr2'}=sprintf <<VR2;# naar Voorschoten
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
 IP=172.20.149.1/26
 DESC=InterLink naar Voorschoten
 SDESC=2voorschoten
-DHCP=40-60
-
-MODE=master
-ESSID=ap-omni.hofland2.wleiden.net
-
-CHANNEL=1
-WLAN0
-
-$config{'wlan1'}=sprintf <<WLAN1;
-TYPE=wireless
-IP=$master_ip/26
-DESC=InterLink naar Voorschoten
-SDESC=2voorschoten
-DHCP=40-60
-
-MODE=master
-ESSID=ap-omni.hofland.wleiden.net
-
-CHANNEL=10
-WLAN1
+DHCP=no
+#MODE=bridge ap
+#ESSID=il-zw.hofland.wleiden.net
+#CHANNEL=108
+VR2