Index: /nodes/CNodeAJSoft2/wleiden.conf
===================================================================
--- /nodes/CNodeAJSoft2/wleiden.conf	(revision 5809)
+++ /nodes/CNodeAJSoft2/wleiden.conf	(revision 5809)
@@ -0,0 +1,92 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeAJSoft2
+$location="5meilaan (Parelvissers), Leiden";
+$master_ip='172.20.137.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='AJSoft2';
+$release="5.0-RELEASE";
+$node_config_version="1";
+$genesis_control="YES";
+
+$OS='FreeBSD';
+
+$status='up';
+
+# edugis x,y 92035,462384
+$X='92035';
+$Y='462384';
+
+$LOKATIE='5meilaan';
+
+$config{'sis0'}=sprintf <<SIS0;  # Ethernet
+TYPE=ethernet
+IP=172.20.136.66/28
+
+DESC=Ethernet naar Parelvissers 
+SDESC=eth
+SPEED=10240000000
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+SIS0
+
+$config{'wi0'}=sprintf <<WI0;  # omni
+TYPE=wireless
+IP=172.16.3.13/30
+
+DESC=interlink
+SDESC=interlink
+SPEED=11534336
+
+DHCP=10-60
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=il-w.ajsoft2.wleiden.net
+CHANNEL=11
+
+POLAR=Ver
+ANTENNA=omni
+GAIN=6dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+HEIGTH=22
+
+WI0
+
+$config{'ath0'}=sprintf <<ATH0;  # link livinglab
+TYPE=wireless
+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.2.241
+
+MODE=managed
+ESSID=il-n.livinglab.wleiden.net
+
+#CHANNEL=11
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=90
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=22
+
+ATH0
+
Index: /nodes/CNodeLivingLab/wleiden.conf
===================================================================
--- /nodes/CNodeLivingLab/wleiden.conf	(revision 5789)
+++ /nodes/CNodeLivingLab/wleiden.conf	(revision 5809)
@@ -36,4 +36,16 @@
 SIS0
 
+$config{'sis0:0'}=sprintf <<SIS00;
+TYPE=Ethernet
+IP=172.16.2.253/30
+
+DESC=Ethernet naar proxy
+SDESC=2proxy
+SPEED=10240000000
+
+DHCP=no
+
+SIS00
+
 
 $config{'sis1'}=sprintf <<SIS1;
@@ -51,7 +63,21 @@
 MODE=master
 ESSID=il-n.livinglab.wleiden.net
-CHANNEL=36
+CHANNEL=165
 
 SIS1
+
+$config{'sis1:0'}=sprintf <<SIS10;
+TYPE=ethernet
+IP=172.16.3.9/30
+
+DESC=Ethernet naar Wandy mgmt iface
+SDESC=2Wandy1
+SPEED=10240000000
+
+DHCP=no
+
+POINT_TO_POINT=172.16.3.10
+
+SIS10
 
 
Index: /nodes/getrange.py
===================================================================
--- /nodes/getrange.py	(revision 5789)
+++ /nodes/getrange.py	(revision 5809)
@@ -31,5 +31,8 @@
 	match = ipre.match(l)
 	if match == None:
-		print "'" + l + "'"
+		#print "'" + l + "'"
+		continue
+	if len(match.groups()) == 0:
+		continue
 	addr = parseaddr(match.group(1))
 	mask = int(match.group(2))
@@ -45,4 +48,5 @@
 	i = 0xac110000
 
+i = 0xac100300
 while bezet.has_key(i):
 	i = i + numaddrs