Index: /nodes/demo1/wleiden.conf
===================================================================
--- /nodes/demo1/wleiden.conf	(revision 4571)
+++ /nodes/demo1/wleiden.conf	(revision 4582)
@@ -3,7 +3,7 @@
 #  Read by /usr/local/sbin/wireless-up.pl
 #
-# config CNodeMarten
-$location="Particulier dak, Leiden Zuid West";
-$master_ip='172.31.254.1';  
+# config demo1.wleiden.net
+$location="demo/cursus node 1";
+$master_ip='172.31.251.1';  
 $gw_open='closed';
 $nodetype='CNode';
@@ -11,8 +11,4 @@
 
 $OS='FreeBSD';
-
-
-
-
 
 
@@ -23,21 +19,12 @@
 
 
-$config{'ed0'}=sprintf <<ED0;  # Ethernet
+$config{'ep0'}=sprintf <<EP0;  # Ethernet
 TYPE=ethernet
-IP=172.31.254.65/28
-ROUTE=0.0.0.0/0 172.18.16.66
-
+IP=172.31.251.65/28
 DESC=Ethernet 
 SDESC=eth0
 SPEED=10240000000
-
 DHCP=no
-
-
-OSPF_AREA=0
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=no
-
-ED0
+EP0
 
 
@@ -46,25 +33,14 @@
 TYPE=wireless
 IP=$master_ip/26
-
 DESC=Omni voor de buurt
 SDESC=omni
 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=0
 OSPF_BROADCAST=no
 OSPF_NEIGHBORS=no
-
 MODE=master
 ESSID=omni.demo1.wleiden.net
 CHANNEL=1
-
-
-
-
 POLAR=Ver
 ANTENNA=omni
@@ -73,38 +49,61 @@
 BEAMWIDTH=360
 CABLE=0
-
 EW0
 
 
-$config{'wi1'}=sprintf <<EW1;  # 
+$config{'wi1'}=sprintf <<EW1;  # Link to demo2.wleiden.net
 TYPE=wireless
-IP=172.16.0.254/30
+IP=172.16.2.48/30
 DESC=Link naar demo2
 SDESC=2demo2
 SPEED=11534336
-POINT_TO_POINT=172.16.0.253
-
-
-
-OSPF_AREA=0
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.0.253
-
-MODE=managed
-ESSID=2demo2.wleiden.net
+POINT_TO_POINT=172.16.2.49
+MODE=master
+ESSID=il-o.demo1.wleiden.net
 CHANNEL=9
-
-
-
 POLAR=Vert
 ANTENNA=Quad
 GAIN=7dBi
-DIRECTION=?
+DIRECTION=10
 BEAMWIDTH=30
 CABLE=1
-
 DHCP=no
-
 EW1
 
+$config{'wi2'}=sprintf <<EW2;  # Link to demo3.wleiden.net
+TYPE=wireless
+IP=172.16.2.69/30
+DESC=Link naar demo3
+SDESC=2demo3
+SPEED=11534336
+POINT_TO_POINT=172.16.2.68
+MODE=managed
+ESSID=il-nw.demo3.wleiden.net
+CHANNEL=9
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=10
+BEAMWIDTH=30
+CABLE=1
+DHCP=no
+EW2
 
+$config{'wi3'}=sprintf <<EW3;  # Link to demo4.wleiden.net
+TYPE=wireless
+IP=172.16.2.73/30
+DESC=Link naar demo4
+SDESC=2demo4
+SPEED=11534336
+POINT_TO_POINT=172.16.2.72
+MODE=managed
+ESSID=il-n.demo4.wleiden.net
+CHANNEL=9
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=10
+BEAMWIDTH=30
+CABLE=1
+DHCP=no
+EW3
Index: /nodes/demo2/wleiden.conf
===================================================================
--- /nodes/demo2/wleiden.conf	(revision 4571)
+++ /nodes/demo2/wleiden.conf	(revision 4582)
@@ -3,7 +3,7 @@
 #  Read by /usr/local/sbin/wireless-up.pl
 #
