Index: nodes/CNodeAJSoft2/wleiden.conf
===================================================================
--- nodes/CNodeAJSoft/wleiden.conf	(revision 5067)
+++ nodes/CNodeAJSoft2/wleiden.conf	(revision 5809)
@@ -3,10 +3,10 @@
 #  Read by /usr/local/sbin/wireless-up.pl
 #
-# config CNodeAJSoft
+# config CNodeAJSoft2
 $location="5meilaan (Parelvissers), Leiden";
-$master_ip='172.20.136.1';  
+$master_ip='172.20.137.1';  
 $gw_open='closed';
 $nodetype='CNode';
-$nodename='AJSoft';
+$nodename='AJSoft2';
 $release="5.0-RELEASE";
 $node_config_version="1";
@@ -23,9 +23,7 @@
 $LOKATIE='5meilaan';
 
-
-
-$config{'ep0'}=sprintf <<ED0;  # Ethernet
+$config{'sis0'}=sprintf <<SIS0;  # Ethernet
 TYPE=ethernet
-IP=172.20.136.65/28
+IP=172.20.136.66/28
 
 DESC=Ethernet naar Parelvissers 
@@ -33,19 +31,15 @@
 SPEED=10240000000
 
-DHCP=67-78
-
 OSPF_BROADCAST=no
 OSPF_NEIGHBORS=no
 
-ED0
+SIS0
 
+$config{'wi0'}=sprintf <<WI0;  # omni
+TYPE=wireless
+IP=172.16.3.13/30
 
-
-$config{'wi0'}=sprintf <<EW0;  # omni
-TYPE=wireless
-IP=$master_ip/26
-
-DESC=omni voor de buurt
-SDESC=omni
+DESC=interlink
+SDESC=interlink
 SPEED=11534336
 
@@ -56,5 +50,5 @@
 
 MODE=master
-ESSID=ap-omni.ajsoft.wleiden.net
+ESSID=il-w.ajsoft2.wleiden.net
 CHANNEL=11
 
@@ -67,32 +61,21 @@
 HEIGTH=22
 
-EW0
+WI0
 
-$config{'wi0:0'}=sprintf <<EW00;  # Link naar Bizet
+$config{'ath0'}=sprintf <<ATH0;  # link livinglab
 TYPE=wireless
-IP=172.16.0.109/30
-DESC=Link naar Bizet
-SDESC=2bizet
-SPEED=11534336
-POINT_TO_POINT=172.16.0.110
-EW00
-
-
-
-$config{'wi1'}=sprintf <<EW1;  # link haagwijk 
-TYPE=wireless
-IP=172.16.1.158/30
-DESC=Link naar Haagwijk
-SDESC=2haagwijk
-SPEED=11534336
-POINT_TO_POINT=172.16.1.157
+IP=172.16.2.242/30
+DESC=Link naar LivingLab
+SDESC=2livinglab
+SPEED=54000000
+POINT_TO_POINT=172.16.2.241
 DHCP=no
 
 OSPF_AREA=0
 OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.157
+OSPF_NEIGHBORS=172.16.2.241
 
 MODE=managed
-ESSID=il-nw.haagwijk.wleiden.net
+ESSID=il-n.livinglab.wleiden.net
 
 #CHANNEL=11
@@ -106,97 +89,4 @@
 HEIGTH=22
 
-EW1
+ATH0
 
-
-$config{'wi2'}=sprintf <<EW2; # Link naar Robijn
-TYPE=wireless
-IP=172.16.1.33/30
-DESC=InterLink naar Robijn
-SDESC=2robijn
-SPEED=1153436
-POINT_TO_POINT=172.16.1.34
-DHCP=no
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.34
-
-MODE=master
-ESSID=il-nw.ajsoft.wleiden.net
-
-CHANNEL=1
-
-POLAR=Hor
-ANTENNA=SD15
-GAIN=13dBi
-DIRECTION=315
-BEAMWIDTH=40
-CABLE=2
-HEIGTH=22
-
-EW2
-
-$config{'wi2:0'}=sprintf <<EW20;  # Link naar NodeGer
-TYPE=wireless
-IP=172.16.1.237/30
-DESC=Link naar NodeGer
-SDESC=2ger
-SPEED=11534336
-POINT_TO_POINT=172.16.1.238
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.238
-EW20
-
-$config{'wi2:1'}=sprintf <<EW21; # Link naar Meca
-TYPE=wireless
-IP=172.16.1.77/30
-DESC=Link naar Meca
-SDESC=2meca
-SPEED=11534336
-POINT_TO_POINT=172.16.1.78
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.78
-
-EW21
-
-
-$config{'wi2:2'}=sprintf <<EW22;  # Link naar Zwaluwmz
-TYPE=wireless
-IP=172.16.2.17/30
-DESC=Link naar Zwaluwmz
-SDESC=2zwaluwmz
-SPEED=11534336
-POINT_TO_POINT=172.16.2.18
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.2.18
-EW22
-
-
-$config{'wi3'}=sprintf <<EW3;
-TYPE=wireless
-IP=172.16.0.142/30
-DESC=Link naar RenV 
-SDESC=2rv
-SPEED=1153436
-POINT_TO_POINT=172.16.0.141
-DHCP=no
-
-OSPF_AREA=0
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.0.141
-
-MODE=managed
-ESSID=il-zw.rv.wleiden.net
-CHANNEL=5
-
-POLAR=vert
-ANTENNA=SD15
-GAIN=13dBi
-DIRECTION=45
-BEAMWIDTH=40
-CABLE=2
-HEIGTH=22
-
-EW3
-
-
-