Index: nodes/CNodeUniGor/wleiden.conf
===================================================================
--- nodes/CNodeUniGor/wleiden.conf	(revision 6900)
+++ nodes/CNodeUniGor/wleiden.conf	(revision 6901)
@@ -28,12 +28,9 @@
 TYPE=ethernet
 IP=172.19.128.65/28
-
 DESC=Ethernet naar UnigorN
 SDESC=eth
 SPEED=10240000000
 POINT_TO_POINT=
-
 DHCP=67-78
-
 
 SIS0
@@ -42,10 +39,8 @@
 TYPE=ethernet
 IP=172.16.1.169/30
-
 DESC=EthernetLink naar UniGorN
 SDESC=2unigorn
 SPEED=10240000000
 POINT_TO_POINT=172.16.1.170
-
 DHCP=no
 
@@ -53,51 +48,46 @@
 SIS00
 
-$config{'sis1'}=sprintf <<SIS1;  # EthernetLink Nanostation naar Dirk Los 2
+$config{'sis1'}=sprintf <<SIS1;  # a-link Nanostation5 naar DirkLos2
 TYPE=ethernet
-IP=172.16.3.66/30
-
-DESC=EthernetLink naar Dirk Los 2
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.3.65/30
+DESC=a-link naar DirkLos2
 SDESC=2DirkLos2
 SPEED=10240000000
-
 DHCP=no
-
 
 SIS1
 
-$config{'sis1:0'}=sprintf <<SIS10;  # management Link Nanostation
+$config{'sis1:0'}=sprintf <<SIS10;  # management Nanostation5
 TYPE=ethernet
 IP=172.16.3.113/30
-
 DESC=EthernetLink naar Nanostation 5
 SDESC=2nanostation5
 SPEED=10240000000
 POINT_TO_POINT=172.16.3.114
-
 DHCP=no
-
+#ESSID=il-0.unigor.wleiden.net
+#CHANNEL=
+#mode 11a bridge master
+#POLAR=Hor
+#GAIN=
+#DIRECTION=90
+#BEAMWIDTH=
+#CABLE=0
+#HEIGHT=35
 
 SIS10
-
 
 $config{'wi0'}=sprintf <<EW0;  # AP richting NO
 TYPE=wireless
 IP=$master_ip/26
-
 DESC=AP Richting NO
 SDESC=no
 SPEED=11534336
-
 DHCP=10-60
-
-
-#OSPF_NEIGHBORS=172.16.0.101
 
 MODE=master
 ESSID=n-o.unigor.wleiden.net
 CHANNEL=1
-
-
-
 
 POLAR=Ver
@@ -111,19 +101,5 @@
 EW0
 
-$config{'wi0:0'}=sprintf <<EW00;  # Link naar Lebkov
-TYPE=wireless
-IP=172.16.1.13/30
-
-DESC=Link naar Lebkov
-SDESC=2lebkov
-DHCP=no
-POINT_TO_POINT=172.16.1.14
-
-SPEED=11534336
-
-
-EW00
-
-$config{'wi0:1'}=sprintf <<EW01;  # Link naar AZC
+$config{'wi0:0'}=sprintf <<EW00;   # Link naar AZC
 TYPE=wireless
 IP=172.16.0.165/30
@@ -133,11 +109,9 @@
 DHCP=no
 POINT_TO_POINT=172.16.0.166
-
 SPEED=11534336
 
+EW00
 
-EW01
-
-$config{'wi0:2'}=sprintf <<EW02;  # Link naar Brug
+$config{'wi0:1'}=sprintf <<EW01;  # Link naar Brug
 TYPE=wireless
 IP=172.16.0.17/30
@@ -147,11 +121,10 @@
 DHCP=no
 POINT_TO_POINT=172.16.0.18
-
 SPEED=11534336
 
 
-EW02
+EW01
 
-$config{'wi0:3'}=sprintf <<EW03;  # Link naar Camimplants
+$config{'wi0:2'}=sprintf <<EW02;  # Link naar Camimplants
 TYPE=wireless
 IP=172.16.1.117/30
@@ -161,15 +134,7 @@
 DHCP=no
 POINT_TO_POINT=172.16.1.118
-
 SPEED=11534336
 
-
-EW03
-
-
-
-
-
-
+EW02
 
 $config{'wi1'}=sprintf <<EW1;  # link naar Robijn
@@ -181,11 +146,6 @@
 POINT_TO_POINT=172.16.1.30
 
-
-
-
-
 MODE=master
 ESSID=il-z.unigor.wleiden.net
-
 CHANNEL=11
 
@@ -197,5 +157,4 @@
 CABLE=1
 HEIGTH=35
-
 DHCP=no
 
@@ -211,7 +170,4 @@
 EW10
 
-
-
-
 $config{'wi2'}=sprintf <<EW2;  # link naar Cope
 TYPE=wireless
@@ -222,14 +178,7 @@
 POINT_TO_POINT=172.16.0.93
 
-
-
-
-
 MODE=managed
 ESSID=omni.cope0.wleiden.net
-CHANNEL=5
-
-
-
+#CHANNEL=5
 POLAR=Vert
 ANTENNA=Patch
@@ -239,5 +188,4 @@
 CABLE=2
 HEIGTH=35
-
 DHCP=no