Index: nodes/CNodeAJSoft2/wleiden.conf
===================================================================
--- nodes/CNodeAJSoft2/wleiden.conf	(revision 7657)
+++ nodes/CNodeAJSoft2/wleiden.conf	(revision 7954)
@@ -1,5 +1,2 @@
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeAJSoft2
@@ -7,40 +4,8 @@
 $nodetype='CNode';
 $nodename='AJSoft2';
-$release="5.0-RELEASE";
-
-
+$release="8.0-RELEASE";
 $status='up';
-
-# edugis x,y 92035,462384
 $X='92035';
 $Y='462384';
-
-$LOKATIE='5meilaan';
-
-$config{'sis0'}=sprintf <<SIS0;  # Ethernet naar AJSoft
-TYPE=ethernet
-IP=172.16.3.82/30
-
-DESC=Ethernet naar AJSoft 
-SDESC=eth
-
-
-SIS0
-
-$config{'wi0'}=sprintf <<WI0;
-TYPE=wireless
-IP=172.16.3.53/30
-
-DESC=interlink naar Hofland
-SDESC=2hofland
-DHCP=no
-
-
-MODE=master
-ESSID=il-w.ajsoft2.wleiden.net
-CHANNEL=13
-
-
-WI0
 
 $config{'ath0'}=sprintf <<ATH0;  # link livinglab
@@ -50,12 +15,53 @@
 SDESC=2livinglab
 DHCP=no
-
-
-MODE=managed
-ESSID=il-n.livinglab.wleiden.net
-
-CHANNEL=36
-
-
+#MODE=bridge managed
+#ESSID=il-n.livinglab.wleiden.net
+#CHANNEL=36
 ATH0
 
+$config{'vr0'}=sprintf <<VR0;  # Ethernet naar AJSoft1
+TYPE=ethernet
+IP=172.16.3.82/30
+DESC=Ethernet naar AJSoft1 
+SDESC=2ajsoft1
+DHCP=no
+VR0
+
+$config{'vr1'}=sprintf <<VR1;  # link naar Hofland 
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=IP=172.16.3.53/30
+DESC=Link naar Hofland
+SDESC=2hofland
+DHCP=no
+#MODE=bridge ap
+#ESSID=il-w.ajsoft2.wleiden.net
+#CHANNEL=100
+#NSMAC=
+VR1
+
+$config{'vr2'}=sprintf <<VR2; # Link naar RijnVliet
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.0.142/30
+DESC=InterLink naar RijnVliet
+SDESC=2rijnvliet
+DHCP=no
+#MODE=bridge managed
+#ESSID=il-zw.rv.wleiden.net
+#CHANNEL=4
+#BulletMAC=
+VR2
+
+$config{'ue0'}=sprintf <<UE0;  # Link naar Muiderkring
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.3.117/30
+DESC=Link naar Muiderkring
+SDESC=2muiderkring
+DHCP=no
+#MODE=bridge ap
+#ESSID=il-nno.ajsoft2.wleiden.net
+#CHANNEL=8
+#BulletMAC=
+UE0