Index: nodes/CNodeUniGorN/wleiden.conf
===================================================================
--- nodes/CNodeUniGorN/wleiden.conf	(revision 2780)
+++ nodes/CNodeUniGorN/wleiden.conf	(revision 2837)
@@ -4,5 +4,9 @@
 #
 # config CNodeUniGorN
-$location="Bovenste omloop van het Gorleus Lab, Universiteit Leiden, voor Kaag/Rijnsburg";
+#
+# let op, namen van ap en interlink moeten veranderen, maar nu nog niet gedaan ivm breken van andere nodes.
+#
+# Hugo
+$location="Bovenste omloop van het Gorlaeus Lab, Universiteit Leiden, voor Kaag/Rijnsburg/Oegstgeest";
 
 $master_ip='172.19.135.1';  
@@ -39,5 +43,5 @@
 $config{'sis0:0'}=sprintf <<SIS01; #link naar gorlaeus 
 TYPE=wireless
-IP=172.19.128.66/28
+IP=172.19.128.69/28
 DESC=Local gorlaeus subnet
 SDESC=2gorlaeus
@@ -51,15 +55,14 @@
 SIS01
 
-$config{'wi0'}=sprintf <<EW0;  # long range naar kaag/leimuiden richting NW
+$config{'wi0'}=sprintf <<EW0; #link naar kaag2
 TYPE=wireless
-IP=$master_ip/26
-DESC=IL Richting K/L
-SDESC=nw
+IP=172.16.1.45/30
+DESC=Link naar kaag2
+SDESC=2kaag2
 SPEED=11534336
-DHCP=10-60
-#DHCP_STATIC= host ipaq1{hardware ethernet 00:02:2D:0E:4F:0D; fixed-address 172.18.8.2;} host ipaq2{hardware ethernet 00:02:2D:09:21:28; fixed-address 172.18.8.3;}
-OSPF_AREA=191
+POINT_TO_POINT=172.16.1.46
 OSPF_BROADCAST=no
-OSPF_NEIGHBORS=no
+OSPF_NEIGHBORS=172.16.1.46
+DHCP=no
 MODE=master
 ESSID=ap-n.unigorn.wleiden.net
@@ -74,17 +77,5 @@
 EW0
 
-$config{'wi0:0'}=sprintf <<EW01; #link naar kaag2
-TYPE=wireless
-IP=172.16.1.45/30
-DESC=Link naar kaag2
-SDESC=2kaag2
-SPEED=11534336
-POINT_TO_POINT=172.16.1.46
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.46
-DHCP=no
-EW01
-
-$config{'wi0:1'}=sprintf <<EW02; #link naar kaag
+$config{'wi0:0'}=sprintf <<EW00; #link naar kaag
 TYPE=wireless
 IP=172.16.0.217/30
@@ -96,8 +87,32 @@
 OSPF_NEIGHBORS=172.16.0.218
 DHCP=no
-EW02
+EW00
 
 
-$config{'wi1'}=sprintf <<EW1;  
+$config{'wi1'}=sprintf <<EW1;  # oegstgeest richting N
+TYPE=wireless
+IP=$master_ip/26
+DESC=AP Richting O
+SDESC=n
+SPEED=11534336
+DHCP=10-60
+#DHCP_STATIC= host ipaq1{hardware ethernet 00:02:2D:0E:4F:0D; fixed-address 172.18.8.2;} host ipaq2{hardware ethernet 00:02:2D:09:21:28; fixed-address 172.18.8.3;}
+OSPF_AREA=191
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+MODE=master
+ESSID=il-no.unigorn.wleiden.net
+CHANNEL=3
+POLAR=Ver
+ANTENNA=pa4040
+GAIN=14dBi
+DIRECTION=315
+BEAMWIDTH=30
+CABLE=0
+HEIGTH=50
+EW1
+
+
+$config{'wi1:0'}=sprintf <<EW10;  
 TYPE=wireless
 IP=172.16.1.89/30
@@ -109,19 +124,8 @@
 OSPF_BROADCAST=no
 OSPF_NEIGHBORS=172.16.1.90
+DHCP=no
+EW10
 
-MODE=master
-ESSID=il-no.unigorn.wleiden.net
-CHANNEL=3
-
-POLAR=Ver
-ANTENNA=pa4040
-GAIN=14dBi
-DIRECTION=315
-BEAMWIDTH=30
-CABLE=0
-HEIGTH=50
-EW1
-
-$config{'wi1:0'}=sprintf <<EW10;
+$config{'wi1:1'}=sprintf <<EW11;
 TYPE=wireless
 IP=172.16.1.93/30
@@ -135,4 +139,4 @@
 
 DHCP=no
-EW10
+EW11