Lots of TG15-changes (-:

1 files changed, 163 insertions, 195 deletions

diff --git a/netlist.txt b/netlist.txt
index 00651c7..b87423b 100644
--- a/netlist.txt
+++ b/netlist.txt
@@ -1,197 +1,165 @@
+## start manuelle nett
+151.216.227.0/24 2a02:ed02:227::/64 fugleberget1
+151.216.229.0/24 2a02:ed02:229::/64 game
+151.216.254.0/24 2a02:ed02:254::/64 noc
+151.216.224.0/24 2a02:ed02:224::/64 logistikk
+151.216.234.0/24 2a02:ed02:234::/64 lounge
+151.216.192.0/19 2a02:ed02:192::/64 tg15-wlan
+151.216.249.0/26 2a02:ed02:249a::/64 southcam
+151.216.241.0/24 2a02:ed02:241::/64 motell
+151.216.240.0/24 2a02:ed02:240::/64 studio
+151.216.178.0/26 2a02:ed02:178a::/64 ap-distro0
+151.216.178.64/26 2a02:ed02:178b::/64 ap-distro1
+151.216.178.128/26 2a02:ed02:178c::/64 ap-distro2
+151.216.178.192/26 2a02:ed02:178d::/64 ap-distro3
+151.216.179.0/26 2a02:ed02:179a::/64 ap-distro4
+151.216.179.64/26 2a02:ed02:179b::/64 ap-distro5
+151.216.179.128/26 2a02:ed02:179c::/64 ap-distro6
+151.216.179.192/26 2a02:ed02:179d::/64 ap-distro7
+## slutt manuelle nett
 # make netlist.txt from switches.txt;
 #   cat switches.txt | perl -lne '($n,$v4,$v6)=split;print "$v4 $v6 $n";'
-151.216.177.0 25 komplett
-151.216.183.0 24 lounge
-151.216.185.0 25 flanke
-151.216.185.128 25 planke
-151.216.192.0 19 tg14-wlan
-151.216.224.0 24 logistikk
-151.216.225.0 24 hoa
-151.216.226.0 24 presse
-151.216.227.0 25 fugleberget1
-151.216.227.128 25 fugleberget2
-151.216.228.0 26 kompett
-151.216.228.64 26 kompott
-151.216.229.0 24 gayme
-151.216.230.0 24 info-dask
-151.216.232.0 25 resepsjon
-151.216.232.128 25 lavvo
-151.216.233.0 24 sponsor
-151.216.234.0 24 clientcam
-151.216.235.0 24 highlights
-151.216.240.0 24 medic
-151.216.242.0 24 scenegulv
-151.216.244.0 26 apenett01
-151.216.244.64 26 apenett02
-151.216.244.128 26 apenett03
-151.216.244.192 26 apenett04
-151.216.245.0 26 apenett05
-151.216.245.64 26 rohypnol
-151.216.245.128 27 apenett00
-151.216.245.160 27 apenett06
-151.216.245.192 27 apekatt
-151.216.250.0 24 bordell
-151.216.251.0 25 forsvarlig
-151.216.251.128 25 event-studio
-151.216.252.0 24 noc
-151.216.253.0 24 noc-server
-151.216.254.0 24 tele
-151.216.177.0 25 komplett
-# Start av switches.txt.crew
-151.216.163.0 26 creative1-1
-151.216.163.64 26 creative2-1
-151.216.163.128 26 creative3-1
-151.216.163.192 26 creative4-1
-151.216.164.0 26 creative4-2
-151.216.164.64 26 creative5-1
-151.216.164.128 26 creative5-2
-151.216.164.192 26 creative6-1
-151.216.165.0 26 creative6-2
-151.216.165.64 26 creative7-1
-151.216.165.128 26 creative7-2
-151.216.165.192 26 creative8-1
-151.216.166.0 26 creative8-2
-151.216.166.64 26 crew1-1
-151.216.166.128 26 crew2-1
-151.216.166.192 26 crew2-2
-151.216.167.0 26 crew3-1
-151.216.167.64 26 crew3-2
-151.216.167.128 26 crew4-1
-151.216.167.192 26 crew4-2
-# Slutt av switches.txt.crew
-# Start av switches.txt fra planning.cpp
-151.216.129.0 26 e1-3
-151.216.129.64 26 e1-4
-151.216.129.128 26 e3-3
-151.216.129.192 26 e3-4
-151.216.130.0 26 e5-3
-151.216.130.64 26 e5-4
-151.216.130.128 26 e7-3
-151.216.130.192 26 e7-4
-151.216.131.0 26 e9-3
-151.216.131.64 26 e9-4
-151.216.131.128 26 e11-1
-151.216.131.192 26 e11-2
-151.216.132.0 26 e11-3
-151.216.132.64 26 e11-4
-151.216.132.128 26 e13-1
-151.216.132.192 26 e13-2
-151.216.133.0 26 e13-3
-151.216.133.64 26 e13-4
-151.216.133.128 26 e15-1
-151.216.133.192 26 e15-2
-151.216.134.0 26 e15-3
-151.216.134.64 26 e15-4
-151.216.134.128 26 e17-1
-151.216.134.192 26 e17-2
-151.216.135.0 26 e17-3
-151.216.135.64 26 e17-4
-151.216.135.128 26 e19-1
-151.216.135.192 26 e19-2
-151.216.136.0 26 e19-3
-151.216.136.64 26 e19-4
-151.216.136.128 26 e21-1
-151.216.136.192 26 e21-2
-151.216.137.0 26 e21-3
-151.216.137.64 26 e21-4
-151.216.137.128 26 e23-1
-151.216.137.192 26 e23-2
-151.216.138.0 26 e23-3
-151.216.138.64 26 e23-4
-151.216.138.128 26 e25-1
-151.216.138.192 26 e25-2
-151.216.139.0 26 e25-3
-151.216.139.64 26 e25-4
-151.216.139.128 26 e27-1
-151.216.139.192 26 e27-2
-151.216.140.0 26 e29-1
-151.216.140.64 26 e29-2
-151.216.140.128 26 e31-1
-151.216.140.192 26 e31-2
-151.216.141.0 26 e33-1
-151.216.141.64 26 e33-2
-151.216.141.128 26 e35-1
-151.216.141.192 26 e35-2
-151.216.142.0 26 e37-1
-151.216.142.64 26 e37-2
-151.216.142.128 26 e39-1
-151.216.142.192 26 e39-2
-151.216.143.0 26 e41-1
-151.216.143.64 26 e41-2
-151.216.143.128 26 e43-1
-151.216.143.192 26 e43-2
-151.216.144.0 26 e43-3
-151.216.144.64 26 e43-4
-151.216.144.128 26 e45-1
-151.216.144.192 26 e45-2
-151.216.145.0 26 e45-3
-151.216.145.64 26 e45-4
-151.216.145.128 26 e47-1
-151.216.145.192 26 e47-2
-151.216.146.0 26 e47-3
-151.216.146.64 26 e47-4
-151.216.146.128 26 e49-1
-151.216.146.192 26 e49-2
-151.216.147.0 26 e49-3
-151.216.147.64 26 e49-4
-151.216.147.128 26 e51-1
-151.216.147.192 26 e51-2
-151.216.148.0 26 e51-3
-151.216.148.64 26 e51-4
-151.216.148.128 26 e53-1
-151.216.148.192 26 e53-2
-151.216.149.0 26 e53-3
-151.216.149.64 26 e53-4
-151.216.149.128 26 e55-1
-151.216.149.192 26 e55-2
-151.216.150.0 26 e55-3
-151.216.150.64 26 e55-4
-151.216.150.128 26 e57-1
-151.216.150.192 26 e57-2
-151.216.151.0 26 e57-3
-151.216.151.64 26 e57-4
-151.216.151.128 26 e59-1
-151.216.151.192 26 e59-2
-151.216.152.0 26 e59-3
-151.216.152.64 26 e59-4
-151.216.152.128 26 e61-1
-151.216.152.192 26 e61-2
-151.216.153.0 26 e61-3
-151.216.153.64 26 e61-4
-151.216.153.128 26 e63-1
-151.216.153.192 26 e63-2
-151.216.154.0 26 e63-3
-151.216.154.64 26 e63-4
-151.216.154.128 26 e65-1
-151.216.154.192 26 e65-2
-151.216.155.0 26 e65-3
-151.216.155.64 26 e65-4
-151.216.155.128 26 e67-1
-151.216.155.192 26 e67-2
-151.216.156.0 26 e67-3
-151.216.156.64 26 e67-4
-151.216.156.128 26 e69-1
-151.216.156.192 26 e69-2
-151.216.157.0 26 e69-3
-151.216.157.64 26 e69-4
-151.216.157.128 26 e71-1
-151.216.157.192 26 e71-2
-151.216.158.0 26 e71-3
-151.216.158.64 26 e71-4
-151.216.158.128 26 e73-1
-151.216.158.192 26 e73-2
-151.216.159.0 26 e73-3
-151.216.159.64 26 e73-4
-151.216.159.128 26 e75-1
-151.216.159.192 26 e75-2
-151.216.160.0 26 e75-3
-151.216.160.64 26 e75-4
-151.216.160.128 26 e77-1
-151.216.160.192 26 e77-2
-151.216.161.0 26 e77-3
-151.216.161.64 26 e77-4
-151.216.161.128 26 e79-1
-151.216.161.192 26 e79-2
-151.216.162.0 26 e81-1
-151.216.162.64 26 e81-2
-# Slutt av switches.txt fra planning.cpp
+## start switches.txt
+151.216.129.0/26 2a02:ed02:129a::/64 e1-3
+151.216.129.64/26 2a02:ed02:129b::/64 e3-3
+151.216.129.128/26 2a02:ed02:129c::/64 e3-4
+151.216.129.192/26 2a02:ed02:129d::/64 e5-2
+151.216.130.0/26 2a02:ed02:130a::/64 e5-3
+151.216.130.64/26 2a02:ed02:130b::/64 e5-4
+151.216.130.128/26 2a02:ed02:130c::/64 e7-2
+151.216.130.192/26 2a02:ed02:130d::/64 e7-3
+151.216.131.0/26 2a02:ed02:131a::/64 e7-4
+151.216.131.64/26 2a02:ed02:131b::/64 e9-2
+151.216.131.128/26 2a02:ed02:131c::/64 e9-3
+151.216.131.192/26 2a02:ed02:131d::/64 e9-4
+151.216.132.0/26 2a02:ed02:132a::/64 e11-1
+151.216.132.64/26 2a02:ed02:132b::/64 e11-2
+151.216.132.128/26 2a02:ed02:132c::/64 e11-3
+151.216.132.192/26 2a02:ed02:132d::/64 e11-4
+151.216.133.0/26 2a02:ed02:133a::/64 e13-1
+151.216.133.64/26 2a02:ed02:133b::/64 e13-2
+151.216.133.128/26 2a02:ed02:133c::/64 e13-3
+151.216.133.192/26 2a02:ed02:133d::/64 e13-4
+151.216.134.0/26 2a02:ed02:134a::/64 e15-1
+151.216.134.64/26 2a02:ed02:134b::/64 e15-2
+151.216.134.128/26 2a02:ed02:134c::/64 e15-3
+151.216.134.192/26 2a02:ed02:134d::/64 e15-4
+151.216.135.0/26 2a02:ed02:135a::/64 e17-1
+151.216.135.64/26 2a02:ed02:135b::/64 e17-2
+151.216.135.128/26 2a02:ed02:135c::/64 e17-3
+151.216.135.192/26 2a02:ed02:135d::/64 e17-4
+151.216.136.0/26 2a02:ed02:136a::/64 e19-1
+151.216.136.64/26 2a02:ed02:136b::/64 e19-2
+151.216.136.128/26 2a02:ed02:136c::/64 e19-3
+151.216.136.192/26 2a02:ed02:136d::/64 e19-4
+151.216.137.0/26 2a02:ed02:137a::/64 e21-1
+151.216.137.64/26 2a02:ed02:137b::/64 e21-2
+151.216.137.128/26 2a02:ed02:137c::/64 e21-3
+151.216.137.192/26 2a02:ed02:137d::/64 e21-4
+151.216.138.0/26 2a02:ed02:138a::/64 e23-1
+151.216.138.64/26 2a02:ed02:138b::/64 e23-2
+151.216.138.128/26 2a02:ed02:138c::/64 e23-3
+151.216.138.192/26 2a02:ed02:138d::/64 e23-4
+151.216.139.0/26 2a02:ed02:139a::/64 e25-1
+151.216.139.64/26 2a02:ed02:139b::/64 e25-2
+151.216.139.128/26 2a02:ed02:139c::/64 e25-3
+151.216.139.192/26 2a02:ed02:139d::/64 e25-4
+151.216.140.0/26 2a02:ed02:140a::/64 e27-1
+151.216.140.64/26 2a02:ed02:140b::/64 e27-2
+151.216.140.128/26 2a02:ed02:140c::/64 e27-3
+151.216.140.192/26 2a02:ed02:140d::/64 e27-4
+151.216.141.0/26 2a02:ed02:141a::/64 e27-1
+151.216.141.64/26 2a02:ed02:141b::/64 e27-2
+151.216.141.128/26 2a02:ed02:141c::/64 e29-1
+151.216.141.192/26 2a02:ed02:141d::/64 e29-2
+151.216.142.0/26 2a02:ed02:142a::/64 e31-1
+151.216.142.64/26 2a02:ed02:142b::/64 e31-2
+151.216.142.128/26 2a02:ed02:142c::/64 e33-1
+151.216.142.192/26 2a02:ed02:142d::/64 e33-2
+151.216.143.0/26 2a02:ed02:143a::/64 e35-1
+151.216.143.64/26 2a02:ed02:143b::/64 e35-2
+151.216.143.128/26 2a02:ed02:143c::/64 e37-1
+151.216.143.192/26 2a02:ed02:143d::/64 e37-2
+151.216.144.0/26 2a02:ed02:144a::/64 e39-1
+151.216.144.64/26 2a02:ed02:144b::/64 e39-2
+151.216.144.128/26 2a02:ed02:144c::/64 e41-1
+151.216.144.192/26 2a02:ed02:144d::/64 e41-2
+151.216.145.0/26 2a02:ed02:145a::/64 e43-1
+151.216.145.64/26 2a02:ed02:145b::/64 e43-2
+151.216.145.128/26 2a02:ed02:145c::/64 e45-1
+151.216.145.192/26 2a02:ed02:145d::/64 e45-2
+151.216.146.0/26 2a02:ed02:146a::/64 e45-3
+151.216.146.64/26 2a02:ed02:146b::/64 e45-4
+151.216.146.128/26 2a02:ed02:146c::/64 e47-1
+151.216.146.192/26 2a02:ed02:146d::/64 e47-2
+151.216.147.0/26 2a02:ed02:147a::/64 e47-3
+151.216.147.64/26 2a02:ed02:147b::/64 e47-4
+151.216.147.128/26 2a02:ed02:147c::/64 e49-1
+151.216.147.192/26 2a02:ed02:147d::/64 e49-2
+151.216.148.0/26 2a02:ed02:148a::/64 e49-3
+151.216.148.64/26 2a02:ed02:148b::/64 e49-4
+151.216.148.128/26 2a02:ed02:148c::/64 e51-1
+151.216.148.192/26 2a02:ed02:148d::/64 e51-2
+151.216.149.0/26 2a02:ed02:149a::/64 e51-3
+151.216.149.64/26 2a02:ed02:149b::/64 e51-4
+151.216.149.128/26 2a02:ed02:149c::/64 e53-1
+151.216.149.192/26 2a02:ed02:149d::/64 e53-2
+151.216.150.0/26 2a02:ed02:150a::/64 e53-3
+151.216.150.64/26 2a02:ed02:150b::/64 e53-4
+151.216.150.128/26 2a02:ed02:150c::/64 e55-1
+151.216.150.192/26 2a02:ed02:150d::/64 e55-2
+151.216.151.0/26 2a02:ed02:151a::/64 e55-3
+151.216.151.64/26 2a02:ed02:151b::/64 e55-4
+151.216.151.128/26 2a02:ed02:151c::/64 e57-1
+151.216.151.192/26 2a02:ed02:151d::/64 e57-2
+151.216.152.0/26 2a02:ed02:152a::/64 e57-3
+151.216.152.64/26 2a02:ed02:152b::/64 e57-4
+151.216.152.128/26 2a02:ed02:152c::/64 e59-1
+151.216.152.192/26 2a02:ed02:152d::/64 e59-2
+151.216.153.0/26 2a02:ed02:153a::/64 e59-3
+151.216.153.64/26 2a02:ed02:153b::/64 e59-4
+151.216.153.128/26 2a02:ed02:153c::/64 e61-1
+151.216.153.192/26 2a02:ed02:153d::/64 e61-2
+151.216.154.0/26 2a02:ed02:154a::/64 e61-3
+151.216.154.64/26 2a02:ed02:154b::/64 e61-4
+151.216.154.128/26 2a02:ed02:154c::/64 e63-1
+151.216.154.192/26 2a02:ed02:154d::/64 e63-2
+151.216.155.0/26 2a02:ed02:155a::/64 e63-3
+151.216.155.64/26 2a02:ed02:155b::/64 e63-4
+151.216.155.128/26 2a02:ed02:155c::/64 e65-1
+151.216.155.192/26 2a02:ed02:155d::/64 e65-2
+151.216.156.0/26 2a02:ed02:156a::/64 e65-3
+151.216.156.64/26 2a02:ed02:156b::/64 e65-4
+151.216.156.128/26 2a02:ed02:156c::/64 e67-1
+151.216.156.192/26 2a02:ed02:156d::/64 e67-2
+151.216.157.0/26 2a02:ed02:157a::/64 e67-3
+151.216.157.64/26 2a02:ed02:157b::/64 e67-4
+151.216.157.128/26 2a02:ed02:157c::/64 e69-1
+151.216.157.192/26 2a02:ed02:157d::/64 e69-2
+151.216.158.0/26 2a02:ed02:158a::/64 e69-3
+151.216.158.64/26 2a02:ed02:158b::/64 e69-4
+151.216.158.128/26 2a02:ed02:158c::/64 e71-1
+151.216.158.192/26 2a02:ed02:158d::/64 e71-2
+151.216.159.0/26 2a02:ed02:159a::/64 e71-3
+151.216.159.64/26 2a02:ed02:159b::/64 e71-4
+151.216.159.128/26 2a02:ed02:159c::/64 e73-1
+151.216.159.192/26 2a02:ed02:159d::/64 e73-2
+151.216.160.0/26 2a02:ed02:160a::/64 e73-3
+151.216.160.64/26 2a02:ed02:160b::/64 e73-4
+151.216.160.128/26 2a02:ed02:160c::/64 e75-1
+151.216.160.192/26 2a02:ed02:160d::/64 e75-2
+151.216.161.0/26 2a02:ed02:161a::/64 e75-3
+151.216.161.64/26 2a02:ed02:161b::/64 e75-4
+151.216.161.128/26 2a02:ed02:161c::/64 e77-1
+151.216.161.192/26 2a02:ed02:161d::/64 e77-2
+151.216.162.0/26 2a02:ed02:162a::/64 e77-3
+151.216.162.64/26 2a02:ed02:162b::/64 e77-4
+151.216.162.128/26 2a02:ed02:162c::/64 e79-1
+151.216.162.192/26 2a02:ed02:162d::/64 e79-2
+151.216.163.0/26 2a02:ed02:163a::/64 e79-3
+151.216.163.64/26 2a02:ed02:163b::/64 e79-4
+151.216.163.128/26 2a02:ed02:163c::/64 e81-1
+151.216.163.192/26 2a02:ed02:163d::/64 e81-2
+151.216.164.0/26 2a02:ed02:164a::/64 e83-1
+151.216.164.64/26 2a02:ed02:164b::/64 e83-2
+## slutt switches.txt