Index: nodes/CNodeZwaluwak/wleiden.conf
===================================================================
--- nodes/CNodeZwaluwak/wleiden.conf	(revision 6721)
+++ nodes/CNodeZwaluwak/wleiden.conf	(revision 7321)
@@ -10,5 +10,5 @@
 $nodetype='CNode';
 $nodename='Zwaluwak';
-$release="5.0-RELEASE";
+$release="7.2-RELEASE";
 $node_config_version="1";
 $genesis_control="YES";
@@ -18,26 +18,9 @@
 $status='up';
 
-$labelpos='center';
-
 # edugis x,y 90739,463249
 $X='90739';
 $Y='463249';
 
-$config{'ep0'}=sprintf <<ED0;  # Ethernet
-TYPE=ethernet
-IP=172.22.0.65/28
-
-
-DESC=Ethernet naar ZwaluwAK
-SDESC=eth
-SPEED=10240000000
-
-DHCP=no
-
-
-ED0
-
-
-$config{'wi0'}=sprintf <<EW0;   # Omni
+$config{'ath0'}=sprintf <<ATH0;   # Omni
 TYPE=wireless
 IP=$master_ip/24
@@ -45,12 +28,8 @@
 SDESC=omni
 SPEED=11534336
-
 DHCP=10-60
-
-
 MODE=master
 ESSID=ap-omni.zwaluwak.wleiden.net
-CHANNEL=1
-
+CHANNEL=7
 POLAR=Ver
 ANTENNA=omni
@@ -60,89 +39,98 @@
 CABLE=6
 HEIGTH=10
+ATH0
 
-EW0
+$config{'vr0'}=sprintf <<VR0;  # Ethernet
+TYPE=ethernet
+IP=172.22.0.65/29
+MEDIA=100baseT/UTP
+DESC=Ethernet naar proxy
+SDESC=eth
+SPEED=10240000000
+DHCP=no
+VR0
 
-
-$config{'wi1'}=sprintf <<EW1;  # link naar  ......
-TYPE=wireless
-IP=172.16.1.246/30
-DESC=Link naar Unused
-SDESC=2unused
-SPEED=11534336
-POINT_TO_POINT=172.16.1.245
-
-
-DHCP=no
-
-MODE=master
-ESSID=il-o.zwaluwak.wleiden.net
-
-CHANNEL=5
-
-POLAR=Hor
-ANTENNA=SD15
-GAIN=13dBi
-DIRECTION=35
-BEAMWIDTH=30
-CABLE=6
-HEIGTH=10
-
-DHCP=no
-
-EW1
-
-
-$config{'wi2'}=sprintf <<EW2;  # link naar Unigor
-TYPE=wireless
+$config{'vr1'}=sprintf <<VR1;  # link naar Unigor via Bullet 1
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
 IP=172.16.1.254/30
-
 DESC=Link naar Unigor
 SDESC=2unigor
-SPEED=11534336
+SPEED=10240000000
+POINT_TO_POINT=172.16.1.253
+DHCP=no
+VR1
 
-POINT_TO_POINT=172.16.1.253
+$config{'vr1:0'}=sprintf <<VR10; # to bullet 1 mgmt interface
+TYPE=ethernet
+IP=172.16.4.13/30
+DESC=ethernet to bullet 1 mgmt interface
+SDESC=manageBUL1
+SPEED=10240000000
+DHCP=no
+#MODE=managed
+#ESSID=il-z.unigor.wleiden.net
+#POINT_TO_POINT=172.16.4.14
+#POLAR=Hor
+#ANTENNA=SD15
+#GAIN=13dBi
+#DIRECTION=10
+#BEAMWIDTH=30
+#CABLE=6
+#HEIGTH=10
+VR10
 
-DHCP=no
-
-
-MODE=managed
-ESSID=il-z.unigor.wleiden.net
-
-#CHANNEL=11
-
-POLAR=Hor
-ANTENNA=SD15
-GAIN=13dBi
-DIRECTION=10
-BEAMWIDTH=30
-CABLE=6
-HEIGTH=10
-
-EW2
-
-
-$config{'wi3'}=sprintf <<EW3;
-TYPE=wireless
+$config{'vr2'}=sprintf <<VR2; # link naar Oblste via Bullet 2
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
 IP=172.16.0.150/30
 DESC=Link naar Oblste
 SDESC=2oblste
-SPEED=11534336
+SPEED=10240000000
 POINT_TO_POINT=172.16.0.149
+VR2
 
-MODE=managed
-ESSID=il-nw.oblste.wleiden.net
-#CHANNEL=
+$config{'vr2:0'}=sprintf <<VR20; # to bullet 2 mgmt interface
+TYPE=ethernet
+IP=172.16.4.17/30
+DESC=ethernet to bullet 2 mgmt interface
+SDESC=manageBUL2
+SPEED=10240000000
+DHCP=no
+#MODE=managed
+#ESSID=il-nw.oblste.wleiden.net
+#POINT_TO_POINT=172.16.4.18
+#POLAR=Hor
+#ANTENNA=SD15
+#GAIN=13dBi
+#DIRECTION=160
+#BEAMWIDTH=40
+#CABLE=6
+#HEIGTH=10
+VR20
 
-POLAR=Hor
-ANTENNA=SD15
-GAIN=13dBi
-DIRECTION=160
-BEAMWIDTH=40
-CABLE=6
-HEIGTH=10
+#commented out till g_list.pl script fixed
+#$config{'aue0'}=sprintf <<UE0; # a-link naar NodeUnigor via Airlive
+#TYPE=ethernet
+#EXTRA_TYPE=eth2wifibridge
+#SUBTYPE=802.11a
+#IP=172.16.4.22/30
+#DESC=A Link naar Unigor
+#SDESC=2unigor
+#SPEED=10240000000
+#POINT_TO_POINT=172.16.4.21
+#DHCP=no
+#UE0
 
-DHCP=no
-
-EW3
-
-
+#commented out till g_list.pl script fixed
+#$config{'aue0:0'}=sprintf <<UE00; # management interface Airlive
+#TYPE=ethernet
+#IP=172.16.4.25/30
+#DESC=mgmt interface airlive
+#SDESC=manageairlive
+#SPEED=10240000000
+#POINT_TO_POINT=172.16.4.26
+#DHCP=no
+#MODE=managed
+#ESSID=il-zA.unigor.wleiden.net
+#UE00