Index: nodes/CNodeRosmolen/wleiden.conf
===================================================================
--- nodes/CNodeRosmolen/wleiden.conf	(revision 8050)
+++ nodes/CNodeRosmolen/wleiden.conf	(revision 8051)
@@ -1,5 +1,2 @@
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeRosmolen
@@ -9,90 +6,79 @@
 $nodetype='CNode';
 $nodename='Rosmolen';
-$release="5.0-RELEASE";
-
-
+$release="8.0-RELEASE";
 $status='up';
-
-# edugis x,y 94644,465831
 $X='94644';
 $Y='465831';
 
-$config{'ep0'}=sprintf <<ED0;  # Ethernet
-TYPE=ethernet
-IP=172.21.168.65/28
-
-
-DESC=Ethernet naar filiaal OBL
-SDESC=eth
-
-DHCP=no
-
-ED0
-
-
-$config{'wi0'}=sprintf <<EW0;   # Omni
+$config{'ath0'}=sprintf <<ATH0;   # AP
 TYPE=wireless
 IP=$master_ip/24
-DESC=omni voor de buurt
-SDESC=omni
+DESC=ap voor de buurt
+SDESC=ap
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden.Rosmolen
+CHANNEL=5
+ATH0
 
-DHCP=10-60
-
-MODE=master
-ESSID=ap-omni.rosmolen.wleiden.net
-CHANNEL=5
-
-EW0
-
-
-$config{'wi1'}=sprintf <<EW1;
-TYPE=wireless
+$config{'vr0'}=sprintf <<VR0; # a-link naar Broekplein
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
 IP=172.16.0.209/30
 DESC=Link naar Broekplein
 SDESC=2Broekplein
+DHCP=no
+#MODE=managed
+#ESSID=il-z.broekplein.wleiden.net
+#CHANNEL=36
+#NSMAC=
+VR0
 
+$config{'vr1'}=sprintf <<VR1; #link naar Roomburgh1
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+DESC=Link naar Roomburgh1
+SDESC=2roomburgh1
+IP=172.16.2.62/30
 DHCP=no
-MODE=master
-ESSID=il-nw.rosmolen.wleiden.net
+#MODE=managed
+#ESSID=il-nnw.roomburgh1.wleiden.net
+#CHANNEL=124
+#NSMAC=
+VR1
 
-CHANNEL=8
-EW1
+$config{'vr2'}=sprintf <<VR2; #link naar Regenboog
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+DESC=Link naar Regenboog
+SDESC=2regenboog
+IP=172.16.2.65/30
+DHCP=no
+#MODE=ap
+#ESSID=il-o.rosmolen.wleiden.net
+#CHANNEL=11
+#BulletMAC=
+VR2
 
-$config{'wi1:0'}=sprintf <<EW10;
-TYPE=wireless
+$config{'ue0'}=sprintf <<UE0;  # Ethernet
+TYPE=ethernet
+IP=172.21.168.65/28
+DESC=Ethernet naar filiaal OBL
+SDESC=eth
+DHCP=no
+UE0
+
+$config{'ue1'}=sprintf <<UE1;  # Link naar Rudi
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
 IP=172.16.2.57/30
 DESC=Link naar Rudi
 SDESC=2Rudi
-
 DHCP=no
-EW10
-
-$config{'wi2'}=sprintf <<EW2;
-TYPE=wireless
-
-DESC=Link naar Roomburgh1
-SDESC=2roomburgh1
-
-IP=172.16.2.62/30
-DHCP=no
-
-MODE=managed
-ESSID=il-n.roomburgh1.wleiden.net
-EW2
+#MODE=bridge ap
+#ESSID=il-nw.rosmolen.wleiden.net
+#CHANNEL=3
+#BulletMAC=00:15:6D:
+UE1
 
 
-$config{'wi3'}=sprintf <<EW3;
-TYPE=wireless
-DESC=Link naar Regenboog
-SDESC=2regenboog
-
-IP=172.16.2.65/30
-DHCP=no
-
-MODE=master
-ESSID=il-o.rosmolen.wleiden.net
-CHANNEL=11
-
-EW3
-
-