diff --git a/README.md b/README.md index 80a41ea..42512f6 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ | MagicNeko | icecat@catio.network | fakeicecat | | SUNNET | | | | JerryXiao | neonet@mail.jerryxiao.cc | JerryXiao | +| Edward_P | edward@edward-p.xyz | @Edward_P | | LibreHouse | i+noc@outv.im | outvi | | James58899 | | | | Junde Yhi | lmy441900@live.com | lmy441900 | @@ -64,6 +65,7 @@ | NeoNetwork | AS4201270017 | CainSakura | Cain's Home Network | | NeoNetwork | AS4201270018 | caxap | caxap Network | | NeoNetwork | AS4201270019 | Cupkappu | Cupkappu | +| NeoNetwork | AS4201270020 | Edward_P | Edward_P | | DN42 | AS4242420140 | Yangfl | Yangfl Network | | DN42 | AS4242420308 | VILLISEK | VILLISEK | | DN42 | AS4242420916 | alanyhq | alanyhq | @@ -119,6 +121,7 @@ | AS4201270019 | Cupkappu-HK1 | | AS4201270019 | Cupkappu-JP | | AS4201270019 | Cupkappu-HK2 | +| AS4201270020 | Edward_P | | AS4242420140 | dfceaef | | AS4242420308 | VILLISEK | | AS4242421037 | megumiLHS | @@ -246,6 +249,8 @@ | AS4201270018 | caxap-minecraft-net | subnet | 10.127.100.0/24 | | | AS4201270018 | caxap6 | subnet | fd10:127:6324::/48 | | | AS4201270019 | cupkappu | subnet | 10.127.19.0/24 | | +| AS4201270020 | Edward_P-Ezpro | subnet | 10.127.8.128/29 | | +| AS4201270020 | Edward_P-Ezpro-V6 | subnet | fd10:127:2f2f::/48 | | | AS4242420140 | dfceaef NET | subnet | 10.127.12.0/24 | | | AS4242420308 | VILLISEK-NEO | subnet | 10.127.38.32/27 | | | AS4242420308 | VILLISEK-NEO-V6 | subnet | fd10:127:308::/48 | | @@ -264,6 +269,7 @@ 10.127.5.0/28 10.127.7.0/24 10.127.8.0/25 +10.127.8.128/29 10.127.8.160/27 10.127.8.192/26 10.127.9.0/24 @@ -314,6 +320,7 @@ fd10:127:234::/48 fd10:127:308::/48 fd10:127:1300::/48 fd10:127:1919::/48 +fd10:127:2f2f::/48 fd10:127:3262::/64 fd10:127:5f37:59df::/64 fd10:127:6324::/48 @@ -325,5 +332,5 @@ fd10:127:ffff:53::/64 | IP Version | Total | Used | Free | Percent Used | Percent Free | |--------------|------------|------------|------------|----------------|----------------| -| IPv4 | 65536 | 7288 | 58248 | 11.12% | 88.88% | -| IPv6 | 7.9228e+28 | 1.5508e+25 | 7.9213e+28 | 0.02% | 99.98% | +| IPv4 | 65536 | 7296 | 58240 | 11.13% | 88.87% | +| IPv6 | 7.9228e+28 | 1.6717e+25 | 7.9211e+28 | 0.02% | 99.98% | diff --git a/neonetwork.json b/neonetwork.json index f740233..3938b3e 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1606302130, - "valid": 1607511730 + "generated": 1606389490, + "valid": 1607599090 }, "people": { "septs": { @@ -842,6 +842,42 @@ } ] }, + "Edward_P": { + "info": { + "name": "Edward_P", + "contact": { + "email": "edward@edward-p.xyz", + "github": "edward-p", + "telegram": "@Edward_P" + }, + "nic_hdl": "EDWARD-P" + }, + "asns": [ + { + "asn": 4201270020, + "owner": "Edward_P", + "name": "Edward_P", + "source": "NeoNetwork", + "description": null, + "routes": { + "ipv4": [ + { + "prefix": "10.127.8.128/29", + "maxLength": 29, + "netname": "Edward_P-Ezpro" + } + ], + "ipv6": [ + { + "prefix": "fd10:127:2f2f::/48", + "maxLength": 64, + "netname": "Edward_P-Ezpro-V6" + } + ] + } + } + ] + }, "LibreHouse": { "info": { "name": "LibreHouse", diff --git a/rfc8416.json b/rfc8416.json index acef6ff..eda3dc4 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -259,6 +259,12 @@ "maxPrefixLength": 29, "comment": "cupkappu" }, + { + "asn": 4201270020, + "prefix": "10.127.8.128/29", + "maxPrefixLength": 29, + "comment": "Edward_P-Ezpro" + }, { "asn": 4242420140, "prefix": "10.127.12.0/24", @@ -463,6 +469,12 @@ "maxPrefixLength": 64, "comment": "caxap6" }, + { + "asn": 4201270020, + "prefix": "fd10:127:2f2f::/48", + "maxPrefixLength": 64, + "comment": "Edward_P-Ezpro-V6" + }, { "asn": 4242420308, "prefix": "fd10:127:308::/48", diff --git a/roa46.json b/roa46.json index 1a63657..3b0e500 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { - "counts": 78, - "generated": 1606302130, - "valid": 1607511730 + "counts": 80, + "generated": 1606389490, + "valid": 1607599090 }, "roas": [ { @@ -215,6 +215,11 @@ "prefix": "10.127.19.0/24", "maxLength": 29 }, + { + "asn": "AS4201270020", + "prefix": "10.127.8.128/29", + "maxLength": 29 + }, { "asn": "AS4242420140", "prefix": "10.127.12.0/24", @@ -385,6 +390,11 @@ "prefix": "fd10:127:6324::/48", "maxLength": 64 }, + { + "asn": "AS4201270020", + "prefix": "fd10:127:2f2f::/48", + "maxLength": 64 + }, { "asn": "AS4242420308", "prefix": "fd10:127:308::/48", diff --git a/roa46_bird2.conf b/roa46_bird2.conf index 53d7361..edab244 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -42,6 +42,7 @@ route 10.127.23.0/29 max 29 as 4201270014; route 10.127.64.0/27 max 29 as 4201270016; route 10.127.100.0/24 max 29 as 4201270018; route 10.127.19.0/24 max 29 as 4201270019; +route 10.127.8.128/29 max 29 as 4201270020; route 10.127.12.0/24 max 29 as 4242420140; route 10.127.38.32/27 max 29 as 4242420308; route 10.127.8.0/26 max 29 as 4242421037; @@ -76,5 +77,6 @@ route fd10:127:10::/48 max 64 as 4201270010; route fd10:127:13::/48 max 64 as 4201270013; route fd10:127:23::/48 max 64 as 4201270014; route fd10:127:6324::/48 max 64 as 4201270018; +route fd10:127:2f2f::/48 max 64 as 4201270020; route fd10:127:308::/48 max 64 as 4242420308; route fd10:127:233:1000::/64 max 64 as 4242421025; \ No newline at end of file diff --git a/roa4_bird2.conf b/roa4_bird2.conf index 3504878..79ad84c 100644 --- a/roa4_bird2.conf +++ b/roa4_bird2.conf @@ -42,6 +42,7 @@ route 10.127.23.0/29 max 29 as 4201270014; route 10.127.64.0/27 max 29 as 4201270016; route 10.127.100.0/24 max 29 as 4201270018; route 10.127.19.0/24 max 29 as 4201270019; +route 10.127.8.128/29 max 29 as 4201270020; route 10.127.12.0/24 max 29 as 4242420140; route 10.127.38.32/27 max 29 as 4242420308; route 10.127.8.0/26 max 29 as 4242421037; diff --git a/roa6_bird2.conf b/roa6_bird2.conf index 444ff7b..13f9c22 100644 --- a/roa6_bird2.conf +++ b/roa6_bird2.conf @@ -27,5 +27,6 @@ route fd10:127:10::/48 max 64 as 4201270010; route fd10:127:13::/48 max 64 as 4201270013; route fd10:127:23::/48 max 64 as 4201270014; route fd10:127:6324::/48 max 64 as 4201270018; +route fd10:127:2f2f::/48 max 64 as 4201270020; route fd10:127:308::/48 max 64 as 4242420308; route fd10:127:233:1000::/64 max 64 as 4242421025; \ No newline at end of file