From f4c71fe70b41a6f813dc8bb83bdbed2dd1090cee Mon Sep 17 00:00:00 2001 From: io Date: Sat, 29 Sep 2018 21:47:01 +0200 Subject: [PATCH 1/3] Remove SKYNET-AS from resolver anycast route objects --- data/route/172.23.0.48_28 | 1 - data/route/172.23.0.53_32 | 2 -- data/route6/fd42:d42:d42:53::_64 | 2 -- 3 files changed, 5 deletions(-) diff --git a/data/route/172.23.0.48_28 b/data/route/172.23.0.48_28 index 6d45a76c7..9b6742466 100644 --- a/data/route/172.23.0.48_28 +++ b/data/route/172.23.0.48_28 @@ -5,7 +5,6 @@ origin: AS4242420123 origin: AS76198 origin: AS4242423723 mnt-by: KRSTN-MNT -mnt-by: SKYNET-MNT mnt-by: NIXNODES-MNT mnt-by: BLAZING-MNT mnt-by: XUU-MNT diff --git a/data/route/172.23.0.53_32 b/data/route/172.23.0.53_32 index 6016a86e3..1eb2460f4 100644 --- a/data/route/172.23.0.53_32 +++ b/data/route/172.23.0.53_32 @@ -4,12 +4,10 @@ origin: AS64737 origin: AS4242420123 origin: AS4242420122 origin: AS76198 -origin: AS4242420630 origin: AS4242423723 mnt-by: KRSTN-MNT mnt-by: NIXNODES-MNT mnt-by: BLAZING-MNT mnt-by: XUU-MNT mnt-by: GRMML-MNT -mnt-by: SKYNET-MNT source: DN42 diff --git a/data/route6/fd42:d42:d42:53::_64 b/data/route6/fd42:d42:d42:53::_64 index 84bc6186f..6a84d1f5b 100644 --- a/data/route6/fd42:d42:d42:53::_64 +++ b/data/route6/fd42:d42:d42:53::_64 @@ -5,12 +5,10 @@ origin: AS64737 origin: AS4242420022 origin: AS4242423955 origin: AS4242420123 -origin: AS4242420630 origin: AS4242423723 mnt-by: XUU-MNT mnt-by: BLAZING-MNT mnt-by: NIXNODES-MNT mnt-by: GRMML-MNT -mnt-by: SKYNET-MNT mnt-by: KRSTN-MNT source: DN42 From 6a7f7c9330c3893f91d75d187fe0a22ff7244958 Mon Sep 17 00:00:00 2001 From: io Date: Sat, 29 Sep 2018 21:55:14 +0200 Subject: [PATCH 2/3] Drop most of my objects My current hiatus will go on for at least a few more months. In the meantime, I'm returning my ASN and IPv4 allocations to the pool. I'd like to keep the IPv6 allocation though, the ULA space is large enough after all. --- data/as-set/AS4242420630:AS-PEER | 8 ------ data/as-set/AS4242420630:AS-TRANSIT | 38 ----------------------------- data/aut-num/AS4242420630 | 14 ----------- data/dns/io.dn42 | 9 ------- data/dns/resolver.dn42 | 9 ------- data/dns/skynet.dn42 | 11 --------- data/inetnum/172.20.28.64_27 | 11 --------- data/inetnum/172.20.46.144_28 | 10 -------- data/route/172.20.28.64_27 | 4 --- data/route/172.20.46.144_28 | 4 --- data/route6/fd10:49:4f::_48 | 4 --- 11 files changed, 122 deletions(-) delete mode 100644 data/as-set/AS4242420630:AS-PEER delete mode 100644 data/as-set/AS4242420630:AS-TRANSIT delete mode 100644 data/aut-num/AS4242420630 delete mode 100644 data/dns/io.dn42 delete mode 100644 data/dns/resolver.dn42 delete mode 100644 data/dns/skynet.dn42 delete mode 100644 data/inetnum/172.20.28.64_27 delete mode 100644 data/inetnum/172.20.46.144_28 delete mode 100644 data/route/172.20.28.64_27 delete mode 100644 data/route/172.20.46.144_28 delete mode 100644 data/route6/fd10:49:4f::_48 diff --git a/data/as-set/AS4242420630:AS-PEER b/data/as-set/AS4242420630:AS-PEER deleted file mode 100644 index 6e7c2598e..000000000 --- a/data/as-set/AS4242420630:AS-PEER +++ /dev/null @@ -1,8 +0,0 @@ -as-set: AS4242420630:AS-PEER -admin-c: IO-DN42 -tech-c: IO-DN42 -mnt-by: SKYNET-MNT -remarks: -remarks: WEITI-AS -members: AS4242423905 -source: DN42 diff --git a/data/as-set/AS4242420630:AS-TRANSIT b/data/as-set/AS4242420630:AS-TRANSIT deleted file mode 100644 index d57809043..000000000 --- a/data/as-set/AS4242420630:AS-TRANSIT +++ /dev/null @@ -1,38 +0,0 @@ -as-set: AS4242420630:AS-TRANSIT -admin-c: IO-DN42 -tech-c: IO-DN42 -mnt-by: SKYNET-MNT -remarks: -remarks: FBNW-AS -members: AS64647 -remarks: LUTOMA-AS -members: AS64719 -remarks: ALLO-AS -members: AS64752 -remarks: FFFRANKFURT-AS -members: AS65026 -remarks: FF3L-AS -members: AS65043 -remarks: CCCDA-AS -members: AS4242420101 -remarks: JRB0001 -members: AS4242420119 -remarks: GRMML-AS -members: AS4242420123 -remarks: NEURONET-AS -members: AS4242420138 -remarks: NIYAWE -members: AS4242421312 -remarks: MULTI -members: AS4242422499 -remarks: SISNET -members: AS4242422950 -remarks: ELOKO-AS -members: AS4242423298 -remarks: HESSENET-FR -members: AS4242423640 -remarks: KRSTN-AS -members: AS4242423723 -remarks: ANDI-AS -members: AS4242423991 -source: DN42 diff --git a/data/aut-num/AS4242420630 b/data/aut-num/AS4242420630 deleted file mode 100644 index 4526934ef..000000000 --- a/data/aut-num/AS4242420630 +++ /dev/null @@ -1,14 +0,0 @@ -aut-num: AS4242420630 -as-name: SKYNET-AS -admin-c: IO-DN42 -tech-c: IO-DN42 -mnt-by: SKYNET-MNT -remarks: Always open for peerings; contact io on the hackint IRC network. -remarks: Peers must agree to the Pico Peering Agreement v1.0 (cf. https://picopeer.net/). -remarks: Wireguard tunnels preferred, others on a case-by-case basis. -remarks: Peers are strongly encouraged to support IPv6. -mp-import: afi any.unicast from AS4242420630:AS-PEER accept PeerAS -mp-export: afi any.unicast to AS4242420630:AS-PEER announce AS4242420630 -mp-import: afi any.unicast from AS4242420630:AS-TRANSIT accept ANY -mp-export: afi any.unicast to AS4242420630:AS-TRANSIT announce ANY -source: DN42 diff --git a/data/dns/io.dn42 b/data/dns/io.dn42 deleted file mode 100644 index 2be62e8bd..000000000 --- a/data/dns/io.dn42 +++ /dev/null @@ -1,9 +0,0 @@ -domain: io.dn42 -descr: Skynet domain -admin-c: IO-DN42 -tech-c: IO-DN42 -mnt-by: SKYNET-MNT -nserver: ns1.skynet.dn42 -nserver: ns2.skynet.dn42 -status: CONNECT -source: DN42 diff --git a/data/dns/resolver.dn42 b/data/dns/resolver.dn42 deleted file mode 100644 index 433c45687..000000000 --- a/data/dns/resolver.dn42 +++ /dev/null @@ -1,9 +0,0 @@ -domain: resolver.dn42 -descr: List of dn42 anycast resolvers -admin-c: IO-DN42 -tech-c: IO-DN42 -mnt-by: SKYNET-MNT -nserver: ns1.skynet.dn42 -nserver: ns2.skynet.dn42 -status: CONNECT -source: DN42 diff --git a/data/dns/skynet.dn42 b/data/dns/skynet.dn42 deleted file mode 100644 index 1de35f50c..000000000 --- a/data/dns/skynet.dn42 +++ /dev/null @@ -1,11 +0,0 @@ -domain: skynet.dn42 -descr: Skynet domain -admin-c: IO-DN42 -tech-c: IO-DN42 -mnt-by: SKYNET-MNT -nserver: ns1.skynet.dn42 172.20.28.65 -nserver: ns1.skynet.dn42 fd10:49:4f:101::2 -nserver: ns2.skynet.dn42 172.20.28.69 -nserver: ns2.skynet.dn42 fd10:49:4f:102::2 -status: CONNECT -source: DN42 diff --git a/data/inetnum/172.20.28.64_27 b/data/inetnum/172.20.28.64_27 deleted file mode 100644 index fb7163950..000000000 --- a/data/inetnum/172.20.28.64_27 +++ /dev/null @@ -1,11 +0,0 @@ -inetnum: 172.20.28.64 - 172.20.28.95 -netname: SKYNET-NET4 -descr: Skynet IPv4 main network -cidr: 172.20.28.64/27 -admin-c: IO-DN42 -tech-c: IO-DN42 -mnt-by: SKYNET-MNT -status: ASSIGNED -nserver: ns1.skynet.dn42 -nserver: ns2.skynet.dn42 -source: DN42 diff --git a/data/inetnum/172.20.46.144_28 b/data/inetnum/172.20.46.144_28 deleted file mode 100644 index 7b90173e0..000000000 --- a/data/inetnum/172.20.46.144_28 +++ /dev/null @@ -1,10 +0,0 @@ -inetnum: 172.20.46.144 - 172.20.46.159 -netname: SKYNET-XFER4 -descr: Skynet IPv4 transfer network -cidr: 172.20.46.144/28 -admin-c: IO-DN42 -tech-c: IO-DN42 -mnt-by: SKYNET-MNT -status: ASSIGNED -bgp-status: ignore -source: DN42 diff --git a/data/route/172.20.28.64_27 b/data/route/172.20.28.64_27 deleted file mode 100644 index fd4f83ed9..000000000 --- a/data/route/172.20.28.64_27 +++ /dev/null @@ -1,4 +0,0 @@ -route: 172.20.28.64/27 -origin: AS4242420630 -mnt-by: SKYNET-MNT -source: DN42 diff --git a/data/route/172.20.46.144_28 b/data/route/172.20.46.144_28 deleted file mode 100644 index 84959e655..000000000 --- a/data/route/172.20.46.144_28 +++ /dev/null @@ -1,4 +0,0 @@ -route: 172.20.46.144/28 -origin: AS4242420630 -mnt-by: SKYNET-MNT -source: DN42 diff --git a/data/route6/fd10:49:4f::_48 b/data/route6/fd10:49:4f::_48 deleted file mode 100644 index 06fd710c7..000000000 --- a/data/route6/fd10:49:4f::_48 +++ /dev/null @@ -1,4 +0,0 @@ -route6: fd10:49:4f::/48 -origin: AS4242420630 -mnt-by: SKYNET-MNT -source: DN42 From 621f6710a64285d5353744bb36691c8dbf7d202d Mon Sep 17 00:00:00 2001 From: io Date: Sat, 29 Sep 2018 22:13:37 +0200 Subject: [PATCH 3/3] Remove stale SKYNET-AS references from various policies --- data/as-set/AS4242420123:AS-PEER | 1 - data/as-set/AS4242420138:AS-PEER | 2 -- data/aut-num/AS4242422499 | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/data/as-set/AS4242420123:AS-PEER b/data/as-set/AS4242420123:AS-PEER index 594730979..653108820 100644 --- a/data/as-set/AS4242420123:AS-PEER +++ b/data/as-set/AS4242420123:AS-PEER @@ -13,7 +13,6 @@ members: AS4242420245 members: AS4242420302 members: AS4242420442 members: AS4242420527 -members: AS4242420630 members: AS4242420789 members: AS4242421110 members: AS4242421114 diff --git a/data/as-set/AS4242420138:AS-PEER b/data/as-set/AS4242420138:AS-PEER index c61b14851..03dc166b2 100644 --- a/data/as-set/AS4242420138:AS-PEER +++ b/data/as-set/AS4242420138:AS-PEER @@ -11,8 +11,6 @@ remarks: florianbAT members: AS64647 remarks: gigga members: AS4242423974 -remarks: io -members: AS4242420630 remarks: jamie9898 members: AS4242423640 remarks: jonas diff --git a/data/aut-num/AS4242422499 b/data/aut-num/AS4242422499 index 927a7e743..11ceb0729 100644 --- a/data/aut-num/AS4242422499 +++ b/data/aut-num/AS4242422499 @@ -7,9 +7,9 @@ remarks: Import/export rules for all new (and recent) peerings mp-import: afi any.unicast from AS-MULTI1-TRANSIT accept ANY mp-export: afi any.unicast to AS-MULTI1-TRANSIT announce ANY remarks: Import/export rules for old peerings at UK router -mp-import: afi any.unicast from AS4242420630 AS4242421819 accept ANY +mp-import: afi any.unicast from AS4242421819 accept ANY mp-import: afi ipv4.unicast from AS64697 AS4242423640 accept ANY -mp-export: afi any.unicast to AS4242420630 AS4242421819 announce AS4242422499 AS64787 AS64697 +mp-export: afi any.unicast to AS4242421819 announce AS4242422499 AS64787 AS64697 mp-export: afi ipv4.unicast to AS64697 export ANY mp-export: afi ipv4.unicast to AS4242423640 announce AS4242422499 AS64787 AS64697 source: DN42