Index: branches/future-nodes/.attic/CNodeMarten/wleiden.conf
===================================================================
--- branches/future-nodes/.attic/CNodeMarten/wleiden.conf	(revision 863)
+++ branches/future-nodes/.attic/CNodeMarten/wleiden.conf	(revision 863)
@@ -0,0 +1,181 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeMarten
+$location="Particulier Dak, Flat Leiden Zuid Oost";
+$master_ip='172.18.16.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Marten';
+
+$OS='FreeBSD';
+$labelpos='left';
+
+
+
+$NS_resolv="127.0.0.1 $master_ip 172.18.0.1 172.18.8.1";
+
+$NS_forward="172.18.0.1 172.18.8.1";
+
+#$X='094544';
+#$Y='462769';
+
+$X='094544';
+$Y='462799';
+
+
+$N='52 09.047';
+$E='04 30.251';
+
+
+$config{'ep0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.18.16.65/28
+#ROUTE=0.0.0.0/0 172.18.16.66
+
+DESC=Ethernet naar Marten
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=no
+NAT=no
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+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;}
+
+NAT=no
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=omni.marten0.wleiden.net
+CHANNEL=1
+
+TXPOWER=20
+SENS=3
+
+POLAR=Ver
+ANTENNA=omni
+GAIN=9dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+HEIGTH=14
+
+EW0
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Evert
+TYPE=wireless
+IP=172.16.0.62/30
+DESC=Link naar Evert
+SDESC=2evert
+SPEED=11534336
+POINT_TO_POINT=172.16.0.61
+
+NAT=no
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.61
+
+MODE=managed
+ESSID=Profwijk.evert0.wleiden.net
+CHANNEL=9
+TXPOWER=20
+SENS=3
+
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=90
+BEAMWIDTH=30
+CABLE=1
+HEIGTH=13
+
+DHCP=no
+
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # link naar Mark
+TYPE=wireless
+IP=172.18.17.1/24
+DESC=Link naar Mark
+SDESC=2imi
+SPEED=11534336
+POINT_TO_POINT=172.18.17.2
+
+NAT=100-150
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+#OSPF_NEIGHBORS=172.18.17.2
+
+MODE=managed
+ESSID=hnode.mark.wleiden.net
+CHANNEL=6
+TXPOWER=20
+SENS=3
+
+POLAR=Vert
+ANTENNA=Omni
+GAIN=7dBi
+DIRECTION=250
+BEAMWIDTH=30
+CABLE=2
+HEIGTH=13
+
+DHCP=no
+
+EW2
+
+#$config{'wi3'}=sprintf <<EW3;  # link naar CeTIM
+#TYPE=wireless
+#IP=172.16.0.114/30
+#DESC=Link naar CeTIM
+#SDESC=2cetim
+#SPEED=11534336
+#POINT_TO_POINT=172.16.0.113
+
+#NAT=no
+
+#OSPF_AREA=0
+#OSPF_BROADCAST=no
+#OSPF_NEIGHBORS=172.16.0.113
+
+#MODE=managed
+#ESSID=il-zo.cetim3.wleiden.net
+#CHANNEL=6
+#TXPOWER=20
+#SENS=3
+
+#POLAR=Vert
+#ANTENNA=SD15
+#GAIN=13dBi
+#DIRECTION=305
+#BEAMWIDTH=30
+#CABLE=2
+
+#DHCP=no
+
+#EW3
+
Index: branches/future-nodes/.attic/CNodeMarten/wleiden.conf.backup
===================================================================
--- branches/future-nodes/.attic/CNodeMarten/wleiden.conf.backup	(revision 863)
+++ branches/future-nodes/.attic/CNodeMarten/wleiden.conf.backup	(revision 863)
@@ -0,0 +1,142 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeMarten
+
+$master_ip='172.18.16.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Marten';
+
+$OS='FreeBSD';
+$labelpos='left';
+
+
+
+$NS_resolv="127.0.0.1 $master_ip 172.18.0.1 172.18.8.1";
+
+$NS_forward="$master_ip 172.18.0.1 172.18.8.1";
+
+$X='094544';
+$Y='462769';
+$N='52 09.047';
+$E='04 30.251';
+
+
+$config{'ed0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.18.16.65/28
+ROUTE=0.0.0.0/0 172.18.16.66
+
+DESC=Ethernet naar Marten
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=no
+NAT=no
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+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;}
+
+NAT=no
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=omni.marten0.wleiden.net
+CHANNEL=1
+
+TXPOWER=20
+SENS=3
+
+POLAR=Ver
+ANTENNA=omni
+GAIN=10dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+
+EW0
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Evert
+TYPE=wireless
+IP=172.16.0.62/30
+DESC=Link naar Evert
+SDESC=2evert
+SPEED=11534336
+POINT_TO_POINT=172.16.0.61
+
+NAT=no
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.61
+
+MODE=managed
+ESSID=Profwijk.evert0.wleiden.net
+CHANNEL=9
+TXPOWER=20
+SENS=3
+
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=?
+BEAMWIDTH=30
+CABLE=1
+
+DHCP=no
+
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # link naar Mark
+TYPE=wireless
+IP=172.18.17.1/26
+DESC=Link naar Mark
+SDESC=2imi
+SPEED=11534336
+POINT_TO_POINT=172.18.17.2
+
+NAT=no
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+#OSPF_NEIGHBORS=172.18.17.2
+
+MODE=managed
+ESSID=hnode.mark.wleiden.net
+CHANNEL=6
+TXPOWER=20
+SENS=3
+
+POLAR=Vert
+ANTENNA=Omni
+GAIN=7dBi
+DIRECTION=0
+BEAMWIDTH=30
+CABLE=2
+
+DHCP=no
+
+EW2
+
Index: branches/future-nodes/CNodeAZC/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeAZC/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeAZC/wleiden.conf	(revision 863)
@@ -0,0 +1,182 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeAZC
+
+$location='Dag AZC gebouw Rijnsburgerweg 124';
+$master_ip='172.19.144.1';  
+$gw_open='closed';
+$nodetype='cnode';
+$nodename='AZC';
+
+$OS='FreeBSD';
+$labelpos='right';
+
+
+
+
+
+$X='92608';
+$Y='465215';
+$LOKATIE='n.v.t.';
+
+$N='';
+$E='';
+
+
+$config{'ep0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.19.144.65/28
+
+
+DESC=Ethernet naar AZC
+SDESC=2azc
+SPEED=10240000000
+
+DHCP=yes
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # AP NW
+TYPE=wireless
+IP=$master_ip/26
+DESC=AP NW
+SDESC=2apnw
+SPEED=11534336
+
+
+
+
+#OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=ap-nw.azc.wleiden.net
+
+CHANNEL=9
+
+
+
+POLAR=Hor
+ANTENNA=4040
+GAIN=15dBi
+DIRECTION=315
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=42
+
+#DHCP=no
+DHCP=10-60
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Rudi
+TYPE=wireless
+IP=172.16.0.173/30
+DESC=Link naar Rudi
+SDESC=2rudi
+SPEED=11534336
+POINT_TO_POINT=172.16.0.174
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.174
+
+MODE=master
+ESSID=il-no.azc.wleiden.net
+
+CHANNEL=5
+
+
+
+POLAR=Hor
+ANTENNA=4040
+GAIN=15dBi
+DIRECTION=45
+BEAMWIDTH=30
+CABLE=2
+HEIGTH=42
+
+DHCP=no
+
+EW1
+
+
+$config{'wi2'}=sprintf <<EW2;  # link naar CeTIM
+TYPE=wireless
+IP=172.16.0.169/30
+DESC=Link naar CeTIM
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.168
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.168
+
+MODE=managed
+ESSID=il-nw.cetim3.wleiden.net
+
+CHANNEL=9
+
+
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=15dBi
+DIRECTION=135
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=42
+
+DHCP=no
+
+EW2
+
+
+
+$config{'wi3'}=sprintf <<EW3;  # Link naar Unigor
+TYPE=wireless
+IP=172.16.0.166/30  
+DESC=Link naar Unigor
+SDESC=2unigor
+SPEED=11534336
+POINT_TO_POINT=172.16.0.165
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.165
+
+DHCP=no
+
+
+MODE=managed
+ESSID=n-o.unigor.wleiden.net
+
+CHANNEL=1
+
+
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=15dBi
+DIRECTION=240
+BEAMWIDTH=30
+CABLE=2
+HEIGTH=42
+
+EW3
+
+
Index: branches/future-nodes/CNodeCeTIM1/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeCeTIM1/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeCeTIM1/wleiden.conf	(revision 863)
@@ -0,0 +1,115 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeCeTIM1
+
+$location="Torentje middenschip Hooglandse Kerk, Leiden, The Netherlands";
+$master_ip='172.17.143.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='CeTIM1';
+$OS='FreeBSD';
+$DISK='FLASH';
+
+$X='093935';
+$Y='463691';
+
+$N='52 09.523';
+$E='04 29.672';
+
+
+
+
+
+$config{'sis0'}=sprintf <<SIS0;  # Ethernet
+TYPE=ethernet
+IP=172.17.143.1/24
+
+
+POINT_TO_POINT=172.17.143.2 172.17.143.3
+
+DESC=Ethernet naar kerkvloer
+SDESC=2cetim
+SPEED=10240000000
+
+DHCP=no
+
+
+OSPF_COST=2
+OSPF_AREA=0
+
+# OSPF AREA is hier wel essentieel!                                                                              
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.17.143.2 172.17.143.3
+
+SIS0
+
+$config{'wi0'}=sprintf <<EW0;  # APs NO
+TYPE=wireless
+IP=172.17.136.1/24
+
+DESC=CeTIM richting NO
+SDESC=no
+SPEED=11534336
+
+DHCP=10-250
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=
+
+MODE=master
+ESSID=ap-no.cetim1.wleiden.net
+CHANNEL=11
+
+
+
+
+POLAR=Vert
+ANTENNA=patch
+GAIN=8dBi
+DIRECTION=60
+BEAMWIDTH=180
+CABLE=1
+HEIGTH=45
+
+EW0
+
+
+$config{'wi1'}=sprintf <<EW1;  # APs ZW
+TYPE=wireless
+IP=172.17.137.1/24
+
+DESC=CeTIM richting ZW
+SDESC=zw
+SPEED=11534336
+
+DHCP=10-250
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=
+
+MODE=master
+ESSID=ap-zw.cetim1.wleiden.net
+CHANNEL=1
+
+
+
+
+POLAR=Vert
+ANTENNA=patch
+GAIN=8dBi
+DIRECTION=240
+BEAMWIDTH=180
+CABLE=2
+HEIGTH=15
+
+EW1
+
+
Index: branches/future-nodes/CNodeCeTIM2/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeCeTIM2/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeCeTIM2/wleiden.conf	(revision 863)
@@ -0,0 +1,220 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeCeTIM2
+$location="Torentje middenschip Hooglandse Kerk, Leiden, The Netherlands";
+
+$master_ip='172.17.143.2';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='CeTIM2';
+$OS='FreeBSD';
+$DISK='FLASH';
+
+$labelpos='right';
+
+$X='093895';
+$Y='463631';
+
+$N='52 09.523';
+$E='04 29.672';
+
+$config{'sis0'}=sprintf <<SIS0;  # Ethernet
+TYPE=ethernet
+IP=172.17.143.2/24
+
+
+POINT_TO_POINT=172.17.143.1 172.17.143.3
+
+DESC=Ethernet naar kerkvloer
+SDESC=2cetim
+SPEED=10240000000
+
+DHCP=no
+
+
+OSPF_COST=2
+OSPF_AREA=0
+# OSPF AREA is hier wel essentieel!
+                                                                                
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.17.143.1 172.17.143.3
+
+SIS0
+
+
+$config{'sis1'}=sprintf <<SIS1;  # Ethernet
+TYPE=2cetim3
+IP=172.16.0.109/30
+
+DESC=Ethernet naar CeTIM3
+SDESC=sis1
+SPEED=10240000000
+POINT_TO_POINT=172.16.0.110
+
+DHCP=no
+
+
+OSPF_COST=1
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.110
+
+SIS1
+
+
+$config{'wi0'}=sprintf <<EW0;  #Interlinks NO
+TYPE=wireless
+IP=172.17.139.1/24
+
+DESC=CeTIM richting NO
+SDESC=no
+SPEED=11534336
+#POINT_TO_POINT=172.16.0.34
+
+DHCP=10-250
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=il-no.cetim2.wleiden.net
+CHANNEL=10
+
+
+
+
+POLAR=Horiz
+ANTENNA=patch
+GAIN=15dBi
+DIRECTION=40
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=45
+
+EW0
+
+$config{'wi0:0'}=sprintf <<EW00;  # link naar Jacob (TMolen)
+TYPE=wireless
+IP=172.16.0.105/30
+DESC=Link naar Jacob
+SDESC=2jacob
+SPEED=11534336
+POINT_TO_POINT=172.16.0.106
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.106
+
+DHCP=no
+EW00
+
+$config{'wi0:1'}=sprintf <<EW01;  # link naar Polder (Jacobswoude
+TYPE=wireless
+IP=172.16.0.129/30
+DESC=Link naar Polder
+SDESC=2polder
+SPEED=11534336
+POINT_TO_POINT=172.16.0.130
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.130
+
+DHCP=no
+EW01
+
+$config{'wi0:2'}=sprintf <<EW02;  # link naar Kees
+TYPE=wireless
+IP=172.16.0.145/30
+DESC=Link naar Kees
+SDESC=2kees
+SPEED=11534336
+POINT_TO_POINT=172.16.0.146
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.146
+
+DHCP=no
+EW02
+
+
+
+$config{'wi1'}=sprintf <<EW1;  #Interlinks ZW
+TYPE=wireless
+IP=172.16.0.33/30
+
+DESC=Link to IMI
+SDESC=2imi
+SPEED=11534336
+POINT_TO_POINT=172.16.0.34
+
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.34
+
+MODE=master
+ESSID=il-zw.cetim2.wleiden.net
+CHANNEL=11
+
+
+
+
+POLAR=Horiz
+ANTENNA=patch
+GAIN=15dBi
+DIRECTION=235
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=45
+
+EW1
+
+
+$config{'wi1:0'}=sprintf <<EW10;  # link naar Lvl-z
+TYPE=wireless
+IP=172.16.0.77/30
+DESC=Link naar LvLz
+SDESC=2lvlz
+SPEED=11534336
+POINT_TO_POINT=172.16.0.78
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.78
+
+DHCP=no
+EW10
+
+$config{'wi1:1'}=sprintf <<EW11;  # link naar RV
+TYPE=wireless
+IP=172.16.0.133/30
+DESC=Link naar RenV
+SDESC=2rv
+SPEED=11534336
+POINT_TO_POINT=172.16.0.134
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.134
+
+DHCP=no
+EW11
Index: branches/future-nodes/CNodeCeTIM3/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeCeTIM3/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeCeTIM3/wleiden.conf	(revision 863)
@@ -0,0 +1,226 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeCeTIM3
+$location="Torentje middenschip Hooglandse Kerk, Leiden, The Netherlands";
+
+$master_ip='172.17.143.3';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='CeTIM3';
+$OS='FreeBSD';
+$DISK='FLASH';
+
+$labelpos='left';
+
+$X='093875';
+$Y='463691';
+
+$N='52 09.523';
+$E='04 29.672';
+
+
+
+
+$config{'sis0'}=sprintf <<SIS0;  # Ethernet
+TYPE=ethernet
+IP=172.17.143.3/24
+
+
+POINT_TO_POINT=172.17.143.1 172.17.143.2
+
+DESC=Ethernet naar kerkvloer
+SDESC=2cetim
+SPEED=10240000000
+
+DHCP=no
+
+
+OSPF_COST=2
+
+OSPF_AREA=0
+# OSPF AREA is hier wel essentieel!
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.17.143.1 172.17.143.2
+
+SIS0
+
+
+$config{'sis1'}=sprintf <<SIS1;  # Ethernet
+TYPE=ethernet
+IP=172.16.0.110/30
+
+DESC=Ethernet naar CeTIM2
+SDESC=2cetim2
+SPEED=10240000000
+POINT_TO_POINT=172.16.0.109
+DHCP=no
+
+
+OSPF_COST=1
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.109
+
+SIS1
+
+
+$config{'wi0'}=sprintf <<EW0;  #Interlinks NW
+TYPE=wireless
+IP=172.16.0.73/30
+
+DESC=Link to LvLn
+SDESC=2lvl2
+SPEED=11534336
+POINT_TO_POINT=172.16.0.74
+
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.74
+
+MODE=master
+ESSID=il-nw.cetim3.wleiden.net
+CHANNEL=9
+
+
+
+
+POLAR=Horiz
+ANTENNA=patch
+GAIN=15dBi
+DIRECTION=320
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=45
+
+EW0
+
+$config{'wi0:0'}=sprintf <<EW00;  # link naar Rabo
+TYPE=wireless
+IP=172.16.0.97/30
+DESC=Link naar Rabo
+SDESC=2rabo
+SPEED=11534336
+POINT_TO_POINT=172.16.0.98
+
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.98
+
+DHCP=no
+EW00
+
+$config{'wi0:1'}=sprintf <<EW01;  # link naar Cope
+TYPE=wireless
+IP=172.16.0.25/30
+DESC=Link naar Cope
+SDESC=2cope
+SPEED=11534336
+POINT_TO_POINT=172.16.0.26
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.26
+
+DHCP=no
+
+EW01
+
+$config{'wi0:2'}=sprintf <<EW02;  # link naar OblC
+TYPE=wireless
+IP=172.16.0.161/30
+DESC=Link naar OblC
+SDESC=2oblc
+SPEED=11534336
+POINT_TO_POINT=172.16.0.162
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.162
+
+DHCP=no
+EW02
+
+$config{'wi0:3'}=sprintf <<EW03;  # link naar Rund
+TYPE=wireless
+IP=172.16.0.177/30
+DESC=Link naar Rund
+SDESC=2rund
+SPEED=11534336
+POINT_TO_POINT=172.16.0.178
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.178
+
+DHCP=no
+EW03
+
+$config{'wi0:4'}=sprintf <<EW04;  # link naar Meca (Klaas)
+TYPE=wireless
+IP=172.16.0.181/30
+DESC=Link naar Meca
+SDESC=2meca
+SPEED=11534336
+POINT_TO_POINT=172.16.0.182
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.182
+
+DHCP=no
+EW04
+
+
+
+
+$config{'wi1'}=sprintf <<EW1;  #Interlinks ZO
+TYPE=wireless
+IP=172.16.0.113/30
+
+DESC=Links to ZO
+SDESC=2marten
+SPEED=11534336
+POINT_TO_POINT=172.16.0.114
+
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.114
+
+MODE=master
+ESSID=il-zo.cetim3.wleiden.net
+CHANNEL=5
+
+
+
+
+POLAR=Horiz
+ANTENNA=patch
+GAIN=15dBi
+DIRECTION=125
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=45
+
+EW1
+
Index: branches/future-nodes/CNodeCope/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeCope/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeCope/wleiden.conf	(revision 863)
@@ -0,0 +1,279 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeCope
+
+$location = 'Begin Rapenburg, bedrijfsverzamelgebouw, aan schoorsteen';
+
+$master_ip='172.17.8.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Cope';
+$OS='FreeBSD';
+
+$labelpos='left';
+
+
+
+$X='093271';
+$Y='463842';
+$N='52 09.617';
+$E='04 29.123';
+
+
+
+
+
+$config{'ep0'}=sprintf <<ETH0;  # OMNI
+TYPE=ethernet
+IP=172.17.8.65/29
+
+
+DESC=Ethernet naar Cope
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=68-70
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ETH0
+
+$config{'ep0:0'}=sprintf <<EP00;  # link naar proxy1.demon
+TYPE=ethernet
+IP=172.31.255.2/30
+DESC=Link naar proxy1.demon
+SDESC=2proxy1
+SPEED=11534336
+
+
+
+OSPF_AREA=31
+OSPF_BROADCAST=no
+EP00
+
+
+
+
+$config{'wi2'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=Omni voor de buurt
+SDESC=omni
+SPEED=11534336
+
+DHCP=10-60
+DHCP_STATIC= host kok{hardware ethernet 00:90:4B:21:7A:8E; fixed-address 172.17.8.6;} 
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=omni.cope0.wleiden.net
+CHANNEL=5
+
+
+
+
+POLAR=Ver
+ANTENNA=omni
+GAIN=9dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=3
+HEIGTH=20
+
+EW0
+
+$config{'wi2:0'}=sprintf <<EW00;  # link naar huub
+TYPE=wireless
+IP=172.16.0.13/30
+DESC=Link naar Huub
+SDESC=2huub
+SPEED=11534336
+POINT_TO_POINT=172.16.0.14
+
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.14
+
+DHCP=no
+EW00
+
+
+$config{'wi2:1'}=sprintf <<EW21;  # link naar Evert
+TYPE=wireless
+IP=172.16.0.57/30
+DESC=Link naar Evert
+SDESC=2evert
+SPEED=11534336
+POINT_TO_POINT=172.16.0.58
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.58
+
+DHCP=no
+EW21
+
+
+$config{'wi2:2'}=sprintf <<EW22;  # link naar LvLn
+TYPE=wireless
+IP=172.16.0.69/30
+DESC=Link naar LvLn
+SDESC=2lvln
+SPEED=11534336
+POINT_TO_POINT=172.16.0.70
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.70
+
+DHCP=no
+EW22
+
+$config{'wi2:3'}=sprintf <<EW23;  # link naar UniGor
+TYPE=wireless
+IP=172.16.0.93/30
+DESC=Link naar UniGor
+SDESC=2unig
+SPEED=11534336
+POINT_TO_POINT=172.16.0.94
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.94
+
+DHCP=no
+EW23
+
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar cetim
+TYPE=wireless
+IP=172.16.0.26/30
+DESC=Link naar CeTIM
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.25
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.25
+
+MODE=managed
+ESSID=il-nw.cetim3.wleiden.net
+CHANNEL=9
+
+
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=110
+BEAMWIDTH=25
+CABLE=1
+HEIGTH=20
+
+
+DHCP=no
+
+EW1
+
+
+
+$config{'wi0'}=sprintf <<EW2;  # link naar jorg
+TYPE=wireless
+IP=172.16.0.21/30
+DESC=Link naar Jorg
+SDESC=2jorg
+SPEED=11534336
+POINT_TO_POINT=172.16.0.22
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.22
+
+MODE=managed
+ESSID=centrum.jorg0.wleiden.net
+CHANNEL=1
+
+
+
+
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=250
+BEAMWIDTH=25
+CABLE=2
+HEIGTH=20
+
+DHCP=no
+
+EW2
+
+
+$config{'wi3'}=sprintf <<EW3;  # link naar IMI
+TYPE=wireless
+IP=172.16.0.37/30
+DESC=Link naar IMI
+SDESC=2imi
+SPEED=11534336
+POINT_TO_POINT=172.16.0.38
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.38
+
+MODE=master
+ESSID=il-z.cope.wleiden.net
+CHANNEL=7
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=180
+BEAMWIDTH=25
+CABLE=3
+HEIGTH=17
+
+DHCP=no
+EW3
+
+$config{'wi3:0'}=sprintf <<EW30;  # link naar Thomas
+TYPE=wireless
+IP=172.16.0.205/30
+DESC=Link naar Thomas
+SDESC=2thomas
+SPEED=11534336
+POINT_TO_POINT=172.16.0.206
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.206
+
+DHCP=no
+EW30
+
Index: branches/future-nodes/CNodeDirkx/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeDirkx/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeDirkx/wleiden.conf	(revision 863)
@@ -0,0 +1,111 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeDirkx
+
+$location="Tegenover Kamerling Onnes Lab, Particulier Dak.";
+$master_ip='172.17.32.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Dirkx';
+$OS='FreeBSD';
+$DISK='FLASH';
+
+
+
+
+
+
+$X='093551';
+$Y='463548';
+
+
+$config{'sis0'}=sprintf <<ED0;  # eth
+TYPE=ethernet
+IP=172.17.32.65/29
+
+ROUTE=0.0.0.0/0 172.17.32.2		# dirkx/san-jose2Leiden
+
+DESC=Ethernet naar buitenste Leiden/SanJose/SanDiego en HCC backup router
+SDESC=eth0
+SPEED=10240000000
+
+#DHCP=68-70
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=Omni voor de buurt
+SDESC=omni
+SPEED=11534336
+
+DHCP=10-60
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=omni.dirkx0.wleiden.net
+CHANNEL=9
+
+
+
+
+POLAR=Vert
+ANTENNA=omni
+GAIN=6dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+HEIGTH=12
+
+EW0
+
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar imi
+TYPE=wireless
+IP=172.16.0.54/30
+DESC=Link naar imi
+SDESC=2imi
+SPEED=11534336
+POINT_TO_POINT=172.16.0.53
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.53
+
+MODE=managed
+ESSID=omni.imi0.wleiden.net
+CHANNEL=5
+
+
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=235
+BEAMWIDTH=35
+CABLE=1
+HEIGTH=12
+
+DHCP=no
+
+EW1
+
+
Index: branches/future-nodes/CNodeEvert/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeEvert/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeEvert/wleiden.conf	(revision 863)
@@ -0,0 +1,150 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeEvet
+$location="Particulier Dak, Leiden Zuid-West";
+$master_ip='172.18.0.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Evert';
+$OS='FreeBSD';
+
+
+
+
+
+$X='094876';
+$Y='462734';
+$N='52 09.030';
+$E='04 30.542';
+
+$config{'ep0'}=sprintf <<EP0;  # Ethernet
+TYPE=ethernet
+IP=172.18.0.65/28
+
+ROUTE=209.132.96.45/32 172.17.8.66
+
+DESC=Ethernet naar Evert
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+
+
+EP0
+
+
+
+
+$config{'wi0'}=sprintf <<EW0;  # link naar Cope
+TYPE=wireless
+IP=172.16.0.58/30
+DESC=Link naar Cope
+SDESC=2cope
+SPEED=11534336
+POINT_TO_POINT=172.16.0.57
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.57
+
+MODE=managed
+ESSID=omni.cope0.wleiden.net
+CHANNEL=5
+
+
+
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=305
+BEAMWIDTH=70
+CABLE=1
+HEIGTH=30
+
+DHCP=no
+
+EW0
+
+
+$config{'wi1'}=sprintf <<EW1;  # AP
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=voor de Professorenwijk
+SDESC=Profwijk
+SPEED=11534336
+
+DHCP=10-60
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=Profwijk.evert0.wleiden.net
+CHANNEL=9
+
+
+
+
+POLAR=Vert
+ANTENNA=4040
+GAIN=14dBi
+DIRECTION=280
+BEAMWIDTH=40
+CABLE=0
+HEIGTH=30
+
+EW1
+
+
+$config{'wi1:0'}=sprintf <<EW10;  # link naar Jasper
+TYPE=wireless
+IP=172.16.0.49/30
+
+DESC=Link naar Jasper
+SDESC=2jasper
+DHCP=no
+POINT_TO_POINT=172.16.0.50
+
+SPEED=11534336
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.50
+
+EW10
+
+$config{'wi1:1'}=sprintf <<EW11;  # link naar Marten
+TYPE=wireless
+IP=172.16.0.61/30
+
+DESC=Link naar Marten
+SDESC=2marten
+DHCP=no
+POINT_TO_POINT=172.16.0.62
+
+SPEED=11534336
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.62
+
+EW11
+
+
+
+
Index: branches/future-nodes/CNodeGandalf/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeGandalf/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeGandalf/wleiden.conf	(revision 863)
@@ -0,0 +1,112 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeGandalf
+$location="Benthuizen";
+$master_ip='172.25.128.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Gandalf';
+$OS='FreeBSD';
+$labelpos='left';
+
+
+
+
+
+
+
+
+$X='094876';
+$Y='461050';
+
+
+
+
+$config{'ed0'}=sprintf <<ED0;  # eth
+TYPE=ethernet
+IP=172.25.128.65/29
+
+DESC=Ethernet naar Gandalf
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=68-70
+#DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=AP voor de buurt
+SDESC=ap-omni
+SPEED=11534336
+
+DHCP=10-60
+#DHCP_STATIC= host qcg{hardware ethernet 00:04:75:BB:69:F8; fixed-address 172.21.128.5;} 
+
+
+
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=ap-omni.gandalf.wleiden.net
+CHANNEL=13
+
+
+
+
+POLAR=Vert
+ANTENNA=omni
+GAIN=9dBi
+DIRECTION=
+BEAMWIDTH=360
+CABLE=0
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # link naar RV
+TYPE=wireless
+IP=172.16.0.198/30
+DESC=Link naar RV
+SDESC=2rv
+SPEED=11534336
+POINT_TO_POINT=172.16.0.197
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.197
+
+MODE=managed
+ESSID=ap-omni.renv0.wleiden.net
+CHANNEL=1
+
+
+
+POLAR=Vert
+ANTENNA=SD19
+GAIN=19dBi
+DIRECTION=300
+BEAMWIDTH=5
+CABLE=1
+
+DHCP=no
+
+EW1
+
Index: branches/future-nodes/CNodeHuub/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeHuub/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeHuub/wleiden.conf	(revision 863)
@@ -0,0 +1,115 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeHuub
+$location="Mast op particulier dak, Halverwege Rapenburg, Leiden";
+$master_ip='172.17.16.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Huub';
+$OS='FreeBSD';
+$labelpos='left';
+
+
+
+
+
+
+
+
+$X='093348';
+$Y='463569';
+$N='52 09.470';
+$E='04 29.194';
+
+
+$config{'sis0'}=sprintf <<EE0;  # Local ethernet
+TYPE=ethernet
+IP=172.17.16.65/27
+
+
+DESC=Local Ethernet
+SDESC=local ethernet
+SPEED=102400000
+
+DHCP=70-90
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+EE0
+
+
+
+$config{'wi0'}=sprintf <<EW0;  # Link nr Thomas
+TYPE=wireless
+IP=$master_ip/26
+
+
+
+DESC=Link naar Thomas
+SDESC=2thomas
+DHCP=10-60
+DHCP_STATIC=host thomas { hardware ethernet 0:c0:c3:11:90:23; }
+
+SPEED=11534336
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=managed
+ESSID=ap-th.cnodehuub.wleiden.net
+#CHANNEL=13
+
+
+
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=240
+BEAMWIDTH=25                                                                    
+CABLE=1
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Cope
+TYPE=wireless
+IP=172.16.0.14/30
+
+DESC=Link naar Cope
+SDESC=2cope
+SPEED=11534336
+POINT_TO_POINT=172.16.0.13
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.13
+
+MODE=managed
+ESSID=omni.cope0.wleiden.net
+#CHANNEL=5
+
+
+
+
+
+POLAR=Vert
+ANTENNA=BIQUAD
+GAIN=8dBi
+DIRECTION=15
+BEAMWIDTH=70
+CABLE=2                                                                         
+
+
+DHCP=no
+
+EW1
+
+
Index: branches/future-nodes/CNodeIMI/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeIMI/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeIMI/wleiden.conf	(revision 863)
@@ -0,0 +1,216 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeImi
+
+$location="Nieuwe dak gemeente Archief, Zijlsingel, nabij het lifthuisje.";
+$master_ip='172.17.24.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='IMI';
+$OS='FreeBSD';
+$labelpos='left';
+
+
+
+
+
+
+$X='093411';
+$Y='463295';
+$N='52 09.263';
+$E='04 29.234';
+
+
+$config{'ep0'}=sprintf <<ED0;  # OMNI
+TYPE=ethernet
+IP=172.17.24.65/29
+
+
+DESC=Ethernet naar GAL
+SDESC=eth0
+SPEED=10240000000
+
+#DHCP=68-70
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=Omni voor de buurt
+SDESC=omni
+SPEED=11534336
+
+DHCP=10-60
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=omni.imi0.wleiden.net
+CHANNEL=1
+
+
+
+
+POLAR=Vert
+ANTENNA=omni
+GAIN=7dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+HEIGTH=20
+
+EW0
+
+
+$config{'wi0:0'}=sprintf <<EW00;  # link naar dirkx
+TYPE=wireless
+IP=172.16.0.53/30
+DESC=Link naar Dirkx
+SDESC=2dirkx
+SPEED=11534336
+POINT_TO_POINT=172.16.0.54
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.54
+
+DHCP=no
+EW00
+
+$config{'wi0:1'}=sprintf <<EW01;  # link naar Lvl-z
+TYPE=wireless
+IP=172.16.0.81/30
+DESC=Link naar LvLz
+SDESC=2lvlz
+SPEED=11534336
+POINT_TO_POINT=172.16.0.82
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.82
+
+DHCP=no
+EW01
+
+
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar cope
+TYPE=wireless
+IP=172.16.0.38/30
+DESC=Link naar cope
+SDESC=2cope
+SPEED=11534336
+POINT_TO_POINT=172.16.0.37
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.37
+
+MODE=managed
+ESSID=il-z.cope.wleiden.net
+CHANNEL=5
+
+
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=350
+BEAMWIDTH=35
+CABLE=1
+HEIGTH=20
+
+DHCP=no
+
+EW1
+
+
+$config{'wi2'}=sprintf <<EW2;  # link naar Jasper
+TYPE=wireless
+IP=172.16.0.41/30
+DESC=Link naar Jasper
+SDESC=2jasper
+SPEED=11534336
+POINT_TO_POINT=172.16.0.42
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.42
+
+MODE=master
+ESSID=ap2.imi2.wleiden.net
+CHANNEL=7
+
+
+
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=170
+BEAMWIDTH=25
+CABLE=2
+HEIGTH=20
+
+DHCP=no
+
+EW2
+
+
+$config{'wi3'}=sprintf <<EW3;  # link naar CeTIM
+TYPE=wireless
+IP=172.16.0.34/30
+DESC=Link naar CeTIM
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.33
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.33
+
+MODE=managed
+ESSID=il-zw.cetim2.wleiden.net
+CHANNEL=13
+
+
+
+
+POLAR=Horiz
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=40
+BEAMWIDTH=25
+CABLE=
+HEIGTH=18
+
+DHCP=no
+
+EW3
+
+
Index: branches/future-nodes/CNodeJacob/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeJacob/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeJacob/wleiden.conf	(revision 863)
@@ -0,0 +1,156 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeJacob
+$location="Particulier Balkon, Torenmodel, Leiden Noord Oost";
+$master_ip='172.21.128.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Jacob';
+$OS='FreeBSD';
+$labelpos='left';
+$DISK='FLASH';
+
+
+
+
+
+
+
+$X='94764';
+$Y='465596';
+
+
+$config{'sis0'}=sprintf <<SIS0;  # eth
+TYPE=ethernet
+IP=172.21.128.65/29
+
+
+DESC=Ethernet naar TorenMolen
+SDESC=eth0
+SPEED=10240000000
+
+#DHCP=68-70
+DHCP=no
+
+
+OSPF_AREA=211
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+SIS0
+
+$config{'sis1'}=sprintf <<SIS1;  # eth
+TYPE=ethernet
+IP=172.16.0.193/30
+
+DESC=Ethernet naar Jacob2
+SDESC=2jacob2
+SPEED=10240000000
+
+POINT_TO_POINT=172.16.0.194
+
+#DHCP=68-70
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.194
+
+SIS1
+
+
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=AP richting Jacobswoude (Noord)
+SDESC=ap-n
+SPEED=11534336
+
+DHCP=10-60
+DHCP_STATIC= host qcg{hardware ethernet 00:04:75:BB:69:F8; fixed-address 172.21.128.5;} 
+
+
+
+
+
+
+OSPF_AREA=211
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=ap-n.jacob.wleiden.net
+CHANNEL=11
+
+
+
+
+POLAR=Horiz
+ANTENNA=patch 2020
+GAIN=21dBi
+DIRECTION=90
+BEAMWIDTH=20
+CABLE=0
+HEIGTH=40
+
+EW0
+
+$config{'wi0:0'}=sprintf <<EW00;  # link naar Jacobswoude
+TYPE=wireless
+IP=172.16.0.121/30
+DESC=Link naar Jacobswoude
+SDESC=2jwoude
+SPEED=11534336
+POINT_TO_POINT=172.16.0.122
+
+
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.122
+
+DHCP=no
+EW00
+
+
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Cetim
+TYPE=wireless
+IP=172.16.0.106/30
+DESC=Link naar Cetim
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.105
+
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.105
+
+MODE=managed
+ESSID=il-no.cetim2.wleiden.net
+CHANNEL=8
+
+
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=180
+BEAMWIDTH=35
+CABLE=1
+HEIGTH=40
+
+DHCP=no
+
+EW1
+
Index: branches/future-nodes/CNodeJacob2/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeJacob2/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeJacob2/wleiden.conf	(revision 863)
@@ -0,0 +1,113 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeJacob2
+
+$location='Particulier Balkon, Torenmodel, Leiden Noord Oost';
+$master_ip='172.21.136.1';  
+$gw_open='closed';
+$nodetype='cnode';
+$nodename='Jacob2';
+
+$OS='FreeBSD';
+$labelpos='right';
+
+
+
+                                                                                
+                                                                                
+$X='94764';
+$Y='465656';
+                                                                                
+$N='';
+$E='';
+
+
+$config{'xl0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.16.0.194/30
+
+DESC=Ethernet naar Jacob1
+SDESC=eth0
+SPEED=10240000000
+POINT_TO_POINT=172.16.0.193
+
+DHCP=yes
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.193
+
+ED0
+
+
+$config{'wi0'}=sprintf <<EW0;  # AP voor buurt
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=ap voor de buurt
+SDESC=ap
+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_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=ap-n.jacob2.wleiden.net
+CHANNEL=11
+
+
+
+
+POLAR=Vert
+ANTENNA=8080
+GAIN=8dBi
+DIRECTION=0
+BEAMWIDTH=80
+CABLE=0
+HEIGTH=40
+
+EW0
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Rudi
+TYPE=wireless
+IP=172.16.0.189/30
+DESC=Link naar Rudi
+SDESC=2rudi
+SPEED=11534336
+POINT_TO_POINT=172.16.0.190
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.190
+
+MODE=master
+ESSID=il-nw.jacob.wleiden.net
+
+CHANNEL=5
+
+
+
+POLAR=Hor
+ANTENNA=8080
+GAIN=8dBi
+DIRECTION=320
+BEAMWIDTH=80
+CABLE=2
+HEIGTH=40
+
+DHCP=no
+
+EW1
+
Index: branches/future-nodes/CNodeJasper/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeJasper/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeJasper/wleiden.conf	(revision 863)
@@ -0,0 +1,146 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeJasper
+
+$location="Particulier Dak, Leiden Zuid Oost";
+$master_ip='172.18.8.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Jasper';
+$labelpos='left';
+
+$OS='FreeBSD';
+$X='093481';
+$Y='462907';
+$N='52 09.114';
+$E='04 29.317';
+
+$config{'ed0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.18.8.65/27
+ROUTE=0.0.0.0/0 172.18.8.66
+
+DESC=Ethernet naar Jasper
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=no
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+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_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=omni.jasper.wleiden.net
+CHANNEL=13
+
+POLAR=Ver
+ANTENNA=omni
+GAIN=6dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+HEIGTH=15
+
+EW0
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Jorg
+TYPE=wireless
+IP=172.16.0.46/30
+DESC=Link naar Jorg
+SDESC=2jorg
+SPEED=11534336
+POINT_TO_POINT=172.16.0.45
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.45
+
+MODE=managed
+ESSID=centrum.jorg0.wleiden.net
+CHANNEL=11
+
+POLAR=Vert
+ANTENNA=PatchPanel
+GAIN=14dBi
+DIRECTION=300
+BEAMWIDTH=30
+CABLE=1
+HEIGTH=14
+
+DHCP=no
+
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # link naar IMI
+TYPE=wireless
+IP=172.16.0.42/30
+DESC=Link naar IMI
+SDESC=2imi
+SPEED=11534336
+POINT_TO_POINT=172.16.0.41
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.41
+
+MODE=managed
+ESSID=ap2.imi2.wleiden.net
+CHANNEL=5
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=15dBi
+DIRECTION=0
+BEAMWIDTH=30
+CABLE=2
+HEIGTH=12
+
+DHCP=no
+
+EW2
+
+
+$config{'wi3'}=sprintf <<EW3;  # link z-o ROC
+TYPE=wireless
+IP=172.16.0.50/30
+DESC=Link naar RoC
+SDESC=2roc
+SPEED=11534336
+POINT_TO_POINT=172.16.0.49
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.49
+
+MODE=master
+ESSID=il-zo.jasper.wleiden.net
+CHANNEL=1
+
+POLAR=Hor
+ANTENNA=8080
+GAIN=14dBi
+DIRECTION=160
+BEAMWIDTH=70
+CABLE=3
+HEIGTH=12
+
+DHCP=no
+
+EW3
+
Index: branches/future-nodes/CNodeJorg/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeJorg/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeJorg/wleiden.conf	(revision 863)
@@ -0,0 +1,195 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeJorg
+$location="Particulier Balkon, Leiden";
+$master_ip='172.20.0.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Jorg';
+$OS='FreeBSD';
+$labelpos='left';
+
+
+
+
+
+$X='091988';
+$Y='463613';
+$N='52 09.425';
+$E='04 27.983';
+
+$config{'fxp0'}=sprintf <<EE0;  # Local ethernet
+TYPE=ethernet
+IP=172.20.0.65/27
+
+
+DESC=Local Ethernet
+SDESC=local ethernet
+SPEED=102400000
+
+DHCP=70-90
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+EE0
+
+$config{'wi0'}=sprintf <<EW0;  # Antenne richting Centrum
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=Antenne Centrum
+SDESC=centrum
+DHCP=10-60
+
+SPEED=11534336
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=centrum.jorg0.wleiden.net
+CHANNEL=1
+
+
+
+
+POLAR=Hor
+ANTENNA=Bi-Quad
+GAIN=7dBi
+DIRECTION=125
+BEAMWIDTH=70
+CABLE=?                                                                         
+HEIGTH=35
+
+EW0
+
+
+$config{'wi0:1'}=sprintf <<EW01;  # link Cope
+TYPE=wireless
+IP=172.16.0.22/30
+
+DESC=Link naar Cope
+SDESC=2cope
+DHCP=no
+POINT_TO_POINT=172.16.0.21
+
+SPEED=11534336
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.21
+
+EW01
+
+$config{'wi0:2'}=sprintf <<EW02;  # link naar Huub_NOT
+TYPE=wireless
+IP=172.16.0.18/30
+
+DESC=Link naar Huub_NOT
+SDESC=2huub_not
+DHCP=no
+POINT_TO_POINT=172.16.0.17
+
+SPEED=11534336
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.17
+
+EW02
+
+$config{'wi0:3'}=sprintf <<EW03;  # link naar Jasper.
+TYPE=wireless
+IP=172.16.0.45/30
+
+DESC=Link naar Jasper
+SDESC=2jasper
+DHCP=no
+POINT_TO_POINT=172.16.0.46
+
+SPEED=11534336
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.46
+
+EW03
+
+$config{'wi0:4'}=sprintf <<EW04;  # link naar renv.
+TYPE=wireless
+IP=172.16.0.137/30
+
+DESC=Link naar renv
+SDESC=2renv
+DHCP=no
+POINT_TO_POINT=172.16.0.138
+
+SPEED=11534336
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.138
+
+EW04
+
+$config{'wi1'}=sprintf <<EW1;  # Antenne Morswijk
+TYPE=wireless
+IP=172.20.1.1/26
+
+DESC=Antenne Morswijk
+SDESC=mors
+
+DHCP=10-60                                                                      
+
+SPEED=11534336
+
+
+OSPF_BROADCAST=no
+
+MODE=master
+ESSID=mors.jorg1.wleiden.net
+CHANNEL=11
+
+
+
+
+POLAR=Hor
+ANTENNA=Bi-Quad
+GAIN=7dBi
+DIRECTION=35
+BEAMWIDTH=70
+CABLE=?
+HEIGTH=35                                                                       
+
+EW1
+
+$config{'wi1:0'}=sprintf <<EW10;  # link naar Unig
+TYPE=wireless
+IP=172.16.0.85/30
+
+DESC=Link naar UniGor
+SDESC=2unig
+DHCP=no
+POINT_TO_POINT=172.16.0.86
+
+SPEED=11534336
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.86
+
+EW10
+
Index: branches/future-nodes/CNodeKees/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeKees/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeKees/wleiden.conf	(revision 863)
@@ -0,0 +1,105 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeKees
+$location="Dak, Centrum Leiden";
+$master_ip='172.17.128.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Kees';
+$OS='FreeBSD';
+
+
+
+
+
+
+$X='093925';
+$Y='463902';
+$N='52 09.653';
+$E='04 29.696';
+
+$config{'ep0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.17.128.65/29
+
+
+DESC=Ethernet naar Kees
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=68-70
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=Omni voor de buurt
+SDESC=omni
+SPEED=11534336
+
+DHCP=10-60
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=omni.kees0.wleiden.net
+CHANNEL=13
+
+
+
+
+POLAR=?
+ANTENNA=omni
+GAIN=6dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=3
+HEIGTH=16
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # link naar CeTIM
+TYPE=wireless
+IP=172.16.0.146/30
+DESC=Link naar CeTIM
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.145
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.145
+
+MODE=managed
+ESSID=il-no.cetim2.wleiden.net
+CHANNEL=1
+
+
+
+
+POLAR=Hor
+ANTENNA=Bi-Quad
+GAIN=7dBi
+DIRECTION=185
+BEAMWIDTH=70
+CABLE=?
+HEIGTH=16
+
+DHCP=no
+
+EW1
Index: branches/future-nodes/CNodeLvLn/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeLvLn/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeLvLn/wleiden.conf	(revision 863)
@@ -0,0 +1,157 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeLvLn (Lucas van Leiden Noord)
+$location="Dak Lucas van Leiden, Basisschool, Ursulasteeg, Leiden";
+$master_ip='172.17.144.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='LvLn';
+$OS='FreeBSD';
+
+
+
+
+
+
+
+$X='93386';
+$Y='464131';
+
+
+$config{'ep0'}=sprintf <<ED0;  # eth
+TYPE=ethernet
+IP=172.17.144.65/29
+
+DESC=Ethernet naar School
+SDESC=eth0
+SPEED=10240000000
+
+#DHCP=68-70
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=Omni voor de buurt
+SDESC=omni
+SPEED=11534336
+
+DHCP=10-60
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=omni.lvln0.wleiden.net
+CHANNEL=9
+
+
+
+
+POLAR=Vert
+ANTENNA=omni
+GAIN=6dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+HEIGTH=10
+
+EW0
+
+$config{'wi0:0'}=sprintf <<EW00;  # link naar Rund
+TYPE=wireless
+IP=172.16.0.181/30
+DESC=Link naar Rund
+SDESC=2rund
+SPEED=11534336
+POINT_TO_POINT=172.16.0.182
+                                                                                
+
+                                                                                
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.182
+                                                                                
+DHCP=no
+EW00
+                                                                                
+
+$config{'wi1'}=sprintf <<EW1;  # link naar cope
+TYPE=wireless
+IP=172.16.0.70/30
+DESC=Link naar cope
+SDESC=2cope
+SPEED=11534336
+POINT_TO_POINT=172.16.0.69
+
+
+
+OSPF_COST=11
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.69
+
+MODE=managed
+ESSID=omni.cope0.wleiden.net
+CHANNEL=5
+
+
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=205
+BEAMWIDTH=35
+CABLE=1
+HEIGTH=10
+
+DHCP=no
+
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # link naar CeTIM (HLK)
+TYPE=wireless
+IP=172.16.0.74/30
+DESC=Link naar CeTIM
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.73
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.73
+
+MODE=managed
+ESSID=il-nw.cetim3.wleiden.net
+CHANNEL=9
+
+
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=135
+BEAMWIDTH=35
+#CABLE=1
+HEIGTH=13
+
+DHCP=no
+
+EW2
+
+
Index: branches/future-nodes/CNodeLvLz/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeLvLz/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeLvLz/wleiden.conf	(revision 863)
@@ -0,0 +1,107 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeLvLz (Lucas van Leiden Zuid)
+$location="Dak Lucas van Leiden, Basisschool, de Vliet, Leiden";
+$master_ip='172.17.40.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='LvLn';
+$OS='FreeBSD';
+
+
+
+
+
+
+
+$X='93450';
+$Y='463350';
+
+
+$config{'ep0'}=sprintf <<ED0;  # eth
+TYPE=ethernet
+IP=172.17.40.65/29
+
+DESC=Ethernet naar School
+SDESC=eth0
+SPEED=10240000000
+
+#DHCP=68-70
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+
+$config{'wi0'}=sprintf <<EW0;  # link naar CeTIM (HLK)
+TYPE=wireless
+IP=172.16.0.78/30
+DESC=Link naar cetim
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.77
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.77
+
+MODE=managed
+ESSID=il-zw.cetim2.wleiden.net
+CHANNEL=13
+
+
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=60
+BEAMWIDTH=35
+#CABLE=1
+HEIGTH=16
+
+DHCP=no
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # link naar IMI
+TYPE=wireless
+IP=172.16.0.82/30
+DESC=Link naar ImI
+SDESC=2imi
+SPEED=11534336
+POINT_TO_POINT=172.16.0.81
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.81
+
+MODE=managed
+ESSID=omni.imi0.wleiden.net
+CHANNEL=1
+
+
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=240
+BEAMWIDTH=35
+#CABLE=1
+HEIGTH=16
+
+DHCP=no
+
+EW1
+
+
Index: branches/future-nodes/CNodeMartenSoe1/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeMartenSoe1/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeMartenSoe1/wleiden.conf	(revision 863)
@@ -0,0 +1,136 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeMarten
+$location="Particulier Dak, Flat Leiden Zuid Oost";
+$master_ip='172.18.16.1';  
+$AGGREGATE=24;
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Marten1';
+
+$OS='FreeBSD';
+$labelpos='left';
+
+
+
+
+
+
+
+#$X='094544';
+#$Y='462769';
+
+$X='094544';
+$Y='462709';
+
+$N='52 09.047';
+$E='04 30.251';
+
+
+$config{'sis0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.16.0.201/30
+
+
+DESC=Ethernet naar MartenSoe2
+SDESC=sis0
+SPEED=10240000000
+
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.202
+
+ED0
+
+
+$config{'sis1'}=sprintf <<ESIS1;  # local ethernet
+TYPE=ethernet
+IP=172.18.16.65/28
+
+DESC=Ethernet 2 marten
+SDESC=eth2marten
+SPEED=10240000000
+
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ESIS1
+
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+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_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=omni.marten0.wleiden.net
+CHANNEL=1
+
+
+
+
+POLAR=Ver
+ANTENNA=omni
+GAIN=9dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+HEIGTH=14
+
+EW0
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Evert
+TYPE=wireless
+IP=172.16.0.62/30
+DESC=Link naar Evert
+SDESC=2evert
+SPEED=11534336
+POINT_TO_POINT=172.16.0.61
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.61
+
+MODE=managed
+ESSID=Profwijk.evert0.wleiden.net
+CHANNEL=9
+
+
+
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=90
+BEAMWIDTH=30
+CABLE=1
+HEIGTH=13
+
+DHCP=no
+
+EW1
+
+
Index: branches/future-nodes/CNodeMartenSoe2/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeMartenSoe2/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeMartenSoe2/wleiden.conf	(revision 863)
@@ -0,0 +1,115 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeMarten
+$location="Particulier Dak, Flat Leiden Zuid Oost";
+$master_ip='172.18.17.1';
+$AGGREGATE=24;
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='MartenSoe2';
+
+$OS='FreeBSD';
+$labelpos='right';
+
+
+
+
+
+
+
+$X='094544';
+$Y='462769';
+
+#$X='094544';
+#$Y='462709';
+
+$N='52 09.047';
+$E='04 30.251';
+
+
+$config{'sis0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.16.0.202/30
+
+
+DESC=Ethernet naar MartenSoe1
+SDESC=sis0
+SPEED=10240000000
+
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.201
+
+ED0
+
+
+
+
+$config{'wi0'}=sprintf <<EW2;  # link naar Mark
+TYPE=wireless
+IP=172.18.17.1/24
+DESC=Link naar Mark
+SDESC=2imi
+SPEED=11534336
+POINT_TO_POINT=172.18.17.2
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=managed
+ESSID=hnode.mark.wleiden.net
+CHANNEL=6
+
+
+
+POLAR=hor
+ANTENNA=sd15
+GAIN=14dBi
+DIRECTION=250
+BEAMWIDTH=30
+CABLE=2
+HEIGTH=13
+
+DHCP=100-140
+
+EW2
+
+$config{'wi1'}=sprintf <<EW3;  # link naar CeTIM
+TYPE=wireless
+IP=172.16.0.114/30
+DESC=Link naar CeTIM
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.113
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.113
+
+MODE=managed
+ESSID=il-zo.cetim3.wleiden.net
+CHANNEL=6
+
+
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=305
+BEAMWIDTH=30
+CABLE=2
+
+DHCP=no
+
+EW3
+
Index: branches/future-nodes/CNodeMeca/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeMeca/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeMeca/wleiden.conf	(revision 863)
@@ -0,0 +1,110 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeMeca
+
+$location='Katwijk';
+$master_ip='172.26.0.1';  
+$gw_open='closed';
+$nodetype='cnode';
+$nodename='Meca';
+
+$OS='FreeBSD';
+$labelpos='right';
+
+
+
+
+
+$X='90100';
+$Y='466800';
+
+$N='';
+$E='';
+
+
+$config{'ep0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.26.0.65/28
+
+
+DESC=Ethernet naar Klaas
+SDESC=2klaas
+SPEED=10240000000
+
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # Omni voor de buurt
+TYPE=wireless
+IP=$master_ip/26
+DESC=Omni voor de buurt
+SDESC=omni
+SPEED=11534336
+
+
+
+
+#OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+#DHCP=no
+DHCP=10-60
+
+MODE=master
+ESSID=ap-omni.meca.wleiden.net
+
+CHANNEL=3
+
+
+
+POLAR=Vert
+ANTENNA=Waveguide
+GAIN=17dBi
+DIRECTION=0
+BEAMWIDTH=360
+CABLE=1
+HEIGTH=12
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # link naar CeTIM
+TYPE=wireless
+IP=172.16.0.182/30
+DESC=Link naar CeTIM
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.181
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.181
+
+MODE=managed
+ESSID=il-nw.cetim3.wleiden.net
+
+CHANNEL=9
+
+
+
+POLAR=Hor
+ANTENNA=SD27
+GAIN=27dBi
+DIRECTION=150
+BEAMWIDTH=10
+CABLE=2
+HEIGTH=22
+
+DHCP=no
+
+EW1
+
Index: branches/future-nodes/CNodeOBLc/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeOBLc/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeOBLc/wleiden.conf	(revision 863)
@@ -0,0 +1,85 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeOBLc
+$location="Dak Bibliotheek, Leiden Centrum";
+$master_ip='172.17.153.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='OBLc';
+$labelpos='left';
+
+
+
+
+
+
+$OS='FreeBSD';
+$X='93825';
+$Y='463725';
+#$N='52 09.114';
+#$E='04 29.317';
+
+$config{'xl0'}=sprintf <<XL0;  # Ethernet
+TYPE=ethernet
+IP=172.17.152.65/27
+
+DESC=Ethernet naar OBL
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=no
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+XL0
+
+$config{'ep0'}=sprintf <<EP0;  # Ethernet
+TYPE=ethernet
+IP=172.17.153.1/24
+
+DESC=AP voor bieb
+SDESC=apples
+SPEED=10240000000
+
+DHCP=10-250
+#DHCP_STATIC= host ipaq1{hardware ethernet 00:02:2D:0E:4F:0D; fixed-address 172.188.8.2;} host ipaq2{hardware ethernet 00:02:2D:09:21:28; fixed-address 172.188.8.3;}
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+EP0
+
+
+$config{'wi0'}=sprintf <<EW1;  # link naar CeTIM
+TYPE=wireless
+IP=172.16.0.162/30
+DESC=Link naar CeTIM
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.161
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.161
+
+MODE=managed
+ESSID=il-nw.cetim3.wleiden.net
+CHANNEL=9
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=90
+BEAMWIDTH=30
+CABLE=1
+HEIGTH=14
+
+DHCP=no
+
+EW1
+
Index: branches/future-nodes/CNodePolder/wleiden.conf
===================================================================
--- branches/future-nodes/CNodePolder/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodePolder/wleiden.conf	(revision 863)
@@ -0,0 +1,142 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodePolder
+$location="Ergens ten oosten van Leiden";
+$master_ip='172.25.8.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Polder';
+$OS='FreeBSD';
+$labelpos='left';
+
+
+
+
+
+
+
+
+$X='097970';
+$Y='465500';
+
+
+$config{'sis0'}=sprintf <<ED0;  # eth
+TYPE=ethernet
+IP=172.25.8.65/29
+
+
+DESC=Ethernet naar Polder
+SDESC=eth0
+SPEED=10240000000
+
+#DHCP=68-70
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=AP voor de buurt
+SDESC=ap-omni
+SPEED=11534336
+
+DHCP=10-60
+#DHCP_STATIC= host qcg{hardware ethernet 00:04:75:BB:69:F8; fixed-address 172.21.128.5;} 
+
+
+
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=ap-omni.polder.wleiden.net
+CHANNEL=1
+
+
+
+
+POLAR=Vert
+ANTENNA=omni
+GAIN=6dBi
+DIRECTION=
+BEAMWIDTH=360
+CABLE=0
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # link naar CeTIM
+TYPE=wireless
+IP=172.16.0.130/30
+DESC=Link naar Cetim
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.129
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.129
+
+MODE=managed
+ESSID=il-no.cetim2.wleiden.net
+CHANNEL=10
+
+
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=
+BEAMWIDTH=0
+CABLE=1
+
+DHCP=no
+
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # link naar Veldbies
+TYPE=wireless
+IP=172.16.0.126/30
+DESC=Link naar NodeVeldbies
+SDESC=2veldbies
+SPEED=11534336
+POINT_TO_POINT=172.16.0.125
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.125
+
+MODE=managed
+ESSID=ap-p.veldbies.wleiden.net
+CHANNEL=5
+
+
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=
+BEAMWIDTH=0
+CABLE=1
+
+DHCP=no
+
+EW2
+
Index: branches/future-nodes/CNodeROCl/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeROCl/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeROCl/wleiden.conf	(revision 863)
@@ -0,0 +1,145 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeROCl
+$location="Duh, Leiden";
+$master_ip='172.21.0.1';  
+$gw_open='closed';
+$nodetype='cnode';
+$nodename='ROCl';
+
+$OS='FreeBSD';
+
+
+
+
+
+
+$X='93806';
+$Y='462220';
+$LOKATIE='Lammenschanspark 1';
+
+$N='';
+$E='';
+
+
+$config{'ep0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.21.1.65/28
+
+
+DESC=Ethernet naar ROCl
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=yes
+
+
+OSPF_AREA=21
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+
+
+$config{'wi0'}=sprintf <<EW0;  # omni
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=omni
+SDESC=no
+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=21
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=ap-omni.rocl.wleiden.net
+CHANNEL=7
+
+
+
+
+POLAR=Ver
+ANTENNA=omni
+GAIN=6dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+HEIGTH=15
+
+EW0
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Marten
+TYPE=wireless
+IP=172.16.0.158/30
+DESC=Link naar Marten
+SDESC=2marten
+SPEED=11534336
+POINT_TO_POINT=172.166.0.157
+
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.166.0.157
+
+MODE=managed
+ESSID=omni.marten0.wleiden.net
+
+CHANNEL=11
+
+
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=60
+BEAMWIDTH=40
+CABLE=1
+
+DHCP=no
+
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # link naar Jasper
+TYPE=wireless
+IP=172.16.0.154/30
+DESC=Link naar Jasper
+SDESC=2jasper
+SPEED=1153436
+POINT_TO_POINT=172.166.0.153
+
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.166.0.153
+
+MODE=managed
+ESSID=il-zo.jasper.wleiden.net
+
+CHANNEL=1
+
+
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=340
+BEAMWIDTH=40
+CABLE=2
+
+DHCP=no
+
+EW2
+
Index: branches/future-nodes/CNodeRV/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeRV/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeRV/wleiden.conf	(revision 863)
@@ -0,0 +1,217 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeRV
+$location="Buurtcentrum Rijn en Vliet, Leiden Zuid";
+$master_ip='172.20.128.1';  
+$gw_open='closed';
+$nodetype='cnode';
+$nodename='RV';
+
+$OS='FreeBSD';
+$labelpos='left';
+
+
+
+
+
+
+
+$X='92486';
+$Y='462804';
+$LOKATIE='';
+
+$N='';
+$E='';
+
+
+$config{'ep0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.20.128.65/27
+
+DESC=Ethernet naar RenV
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=70-80
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+
+$config{'ep1'}=sprintf <<ED1;  # Ethernet
+TYPE=ethernet
+IP=172.20.128.97/29
+
+DESC=Ethernet naar proxy
+SDESC=2proxy
+SPEED=10240000000
+
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED1
+
+
+
+$config{'wi0'}=sprintf <<EW0;  #  Omni
+TYPE=wireless
+IP=172.20.128.1/26
+DESC=omni
+SDESC=omni
+SPEED=11534336
+
+
+
+OSPF_AREA=no
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=ap-omni.renv0.wleiden.net
+
+CHANNEL=1
+
+
+
+POLAR=hor
+ANTENNA=dubbele golfpijp
+GAIN=15dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=1
+HEIGTH=25
+
+DHCP=10-60
+
+EW0
+
+$config{'wi0:0'}=sprintf <<EW00;  # link naar Gandalf
+TYPE=wireless
+IP=172.16.0.197/30
+DESC=Link naar Gandalf
+SDESC=2gandalf
+SPEED=11534336
+POINT_TO_POINT=172.16.0.198
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.198
+
+DHCP=no
+EW00
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar CeTIM
+TYPE=wireless
+IP=172.16.0.134/30
+DESC=Link naar Cetim
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.133
+
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.133
+
+MODE=managed
+ESSID=il-zw.cetim2.wleiden.net
+
+CHANNEL=11
+
+
+
+POLAR=hor
+ANTENNA=sd15
+GAIN=15dBi
+DIRECTION=60
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=20
+
+DHCP=no
+
+EW1
+
+
+
+$config{'wi2'}=sprintf <<EW2;  # link naar Jorg
+TYPE=wireless
+IP=172.16.0.138/30
+DESC=Link naar Jorg
+SDESC=2jorg
+SPEED=11534336
+POINT_TO_POINT=172.16.0.137
+
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.137
+
+MODE=managed
+ESSID=centrum.jorg0.wleiden.net
+
+CHANNEL=1
+
+
+
+POLAR=hor
+ANTENNA=sd15
+GAIN=15dBi
+DIRECTION=330
+BEAMWIDTH=30
+CABLE=2
+HEIGTH=20
+
+DHCP=no
+
+EW2
+
+$config{'wi3'}=sprintf <<EW3;  # link naar 5mei / parelvissers
+TYPE=wireless
+IP=172.16.0.141/30
+DESC=Link naar ParelVissers
+SDESC=2parel
+SPEED=11534336
+POINT_TO_POINT=172.16.0.142
+
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.142
+
+MODE=master
+ESSID=il-zw.renv3.wleiden.net
+
+CHANNEL=5
+
+
+
+POLAR=hor
+ANTENNA=Patch
+GAIN=14dBi
+DIRECTION=225
+BEAMWIDTH=40
+CABLE=2
+HEIGTH=24
+
+DHCP=no
+
+EW3
+
+
Index: branches/future-nodes/CNodeRabo/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeRabo/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeRabo/wleiden.conf	(revision 863)
@@ -0,0 +1,182 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeRabo
+
+$location='Dag Rabobank gebouw schipholweg';
+$master_ip='172.19.136.1';  
+$gw_open='closed';
+$nodetype='cnode';
+$nodename='Rabo';
+
+$OS='FreeBSD';
+$labelpos='right';
+
+
+
+
+
+$X='93543';
+$Y='464998';
+$LOKATIE='Schipholweg';
+
+$N='';
+$E='';
+
+
+$config{'ep0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.19.136.65/28
+
+
+DESC=Ethernet naar rabo
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=70-78
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # link naar CeTIM
+TYPE=wireless
+IP=172.16.0.98/30
+DESC=Link naar CeTIM
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.97
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.97
+
+MODE=managed
+ESSID=il-nw.cetim3.wleiden.net
+
+CHANNEL=9
+
+
+
+POLAR=Vert
+ANTENNA=Patch
+GAIN=15dBi
+DIRECTION=165
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=22
+
+DHCP=no
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Rudi
+TYPE=wireless
+IP=172.16.0.65/30
+DESC=Link naar Rudi
+SDESC=2rudi
+SPEED=11534336
+POINT_TO_POINT=172.16.0.66
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.66
+
+MODE=master
+ESSID=il-n.rabo.wleiden.net
+
+CHANNEL=5
+
+
+
+POLAR=Vert
+ANTENNA=Patch
+GAIN=15dBi
+DIRECTION=20
+BEAMWIDTH=30
+CABLE=2
+HEIGTH=22
+
+DHCP=no
+
+EW1
+
+
+
+$config{'wi2'}=sprintf <<EW2;  # Link naar Unigor
+TYPE=wireless
+IP=172.16.0.101/30  
+DESC=Link naar Unigor
+SDESC=2unigor
+SPEED=11534336
+POINT_TO_POINT=172.16.0.102
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.102
+
+DHCP=no
+
+
+MODE=managed
+ESSID=n-o.unigor.wleiden.net
+
+CHANNEL=1
+
+
+
+POLAR=Vert
+ANTENNA=Patch
+GAIN=15dBi
+DIRECTION=260
+BEAMWIDTH=30
+CABLE=2
+HEIGTH=22
+
+EW2
+
+
+
+$config{'wi3'}=sprintf <<EW3;  # AP omni
+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_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=omni.rabo.wleiden.net
+CHANNEL=11
+
+
+
+
+POLAR=Ver
+ANTENNA=omni
+GAIN=9dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+HEIGTH=22
+
+EW3
Index: branches/future-nodes/CNodeRudi/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeRudi/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeRudi/wleiden.conf	(revision 863)
@@ -0,0 +1,176 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeRudi
+$location="Richting Oegstgeest, Particulier dak";
+$master_ip='172.23.0.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Rudi';
+$OS='FreeBSD';
+$labelpos='left';
+
+
+
+
+
+
+
+
+$X='94058';
+$Y='466097';
+
+
+$config{'ep0'}=sprintf <<ED0;  # eth
+TYPE=ethernet
+IP=172.23.0.65/29
+
+
+DESC=Ethernet naar Xlexit
+SDESC=eth0
+SPEED=10240000000
+
+#DHCP=68-70
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=Omni voor de buurt
+SDESC=omni
+SPEED=11534336
+
+DHCP=10-60
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=omni.rudi0.wleiden.net
+CHANNEL=9
+
+
+
+
+POLAR=Vert
+ANTENNA=omni
+GAIN=6dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+HEIGTH=9
+
+EW0
+
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Rabo
+TYPE=wireless
+IP=172.16.0.66/30
+DESC=Link naar Rabo
+SDESC=2rabo
+SPEED=11534336
+POINT_TO_POINT=172.16.0.65
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.65
+
+MODE=managed
+ESSID=il-n.rabo.wleiden.net
+CHANNEL=5
+
+
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=210
+BEAMWIDTH=35
+CABLE=1
+HEIGTH=9
+
+DHCP=no
+
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # link naar AZC
+TYPE=wireless
+IP=172.16.0.174/30
+DESC=Link naar AZC
+SDESC=2azc
+SPEED=11534336
+POINT_TO_POINT=172.16.0.174
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.174
+
+MODE=managed
+ESSID=il-no.azc.wleiden.net
+CHANNEL=0
+
+
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=210
+BEAMWIDTH=35
+CABLE=1
+HEIGTH=9
+
+DHCP=no
+
+EW2
+
+
+$config{'wi3'}=sprintf <<EW3;  # link naar Jacob
+TYPE=wireless
+IP=172.16.0.190/30
+DESC=Link naar Jacob
+SDESC=2jacob
+SPEED=11534336
+POINT_TO_POINT=172.16.0.189
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.189
+
+MODE=managed
+ESSID=il-nw.jacob.wleiden.net
+CHANNEL=5
+
+
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=110
+BEAMWIDTH=35
+CABLE=1
+HEIGTH=9
+
+DHCP=no
+
+EW3
+
+
Index: branches/future-nodes/CNodeRund/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeRund/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeRund/wleiden.conf	(revision 863)
@@ -0,0 +1,152 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeRund
+
+$location='Noord Rundersteeg 10';
+$master_ip='172.17.160.1';  
+$gw_open='closed';
+$nodetype='cnode';
+$nodename='Rund';
+
+$OS='FreeBSD';
+$labelpos='right';
+
+
+
+
+
+$X='93745';
+$Y='464000';
+
+#$Y='463931';
+
+#$X='93658';
+#$Y='464131';
+
+$LOKATIE='n.v.t.';
+
+$N='';
+$E='';
+
+
+$config{'ep0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.17.160.65/28
+
+
+DESC=Ethernet naar Dirkx
+SDESC=2dirkx
+SPEED=10240000000
+
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # AP NW
+TYPE=wireless
+IP=$master_ip/26
+DESC=Omni voor de buurt
+SDESC=omni
+SPEED=11534336
+
+
+
+
+#OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+#DHCP=no
+DHCP=10-60
+
+MODE=master
+ESSID=ap-omni.rund.wleiden.net
+
+CHANNEL=9
+
+
+
+POLAR=Vert
+ANTENNA=Omni
+GAIN=3dBi
+DIRECTION=0
+BEAMWIDTH=360
+CABLE=1
+HEIGTH=12
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # link naar CeTIM
+TYPE=wireless
+IP=172.16.0.178/30
+DESC=Link naar CeTIM
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.177
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.177
+
+MODE=managed
+ESSID=il-nw.cetim3.wleiden.net
+
+CHANNEL=9
+
+
+
+POLAR=Hor
+ANTENNA=Yagi
+GAIN=16dBi
+DIRECTION=150
+BEAMWIDTH=20
+CABLE=2
+HEIGTH=22
+
+DHCP=no
+
+EW1
+
+
+$config{'wi2'}=sprintf <<EW2;  # link naar LvLn
+TYPE=wireless
+IP=172.16.0.182/30
+DESC=Link naar LvLn
+SDESC=2lvln
+SPEED=11534336
+POINT_TO_POINT=172.16.0.181
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.181
+
+MODE=managed
+ESSID=omni.lvln0.wleiden.net
+
+CHANNEL=9
+
+
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=15dBi
+DIRECTION=250
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=22
+
+DHCP=no
+
+EW2
+
+
Index: branches/future-nodes/CNodeThomas/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeThomas/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeThomas/wleiden.conf	(revision 863)
@@ -0,0 +1,127 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeThomas
+$location="Particulier dak, einde Rapenburg tegenover van der Werf park, Leiden";
+$master_ip='172.17.40.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Thomas';
+
+$OS='FreeBSD';
+$labelpos='right';
+
+$X='93010';  # Even op zij gezet voor de zichtbaarheid.
+$Y='463451';
+
+# Orig:
+#$X='93510';
+#$Y='463451';
+
+
+$N='';
+$E='';
+
+
+
+$config{'ep0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.17.40.65/29
+
+
+DESC=Ethernet naar Thomas
+SDESC=eth0
+SPEED=10240000000
+
+#DHCP=68-70
+DHCP=no
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=Omni voor de buurt
+SDESC=omni
+SPEED=11534336
+
+DHCP=10-60
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=ap-omni.thomas.wleiden.net
+CHANNEL=1
+
+POLAR=Vert
+ANTENNA=omni
+GAIN=7dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+HEIGTH=20
+
+EW0
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Cope
+TYPE=wireless
+IP=172.16.0.206/30
+DESC=Link naar Cope
+SDESC=2cope
+SPEED=11534336
+POINT_TO_POINT=172.16.0.205
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.205
+
+MODE=managed
+ESSID=il-z.cope.wleiden.net
+CHANNEL=7
+
+POLAR=Horiz
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=330
+BEAMWIDTH=25
+CABLE=
+HEIGTH=12
+
+DHCP=no
+
+EW1
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar IMI
+TYPE=wireless
+IP=172.16.0.210/30
+DESC=Link naar IMI
+SDESC=2imi
+SPEED=11534336
+POINT_TO_POINT=172.16.0.209
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.209
+
+MODE=managed
+ESSID=il-no.IMI.wleiden.net
+CHANNEL=7
+
+POLAR=Horiz
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=210
+BEAMWIDTH=25
+CABLE=
+HEIGTH=12
+
+DHCP=no
+
+EW1
+
Index: branches/future-nodes/CNodeUniGor/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeUniGor/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeUniGor/wleiden.conf	(revision 863)
@@ -0,0 +1,223 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeUniGor
+$location="Bovenste omloop van het Gorleus Lab, Universiteit Leiden, Leiden West";
+$master_ip='172.19.128.1';  
+$AGGREGATE='22';
+
+$gw_open='closed';
+$nodetype='cnode';
+$nodename='UniGor';
+$labelpos='right';
+
+$OS='FreeBSD';
+
+
+
+
+
+$X='91589';
+$Y='464821';
+$N='';
+$E='';
+
+
+$config{'ep0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.19.128.65/28
+
+
+DESC=Ethernet naar uni
+SDESC=eth0
+SPEED=10240000000
+POINT_TO_POINT=
+
+DHCP=66-78
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+
+ED0
+
+$config{'ep1'}=sprintf <<EP1;  # Ethernet
+TYPE=ethernet
+DESC=Link naar Unigor Noord
+SDESC=2unigorn
+TYPE=ethernet
+IP=172.16.0.117/30
+SPEED=10240000000
+POINT_TO_POINT=172.16.0.118
+DHCP=118-118
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.118
+
+EP1
+
+
+
+$config{'wi0'}=sprintf <<EW0;  # AP richting NO
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=AP Richting NO
+SDESC=no
+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_BROADCAST=no
+#
+#OSPF_NEIGHBORS=172.16.0.101
+# Leave empty
+
+MODE=master
+ESSID=n-o.unigor.wleiden.net
+CHANNEL=1
+
+
+
+
+POLAR=Ver
+ANTENNA=panel
+GAIN=14dBi
+DIRECTION=45
+BEAMWIDTH=40
+HEIGTH=35
+CABLE=0
+
+EW0
+
+$config{'wi0:0'}=sprintf <<EW00;  # Link naar Rudi
+YPE=wireless
+IP=172.16.0.89/30
+
+DESC=Link naar Rudi
+SDESC=2rudi
+DHCP=no
+POINT_TO_POINT=172.16.0.90
+
+SPEED=11534336
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.90
+
+EW00
+
+$config{'wi0:1'}=sprintf <<EW01;  # Link naar Rabo
+YPE=wireless
+IP=172.16.0.102/30
+
+DESC=Link naar Rabo
+SDESC=2rabo
+DHCP=no
+POINT_TO_POINT=172.16.0.101
+
+SPEED=11534336
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.101
+
+EW01
+
+$config{'wi0:2'}=sprintf <<EW02;  # Link naar AZC
+YPE=wireless
+IP=172.16.0.165/30
+
+DESC=Link naar AZC
+SDESC=2azc
+DHCP=no
+POINT_TO_POINT=172.16.0.166
+
+SPEED=11534336
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.166
+
+EW02
+
+
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Jorg
+TYPE=wireless
+IP=172.16.0.86/30
+DESC=Link naar Jorg
+SDESC=2jorg
+SPEED=11534336
+POINT_TO_POINT=172.16.0.85
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.85
+
+MODE=managed
+ESSID=mors.jorg1.wleiden.net
+
+CHANNEL=11
+
+
+
+POLAR=Vert
+ANTENNA=Patch
+GAIN=15dBi
+DIRECTION=160
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=35
+
+DHCP=no
+
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # link naar Cope
+TYPE=wireless
+IP=172.16.0.94/30
+DESC=Link naar Cope
+SDESC=2cope
+SPEED=11534336
+POINT_TO_POINT=172.16.0.93
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.93
+
+MODE=managed
+ESSID=omni.cope0.wleiden.net
+CHANNEL=5
+
+
+
+POLAR=Vert
+ANTENNA=Patch
+GAIN=15dBi
+DIRECTION=125
+BEAMWIDTH=30
+CABLE=2
+HEIGTH=35
+
+DHCP=no
+
+EW2
+
Index: branches/future-nodes/CNodeUniGorN/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeUniGorN/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeUniGorN/wleiden.conf	(revision 863)
@@ -0,0 +1,83 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeUniGorN
+$location="Bovenste omloop van het Gorleus Lab, Universiteit Leiden, Leiden West";
+
+$master_ip='172.19.135.1';  
+$AGGREGATE='24';
+$gw_open='closed';
+$nodetype='cnode';
+$nodename='UniGorN';
+$labelpos='left';
+$DISK='FLASH';
+
+
+$OS='FreeBSD';
+
+
+
+
+
+
+$X='91529';
+$Y='464821';
+$N='';
+$E='';
+
+
+$config{'sis0'}=sprintf <<SIS0;  # Ethernet
+TYPE=ethernet
+IP=172.16.0.118/30
+
+
+DESC=Ethernet naar UniGor
+SDESC=eth0
+SPEED=10240000000
+
+POINT_TO_POINT=172.16.0.117
+
+DHCP=no
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.117
+
+SIS0
+
+$config{'wi0'}=sprintf <<EW0;  # AP richting NW
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=AP Richting NW
+SDESC=nw
+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=ap-nw.unigor.wleiden.net
+CHANNEL=6
+
+
+
+
+POLAR=Ver
+ANTENNA=waveguide
+GAIN=11dBi
+DIRECTION=335
+BEAMWIDTH=160
+CABLE=0
+HEIGTH=35
+
+EW0
+
Index: branches/future-nodes/CNodeVeldbies/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeVeldbies/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeVeldbies/wleiden.conf	(revision 863)
@@ -0,0 +1,132 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeVeldbies
+$location="Ergens oostelijk van Leiden";
+$master_ip='172.25.0.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Veldbies';
+$OS='FreeBSD';
+$labelpos='left';
+
+
+
+
+$X='097970';
+$Y='466500';
+
+$config{'ep0'}=sprintf <<ED0;  # eth
+TYPE=ethernet
+IP=172.25.0.65/29
+
+DESC=Ethernet naar Veldbies
+SDESC=eth0
+SPEED=10240000000
+
+#DHCP=68-70
+DHCP=no
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=AP voor de buurt
+SDESC=ap-omni
+SPEED=11534336
+
+DHCP=10-60
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=ap-omni.veldbies.wleiden.net
+CHANNEL=1
+
+
+
+
+POLAR=Vert
+ANTENNA=omni
+GAIN=6dBi
+DIRECTION=
+BEAMWIDTH=360
+CABLE=0
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # link naar NodeJacob
+TYPE=wireless
+IP=172.16.0.122/30
+DESC=Link naar NodeJacob
+SDESC=2jacob
+SPEED=11534336
+POINT_TO_POINT=172.16.0.121
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.121
+
+MODE=managed
+ESSID=ap-n.jacob.wleiden.net
+CHANNEL=11
+
+
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=
+BEAMWIDTH=0
+CABLE=1
+
+DHCP=no
+
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # link naar Polder
+TYPE=wireless
+IP=172.16.0.125/30
+DESC=Link naar NodePolder
+SDESC=2polder
+SPEED=11534336
+POINT_TO_POINT=172.16.0.126
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.126
+
+MODE=master
+ESSID=ap-p.veldbies.wleiden.net
+CHANNEL=5
+
+
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=
+BEAMWIDTH=0
+CABLE=1
+
+DHCP=no
+
+EW2
+
Index: branches/future-nodes/CNodeVhs/wleiden.conf
===================================================================
--- branches/future-nodes/CNodeVhs/wleiden.conf	(revision 863)
+++ branches/future-nodes/CNodeVhs/wleiden.conf	(revision 863)
@@ -0,0 +1,69 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeVhs
+$location="Volkshuis, Apothekersdijk, Leiden";
+$master_ip='172.17.0.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Vhs';
+$OS='FreeBSD';
+
+$config{'ed0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=$master_ip/29
+
+DESC=Ethernet Volkshuis
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=100-120
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # Antenne naar Cope
+TYPE=wireless
+IP=172.16.0.30/30
+DESC=Link naar Cope
+SDESC=2cope
+SPEED=11534336
+
+POINT_TO_POINT=172.16.0.29
+
+ROUTE=172.16.0.0/12 172.16.0.29
+
+
+DESC=Link naar Cope
+SDESC=2cope
+SPEED=11534336
+
+DHCP=no
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=managed
+ESSID=cope1.wleiden.net
+CHANNEL=1
+
+
+
+
+POLAR=Hor
+ANTENNA=bi-quad
+GAIN=7dBi
+DIRECTION=119
+BEAMWIDTH=70
+CABLE=?
+
+EW0
+
Index: branches/future-nodes/HNodeMark/wleiden.conf
===================================================================
--- branches/future-nodes/HNodeMark/wleiden.conf	(revision 863)
+++ branches/future-nodes/HNodeMark/wleiden.conf	(revision 863)
@@ -0,0 +1,27 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config HNodeMark
+$location="Professorenwijk, Particulier dak, Leiden zuid west";
+$master_ip='172.18.17.2';  
+$gw_open='closed';
+$nodetype='HNode';
+$nodename='Mark';
+
+$OS='FreeBSD';
+$labelpos='right';
+
+
+
+
+
+
+$X='94084';
+
+$Y='462601';
+$N='';
+$E='';
+
+$MODE="master";
+$ESSID="hnode.mark.wleiden.net";
Index: branches/future-nodes/HNodeQCG/cnode.conf
===================================================================
--- branches/future-nodes/HNodeQCG/cnode.conf	(revision 863)
+++ branches/future-nodes/HNodeQCG/cnode.conf	(revision 863)
@@ -0,0 +1,102 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeQcg
+
+$master_ip='172.24.0.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Qcg';
+$OS='FreeBSD';
+$labelpos='left';
+
+$NS_resolv="127.0.0.1 172.18.8.66 172.17.8.1";
+$NS_forward="172.18.8.66 172.17.8.1";
+
+$X='96764';
+$Y='465073';
+
+$config{'ep0'}=sprintf <<ED0;  # eth
+TYPE=ethernet
+IP=172.24.0.65/29
+
+DESC=Ethernet naar Qcg
+SDESC=eth0
+SPEED=10240000000
+
+#DHCP=68-70
+DHCP=no
+NAT=no
+
+OSPF_AREA=250
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=AP voor de buurt
+SDESC=ap-omni
+SPEED=11534336
+
+DHCP=10-60
+
+NAT=no
+
+OSPF_AREA=250
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=ap-omni.qcg.wleiden.net
+CHANNEL=1
+
+TXPOWER=20
+SENS=3
+
+POLAR=Vert
+ANTENNA=omni
+GAIN=9dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # link naar NodeJacob
+TYPE=wireless
+IP=172.16.0.150/30
+DESC=Link naar NodeJacob
+SDESC=2jacob
+SPEED=11534336
+POINT_TO_POINT=172.16.0.149
+
+NAT=no
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.149
+
+MODE=managed
+ESSID=ap-n.jacob.wleiden.net
+CHANNEL=11
+TXPOWER=20
+SENS=3
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=290
+BEAMWIDTH=0
+CABLE=1
+
+DHCP=no
+
+EW1
+
+
Index: branches/future-nodes/HNodeQCG/wleiden.conf
===================================================================
--- branches/future-nodes/HNodeQCG/wleiden.conf	(revision 863)
+++ branches/future-nodes/HNodeQCG/wleiden.conf	(revision 863)
@@ -0,0 +1,30 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config HNodeQCG
+$location="Leyhof, Particulier dak, Leiderdorp noord-oost";
+$master_ip='172.21.128.5';  
+$gw_open='closed';
+$nodetype='HNode';
+$nodename='QCG';
+
+$OS='Linux';
+$labelpos='right';
+
+
+
+
+
+
+$X='96764';
+$Y='465073';
+
+$N='';
+$E='';
+
+$MODE="managed";
+$ESSID="ap-n.jacob.wleiden.net";
+
+
+
Index: branches/future-nodes/HNodeRuben/wleiden.conf
===================================================================
--- branches/future-nodes/HNodeRuben/wleiden.conf	(revision 863)
+++ branches/future-nodes/HNodeRuben/wleiden.conf	(revision 863)
@@ -0,0 +1,120 @@
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config HNodeRuben 
+$location="Professorenwijk, Particulier dak, Leiden zuid west";
+$master_ip='172.18.19.1';  
+$gw_open='closed';
+$nodetype='HNode';
+$nodename='Ruben';
+
+$AGGREGATE=24;
+$OS='FreeBSD';
+$labelpos='right';
+
+$X='094876';
+$Y='463101';
+
+$N='';
+$E='';
+
+$MODE="master";
+$ESSID="hnode.ruben.wleiden.net";
+#
+#
+
+$config{'sis0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.18.19.65/28
+
+DESC=Ethernet naar utp Ruben 
+SDESC=sis0
+SPEED=10240000000
+
+DHCP=no
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+
+
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=Omni voor de buurt
+SDESC=omni
+SPEED=11534336
+
+DHCP=10-60
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=omni.ruben0.wleiden.net
+CHANNEL=1
+
+
+POLAR=Ver
+ANTENNA=omni
+GAIN=9dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+HEIGTH=14
+
+EW0
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Cetim3 
+TYPE=wireless
+IP=172.16.0.206/30
+DESC=Link naar Cetim3 
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.205
+
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.205
+
+MODE=managed
+ESSID=il-zo.cetim3.wleiden.net
+CHANNEL=9
+
+
+
+POLAR=hor
+ANTENNA=sd15
+GAIN=14dBi
+DIRECTION=90
+BEAMWIDTH=30
+CABLE=1
+HEIGTH=13
+
+DHCP=no
+
+EW1
+
+
+$config{'wi2'}=sprintf <<EW2;  # link naar Bona? 
+
+TYPE=wireless
+IP=172.16.0.210/30
+DESC=Link naar Bona 
+SDESC=2cetim
+SPEED=11534336
+POINT_TO_POINT=172.16.0.209
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+MODE=managed
+ESSID=il.bona.wleiden.net
+CHANNEL=9
+
+EW2
Index: branches/future-nodes/HNodeThomas/wleiden.conf
===================================================================
--- branches/future-nodes/HNodeThomas/wleiden.conf	(revision 863)
+++ branches/future-nodes/HNodeThomas/wleiden.conf	(revision 863)
@@ -0,0 +1,23 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config HNodeThomas
+$location="Particulier dak, einde Rapenburg tegenover van der Werf park, Leiden";
+$master_ip='172.18.17.2';  
+$gw_open='closed';
+$nodetype='HNode';
+$nodename='Thomas';
+
+$OS='FreeBSD';
+$labelpos='right';
+
+
+$X='93510';
+$Y='463451';
+$N='';
+$E='';
+
+$MODE='master';
+$ESSID="ap-th.cnodehuub.wleiden.net";
+
Index: branches/future-nodes/demo1/wleiden.conf
===================================================================
--- branches/future-nodes/demo1/wleiden.conf	(revision 863)
+++ branches/future-nodes/demo1/wleiden.conf	(revision 863)
@@ -0,0 +1,110 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeMarten
+$location="Particulier dak, Leiden Zuid West";
+$master_ip='172.31.254.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='demo1';
+
+$OS='FreeBSD';
+
+
+
+
+
+
+$X='1';
+$Y='1';
+$N='1';
+$E='1';
+
+
+$config{'ed0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.31.254.65/28
+ROUTE=0.0.0.0/0 172.18.16.66
+
+DESC=Ethernet 
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=no
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+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
+GAIN=10dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+
+EW0
+
+
+$config{'wi1'}=sprintf <<EW1;  # 
+TYPE=wireless
+IP=172.16.0.254/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
+CHANNEL=9
+
+
+
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=?
+BEAMWIDTH=30
+CABLE=1
+
+DHCP=no
+
+EW1
+
+
Index: branches/future-nodes/demo2/wleiden.conf
===================================================================
--- branches/future-nodes/demo2/wleiden.conf	(revision 863)
+++ branches/future-nodes/demo2/wleiden.conf	(revision 863)
@@ -0,0 +1,110 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeMarten
+
+$master_ip='172.31.254.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='demo2';
+
+$OS='FreeBSD';
+
+
+
+
+
+
+$X='1';
+$Y='1';
+$N='1';
+$E='1';
+
+
+$config{'ed0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.31.254.65/28
+ROUTE=0.0.0.0/0 172.18.16.66
+
+DESC=Ethernet 
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=no
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+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
+GAIN=10dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+
+EW0
+
+
+$config{'wi1'}=sprintf <<EW1;  # 
+TYPE=wireless
+IP=172.16.0.253/30
+DESC=Link naar demo2
+SDESC=2demo2
+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
+CHANNEL=9
+
+
+
+POLAR=Vert
+ANTENNA=Quad
+GAIN=7dBi
+DIRECTION=?
+BEAMWIDTH=30
+CABLE=1
+
+DHCP=no
+
+EW1
+
+
Index: branches/future-nodes/list_ap
===================================================================
--- branches/future-nodes/list_ap	(revision 863)
+++ branches/future-nodes/list_ap	(revision 863)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# show all used interlink ip's from genesis
+# a bit crude, bit you get the idea.
+# hugo@meiland.nl , www.wirelessleiden.nl
+
+cat */* | grep 172.  > accesspoint_ip
+sort accesspoint_ip > accesspoint_ip_sorted
Index: branches/future-nodes/list_il
===================================================================
--- branches/future-nodes/list_il	(revision 863)
+++ branches/future-nodes/list_il	(revision 863)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# show all used interlink ip's from genesis
+# a bit crude, bit you get the idea.
+# hugo@meiland.nl , www.wirelessleiden.nl
+
+cat */* | grep 172.16.0 | grep POINT > interlink_ip
+sort interlink_ip > interlink_ip_sorted
Index: branches/future-nodes/proxy1/wleiden.conf
===================================================================
--- branches/future-nodes/proxy1/wleiden.conf	(revision 863)
+++ branches/future-nodes/proxy1/wleiden.conf	(revision 863)
@@ -0,0 +1,51 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeMarten
+
+$master_ip='172.18.16.67/29';  
+$gw_open='closed';
+$nodetype='proxy';
+$nodename='1';
+
+$OS='FreeBSD';
+
+$X='093241';
+$Y='463790';
+
+$config{'xl0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=192.168.1.2/24
+
+
+DESC=Ethernet 
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=no
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'xl1'}=sprintf <<ED1;  # Ethernet
+TYPE=ethernet
+IP=172.17.8.67/29
+
+
+DESC=Ethernet 
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=no
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED1
Index: branches/future-nodes/test/wleiden.conf
===================================================================
--- branches/future-nodes/test/wleiden.conf	(revision 863)
+++ branches/future-nodes/test/wleiden.conf	(revision 863)
@@ -0,0 +1,170 @@
+#
+
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeMarten
+
+$master_ip='10.0.1.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='test';
+
+$OS='FreeBSD';
+
+
+
+
+
+
+$X='1';
+$Y='1';
+$N='1';
+$E='1';
+
+
+$config{'sis0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=10.0.0.1/24
+ROUTE=0.0.0.0/0 10.0.0.10
+
+DESC=Ethernet 
+SDESC=eth0
+SPEED=10240000000
+
+DHCP=no
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI
+TYPE=wireless
+IP=$master_ip/24
+
+DESC=Omni voor de buurt
+SDESC=wi0
+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=wi0.test.wleiden.net
+CHANNEL=1
+
+
+
+POLAR=Ver
+ANTENNA=omni
+GAIN=10dBi
+DIRECTION=onbekent
+BEAMWIDTH=360
+CABLE=0
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # 
+TYPE=wireless
+IP=10.0.2.1/24
+DESC=wi in ap
+SDESC=wi1
+SPEED=11534336
+POINT_TO_POINT=10.0.0.1
+
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=10.0.0.1
+
+MODE=master
+ESSID=wi1.test.wleiden.net
+CHANNEL=9
+
+
+
+POLAR=Vert
+ANTENNA=onbekent
+GAIN=7dBi
+DIRECTION=?
+BEAMWIDTH=30
+CABLE=1
+
+DHCP=no
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # 
+TYPE=wireless
+IP=10.0.3.1/24
+DESC=wi in ap
+SDESC=wi2
+SPEED=11534336
+POINT_TO_POINT=10.0.0.1
+
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.253
+
+MODE=master
+ESSID=wi2.test.wleiden.net
+CHANNEL=6
+
+
+
+POLAR=Vert
+ANTENNA=onbekent
+GAIN=7dBi
+DIRECTION=?
+BEAMWIDTH=30
+CABLE=1
+
+DHCP=no
+
+EW2
+
+$config{'wi3'}=sprintf <<EW3;  # 
+TYPE=wireless
+IP=10.0.4.1/24
+DESC=wi in ap
+SDESC=wi3
+SPEED=11534336
+POINT_TO_POINT=10.0.0.1
+
+
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=1.1.1.1
+
+MODE=master
+ESSID=wi3.test.wleiden.net
+CHANNEL=13
+
+
+
+POLAR=Vert
+ANTENNA=onbekent
+GAIN=7dBi
+DIRECTION=?
+BEAMWIDTH=30
+CABLE=1
+
+DHCP=no
+
+EW3
+
+
Index: branches/future-nodes/vpnbox.test/wleiden.conf
===================================================================
--- branches/future-nodes/vpnbox.test/wleiden.conf	(revision 863)
+++ branches/future-nodes/vpnbox.test/wleiden.conf	(revision 863)
@@ -0,0 +1,66 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config vpnbox.test
+# to be used as a WirelessLeiden client, and to provide adsl/wl/homenet connections
+# hugo@meiland.nl , www.wirelessleiden.nl
+
+$master_ip='192.168.3.13';  
+$gw_open='open';
+$nodetype='cnode';
+$nodename='vpnbox';
+$labelpos='left';
+
+
+$OS='FreeBSD';
+
+
+
+
+
+
+$X='';
+$Y='';
+$N='';
+$E='';
+
+
+$config{'sis0'}=sprintf <<SIS0;  # Ethernet
+TYPE=ethernet
+IP=192.168.3.13/24
+
+DESC=Local home connection
+SDESC=sis0
+SPEED=10240000000
+
+#POINT_TO_POINT=172.19.128.66
+
+DHCP=no
+
+
+OSPF_AREA=no
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+SIS0
+
+$config{'sis1'}=sprintf <<SIS1;  # Ethernet
+TYPE=ethernet
+IP=192.168.2.2/24
+ROUTE=0.0.0.0/0 192.168.2.1
+
+DESC=Local adsl connection
+SDESC=sis1
+SPEED=10240000000
+
+#POINT_TO_POINT=172.19.128.66
+
+DHCP=no
+
+
+OSPF_AREA=no
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+SIS1
Index: branches/future-nodes/vuilnis/wleiden.conf
===================================================================
--- branches/future-nodes/vuilnis/wleiden.conf	(revision 863)
+++ branches/future-nodes/vuilnis/wleiden.conf	(revision 863)
@@ -0,0 +1,25 @@
+#
+
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config vuilnis
+
+$master_ip='10.0.1.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='vuilnis';
+
+$OS='FreeBSD';
+
+
+
+
+
+$X='1';
+$Y='1';
+$N='1';
+$E='1';
+
+
+