-# config CNodeMarten
-
-$master_ip='172.31.254.1';  
+# config demo2.wleiden.net
+$location="demo/cursus node 2";
+$master_ip='172.31.252.1';  
 $gw_open='closed';
 $nodetype='CNode';
@@ -11,8 +11,4 @@
 
 $OS='FreeBSD';
-
-
-
-
 
 
@@ -23,21 +19,12 @@
 
 
-$config{'ed0'}=sprintf <<ED0;  # Ethernet
+$config{'ep0'}=sprintf <<EP0;  # Ethernet
 TYPE=ethernet
-IP=172.31.254.65/28
-ROUTE=0.0.0.0/0 172.18.16.66
-
+IP=172.31.252.65/28
 DESC=Ethernet 
 SDESC=eth0
 SPEED=10240000000
-
 DHCP=no
-
-
-OSPF_AREA=0
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=no
-
-ED0
+EP0
 
 
@@ -46,25 +33,14 @@
 TYPE=wireless
 IP=$master_ip/26
-
 DESC=Omni voor de buurt
 SDESC=omni
 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=0
 OSPF_BROADCAST=no
 OSPF_NEIGHBORS=no
-
 MODE=master
 ESSID=omni.demo2.wleiden.net
 CHANNEL=1
-
-
-
-
 POLAR=Ver
 ANTENNA=omni
@@ -73,38 +49,61 @@
 BEAMWIDTH=360
 CABLE=0
-
 EW0
 
 
-$config{'wi1'}=sprintf <<EW1;  # 
+$config{'wi1'}=sprintf <<EW1;  # Link to demo1.wleiden.net
 TYPE=wireless
-IP=172.16.0.253/30
-DESC=Link naar demo2
-SDESC=2demo2
+IP=172.16.2.49/30
+DESC=Link naar demo1
+SDESC=2demo1
 SPEED=11534336
-POINT_TO_POINT=172.16.0.254
-
-
-
-OSPF_AREA=0
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.0.254
-
-MODE=master
-ESSID=2demo2.wleiden.net
+POINT_TO_POINT=172.16.2.48
+MODE=managed
+ESSID=il-o.demo1.wleiden.net
 CHANNEL=9
-
-
-
 POLAR=Vert
 ANTENNA=Quad
 GAIN=7dBi
-DIRECTION=?
+DIRECTION=10
 BEAMWIDTH=30
 CABLE=1
-
 DHCP=no
-
 EW1
 
+$config{'wi2'}=sprintf <<EW2;  # Link to demo3.wleiden.net
+TYPE=wireless
+IP=172.16.2.76/30
+DESC=Link naar demo3
+SDESC=2demo3
+SPEED=11534336
+POINT_TO_POINT=172.16.2.77
+MODE=master
+ESSID=il-z.demo2.wleiden.net
+CHANNEL=9
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=10
+BEAMWIDTH=30
+CABLE=1
+DHCP=no
+EW1
 
