From 929edcf532dfddcf6312f2b0f848e000ab02fe35 Mon Sep 17 00:00:00 2001 From: David Zhixu Liu Date: Tue, 23 Mar 2021 11:11:48 +0800 Subject: [PATCH 1/4] Add objects: entity, asn, route, node --- asn/AS211876.toml | 4 ++++ asn/AS4201270021.toml | 3 +++ asn/AS4242421876.toml | 3 +++ entity/DavidLiu.toml | 11 +++++++++++ node/DavidLiu.toml | 2 ++ route/AS211876.toml | 9 +++++++++ route/AS4201270021.toml | 9 +++++++++ route/AS4242421876.toml | 9 +++++++++ 8 files changed, 50 insertions(+) create mode 100644 asn/AS211876.toml create mode 100644 asn/AS4201270021.toml create mode 100644 asn/AS4242421876.toml create mode 100644 entity/DavidLiu.toml create mode 100644 node/DavidLiu.toml create mode 100644 route/AS211876.toml create mode 100644 route/AS4201270021.toml create mode 100644 route/AS4242421876.toml diff --git a/asn/AS211876.toml b/asn/AS211876.toml new file mode 100644 index 0000000..674c755 --- /dev/null +++ b/asn/AS211876.toml @@ -0,0 +1,4 @@ +name = "AS-FIXMIX" +owner = "DavidLiu" +description = "fixmix Global Experimental Network" +source = "Internet" diff --git a/asn/AS4201270021.toml b/asn/AS4201270021.toml new file mode 100644 index 0000000..d9353f2 --- /dev/null +++ b/asn/AS4201270021.toml @@ -0,0 +1,3 @@ +name = "AS-FIXMIX-NEONETWORK" +owner = "DavidLiu" +description = "fixmix NeoNetwork Network" diff --git a/asn/AS4242421876.toml b/asn/AS4242421876.toml new file mode 100644 index 0000000..2d68e6d --- /dev/null +++ b/asn/AS4242421876.toml @@ -0,0 +1,3 @@ +name = "AS-FIXMIX-DN42" +owner = "DavidLiu" +description = "fixmix DN42 Network" diff --git a/entity/DavidLiu.toml b/entity/DavidLiu.toml new file mode 100644 index 0000000..f7ba430 --- /dev/null +++ b/entity/DavidLiu.toml @@ -0,0 +1,11 @@ +name = "DavidLiu" +babel = ["zh-N", "en-3"] + +[contact] +email = "david@fixmix.tech" +telegram = "p0tat05" +irc = "p0tat05" +github = "p0tat05" + +[persona] +pgp = "11BA9B106D0DF5E6A1C4BC180641F2177A5530C0" diff --git a/node/DavidLiu.toml b/node/DavidLiu.toml new file mode 100644 index 0000000..dd2a9ce --- /dev/null +++ b/node/DavidLiu.toml @@ -0,0 +1,2 @@ +[fixmix] +asn = 4201270021 diff --git a/route/AS211876.toml b/route/AS211876.toml new file mode 100644 index 0000000..a70ecad --- /dev/null +++ b/route/AS211876.toml @@ -0,0 +1,9 @@ +["10.127.66.0/24"] +type = "subnet" +name = "FIXMIX-NET-NEOV4A" +description = "fixmix NeoNetwork Network - IPv4 A" + +["fd10:127:aa66::/48"] +type = "subnet" +name = "FIXMIX-NET-NEOV6A" +description = "fixmix NeoNetwork Network - IPv6 A" diff --git a/route/AS4201270021.toml b/route/AS4201270021.toml new file mode 100644 index 0000000..a70ecad --- /dev/null +++ b/route/AS4201270021.toml @@ -0,0 +1,9 @@ +["10.127.66.0/24"] +type = "subnet" +name = "FIXMIX-NET-NEOV4A" +description = "fixmix NeoNetwork Network - IPv4 A" + +["fd10:127:aa66::/48"] +type = "subnet" +name = "FIXMIX-NET-NEOV6A" +description = "fixmix NeoNetwork Network - IPv6 A" diff --git a/route/AS4242421876.toml b/route/AS4242421876.toml new file mode 100644 index 0000000..a70ecad --- /dev/null +++ b/route/AS4242421876.toml @@ -0,0 +1,9 @@ +["10.127.66.0/24"] +type = "subnet" +name = "FIXMIX-NET-NEOV4A" +description = "fixmix NeoNetwork Network - IPv4 A" + +["fd10:127:aa66::/48"] +type = "subnet" +name = "FIXMIX-NET-NEOV6A" +description = "fixmix NeoNetwork Network - IPv6 A" From 9b4dc5d0d69e2903c64fc36f072f5d92f7737a04 Mon Sep 17 00:00:00 2001 From: David Zhixu Liu Date: Tue, 23 Mar 2021 11:30:27 +0800 Subject: [PATCH 2/4] Add mastodon to entity/DavidLiu --- entity/DavidLiu.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/entity/DavidLiu.toml b/entity/DavidLiu.toml index f7ba430..ac1d176 100644 --- a/entity/DavidLiu.toml +++ b/entity/DavidLiu.toml @@ -5,6 +5,7 @@ babel = ["zh-N", "en-3"] email = "david@fixmix.tech" telegram = "p0tat05" irc = "p0tat05" +mastodon = "@p0tat05@mastodon.online" github = "p0tat05" [persona] From 62cd2e3f93d88367a38cf72151fb998d7cf90a52 Mon Sep 17 00:00:00 2001 From: David Zhixu Liu Date: Tue, 23 Mar 2021 21:47:36 +0800 Subject: [PATCH 3/4] Modify a few details --- asn/AS211876.toml | 2 +- asn/AS4201270021.toml | 2 +- asn/AS4242421876.toml | 2 +- entity/{DavidLiu.toml => David Liu.toml} | 2 +- node/{DavidLiu.toml => fixmix.toml} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename entity/{DavidLiu.toml => David Liu.toml} (91%) rename node/{DavidLiu.toml => fixmix.toml} (100%) diff --git a/asn/AS211876.toml b/asn/AS211876.toml index 674c755..57fa5b1 100644 --- a/asn/AS211876.toml +++ b/asn/AS211876.toml @@ -1,4 +1,4 @@ name = "AS-FIXMIX" -owner = "DavidLiu" +owner = "David Liu" description = "fixmix Global Experimental Network" source = "Internet" diff --git a/asn/AS4201270021.toml b/asn/AS4201270021.toml index d9353f2..cd9a1b2 100644 --- a/asn/AS4201270021.toml +++ b/asn/AS4201270021.toml @@ -1,3 +1,3 @@ name = "AS-FIXMIX-NEONETWORK" -owner = "DavidLiu" +owner = "David Liu" description = "fixmix NeoNetwork Network" diff --git a/asn/AS4242421876.toml b/asn/AS4242421876.toml index 2d68e6d..60e8aba 100644 --- a/asn/AS4242421876.toml +++ b/asn/AS4242421876.toml @@ -1,3 +1,3 @@ name = "AS-FIXMIX-DN42" -owner = "DavidLiu" +owner = "David Liu" description = "fixmix DN42 Network" diff --git a/entity/DavidLiu.toml b/entity/David Liu.toml similarity index 91% rename from entity/DavidLiu.toml rename to entity/David Liu.toml index ac1d176..efb2a6a 100644 --- a/entity/DavidLiu.toml +++ b/entity/David Liu.toml @@ -1,4 +1,4 @@ -name = "DavidLiu" +name = "David Liu" babel = ["zh-N", "en-3"] [contact] diff --git a/node/DavidLiu.toml b/node/fixmix.toml similarity index 100% rename from node/DavidLiu.toml rename to node/fixmix.toml From 4109a77969f5166c6545f0a1d50186364c5b6222 Mon Sep 17 00:00:00 2001 From: David Zhixu Liu Date: Tue, 23 Mar 2021 16:51:27 +0000 Subject: [PATCH 4/4] Fix some errors --- asn/AS211876.toml | 2 +- asn/AS4201270021.toml | 3 ++- asn/AS4242421876.toml | 2 +- entity/David Liu.toml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/asn/AS211876.toml b/asn/AS211876.toml index 57fa5b1..c842ff9 100644 --- a/asn/AS211876.toml +++ b/asn/AS211876.toml @@ -1,4 +1,4 @@ -name = "AS-FIXMIX" +name = "FIXMIX-AS" owner = "David Liu" description = "fixmix Global Experimental Network" source = "Internet" diff --git a/asn/AS4201270021.toml b/asn/AS4201270021.toml index cd9a1b2..f72cd78 100644 --- a/asn/AS4201270021.toml +++ b/asn/AS4201270021.toml @@ -1,3 +1,4 @@ -name = "AS-FIXMIX-NEONETWORK" +name = "FIXMIX-AS-NEONETWORK" owner = "David Liu" description = "fixmix NeoNetwork Network" + diff --git a/asn/AS4242421876.toml b/asn/AS4242421876.toml index 60e8aba..8273315 100644 --- a/asn/AS4242421876.toml +++ b/asn/AS4242421876.toml @@ -1,3 +1,3 @@ -name = "AS-FIXMIX-DN42" +name = "FIXMIX-AS-DN42" owner = "David Liu" description = "fixmix DN42 Network" diff --git a/entity/David Liu.toml b/entity/David Liu.toml index efb2a6a..57460e3 100644 --- a/entity/David Liu.toml +++ b/entity/David Liu.toml @@ -5,7 +5,7 @@ babel = ["zh-N", "en-3"] email = "david@fixmix.tech" telegram = "p0tat05" irc = "p0tat05" -mastodon = "@p0tat05@mastodon.online" +mastodon = "@p0tat05@mas.to" github = "p0tat05" [persona]