From 9bf62ed846c9fcb932aa73f0ca26f5a95208273a Mon Sep 17 00:00:00 2001 From: marlin Date: Mon, 15 Jun 2020 21:39:27 +0800 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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 04/10] 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 8fd2995a216967e91ff35f4fbee3dd9926c3cd79 Mon Sep 17 00:00:00 2001 From: marlin Date: Tue, 16 Jun 2020 21:14:13 +0800 Subject: [PATCH 05/10] 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 06/10] 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 0f44f62e2b4e4727dc99164e68c344a89b7bf566 Mon Sep 17 00:00:00 2001 From: marlin Date: Tue, 16 Jun 2020 22:38:38 +0800 Subject: [PATCH 07/10] 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 08/10] 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 09/10] 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 0f546f0f55d4ba85998b9a60365dd45e3440fe34 Mon Sep 17 00:00:00 2001 From: marlin Date: Wed, 17 Jun 2020 22:21:09 +0800 Subject: [PATCH 10/10] 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