+$config{'wi3'}=sprintf <<EW3;  # Link to demo4.wleiden.net
+TYPE=wireless
+IP=172.16.2.81/30
+DESC=Link naar demo4
+SDESC=2demo4
+SPEED=11534336
+POINT_TO_POINT=172.16.2.80
+MODE=managed
+ESSID=il-no.demo4.wleiden.net
+CHANNEL=9
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=10
+BEAMWIDTH=30
+CABLE=1
+DHCP=no
+EW1
Index: /nodes/demo3/wleiden.conf
===================================================================
--- /nodes/demo3/wleiden.conf	(revision 4582)
+++ /nodes/demo3/wleiden.conf	(revision 4582)
@@ -0,0 +1,109 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config demo3.wleiden.net
+$location="demo/cursus node 3";
+$master_ip='172.31.253.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='demo1';
+
+$OS='FreeBSD';
+
+
+$X='1';
+$Y='1';
+$N='1';
+$E='1';
+
+
+$config{'ep0'}=sprintf <<EP0;  # Ethernet
+TYPE=ethernet
+IP=172.31.253.65/28
+DESC=Ethernet 
+SDESC=eth0
+SPEED=10240000000
+DHCP=no
+EP0
+
+
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/26
+DESC=Omni voor de buurt
+SDESC=omni
+SPEED=11534336
+DHCP=10-60
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+MODE=master
+ESSID=omni.demo3.wleiden.net
+CHANNEL=1
+POLAR=Ver
+ANTENNA=omni
+GAIN=10dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+EW0
+
+
+$config{'wi1'}=sprintf <<EW1;  # Link to demo1.wleiden.net
+TYPE=wireless
+IP=172.16.2.68/30
+DESC=Link naar demo1
+SDESC=2demo1
+SPEED=11534336
+POINT_TO_POINT=172.16.2.69
+MODE=master
+ESSID=il-nw.demo3.wleiden.net
+CHANNEL=9
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=10
+BEAMWIDTH=30
+CABLE=1
+DHCP=no
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # Link to demo2.wleiden.net
+TYPE=wireless
+IP=172.16.2.77/30
+DESC=Link naar demo3
+SDESC=2demo2
+SPEED=11534336
+POINT_TO_POINT=172.16.2.76
+MODE=managed
+ESSID=il-z.demo2.wleiden.net
+CHANNEL=9
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=10
+BEAMWIDTH=30
+CABLE=1
+DHCP=no
+EW2
+
+$config{'wi3'}=sprintf <<EW3;  # Link to demo4.wleiden.net
+TYPE=wireless
+IP=172.16.2.84/30
+DESC=Link naar demo4
+SDESC=2demo4
+SPEED=11534336
+POINT_TO_POINT=172.16.2.85
+MODE=master
+ESSID=il-w.demo3.wleiden.net
+CHANNEL=9
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=10
+BEAMWIDTH=30
+CABLE=1
+DHCP=no
+EW3
Index: /nodes/demo4/wleiden.conf
===================================================================
--- /nodes/demo4/wleiden.conf	(revision 4582)
+++ /nodes/demo4/wleiden.conf	(revision 4582)
@@ -0,0 +1,109 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config demo4.wleiden.net
+$location="demo/cursus node 4";
+$master_ip='172.31.254.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='demo4';
+
+$OS='FreeBSD';
+
+
+$X='1';
+$Y='1';
+$N='1';
+$E='1';
+
+
+$config{'ep0'}=sprintf <<EP0;  # Ethernet
+TYPE=ethernet
+IP=172.31.254.65/28
+DESC=Ethernet 
+SDESC=eth0
+SPEED=10240000000
+DHCP=no
+EP0
+
+
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/26
+DESC=Omni voor de buurt
+SDESC=omni
+SPEED=11534336
+DHCP=10-60
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+MODE=master
+ESSID=omni.demo4.wleiden.net
+CHANNEL=1
+POLAR=Ver
+ANTENNA=omni
+GAIN=10dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+EW0
+
+
+$config{'wi1'}=sprintf <<EW1;  # Link to demo1.wleiden.net
+TYPE=wireless
+IP=172.16.2.72/30
+DESC=Link naar demo1
+SDESC=2demo1
+SPEED=11534336
+POINT_TO_POINT=172.16.2.73
+MODE=master
+ESSID=il-n.demo4.wleiden.net
+CHANNEL=9
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=10
+BEAMWIDTH=30
+CABLE=1
+DHCP=no
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # Link to demo3.wleiden.net
+TYPE=wireless
+IP=172.16.2.85/30
+DESC=Link naar demo3
+SDESC=2demo3
+SPEED=11534336
+POINT_TO_POINT=172.16.2.84
+MODE=managed
+ESSID=il-w.demo3.wleiden.net
+CHANNEL=9
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=10
+BEAMWIDTH=30
+CABLE=1
+DHCP=no
+EW2
+
+$config{'wi3'}=sprintf <<EW3;  # Link to demo2.wleiden.net
+TYPE=wireless
+IP=172.16.2.80/30
+DESC=Link naar demo2
+SDESC=2demo2
+SPEED=11534336
+POINT_TO_POINT=172.16.2.81
+MODE=master
+ESSID=il-no.demo4.wleiden.net
+CHANNEL=9
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=10
+BEAMWIDTH=30
+CABLE=1
+DHCP=no
+EW3