From d1949af7f5d49c969b2574354fb6c5dea968c66f Mon Sep 17 00:00:00 2001 From: funnysyc Date: Mon, 11 Jul 2022 07:28:35 +0000 Subject: [PATCH 1/4] Add organization HuajiTech Signed-off-by: funnysyc --- asn/AS4201270456.toml | 2 +- asn/AS4242420458.toml | 4 ++++ asn/AS4242422458.toml | 3 +++ dns/db.10.127 | 2 +- dns/db.fd10.127 | 3 ++- dns/neonetwork | 8 +++++--- dns/rfc2317.toml | 3 +++ entity/huajitech.toml | 11 +++++++++++ entity/ricky8955555.toml | 7 +++++++ route/AS4201270456.toml | 8 ++++++++ route/AS4242420458.toml | 7 +++++++ route/AS4242422458.toml | 7 +++++++ 12 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 asn/AS4242420458.toml create mode 100644 asn/AS4242422458.toml create mode 100644 entity/huajitech.toml create mode 100644 entity/ricky8955555.toml create mode 100644 route/AS4242420458.toml create mode 100644 route/AS4242422458.toml diff --git a/asn/AS4201270456.toml b/asn/AS4201270456.toml index e3bab57..61290cb 100644 --- a/asn/AS4201270456.toml +++ b/asn/AS4201270456.toml @@ -1,4 +1,4 @@ name = "HJTMESH-AS" -owner = "funnysyc" +owner = "huajitech" source = "NeoNetwork" description = "HUAJITECH Mesh Network" diff --git a/asn/AS4242420458.toml b/asn/AS4242420458.toml new file mode 100644 index 0000000..81a1f4a --- /dev/null +++ b/asn/AS4242420458.toml @@ -0,0 +1,4 @@ +name = "HUAJINET" +owner = "funnysyc" +source = "DN42" +description = "HUAJINET DN42 Networks" diff --git a/asn/AS4242422458.toml b/asn/AS4242422458.toml new file mode 100644 index 0000000..143c068 --- /dev/null +++ b/asn/AS4242422458.toml @@ -0,0 +1,3 @@ +name = "PIGEONHOLE-AS" +owner = "ricky8955555" +source = "NeoNetwork" diff --git a/dns/db.10.127 b/dns/db.10.127 index a410716..ffcb120 100644 --- a/dns/db.10.127 +++ b/dns/db.10.127 @@ -107,7 +107,7 @@ $TTL 3600 111 IN NS ns.kskb.neo. -45 IN NS ns0.hjt.neo. +45 IN NS ns0.hmn.neo. 186 IN NS ns1.186526.dn42. 186 IN NS ns2.186526.dn42. diff --git a/dns/db.fd10.127 b/dns/db.fd10.127 index c25ca05..64f8770 100644 --- a/dns/db.fd10.127 +++ b/dns/db.fd10.127 @@ -65,7 +65,8 @@ c.c.0.0 IN NS ns1.an.dn42. f.0.0.e IN NS ns.kskb.neo. -5.4.0.0 IN NS ns0.hjt.neo. +5.4.0.0 IN NS ns0.hmn.neo. +2.0.0.7.2.0.0 IN NS ns0.hmn.neo. 6.8.1.0 IN NS ns1.186526.dn42. 6.8.1.0 IN NS ns2.186526.dn42. diff --git a/dns/neonetwork b/dns/neonetwork index 2443cfd..62fd220 100644 --- a/dns/neonetwork +++ b/dns/neonetwork @@ -165,9 +165,11 @@ kskb IN NS ns.kskb ns.kskb IN A 10.127.111.233 ns.kskb IN AAAA fd10:127:e00f:aca::233 -hjt IN NS ns0.hjt -ns0.hjt IN A 10.127.45.233 -ns0.hjt IN AAAA fd10:127:45:233::1 +hmn IN NS ns0.hmn +ns0.hmn IN A 10.127.45.233 +ns0.hmn IN AAAA fd10:127:45:233::1 + +hjt IN NS ns0.hmn hanako IN NS ns.hanako ns.hanako IN A 10.127.80.80 diff --git a/dns/rfc2317.toml b/dns/rfc2317.toml index c0bde43..336b18d 100644 --- a/dns/rfc2317.toml +++ b/dns/rfc2317.toml @@ -16,3 +16,6 @@ NS = ["ns1.staph.neo."] ["10.127.8.128/29"] NS = ["ns.leedagee.neo."] + +["10.127.27.24/29"] +NS = ["ns0.hmn.neo."] diff --git a/entity/huajitech.toml b/entity/huajitech.toml new file mode 100644 index 0000000..fdf3950 --- /dev/null +++ b/entity/huajitech.toml @@ -0,0 +1,11 @@ +name = "HuajiTech" +babel = ["zh-N", "en-2"] + +[contact] +email = "noc@huajitech.net" +telegram = "huajitech" +github = "huajitech" + +# See also: +# entity/funnysyc.toml +# entity/ricky8955555.toml diff --git a/entity/ricky8955555.toml b/entity/ricky8955555.toml new file mode 100644 index 0000000..aa5694a --- /dev/null +++ b/entity/ricky8955555.toml @@ -0,0 +1,7 @@ +name = "Ricky8955555" +babel = ["zh-N", "en-2"] + +[contact] +email = "397050061@qq.com" +telegram = "ricky8955555" +github = "ricky8955555" diff --git a/route/AS4201270456.toml b/route/AS4201270456.toml index eff1fc4..80f5ff5 100644 --- a/route/AS4201270456.toml +++ b/route/AS4201270456.toml @@ -5,3 +5,11 @@ name = "HJTMESH-NET" ["fd10:127:45::/48"] type = "subnet" name = "HJTMESH-NET" + +["10.127.27.24/29"] +type = "subnet" +name = "HUAJITECH-ANYCAST" + +["fd10:127:27:20::/60"] +type = "subnet" +name = "HUAJITECH-ANYCAST" diff --git a/route/AS4242420458.toml b/route/AS4242420458.toml new file mode 100644 index 0000000..d164756 --- /dev/null +++ b/route/AS4242420458.toml @@ -0,0 +1,7 @@ +["10.127.27.24/29"] +type = "subnet" +name = "HUAJITECH-ANYCAST" + +["fd10:127:27:20::/60"] +type = "subnet" +name = "HUAJITECH-ANYCAST" diff --git a/route/AS4242422458.toml b/route/AS4242422458.toml new file mode 100644 index 0000000..d164756 --- /dev/null +++ b/route/AS4242422458.toml @@ -0,0 +1,7 @@ +["10.127.27.24/29"] +type = "subnet" +name = "HUAJITECH-ANYCAST" + +["fd10:127:27:20::/60"] +type = "subnet" +name = "HUAJITECH-ANYCAST" From e56693c47dc8836db6556f0afaed1380cc7bd7e7 Mon Sep 17 00:00:00 2001 From: funnysyc Date: Mon, 11 Jul 2022 07:56:08 +0000 Subject: [PATCH 2/4] Unify the owners of the ASNs Signed-off-by: funnysyc --- asn/AS4242420458.toml | 5 ++--- asn/AS4242422458.toml | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/asn/AS4242420458.toml b/asn/AS4242420458.toml index 81a1f4a..ddfa153 100644 --- a/asn/AS4242420458.toml +++ b/asn/AS4242420458.toml @@ -1,4 +1,3 @@ -name = "HUAJINET" -owner = "funnysyc" +owner = "huajitech" source = "DN42" -description = "HUAJINET DN42 Networks" + diff --git a/asn/AS4242422458.toml b/asn/AS4242422458.toml index 143c068..9308c74 100644 --- a/asn/AS4242422458.toml +++ b/asn/AS4242422458.toml @@ -1,3 +1,2 @@ -name = "PIGEONHOLE-AS" -owner = "ricky8955555" -source = "NeoNetwork" +owner = "huajitech" +source = "DN42" From be6d30edf854a2d6611f50a3823075eae323230a Mon Sep 17 00:00:00 2001 From: funnysyc Date: Mon, 11 Jul 2022 08:00:52 +0000 Subject: [PATCH 3/4] Fill in AS-names Signed-off-by: funnysyc --- asn/AS4242420458.toml | 1 + asn/AS4242422458.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/asn/AS4242420458.toml b/asn/AS4242420458.toml index ddfa153..f9794ca 100644 --- a/asn/AS4242420458.toml +++ b/asn/AS4242420458.toml @@ -1,3 +1,4 @@ +name = "HUAJINET" owner = "huajitech" source = "DN42" diff --git a/asn/AS4242422458.toml b/asn/AS4242422458.toml index 9308c74..42fe6eb 100644 --- a/asn/AS4242422458.toml +++ b/asn/AS4242422458.toml @@ -1,2 +1,3 @@ +name = "PIGEONHOLE-AS" owner = "huajitech" source = "DN42" From 58e8884755edc5d8ed775f408796b8d1761bf354 Mon Sep 17 00:00:00 2001 From: funnysyc Date: Mon, 11 Jul 2022 08:03:06 +0000 Subject: [PATCH 4/4] Adjust format Signed-off-by: funnysyc --- asn/AS4242420458.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/asn/AS4242420458.toml b/asn/AS4242420458.toml index f9794ca..255f0d2 100644 --- a/asn/AS4242420458.toml +++ b/asn/AS4242420458.toml @@ -1,4 +1,3 @@ name = "HUAJINET" owner = "huajitech" source = "DN42" -