Index: /nodes/CNodeAJSoft2/wleiden.conf
===================================================================
--- /nodes/CNodeAJSoft2/wleiden.conf	(revision 9075)
+++ /nodes/CNodeAJSoft2/wleiden.conf	(revision 9076)
@@ -12,5 +12,5 @@
 COMMENT=link livinglab
 TYPE=wireless
-IP=172.16.2.242/30
+IP= 172.16.17.108/29
 DESC=Link naar LivingLab
 SDESC=2livinglab
Index: /nodes/CNodeHaagwijk/wleiden.conf
===================================================================
--- /nodes/CNodeHaagwijk/wleiden.conf	(revision 9075)
+++ /nodes/CNodeHaagwijk/wleiden.conf	(revision 9076)
@@ -42,5 +42,5 @@
 STATUS=down
 EXTRA_TYPE=eth2wifibridge
-IP=172.16.2.246/30
+IP=172.16.17.116/29
 DESC=link naar LivingLab
 SDESC=2livinglab
@@ -50,5 +50,6 @@
 CHANNEL=36
 NSMAC=00:15:6d:bd:68:05
-NS_IP=172.16.3.86/30
+NSIP=172.16.17.115/29
+#oud NSIP=172.16.3.86/30
 VR1
 
@@ -66,5 +67,5 @@
 CHANNEL=128
 NSMAC=00:15:6d:ea:f0:f6
-NS_IP=192.168.1.20
+NSIP=192.168.1.20
 VR2
 
@@ -80,5 +81,5 @@
 CHANNEL=40
 NSMAC=
-NS_IP=172.16.4.146/29
+NSIP=172.16.4.146/29
 DHCP=no
 UE0
Index: /nodes/CNodeLivingLab/wleiden.conf
===================================================================
--- /nodes/CNodeLivingLab/wleiden.conf	(revision 9075)
+++ /nodes/CNodeLivingLab/wleiden.conf	(revision 9076)
@@ -5,81 +5,9 @@
 $nodetype='CNode';
 $nodename='LivingLab';
-$release="8.0-RELEASE";
-$status='up';
+$release="8.2-RELEASE";
+$status='down';
 $X='92036';
 $Y='462256';
-$status='up';
-
-$config{'sis0'}=sprintf <<SIS0;
-TYPE=Ethernet
-IP=172.20.140.65/27
-DESC=Ethernet naar modelwoning Pergolesipad
-SDESC=2modelwoning
-DHCP=no
-SIS0
-
-$config{'sis0:0'}=sprintf <<SIS00;
-TYPE=Ethernet
-IP=172.16.2.253/30
-DESC=Ethernet naar proxy
-SDESC=2proxy
-DHCP=no
-SIS00
-
-$config{'sis1'}=sprintf <<SIS1;
-TYPE=ethernet
-STATUS=up
-EXTRA_TYPE=eth2wifibridge
-IP=172.16.2.241/30
-DESC=Ethernet naar interlink noord (AJSoft)
-SDESC=2AJSoft
-DHCP=no
-MODE=master
-ESSID=il-n.livinglab.wleiden.net
-CHANNEL=36
-SIS1
-
-$config{'sis1:0'}=sprintf <<SIS10;
-TYPE=ethernet
-STATUS=up
-IP=172.16.3.9/30
-DESC=Ethernet naar Wandy mgmt iface
-SDESC=2Wandy1
-DHCP=no
-SIS10
-
-$config{'sis2'}=sprintf <<SIS2;
-TYPE=ethernet
-STATUS=down
-EXTRA_TYPE=eth2wifibridge
-IP=172.16.2.245/30
-DESC=Ethernet naar interlink zuid-oost (Haagwijk)
-SDESC=2Haagwijk
-DHCP=no
-MODE=master
-ESSID=il-zo.livinglab.wleiden.net
-CHANNEL=44
-SIS2
-
-$config{'sis2:0'}=sprintf <<SIS20;
-TYPE=ethernet
-STATUS=down
-IP=172.16.3.13/30
-DESC=Ethernet naar Wandy mgmt iface
-SDESC=2Wandy2
-DHCP=no
-SIS20
-
-$config{'sis3'}=sprintf <<SIS3;
-TYPE=IRIS ethernet
-STATUS=down
-IP=172.16.2.249/30
-DESC=Ethernet naar unknown
-SDESC=2unknown
-DHCP=no
-MODE=
-ESSID=
-CHANNEL=
-SIS3
+$status='down';
 
 $config{'ath0'}=sprintf <<ATH0;
@@ -90,9 +18,61 @@
 SDESC=ap
 DHCP=10-60
-MODE=master
-ESSID=omni.livinglab.wleiden.net
-CHANNEL=1
-CARD_OPTION=mode 11b
+MODE=ap
+ESSID=ap-WirelessLeiden-LivingLab
+CHANNEL=4
 ATH0
 
+$config{'vr0'}=sprintf <<VR0;
+TYPE=Ethernet
+IP=172.16.2.253/30
+DESC=Ethernet naar proxy
+SDESC=2proxy
+DHCP=no
+VR0
 
+$config{'vr1'}=sprintf <<VR1;
+TYPE=ethernet
+STATUS=up
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.17.105/29
+DESC=link naar AJSoft2
+SDESC=2AJSoft2
+DHCP=no
+MODE=ap wds
+ESSID=il-n.livinglab.wleiden.net
+CHANNEL=36
+NSMAC=
+NSIP=172.16.17.106/29
+VR1
+
+$config{'vr2'}=sprintf <<VR2;
+TYPE=ethernet
+STATUS=up
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.17.113/29
+DESC=Ethernet naar Haagwijk
+SDESC=2Haagwijk
+DHCP=no
+MODE=ap wds
+ESSID=il-zo.livinglab.wleiden.net
+CHANNEL=44
+NSMAC=
+NSIP=172.16.17.114
+VR2
+
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=Link naar Centrum
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+STATUS=down
+IP=172.16.17.121/29
+DESC=link naar Centrum
+SDESC=2rick
+MODE=bridge ap
+ESSID=il-no.livinglab.wleiden.net
+CHANNEL=108
+NSMAC=
+NSIP=172.16.17.122/29
+DHCP=no
+UE0
+