From 211ffc4dc68466a22e54db660d36112d2c78b9f0 Mon Sep 17 00:00:00 2001 From: Maraun Date: Sun, 5 Apr 2020 13:18:32 +0200 Subject: [PATCH 01/40] Remarks for peering --- data/aut-num/AS4242422225 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/aut-num/AS4242422225 b/data/aut-num/AS4242422225 index f35bff0f5..3564aaf42 100644 --- a/data/aut-num/AS4242422225 +++ b/data/aut-num/AS4242422225 @@ -2,5 +2,8 @@ aut-num: AS4242422225 as-name: MARAUN-AS admin-c: MARAUN-DN42 tech-c: MARAUN-DN42 -mnt-by: MARAUN-MNT +remarks: Peers are welcome, contact maraun@web.de +remarks: OpenVPN on all nodes, wireguard @ dn42-de.maraun.de +remarks: RFC7999 are not supported yet +mnt-by: MARAUN- source: DN42 From e7581931181d7623ba667f29464a5b10e8ad6605 Mon Sep 17 00:00:00 2001 From: Maraun Date: Fri, 10 Apr 2020 18:35:36 +0200 Subject: [PATCH 02/40] Create as-set as example --- data/as-set/AS4242422225:AS-PEER | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 data/as-set/AS4242422225:AS-PEER diff --git a/data/as-set/AS4242422225:AS-PEER b/data/as-set/AS4242422225:AS-PEER new file mode 100644 index 000000000..3c83f51de --- /dev/null +++ b/data/as-set/AS4242422225:AS-PEER @@ -0,0 +1,29 @@ +as-set: AS4242422225:AS-PEER +admin-c: MARAUN-DN42 +tech-c: MARAUN-DN42 +mnt-by: MARAUN-MNT +remarks: burble +members: AS4242422601 +remarks: dynos01 +members: AS4242423360 +remarks: grc +members: AS4242422602 +remarks: kioubit +members: AS4242423914 +remarks: sigterm +members: AS4242423754 +remarks: iedon +members: AS4242422189 +remarks: lfnet +members: AS4242423513 +remarks: mgl +members: AS4242420181 +remarks: hex +members: AS4242423078 +remarks: waxman +members: AS4242422227 +remarks: gatuno +members: AS4242420180 +remarks: sunnet +members: AS4242423088 +source: DN42 From 7cfb4a953cb42e364ed8dfd24dd9d2bd44ca9dc1 Mon Sep 17 00:00:00 2001 From: Maraun Date: Fri, 10 Apr 2020 18:38:10 +0200 Subject: [PATCH 03/40] Correct typo at mnt-by --- data/aut-num/AS4242422225 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/aut-num/AS4242422225 b/data/aut-num/AS4242422225 index 3564aaf42..d871435b0 100644 --- a/data/aut-num/AS4242422225 +++ b/data/aut-num/AS4242422225 @@ -5,5 +5,5 @@ tech-c: MARAUN-DN42 remarks: Peers are welcome, contact maraun@web.de remarks: OpenVPN on all nodes, wireguard @ dn42-de.maraun.de remarks: RFC7999 are not supported yet -mnt-by: MARAUN- +mnt-by: MARAUN-MNT source: DN42 From 622a749ca939b0edaf72d19873ede13a93c05fab Mon Sep 17 00:00:00 2001 From: jackcooku Date: Fri, 12 Jun 2020 03:06:58 +0000 Subject: [PATCH 04/40] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20'data/mntner/STEVEYI?= =?UTF-8?q?-MNT'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/mntner/STEVEYI-MNT | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 data/mntner/STEVEYI-MNT diff --git a/data/mntner/STEVEYI-MNT b/data/mntner/STEVEYI-MNT new file mode 100644 index 000000000..6a4e65a9b --- /dev/null +++ b/data/mntner/STEVEYI-MNT @@ -0,0 +1,6 @@ +mntner: STEVEYI-MNT +descr: YI +admin-c: STEVEYI-DN42 +tech-c: STEVEYI-DN42 +mnt-by: STEVEYI-MNT +source: DN42 \ No newline at end of file From cd5b9dc08de2b12fe676800a23f8def95c34b442 Mon Sep 17 00:00:00 2001 From: jackcooku Date: Fri, 12 Jun 2020 03:16:37 +0000 Subject: [PATCH 05/40] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20'data/person/STEVEYI?= =?UTF-8?q?-DN42'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/person/STEVEYI-DN42 | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/person/STEVEYI-DN42 diff --git a/data/person/STEVEYI-DN42 b/data/person/STEVEYI-DN42 new file mode 100644 index 000000000..eef7aad2a --- /dev/null +++ b/data/person/STEVEYI-DN42 @@ -0,0 +1,5 @@ +person: STEVEYI +contact: noc-dns42@steveyi.net +nic-hdl: STEVEYI-DN42 +mnt-by: STEVEYI-MNT +source: DN42 \ No newline at end of file From 65043d0b70aecde187273974475f76310d6aec35 Mon Sep 17 00:00:00 2001 From: jackcooku Date: Fri, 12 Jun 2020 03:17:47 +0000 Subject: [PATCH 06/40] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'data/mntner/YI-MNT'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/mntner/STEVEYI-MNT | 6 ------ data/mntner/YI-MNT | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 data/mntner/STEVEYI-MNT create mode 100644 data/mntner/YI-MNT diff --git a/data/mntner/STEVEYI-MNT b/data/mntner/STEVEYI-MNT deleted file mode 100644 index 6a4e65a9b..000000000 --- a/data/mntner/STEVEYI-MNT +++ /dev/null @@ -1,6 +0,0 @@ -mntner: STEVEYI-MNT -descr: YI -admin-c: STEVEYI-DN42 -tech-c: STEVEYI-DN42 -mnt-by: STEVEYI-MNT -source: DN42 \ No newline at end of file diff --git a/data/mntner/YI-MNT b/data/mntner/YI-MNT new file mode 100644 index 000000000..f8cfce13d --- /dev/null +++ b/data/mntner/YI-MNT @@ -0,0 +1,6 @@ +mntner: YI-MNT +descr: YI +admin-c: YI-DN42 +tech-c: YI-DN42 +mnt-by: YI-MNT +source: DN42 \ No newline at end of file From cabcb8b6d741e12a2eed4a701d920b55adee4ac7 Mon Sep 17 00:00:00 2001 From: jackcooku Date: Fri, 12 Jun 2020 03:18:06 +0000 Subject: [PATCH 07/40] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'data/person/YI-DN42?= =?UTF-8?q?'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/person/STEVEYI-DN42 | 5 ----- data/person/YI-DN42 | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 data/person/STEVEYI-DN42 create mode 100644 data/person/YI-DN42 diff --git a/data/person/STEVEYI-DN42 b/data/person/STEVEYI-DN42 deleted file mode 100644 index eef7aad2a..000000000 --- a/data/person/STEVEYI-DN42 +++ /dev/null @@ -1,5 +0,0 @@ -person: STEVEYI -contact: noc-dns42@steveyi.net -nic-hdl: STEVEYI-DN42 -mnt-by: STEVEYI-MNT -source: DN42 \ No newline at end of file diff --git a/data/person/YI-DN42 b/data/person/YI-DN42 new file mode 100644 index 000000000..56e88f6b8 --- /dev/null +++ b/data/person/YI-DN42 @@ -0,0 +1,5 @@ +person: YI +contact: noc-dns42@yiy.tw +nic-hdl: YI-DN42 +mnt-by: YI-MNT +source: DN42 \ No newline at end of file From 4cd12c887c739377900279eb13192f35ca23a2c9 Mon Sep 17 00:00:00 2001 From: SteveYi Yo Date: Fri, 12 Jun 2020 11:54:03 +0800 Subject: [PATCH 08/40] AS4242421214 Create --- data/aut-num/AS4242421214 | 6 ++++++ data/dns/yi.dn42 | 6 ++++++ data/inetnum/172.20.12.0_27 | 10 ++++++++++ data/route/172.20.12.0_27 | 4 ++++ 4 files changed, 26 insertions(+) create mode 100644 data/aut-num/AS4242421214 create mode 100644 data/dns/yi.dn42 create mode 100644 data/inetnum/172.20.12.0_27 create mode 100644 data/route/172.20.12.0_27 diff --git a/data/aut-num/AS4242421214 b/data/aut-num/AS4242421214 new file mode 100644 index 000000000..78a338be3 --- /dev/null +++ b/data/aut-num/AS4242421214 @@ -0,0 +1,6 @@ +aut-num: AS4242421214 +as-name: YiNetwork At DN42 +admin-c: YI-DN42 +tech-c: YI-DN42 +mnt-by: YI-MNT +source: DN42 diff --git a/data/dns/yi.dn42 b/data/dns/yi.dn42 new file mode 100644 index 000000000..877879243 --- /dev/null +++ b/data/dns/yi.dn42 @@ -0,0 +1,6 @@ +domain: yi.dn42 +nserver: dns1.yi.dn42 172.20.12.0 +admin-c: YI-DN42 +tech-c: YI-DN42 +mnt-by: YI-MNT +source: DN42 diff --git a/data/inetnum/172.20.12.0_27 b/data/inetnum/172.20.12.0_27 new file mode 100644 index 000000000..56da83a93 --- /dev/null +++ b/data/inetnum/172.20.12.0_27 @@ -0,0 +1,10 @@ +inetnum: 172.20.12.0 - 172.20.12.31 +cidr: 172.20.12.0/27 +netname: YI-NET-001 +descr: YI-NET-001 +country: TW +admin-c: YI-DN42 +tech-c: YI-DN42 +mnt-by: YI-MNT +status: ASSIGNED +source: DN42 diff --git a/data/route/172.20.12.0_27 b/data/route/172.20.12.0_27 new file mode 100644 index 000000000..44d60126c --- /dev/null +++ b/data/route/172.20.12.0_27 @@ -0,0 +1,4 @@ +route: 172.20.12.0/27 +origin: AS4242421214 +mnt-by: YI-MNT +source: DN42 From 83923ff7d00c354818f5a502251abc7bcad0c125 Mon Sep 17 00:00:00 2001 From: SteveYi Yo Date: Fri, 12 Jun 2020 15:42:40 +0800 Subject: [PATCH 09/40] Changes to be committed: renamed: data/inetnum/172.20.12.0_27 -> data/inetnum/10.12.14.0_27 renamed: data/route/172.20.12.0_27 -> data/route/10.12.14.0_27 --- data/inetnum/{172.20.12.0_27 => 10.12.14.0_27} | 4 ++-- data/route/{172.20.12.0_27 => 10.12.14.0_27} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename data/inetnum/{172.20.12.0_27 => 10.12.14.0_27} (73%) rename data/route/{172.20.12.0_27 => 10.12.14.0_27} (70%) diff --git a/data/inetnum/172.20.12.0_27 b/data/inetnum/10.12.14.0_27 similarity index 73% rename from data/inetnum/172.20.12.0_27 rename to data/inetnum/10.12.14.0_27 index 56da83a93..4b04b6cd3 100644 --- a/data/inetnum/172.20.12.0_27 +++ b/data/inetnum/10.12.14.0_27 @@ -1,5 +1,5 @@ -inetnum: 172.20.12.0 - 172.20.12.31 -cidr: 172.20.12.0/27 +inetnum: 10.12.14.0 - 10.12.14.31 +cidr: 10.12.14.0_27 netname: YI-NET-001 descr: YI-NET-001 country: TW diff --git a/data/route/172.20.12.0_27 b/data/route/10.12.14.0_27 similarity index 70% rename from data/route/172.20.12.0_27 rename to data/route/10.12.14.0_27 index 44d60126c..92ec7089b 100644 --- a/data/route/172.20.12.0_27 +++ b/data/route/10.12.14.0_27 @@ -1,4 +1,4 @@ -route: 172.20.12.0/27 +route: 10.12.14.0_27 origin: AS4242421214 mnt-by: YI-MNT source: DN42 From d0992181c345e299d7569b4b018c8a13073a9a9d Mon Sep 17 00:00:00 2001 From: Bastien Durel Date: Fri, 12 Jun 2020 15:11:34 +0200 Subject: [PATCH 10/40] New user: GEEKWU --- data/aut-num/AS4242421021 | 7 +++++++ data/inet6num/fd55:eedf:a5c0::_48 | 10 ++++++++++ data/inetnum/172.20.55.128_27 | 10 ++++++++++ data/mntner/GEEKWU-MNT | 6 ++++++ data/person/GEEKWU-DN42 | 5 +++++ data/route/172.20.55.128_27 | 4 ++++ data/route6/fd55:eedf:a5c0::_48 | 4 ++++ 7 files changed, 46 insertions(+) create mode 100644 data/aut-num/AS4242421021 create mode 100644 data/inet6num/fd55:eedf:a5c0::_48 create mode 100644 data/inetnum/172.20.55.128_27 create mode 100644 data/mntner/GEEKWU-MNT create mode 100644 data/person/GEEKWU-DN42 create mode 100644 data/route/172.20.55.128_27 create mode 100644 data/route6/fd55:eedf:a5c0::_48 diff --git a/data/aut-num/AS4242421021 b/data/aut-num/AS4242421021 new file mode 100644 index 000000000..7cb0e26ac --- /dev/null +++ b/data/aut-num/AS4242421021 @@ -0,0 +1,7 @@ +aut-num: AS4242421021 +as-name: GEEKWU-AS +descr: GEEKWU's AS +admin-c: GEEKWU-DN42 +tech-c: GEEKWU-DN42 +mnt-by: GEEKWU-MNT +source: DN42 diff --git a/data/inet6num/fd55:eedf:a5c0::_48 b/data/inet6num/fd55:eedf:a5c0::_48 new file mode 100644 index 000000000..42371079e --- /dev/null +++ b/data/inet6num/fd55:eedf:a5c0::_48 @@ -0,0 +1,10 @@ +inet6num: fd55:eedf:a5c0:0000:0000:0000:0000:0000 - fd55:eedf:a5c0:ffff:ffff:ffff:ffff:ffff +cidr: fd55:eedf:a5c0::/48 +netname: GEEKWU-NET +descr: GEKKWU internal network +country: FR +admin-c: GEEKWU-DN42 +tech-c: GEEKWU-DN42 +mnt-by: GEEKWU-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inetnum/172.20.55.128_27 b/data/inetnum/172.20.55.128_27 new file mode 100644 index 000000000..8b056cae8 --- /dev/null +++ b/data/inetnum/172.20.55.128_27 @@ -0,0 +1,10 @@ +inetnum: 172.20.55.128 - 172.20.55.159 +netname: GEEKWU-NETWORK +descr: Network of GEEKWU +country: FR +admin-c: GEEKWU-DN42 +tech-c: GEEKWU-DN42 +mnt-by: GEEKWU-MNT +status: ASSIGNED +cidr: 172.20.55.128/27 +source: DN42 diff --git a/data/mntner/GEEKWU-MNT b/data/mntner/GEEKWU-MNT new file mode 100644 index 000000000..27119c714 --- /dev/null +++ b/data/mntner/GEEKWU-MNT @@ -0,0 +1,6 @@ +mntner: GEEKWU-MNT +auth: pgp-fingerprint 3479F3336D42720770DB82AF29CEE990CB6EEF13 +admin-c: GEEKWU-DN42 +tech-c: GEEKWU-DN42 +mnt-by: GEEKWU-MNT +source: DN42 diff --git a/data/person/GEEKWU-DN42 b/data/person/GEEKWU-DN42 new file mode 100644 index 000000000..94e88a134 --- /dev/null +++ b/data/person/GEEKWU-DN42 @@ -0,0 +1,5 @@ +person: Bastien Durel +contact: noc-dn42@geekwu.org +nic-hdl: GEEKWU-DN42 +mnt-by: GEEKWU-MNT +source: DN42 diff --git a/data/route/172.20.55.128_27 b/data/route/172.20.55.128_27 new file mode 100644 index 000000000..812610109 --- /dev/null +++ b/data/route/172.20.55.128_27 @@ -0,0 +1,4 @@ +route: 172.20.55.128/27 +origin: AS4242421021 +mnt-by: GEEKWU-MNT +source: DN42 diff --git a/data/route6/fd55:eedf:a5c0::_48 b/data/route6/fd55:eedf:a5c0::_48 new file mode 100644 index 000000000..89f41bf73 --- /dev/null +++ b/data/route6/fd55:eedf:a5c0::_48 @@ -0,0 +1,4 @@ +route6: fd55:eedf:a5c0::/48 +origin: AS4242421021 +mnt-by: GEEKWU-MNT +source: DN42 From 027a9cbba6b2c576772f6762baa187ea66c74633 Mon Sep 17 00:00:00 2001 From: rob brandon Date: Fri, 12 Jun 2020 10:42:48 -0400 Subject: [PATCH 11/40] Remove RBRANDON81 --- data/aut-num/AS4242421227 | 6 ------ data/mntner/RBRANDON81-MNT | 5 ----- data/person/RBRANDON81-DN42 | 5 ----- 3 files changed, 16 deletions(-) delete mode 100644 data/aut-num/AS4242421227 delete mode 100644 data/mntner/RBRANDON81-MNT delete mode 100644 data/person/RBRANDON81-DN42 diff --git a/data/aut-num/AS4242421227 b/data/aut-num/AS4242421227 deleted file mode 100644 index d2af47093..000000000 --- a/data/aut-num/AS4242421227 +++ /dev/null @@ -1,6 +0,0 @@ -aut-num: AS4242421227 -as-name: RBRANDON81 -admin-c: RBRANDON81-DN42 -tech-c: RBRANDON81-DN42 -mnt-by: RBRANDON81-MNT -source: DN42 diff --git a/data/mntner/RBRANDON81-MNT b/data/mntner/RBRANDON81-MNT deleted file mode 100644 index aa06f6415..000000000 --- a/data/mntner/RBRANDON81-MNT +++ /dev/null @@ -1,5 +0,0 @@ -mntner: RBRANDON81-MNT -admin-c: RBRANDON81-DN42 -tech-c: RBRANDON81-DN42 -mnt-by: RBRANDON81-MNT -source: DN42 diff --git a/data/person/RBRANDON81-DN42 b/data/person/RBRANDON81-DN42 deleted file mode 100644 index f68e2fccd..000000000 --- a/data/person/RBRANDON81-DN42 +++ /dev/null @@ -1,5 +0,0 @@ -person: rob brandon -nic-hdl: RBRANDON81-DN42 -mnt-by: RBRANDON81-MNT -contact: rbrandon81@gmail.com -source: DN42 From d34965a6c58ba35fecac2ff4602b0c3d15978d7a Mon Sep 17 00:00:00 2001 From: Simon Marsh Date: Sat, 13 Jun 2020 19:00:29 +0100 Subject: [PATCH 12/40] revert addition of empty data/schema/key from 8efd1feb808e6172722009884bd59fa70b974d40 --- data/schema/key | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 data/schema/key diff --git a/data/schema/key b/data/schema/key deleted file mode 100644 index e69de29bb..000000000 From 9e4815fe69311542a1739602eb584761213a8f11 Mon Sep 17 00:00:00 2001 From: SteveYi Yo Date: Sun, 14 Jun 2020 03:27:47 +0800 Subject: [PATCH 13/40] Test GPG --- data/inet6num/fd40:3598:08b8::_48 | 12 ++++++++++++ data/mntner/YI-MNT | 3 ++- data/route6/fd40:3598:08b8::_48 | 4 ++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 data/inet6num/fd40:3598:08b8::_48 create mode 100644 data/route6/fd40:3598:08b8::_48 diff --git a/data/inet6num/fd40:3598:08b8::_48 b/data/inet6num/fd40:3598:08b8::_48 new file mode 100644 index 000000000..bbe2cd6e5 --- /dev/null +++ b/data/inet6num/fd40:3598:08b8::_48 @@ -0,0 +1,12 @@ +inet6num: fd40:3598:08b8:0000:0000:0000:0000:0000 - fd40:3598:08b8:ffff:ffff:ffff:ffff:ffff +netname: YI-NETWORK-IPV6 +descr: Peer with me at noc-dn42@steveyi.net +country: TW +admin-c: YI-DN42 +tech-c: YI-DN42 +mnt-by: YI-MNT +nserver: ns1.yi.dn42 +nserver: ns2.yi.dn42 +status: ASSIGNED +cidr: fd40:3598:08b8::/48 +source: DN42 diff --git a/data/mntner/YI-MNT b/data/mntner/YI-MNT index f8cfce13d..544590ce4 100644 --- a/data/mntner/YI-MNT +++ b/data/mntner/YI-MNT @@ -3,4 +3,5 @@ descr: YI admin-c: YI-DN42 tech-c: YI-DN42 mnt-by: YI-MNT -source: DN42 \ No newline at end of file +auth: pgp-fingerprint 8494AEA47C7F0DD115D5F380214B9E43D3535759 +source: DN42 diff --git a/data/route6/fd40:3598:08b8::_48 b/data/route6/fd40:3598:08b8::_48 new file mode 100644 index 000000000..daecd7c46 --- /dev/null +++ b/data/route6/fd40:3598:08b8::_48 @@ -0,0 +1,4 @@ +route6: fd40:3598"08b8::/48 +origin: AS4242421214 +mnt-by: YI-MNT +source: DN42 From 65bd021877e745bafb814630d5ec03e459a19585 Mon Sep 17 00:00:00 2001 From: Liang Jingwen Date: Sun, 14 Jun 2020 10:44:40 +0800 Subject: [PATCH 14/40] Edit MNT handle for ca.dn42 verification --- data/mntner/MOECAST-MNT | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mntner/MOECAST-MNT b/data/mntner/MOECAST-MNT index 7a8c21fdd..9a5944fab 100644 --- a/data/mntner/MOECAST-MNT +++ b/data/mntner/MOECAST-MNT @@ -4,3 +4,4 @@ tech-c: MOECAST-DN42 mnt-by: MOECAST-MNT source: DN42 auth: pgp-fingerprint A04C56688622E1D51DB4ED5D263BDBB7ECAB32E4 +remarks: pin-sha256:cv+GjbOaqhfsldvMWzQoEq6uiA2WMkm14dr/SfORMrc= From 6aed1853a040607838f9d8760eeb7a71975416aa Mon Sep 17 00:00:00 2001 From: rob brandon Date: Sun, 14 Jun 2020 13:16:15 -0400 Subject: [PATCH 15/40] new file: data/aut-num/AS4242421227 new file: data/inet6num/fd50:9b3b:9cd6::_48 new file: data/mntner/RBRANDON81-MNT new file: data/person/RBRANDON81-DN42 new file: data/route6/fd50:9b3b:9cd6::_48 --- data/aut-num/AS4242421227 | 6 ++++++ data/inet6num/fd50:9b3b:9cd6::_48 | 10 ++++++++++ data/mntner/RBRANDON81-MNT | 6 ++++++ data/person/RBRANDON81-DN42 | 5 +++++ data/route6/fd50:9b3b:9cd6::_48 | 5 +++++ 5 files changed, 32 insertions(+) create mode 100644 data/aut-num/AS4242421227 create mode 100644 data/inet6num/fd50:9b3b:9cd6::_48 create mode 100644 data/mntner/RBRANDON81-MNT create mode 100644 data/person/RBRANDON81-DN42 create mode 100644 data/route6/fd50:9b3b:9cd6::_48 diff --git a/data/aut-num/AS4242421227 b/data/aut-num/AS4242421227 new file mode 100644 index 000000000..1b441c3a6 --- /dev/null +++ b/data/aut-num/AS4242421227 @@ -0,0 +1,6 @@ +aut-num: AS4242421227 +as-name: AS for RBRANDON81 +admin-c: RBRANDON81-DN42 +tech-c: RBRANDON81-DN42 +mnt-by: RBRANDON81-MNT +source: DN42 diff --git a/data/inet6num/fd50:9b3b:9cd6::_48 b/data/inet6num/fd50:9b3b:9cd6::_48 new file mode 100644 index 000000000..6fef22726 --- /dev/null +++ b/data/inet6num/fd50:9b3b:9cd6::_48 @@ -0,0 +1,10 @@ +inet6num: fd50:9b3b:9cd6:0000:0000:0000:0000:0000 - fd50:9b3b:9cd6:ffff:ffff:ffff:ffff:ffff +cidr: fd50:9b3b:9cd6::/48 +netname: RBRANDON81-NETWORK +descr: RBRANDON81 +country: US +admin-c: RBRANDON81-DN42 +tech-c: RBRANDON81-DN42 +mnt-by: RBRANDON81-MNT +status: ASSIGNED +source: DN42 diff --git a/data/mntner/RBRANDON81-MNT b/data/mntner/RBRANDON81-MNT new file mode 100644 index 000000000..26b140650 --- /dev/null +++ b/data/mntner/RBRANDON81-MNT @@ -0,0 +1,6 @@ +mntner: RBRANDON81-MNT +admin-c: RBRANDON81-DN42 +tech-c: RBRANDON81-DN42 +mnt-by: RBRANDON81-MNT +auth: pgp-fingerprint DFDC4788D4B78673DFE63FD608E3E82D9532A1AF +source: DN42 diff --git a/data/person/RBRANDON81-DN42 b/data/person/RBRANDON81-DN42 new file mode 100644 index 000000000..e3b5ed985 --- /dev/null +++ b/data/person/RBRANDON81-DN42 @@ -0,0 +1,5 @@ +person: Rob Brandon +contact: rbrandon81@gmail.com +nic-hdl: RBRANDON81-DN42 +mnt-by: RBRANDON81-MNT +source: DN42 diff --git a/data/route6/fd50:9b3b:9cd6::_48 b/data/route6/fd50:9b3b:9cd6::_48 new file mode 100644 index 000000000..2db7cc292 --- /dev/null +++ b/data/route6/fd50:9b3b:9cd6::_48 @@ -0,0 +1,5 @@ +route6: fd50:9b3b:9cd6::/48 +origin: AS4242421227 +max-length: 48 +mnt-by: RBRANDON81-MNT +source: DN42 From 56369efaa279e5fcc2b00ad184c5064023a59f49 Mon Sep 17 00:00:00 2001 From: rob brandon Date: Fri, 12 Jun 2020 10:42:48 -0400 Subject: [PATCH 16/40] Squash commits new file: data/aut-num/AS4242421227 new file: data/inet6num/fd50:9b3b:9cd6::_48 new file: data/mntner/RBRANDON81-MNT new file: data/person/RBRANDON81-DN42 new file: data/route6/fd50:9b3b:9cd6::_48 --- data/aut-num/AS4242421227 | 2 +- data/inet6num/fd50:9b3b:9cd6::_48 | 10 ++++++++++ data/mntner/RBRANDON81-MNT | 1 + data/person/RBRANDON81-DN42 | 4 ++-- data/route6/fd50:9b3b:9cd6::_48 | 5 +++++ 5 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 data/inet6num/fd50:9b3b:9cd6::_48 create mode 100644 data/route6/fd50:9b3b:9cd6::_48 diff --git a/data/aut-num/AS4242421227 b/data/aut-num/AS4242421227 index d2af47093..1b441c3a6 100644 --- a/data/aut-num/AS4242421227 +++ b/data/aut-num/AS4242421227 @@ -1,5 +1,5 @@ aut-num: AS4242421227 -as-name: RBRANDON81 +as-name: AS for RBRANDON81 admin-c: RBRANDON81-DN42 tech-c: RBRANDON81-DN42 mnt-by: RBRANDON81-MNT diff --git a/data/inet6num/fd50:9b3b:9cd6::_48 b/data/inet6num/fd50:9b3b:9cd6::_48 new file mode 100644 index 000000000..6fef22726 --- /dev/null +++ b/data/inet6num/fd50:9b3b:9cd6::_48 @@ -0,0 +1,10 @@ +inet6num: fd50:9b3b:9cd6:0000:0000:0000:0000:0000 - fd50:9b3b:9cd6:ffff:ffff:ffff:ffff:ffff +cidr: fd50:9b3b:9cd6::/48 +netname: RBRANDON81-NETWORK +descr: RBRANDON81 +country: US +admin-c: RBRANDON81-DN42 +tech-c: RBRANDON81-DN42 +mnt-by: RBRANDON81-MNT +status: ASSIGNED +source: DN42 diff --git a/data/mntner/RBRANDON81-MNT b/data/mntner/RBRANDON81-MNT index aa06f6415..26b140650 100644 --- a/data/mntner/RBRANDON81-MNT +++ b/data/mntner/RBRANDON81-MNT @@ -2,4 +2,5 @@ mntner: RBRANDON81-MNT admin-c: RBRANDON81-DN42 tech-c: RBRANDON81-DN42 mnt-by: RBRANDON81-MNT +auth: pgp-fingerprint DFDC4788D4B78673DFE63FD608E3E82D9532A1AF source: DN42 diff --git a/data/person/RBRANDON81-DN42 b/data/person/RBRANDON81-DN42 index f68e2fccd..e3b5ed985 100644 --- a/data/person/RBRANDON81-DN42 +++ b/data/person/RBRANDON81-DN42 @@ -1,5 +1,5 @@ -person: rob brandon +person: Rob Brandon +contact: rbrandon81@gmail.com nic-hdl: RBRANDON81-DN42 mnt-by: RBRANDON81-MNT -contact: rbrandon81@gmail.com source: DN42 diff --git a/data/route6/fd50:9b3b:9cd6::_48 b/data/route6/fd50:9b3b:9cd6::_48 new file mode 100644 index 000000000..2db7cc292 --- /dev/null +++ b/data/route6/fd50:9b3b:9cd6::_48 @@ -0,0 +1,5 @@ +route6: fd50:9b3b:9cd6::/48 +origin: AS4242421227 +max-length: 48 +mnt-by: RBRANDON81-MNT +source: DN42 From 5baefcf1e9dc99bd02da2fc42e0bed98fd8bd26f Mon Sep 17 00:00:00 2001 From: registry-sync Date: Mon, 15 Jun 2020 07:28:55 +0200 Subject: [PATCH 17/40] registry-sync --- data/inetnum/172.21.66.32_27 | 2 +- data/route6/fddd:a553:ee0e::_48 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/inetnum/172.21.66.32_27 b/data/inetnum/172.21.66.32_27 index 255096cc5..2bb9add18 100644 --- a/data/inetnum/172.21.66.32_27 +++ b/data/inetnum/172.21.66.32_27 @@ -6,4 +6,4 @@ admin-c: TBSO-DN42 tech-c: TBSO-DN42 mnt-by: TBSO-MNT status: ASSIGNED -source: DN42 \ No newline at end of file +source: DN42 diff --git a/data/route6/fddd:a553:ee0e::_48 b/data/route6/fddd:a553:ee0e::_48 index b620c8b98..0bf790468 100644 --- a/data/route6/fddd:a553:ee0e::_48 +++ b/data/route6/fddd:a553:ee0e::_48 @@ -1,4 +1,4 @@ route6: fddd:a553:ee0e::/48 origin: AS4242421119 mnt-by: TBSO-MNT -source: DN42 \ No newline at end of file +source: DN42 From 9bf62ed846c9fcb932aa73f0ca26f5a95208273a Mon Sep 17 00:00:00 2001 From: marlin Date: Mon, 15 Jun 2020 21:39:27 +0800 Subject: [PATCH 18/40] add --- data/aut-num/AS4242423189 | 6 ++++++ data/inetnum/172.20.0.0_27 | 9 +++++++++ data/mntner/MARLIN-MNT | 8 ++++++++ data/person/MARLIN-DN42 | 5 +++++ data/route/172.20.0.0_27 | 4 ++++ 5 files changed, 32 insertions(+) create mode 100644 data/aut-num/AS4242423189 create mode 100644 data/inetnum/172.20.0.0_27 create mode 100644 data/mntner/MARLIN-MNT create mode 100644 data/person/MARLIN-DN42 create mode 100644 data/route/172.20.0.0_27 diff --git a/data/aut-num/AS4242423189 b/data/aut-num/AS4242423189 new file mode 100644 index 000000000..258b33799 --- /dev/null +++ b/data/aut-num/AS4242423189 @@ -0,0 +1,6 @@ +aut-num: AS4242423189 +as-name: MARLIN-AS +admin-c: MARLIN-DN42 +tech-c: MARLIN-DN42 +mnt-by: MARLIN-MNT +source: DN42 diff --git a/data/inetnum/172.20.0.0_27 b/data/inetnum/172.20.0.0_27 new file mode 100644 index 000000000..7e1e5a317 --- /dev/null +++ b/data/inetnum/172.20.0.0_27 @@ -0,0 +1,9 @@ +inetnum: 172.20.0.0 - 172.20.0.31 +netname: MARLIN-IPV4 +country: CN +admin-c: MARLIN-DN42 +tech-c: MARLIN-DN42 +mnt-by: MARLIN-MNT +status: ASSIGNED +cidr: 172.20.0.0/27 +source: DN42 diff --git a/data/mntner/MARLIN-MNT b/data/mntner/MARLIN-MNT new file mode 100644 index 000000000..3f8546085 --- /dev/null +++ b/data/mntner/MARLIN-MNT @@ -0,0 +1,8 @@ +mntner: MARLIN-MNT +admin-c: MARLIN-DN42 +tech-c: MARLIN-DN42 +mnt-by: MARLIN-MNT +source: DN42 +auth: pgp-fingerprint 2B04210F46CFD6080647A0B8FB5EC04DEB5D9175 +auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDScp/HV0hw9EF7UFpjV2zSALAXB39f4tho3w/nhC4qYwxwySL9ghptzqeCyuVXUKgfTR30CYpmYhOtWyDnDYcgwrmQ/dQcJH9cP6S26m/PR1xir3Xd8BEMOySnuaH9QOLpgNk4QJIqR3J3rbQ+k2wydosQXv3/eidy3iFA7VH1GMxeEoYIPFtiAGVaQYTr4rzBYDGAzDwWaUvabtRzCLjkaqVzRdKUxGuZUVR7fMw9Ylq83FyGUsjvxhXqxpDmRZ1WA+J2H9Vh1bW3PFZkyx527/dPzkLCIzwxAj4V7HaObY3UbHdytASd1OVKdgPLmh8hiJ4CbFjLG7bjcEs1ajTd/pyWuo5QJUcSJ1UyQV65rkR5tKlVMVtthcb1muecSQOdZt7NLsEINeOXIRcjPiDiLs//iYLsD2GD8iBOds4d+GMEqh+ig4G608+eYCERE35zpwLhKIq5V2h6So/y3awS7HrUwFQA4R1yWVhGn/lTdVlRxI5WKWAnOKev3AShx38= +remarks: pin-sha256:o1lfYvcdcYy81UIuZMZO1CkCLX+vJOdD5GLw1cmeStU= diff --git a/data/person/MARLIN-DN42 b/data/person/MARLIN-DN42 new file mode 100644 index 000000000..88c407edd --- /dev/null +++ b/data/person/MARLIN-DN42 @@ -0,0 +1,5 @@ +person: Marlin +contact: wangweimingooo@gmail.com +nic-hdl: MARLIN-DN42 +mnt-by: MARLIN-MNT +source: DN42 diff --git a/data/route/172.20.0.0_27 b/data/route/172.20.0.0_27 new file mode 100644 index 000000000..599f66da9 --- /dev/null +++ b/data/route/172.20.0.0_27 @@ -0,0 +1,4 @@ +route: 172.20.0.0/27 +origin: AS4242423189 +mnt-by: MARLIN-MNT +source: DN42 From 29c6f77db3a0e5ed4d02e8aa2a486a48402ed7f3 Mon Sep 17 00:00:00 2001 From: marlin Date: Mon, 15 Jun 2020 22:02:38 +0800 Subject: [PATCH 19/40] add --- data/inetnum/172.20.0.0_27 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/inetnum/172.20.0.0_27 b/data/inetnum/172.20.0.0_27 index 7e1e5a317..1d734b5f8 100644 --- a/data/inetnum/172.20.0.0_27 +++ b/data/inetnum/172.20.0.0_27 @@ -3,7 +3,7 @@ netname: MARLIN-IPV4 country: CN admin-c: MARLIN-DN42 tech-c: MARLIN-DN42 -mnt-by: MARLIN-MNT +mnt-by: DN42-MNT status: ASSIGNED cidr: 172.20.0.0/27 source: DN42 From d30e26450ed7ecf288ffcba50b257f483bb0bcdb Mon Sep 17 00:00:00 2001 From: marlin Date: Mon, 15 Jun 2020 22:02:38 +0800 Subject: [PATCH 20/40] fix inetnum --- data/inetnum/172.20.0.0_27 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/inetnum/172.20.0.0_27 b/data/inetnum/172.20.0.0_27 index 7e1e5a317..1d734b5f8 100644 --- a/data/inetnum/172.20.0.0_27 +++ b/data/inetnum/172.20.0.0_27 @@ -3,7 +3,7 @@ netname: MARLIN-IPV4 country: CN admin-c: MARLIN-DN42 tech-c: MARLIN-DN42 -mnt-by: MARLIN-MNT +mnt-by: DN42-MNT status: ASSIGNED cidr: 172.20.0.0/27 source: DN42 From 3b830e42602b8d496273ca42c1b3a314911f61f6 Mon Sep 17 00:00:00 2001 From: marlin Date: Mon, 15 Jun 2020 22:12:33 +0800 Subject: [PATCH 21/40] fix inetnum property --- data/inetnum/172.20.0.0_27 | 1 + 1 file changed, 1 insertion(+) diff --git a/data/inetnum/172.20.0.0_27 b/data/inetnum/172.20.0.0_27 index 1d734b5f8..804a76648 100644 --- a/data/inetnum/172.20.0.0_27 +++ b/data/inetnum/172.20.0.0_27 @@ -1,6 +1,7 @@ inetnum: 172.20.0.0 - 172.20.0.31 netname: MARLIN-IPV4 country: CN +descr: Peer with me at wangweimingooo@gmail.com admin-c: MARLIN-DN42 tech-c: MARLIN-DN42 mnt-by: DN42-MNT From 92689093d73ef11af062c4e4d7bb7fb85640413c Mon Sep 17 00:00:00 2001 From: Maraun Date: Mon, 15 Jun 2020 21:35:03 +0200 Subject: [PATCH 22/40] Change to default prefix --- .../{fdb3:4cc3:3bfb:7830::_64 => fdb3:4cc3:3bfb::_48} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename data/inet6num/{fdb3:4cc3:3bfb:7830::_64 => fdb3:4cc3:3bfb::_48} (60%) diff --git a/data/inet6num/fdb3:4cc3:3bfb:7830::_64 b/data/inet6num/fdb3:4cc3:3bfb::_48 similarity index 60% rename from data/inet6num/fdb3:4cc3:3bfb:7830::_64 rename to data/inet6num/fdb3:4cc3:3bfb::_48 index dbb1a241a..9f06f7853 100644 --- a/data/inet6num/fdb3:4cc3:3bfb:7830::_64 +++ b/data/inet6num/fdb3:4cc3:3bfb::_48 @@ -1,5 +1,5 @@ -inet6num: fdb3:4cc3:3bfb:7830:0000:0000:0000:0000 - fdb3:4cc3:3bfb:7830:ffff:ffff:ffff:ffff -cidr: fdb3:4cc3:3bfb:7830::/64 +inet6num: fdb3:4cc3:3bfb:0000:0000:0000:0000:0000 - fdb3:4cc3:3bfb:ffff:ffff:ffff:ffff:ffff +cidr: fdb3:4cc3:3bfb::/48 descr: Maraun's six net mnt-by: MARAUN-MNT admin-c: MARAUN-DN42 From c7ff15c4c2b13de152b37fa862a644b5f7f3f0ec Mon Sep 17 00:00:00 2001 From: Maraun Date: Mon, 15 Jun 2020 21:38:07 +0200 Subject: [PATCH 23/40] Don't use AS --- data/as-set/AS4242422225:AS-PEER | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 data/as-set/AS4242422225:AS-PEER diff --git a/data/as-set/AS4242422225:AS-PEER b/data/as-set/AS4242422225:AS-PEER deleted file mode 100644 index 3c83f51de..000000000 --- a/data/as-set/AS4242422225:AS-PEER +++ /dev/null @@ -1,29 +0,0 @@ -as-set: AS4242422225:AS-PEER -admin-c: MARAUN-DN42 -tech-c: MARAUN-DN42 -mnt-by: MARAUN-MNT -remarks: burble -members: AS4242422601 -remarks: dynos01 -members: AS4242423360 -remarks: grc -members: AS4242422602 -remarks: kioubit -members: AS4242423914 -remarks: sigterm -members: AS4242423754 -remarks: iedon -members: AS4242422189 -remarks: lfnet -members: AS4242423513 -remarks: mgl -members: AS4242420181 -remarks: hex -members: AS4242423078 -remarks: waxman -members: AS4242422227 -remarks: gatuno -members: AS4242420180 -remarks: sunnet -members: AS4242423088 -source: DN42 From a8a95a7d2346d037d0ebd0584e094726529620f4 Mon Sep 17 00:00:00 2001 From: Maraun Date: Mon, 15 Jun 2020 21:47:46 +0200 Subject: [PATCH 24/40] Route are prefix 48 too --- data/route6/fdb3:4cc3:3bfb:7830::_64 | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 data/route6/fdb3:4cc3:3bfb:7830::_64 diff --git a/data/route6/fdb3:4cc3:3bfb:7830::_64 b/data/route6/fdb3:4cc3:3bfb:7830::_64 deleted file mode 100644 index 927875da9..000000000 --- a/data/route6/fdb3:4cc3:3bfb:7830::_64 +++ /dev/null @@ -1,6 +0,0 @@ -route6: fdb3:4cc3:3bfb:7830::/64 -origin: AS4242422225 -admin-c: MARAUN-DN42 -tech-c: MARAUN-DN42 -mnt-by: MARAUN-MNT -source: DN42 From 5ab669a04982cf8be7052e44b3d8eefa8be74d56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Arreola=20Rodr=C3=ADguez?= Date: Mon, 15 Jun 2020 21:37:50 -0500 Subject: [PATCH 25/40] Add a small test network. --- data/inetnum/172.22.124.16_28 | 10 ++++++++++ data/route/172.22.124.16_28 | 4 ++++ 2 files changed, 14 insertions(+) create mode 100644 data/inetnum/172.22.124.16_28 create mode 100644 data/route/172.22.124.16_28 diff --git a/data/inetnum/172.22.124.16_28 b/data/inetnum/172.22.124.16_28 new file mode 100644 index 000000000..1f0e96065 --- /dev/null +++ b/data/inetnum/172.22.124.16_28 @@ -0,0 +1,10 @@ +inetnum: 172.22.124.16 - 172.22.124.31 +cidr: 172.22.124.16/28 +netname: GATUNO-NETWORK +country: MX +admin-c: GATUNO-DN42 +tech-c: GATUNO-DN42 +mnt-by: GATUNO-MNT +status: ASSIGNED +source: DN42 +nserver: ns1.gatuno.dn42 diff --git a/data/route/172.22.124.16_28 b/data/route/172.22.124.16_28 new file mode 100644 index 000000000..b2a01e8b1 --- /dev/null +++ b/data/route/172.22.124.16_28 @@ -0,0 +1,4 @@ +route: 172.22.124.16/28 +origin: AS4242420180 +mnt-by: GATUNO-MNT +source: DN42 From 2f827d88b3b450724006b23a87ec50530b5dd117 Mon Sep 17 00:00:00 2001 From: registry-sync Date: Tue, 16 Jun 2020 04:44:00 +0200 Subject: [PATCH 26/40] registry-sync --- data/person/ICECAT-NEONETWORK | 1 + 1 file changed, 1 insertion(+) diff --git a/data/person/ICECAT-NEONETWORK b/data/person/ICECAT-NEONETWORK index 766531a4c..43ec668e4 100644 --- a/data/person/ICECAT-NEONETWORK +++ b/data/person/ICECAT-NEONETWORK @@ -2,6 +2,7 @@ person: Icecat nic-hdl: ICECAT-NEONETWORK contact: github: Myer921 contact: telegram: fakeicecat +e-mail: icecat@catio.network remarks: Imported from neonetwork, do not edit! mnt-by: DN42-MNT source: NEONETWORK From 8fd2995a216967e91ff35f4fbee3dd9926c3cd79 Mon Sep 17 00:00:00 2001 From: marlin Date: Tue, 16 Jun 2020 21:14:13 +0800 Subject: [PATCH 27/40] fix ip range --- data/inet6num/fd42:4999:abcd::_48 | 10 ++++++++++ data/inetnum/{172.20.0.0_27 => 172.20.7.32_27} | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 data/inet6num/fd42:4999:abcd::_48 rename data/inetnum/{172.20.0.0_27 => 172.20.7.32_27} (76%) diff --git a/data/inet6num/fd42:4999:abcd::_48 b/data/inet6num/fd42:4999:abcd::_48 new file mode 100644 index 000000000..32621cd8b --- /dev/null +++ b/data/inet6num/fd42:4999:abcd::_48 @@ -0,0 +1,10 @@ +inet6num: fd42:4999:abcd:0000:0000:0000:0000:0000 - fd42:4999:abcd:ffff:ffff:ffff:ffff:ffff +cidr: fd42:4999:abcd::/48 +netname: MARLIN-NETWORK +descr: Network of MARLIN +country: CN +admin-c: MARLIN-DN42 +tech-c: MARLIN-DN42 +mnt-by: MARLIN-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inetnum/172.20.0.0_27 b/data/inetnum/172.20.7.32_27 similarity index 76% rename from data/inetnum/172.20.0.0_27 rename to data/inetnum/172.20.7.32_27 index 804a76648..7ce9b3e52 100644 --- a/data/inetnum/172.20.0.0_27 +++ b/data/inetnum/172.20.7.32_27 @@ -1,4 +1,4 @@ -inetnum: 172.20.0.0 - 172.20.0.31 +inetnum: 172.20.7.32 - 172.20.7.63 netname: MARLIN-IPV4 country: CN descr: Peer with me at wangweimingooo@gmail.com @@ -6,5 +6,5 @@ admin-c: MARLIN-DN42 tech-c: MARLIN-DN42 mnt-by: DN42-MNT status: ASSIGNED -cidr: 172.20.0.0/27 +cidr: 172.20.7.32/27 source: DN42 From ad22a145c76d868a57c81d06ab54f3bbb83a2158 Mon Sep 17 00:00:00 2001 From: marlin Date: Tue, 16 Jun 2020 21:34:11 +0800 Subject: [PATCH 28/40] fix ip range --- data/inetnum/{172.20.7.32_27 => 172.20.165.32_27} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename data/inetnum/{172.20.7.32_27 => 172.20.165.32_27} (66%) diff --git a/data/inetnum/172.20.7.32_27 b/data/inetnum/172.20.165.32_27 similarity index 66% rename from data/inetnum/172.20.7.32_27 rename to data/inetnum/172.20.165.32_27 index 7ce9b3e52..b0b927e12 100644 --- a/data/inetnum/172.20.7.32_27 +++ b/data/inetnum/172.20.165.32_27 @@ -1,10 +1,10 @@ -inetnum: 172.20.7.32 - 172.20.7.63 +inetnum: 172.20.165.32 - 172.20.165.63 netname: MARLIN-IPV4 country: CN descr: Peer with me at wangweimingooo@gmail.com admin-c: MARLIN-DN42 tech-c: MARLIN-DN42 -mnt-by: DN42-MNT +mnt-by: MARLIN-MNT status: ASSIGNED -cidr: 172.20.7.32/27 +cidr: 172.20.165.32/27 source: DN42 From 49f549f20be7b62f525d1194927fa67ceee9c5a3 Mon Sep 17 00:00:00 2001 From: SteveYi Yo Date: Tue, 16 Jun 2020 22:06:20 +0800 Subject: [PATCH 29/40] GPG --- data/inetnum/{10.12.14.0_27 => 172.20.232.208_28} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename data/inetnum/{10.12.14.0_27 => 172.20.232.208_28} (71%) diff --git a/data/inetnum/10.12.14.0_27 b/data/inetnum/172.20.232.208_28 similarity index 71% rename from data/inetnum/10.12.14.0_27 rename to data/inetnum/172.20.232.208_28 index 4b04b6cd3..5054a0242 100644 --- a/data/inetnum/10.12.14.0_27 +++ b/data/inetnum/172.20.232.208_28 @@ -1,5 +1,5 @@ -inetnum: 10.12.14.0 - 10.12.14.31 -cidr: 10.12.14.0_27 +inetnum: 172.20.232.208 - 172.20.232.223 +cidr: 172.20.232.208_28 netname: YI-NET-001 descr: YI-NET-001 country: TW From 61b4335cfd742117ade57a98efdafd336fc1dad6 Mon Sep 17 00:00:00 2001 From: SteveYi Yo Date: Tue, 16 Jun 2020 22:11:49 +0800 Subject: [PATCH 30/40] IPv4 --- data/inetnum/{172.20.232.208_28 => 172.22.189.96_27} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename data/inetnum/{172.20.232.208_28 => 172.22.189.96_27} (71%) diff --git a/data/inetnum/172.20.232.208_28 b/data/inetnum/172.22.189.96_27 similarity index 71% rename from data/inetnum/172.20.232.208_28 rename to data/inetnum/172.22.189.96_27 index 5054a0242..1e3905845 100644 --- a/data/inetnum/172.20.232.208_28 +++ b/data/inetnum/172.22.189.96_27 @@ -1,5 +1,5 @@ -inetnum: 172.20.232.208 - 172.20.232.223 -cidr: 172.20.232.208_28 +inetnum: 172.22.189.96 - 172.22.189.127 +cidr: 172.22.189.96_27 netname: YI-NET-001 descr: YI-NET-001 country: TW From 0f44f62e2b4e4727dc99164e68c344a89b7bf566 Mon Sep 17 00:00:00 2001 From: marlin Date: Tue, 16 Jun 2020 22:38:38 +0800 Subject: [PATCH 31/40] fix route --- data/inet6num/{fd42:4999:abcd::_48 => fd00:0000:03fd::_48} | 4 ++-- data/route/{172.20.0.0_27 => 172.20.165.32_27} | 2 +- data/route6/fd00:0000:03fd::_48 | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) rename data/inet6num/{fd42:4999:abcd::_48 => fd00:0000:03fd::_48} (63%) rename data/route/{172.20.0.0_27 => 172.20.165.32_27} (70%) create mode 100644 data/route6/fd00:0000:03fd::_48 diff --git a/data/inet6num/fd42:4999:abcd::_48 b/data/inet6num/fd00:0000:03fd::_48 similarity index 63% rename from data/inet6num/fd42:4999:abcd::_48 rename to data/inet6num/fd00:0000:03fd::_48 index 32621cd8b..9660c89fe 100644 --- a/data/inet6num/fd42:4999:abcd::_48 +++ b/data/inet6num/fd00:0000:03fd::_48 @@ -1,5 +1,5 @@ -inet6num: fd42:4999:abcd:0000:0000:0000:0000:0000 - fd42:4999:abcd:ffff:ffff:ffff:ffff:ffff -cidr: fd42:4999:abcd::/48 +inet6num: fd00:0000:03fd:0000:0000:0000:0000:0000 - fd00:0000:03fd:ffff:ffff:ffff:ffff:ffff +cidr: fd00:0000:03fd::/48 netname: MARLIN-NETWORK descr: Network of MARLIN country: CN diff --git a/data/route/172.20.0.0_27 b/data/route/172.20.165.32_27 similarity index 70% rename from data/route/172.20.0.0_27 rename to data/route/172.20.165.32_27 index 599f66da9..d5ecd9691 100644 --- a/data/route/172.20.0.0_27 +++ b/data/route/172.20.165.32_27 @@ -1,4 +1,4 @@ -route: 172.20.0.0/27 +route: 172.20.165.32/27 origin: AS4242423189 mnt-by: MARLIN-MNT source: DN42 diff --git a/data/route6/fd00:0000:03fd::_48 b/data/route6/fd00:0000:03fd::_48 new file mode 100644 index 000000000..6208340f2 --- /dev/null +++ b/data/route6/fd00:0000:03fd::_48 @@ -0,0 +1,4 @@ +route6: fd00:0000:03fd::/48 +origin: AS4242423189 +mnt-by: MARLIN-MNT +source: DN42 From 3d13e760f7f48f51ad7872f6f706b36c84770dab Mon Sep 17 00:00:00 2001 From: marlin Date: Tue, 16 Jun 2020 23:14:47 +0800 Subject: [PATCH 32/40] fix route --- .../{fd00:0000:03fd::_48 => fdef:f40f:1337:cafe::_64} | 4 ++-- data/route6/{fd00:0000:03fd::_48 => fdef:f40f:1337:cafe::_64} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename data/inet6num/{fd00:0000:03fd::_48 => fdef:f40f:1337:cafe::_64} (62%) rename data/route6/{fd00:0000:03fd::_48 => fdef:f40f:1337:cafe::_64} (66%) diff --git a/data/inet6num/fd00:0000:03fd::_48 b/data/inet6num/fdef:f40f:1337:cafe::_64 similarity index 62% rename from data/inet6num/fd00:0000:03fd::_48 rename to data/inet6num/fdef:f40f:1337:cafe::_64 index 9660c89fe..f75202a35 100644 --- a/data/inet6num/fd00:0000:03fd::_48 +++ b/data/inet6num/fdef:f40f:1337:cafe::_64 @@ -1,5 +1,5 @@ -inet6num: fd00:0000:03fd:0000:0000:0000:0000:0000 - fd00:0000:03fd:ffff:ffff:ffff:ffff:ffff -cidr: fd00:0000:03fd::/48 +inet6num: fdef:f40f:1337:cafe:0000:0000:0000:0000 - fdef:f40f:1337:cafe:ffff:ffff:ffff:ffff +cidr: fdef:f40f:1337:cafe::_64 netname: MARLIN-NETWORK descr: Network of MARLIN country: CN diff --git a/data/route6/fd00:0000:03fd::_48 b/data/route6/fdef:f40f:1337:cafe::_64 similarity index 66% rename from data/route6/fd00:0000:03fd::_48 rename to data/route6/fdef:f40f:1337:cafe::_64 index 6208340f2..1f779b38a 100644 --- a/data/route6/fd00:0000:03fd::_48 +++ b/data/route6/fdef:f40f:1337:cafe::_64 @@ -1,4 +1,4 @@ -route6: fd00:0000:03fd::/48 +route6: fdef:f40f:1337:cafe::_64 origin: AS4242423189 mnt-by: MARLIN-MNT source: DN42 From 59ca4442dd192e491133f2aebcaf5d2044a98710 Mon Sep 17 00:00:00 2001 From: marlin Date: Tue, 16 Jun 2020 23:22:12 +0800 Subject: [PATCH 33/40] fix route --- data/inet6num/fdef:f40f:1337:cafe::_64 | 2 +- data/route6/fdef:f40f:1337:cafe::_64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/inet6num/fdef:f40f:1337:cafe::_64 b/data/inet6num/fdef:f40f:1337:cafe::_64 index f75202a35..0cdab02a9 100644 --- a/data/inet6num/fdef:f40f:1337:cafe::_64 +++ b/data/inet6num/fdef:f40f:1337:cafe::_64 @@ -1,5 +1,5 @@ inet6num: fdef:f40f:1337:cafe:0000:0000:0000:0000 - fdef:f40f:1337:cafe:ffff:ffff:ffff:ffff -cidr: fdef:f40f:1337:cafe::_64 +cidr: fdef:f40f:1337:cafe::/64 netname: MARLIN-NETWORK descr: Network of MARLIN country: CN diff --git a/data/route6/fdef:f40f:1337:cafe::_64 b/data/route6/fdef:f40f:1337:cafe::_64 index 1f779b38a..1c9499be3 100644 --- a/data/route6/fdef:f40f:1337:cafe::_64 +++ b/data/route6/fdef:f40f:1337:cafe::_64 @@ -1,4 +1,4 @@ -route6: fdef:f40f:1337:cafe::_64 +route6: fdef:f40f:1337:cafe::/64 origin: AS4242423189 mnt-by: MARLIN-MNT source: DN42 From 62f8b3051821962b2fe85d18123daeab225ed7d6 Mon Sep 17 00:00:00 2001 From: Maraun Date: Tue, 16 Jun 2020 17:47:59 +0200 Subject: [PATCH 34/40] add the missing route --- data/route6/fdb3:4cc3:3bfb::_48 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 data/route6/fdb3:4cc3:3bfb::_48 diff --git a/data/route6/fdb3:4cc3:3bfb::_48 b/data/route6/fdb3:4cc3:3bfb::_48 new file mode 100644 index 000000000..7977e2489 --- /dev/null +++ b/data/route6/fdb3:4cc3:3bfb::_48 @@ -0,0 +1,6 @@ +route6: fdb3:4cc3:3bfb::/48 +origin: AS4242422225 +admin-c: MARAUN-DN42 +tech-c: MARAUN-DN42 +mnt-by: MARAUN-MNT +source: DN42 From 4dc17ee7d4826ea401db661df076022798b21295 Mon Sep 17 00:00:00 2001 From: SteveYi Yo Date: Wed, 17 Jun 2020 01:20:48 +0800 Subject: [PATCH 35/40] YI-MNT --- data/inet6num/fd40:3598:08b8::_48 | 4 ---- data/inetnum/172.22.189.96_27 | 4 +--- data/person/YI-DN42 | 2 +- data/route6/fd40:3598:08b8::_48 | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/data/inet6num/fd40:3598:08b8::_48 b/data/inet6num/fd40:3598:08b8::_48 index bbe2cd6e5..67e2f2d9a 100644 --- a/data/inet6num/fd40:3598:08b8::_48 +++ b/data/inet6num/fd40:3598:08b8::_48 @@ -1,12 +1,8 @@ inet6num: fd40:3598:08b8:0000:0000:0000:0000:0000 - fd40:3598:08b8:ffff:ffff:ffff:ffff:ffff netname: YI-NETWORK-IPV6 -descr: Peer with me at noc-dn42@steveyi.net -country: TW admin-c: YI-DN42 tech-c: YI-DN42 mnt-by: YI-MNT -nserver: ns1.yi.dn42 -nserver: ns2.yi.dn42 status: ASSIGNED cidr: fd40:3598:08b8::/48 source: DN42 diff --git a/data/inetnum/172.22.189.96_27 b/data/inetnum/172.22.189.96_27 index 1e3905845..651cfe646 100644 --- a/data/inetnum/172.22.189.96_27 +++ b/data/inetnum/172.22.189.96_27 @@ -1,8 +1,6 @@ inetnum: 172.22.189.96 - 172.22.189.127 -cidr: 172.22.189.96_27 +cidr: 172.22.189.96/27 netname: YI-NET-001 -descr: YI-NET-001 -country: TW admin-c: YI-DN42 tech-c: YI-DN42 mnt-by: YI-MNT diff --git a/data/person/YI-DN42 b/data/person/YI-DN42 index 56e88f6b8..cfea6755b 100644 --- a/data/person/YI-DN42 +++ b/data/person/YI-DN42 @@ -2,4 +2,4 @@ person: YI contact: noc-dns42@yiy.tw nic-hdl: YI-DN42 mnt-by: YI-MNT -source: DN42 \ No newline at end of file +source: DN42 diff --git a/data/route6/fd40:3598:08b8::_48 b/data/route6/fd40:3598:08b8::_48 index daecd7c46..bd56502bb 100644 --- a/data/route6/fd40:3598:08b8::_48 +++ b/data/route6/fd40:3598:08b8::_48 @@ -1,4 +1,4 @@ -route6: fd40:3598"08b8::/48 +route6: fd40:3598:08b8::/48 origin: AS4242421214 mnt-by: YI-MNT source: DN42 From 49e95db62d4f9a2634838d1f3148f5ee37401f53 Mon Sep 17 00:00:00 2001 From: SteveYi Yo Date: Wed, 17 Jun 2020 01:27:37 +0800 Subject: [PATCH 36/40] fix ipv4 route --- data/route/{10.12.14.0_27 => 172.22.189.96_27} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename data/route/{10.12.14.0_27 => 172.22.189.96_27} (69%) diff --git a/data/route/10.12.14.0_27 b/data/route/172.22.189.96_27 similarity index 69% rename from data/route/10.12.14.0_27 rename to data/route/172.22.189.96_27 index 92ec7089b..a44f82e68 100644 --- a/data/route/10.12.14.0_27 +++ b/data/route/172.22.189.96_27 @@ -1,4 +1,4 @@ -route: 10.12.14.0_27 +route: 172.22.189.96/27 origin: AS4242421214 mnt-by: YI-MNT source: DN42 From d54398979856cc1b6f1aafe052d9e85db4445f14 Mon Sep 17 00:00:00 2001 From: SteveYi Yo Date: Wed, 17 Jun 2020 01:37:50 +0800 Subject: [PATCH 37/40] ipv6 --- data/inet6num/fd69:9889:9692::_48 | 8 ++++++++ data/route6/{fd40:3598:08b8::_48 => fd69:9889:9692::_48} | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 data/inet6num/fd69:9889:9692::_48 rename data/route6/{fd40:3598:08b8::_48 => fd69:9889:9692::_48} (68%) diff --git a/data/inet6num/fd69:9889:9692::_48 b/data/inet6num/fd69:9889:9692::_48 new file mode 100644 index 000000000..a80408610 --- /dev/null +++ b/data/inet6num/fd69:9889:9692::_48 @@ -0,0 +1,8 @@ +inet6num: fd69:9889:9692:0000:0000:0000:0000:0000 - fd69:9889:9692:ffff:ffff:ffff:ffff:ffff +cidr: fd69:9889:9692::/48 +netname: YI-NETWORK-IPV6 +admin-c: YI-DN42 +tech-c: YI-DN42 +mnt-by: YI-MNT +status: ASSIGNED +source: DN42 diff --git a/data/route6/fd40:3598:08b8::_48 b/data/route6/fd69:9889:9692::_48 similarity index 68% rename from data/route6/fd40:3598:08b8::_48 rename to data/route6/fd69:9889:9692::_48 index bd56502bb..d073663b9 100644 --- a/data/route6/fd40:3598:08b8::_48 +++ b/data/route6/fd69:9889:9692::_48 @@ -1,4 +1,4 @@ -route6: fd40:3598:08b8::/48 +route6: fd69:9889:9692::/48 origin: AS4242421214 mnt-by: YI-MNT source: DN42 From 541d11b7479ccf8b3c5136be80f238d81b03c86b Mon Sep 17 00:00:00 2001 From: SteveYi Yo Date: Wed, 17 Jun 2020 01:41:09 +0800 Subject: [PATCH 38/40] fix --- data/inet6num/fd40:3598:08b8::_48 | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 data/inet6num/fd40:3598:08b8::_48 diff --git a/data/inet6num/fd40:3598:08b8::_48 b/data/inet6num/fd40:3598:08b8::_48 deleted file mode 100644 index 67e2f2d9a..000000000 --- a/data/inet6num/fd40:3598:08b8::_48 +++ /dev/null @@ -1,8 +0,0 @@ -inet6num: fd40:3598:08b8:0000:0000:0000:0000:0000 - fd40:3598:08b8:ffff:ffff:ffff:ffff:ffff -netname: YI-NETWORK-IPV6 -admin-c: YI-DN42 -tech-c: YI-DN42 -mnt-by: YI-MNT -status: ASSIGNED -cidr: fd40:3598:08b8::/48 -source: DN42 From de93f1534e26c16bf412f71f7220fac51edc2b82 Mon Sep 17 00:00:00 2001 From: SteveYi Yo Date: Wed, 17 Jun 2020 04:36:28 +0800 Subject: [PATCH 39/40] DNS --- data/dns/yi.dn42 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/dns/yi.dn42 b/data/dns/yi.dn42 index 877879243..db0609fb0 100644 --- a/data/dns/yi.dn42 +++ b/data/dns/yi.dn42 @@ -1,5 +1,5 @@ domain: yi.dn42 -nserver: dns1.yi.dn42 172.20.12.0 +nserver: dns1.yi.dn42 172.22.189.96 admin-c: YI-DN42 tech-c: YI-DN42 mnt-by: YI-MNT From 0f546f0f55d4ba85998b9a60365dd45e3440fe34 Mon Sep 17 00:00:00 2001 From: marlin Date: Wed, 17 Jun 2020 22:21:09 +0800 Subject: [PATCH 40/40] fix route --- .../{fdef:f40f:1337:cafe::_64 => fdef:6fb6:592d::_48} | 4 ++-- data/route6/{fdef:f40f:1337:cafe::_64 => fdef:6fb6:592d::_48} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename data/inet6num/{fdef:f40f:1337:cafe::_64 => fdef:6fb6:592d::_48} (62%) rename data/route6/{fdef:f40f:1337:cafe::_64 => fdef:6fb6:592d::_48} (66%) diff --git a/data/inet6num/fdef:f40f:1337:cafe::_64 b/data/inet6num/fdef:6fb6:592d::_48 similarity index 62% rename from data/inet6num/fdef:f40f:1337:cafe::_64 rename to data/inet6num/fdef:6fb6:592d::_48 index 0cdab02a9..dcac9c463 100644 --- a/data/inet6num/fdef:f40f:1337:cafe::_64 +++ b/data/inet6num/fdef:6fb6:592d::_48 @@ -1,5 +1,5 @@ -inet6num: fdef:f40f:1337:cafe:0000:0000:0000:0000 - fdef:f40f:1337:cafe:ffff:ffff:ffff:ffff -cidr: fdef:f40f:1337:cafe::/64 +inet6num: fdef:6fb6:592d:0000:0000:0000:0000:0000 - fdef:6fb6:592d:ffff:ffff:ffff:ffff:ffff +cidr: fdef:6fb6:592d::/48 netname: MARLIN-NETWORK descr: Network of MARLIN country: CN diff --git a/data/route6/fdef:f40f:1337:cafe::_64 b/data/route6/fdef:6fb6:592d::_48 similarity index 66% rename from data/route6/fdef:f40f:1337:cafe::_64 rename to data/route6/fdef:6fb6:592d::_48 index 1c9499be3..0cdae2e5b 100644 --- a/data/route6/fdef:f40f:1337:cafe::_64 +++ b/data/route6/fdef:6fb6:592d::_48 @@ -1,4 +1,4 @@ -route6: fdef:f40f:1337:cafe::/64 +route6: fdef:6fb6:592d::/48 origin: AS4242423189 mnt-by: MARLIN-MNT source: DN42