diff --git a/README.md b/README.md index 8206b18..5422fa8 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ | Neo_Chen | chenkolei@gmail.com | Neo_Chen | | Yangfl Network | | | | Tyler | | santost12 | -| liangjw | liangjw@etlgr.com | liangjw | +| liangjw | dn42@cas7.moe | liangjw | | Staph | staph@aosc.io | Staph | | iEdon | | | | Cupkappu | cup@kust.ga | kifuc | @@ -217,7 +217,8 @@ | AS4201270013 | Ndoskrnls LAN (IPv6) | subnet | fd10:127:13::/48 | | | AS4201270014 | leedagee | subnet | 10.127.23.0/29 | | | AS4201270014 | leedagee | subnet | fd10:127:23::/48 | | -| AS4201270016 | Moecast Network | subnet | 10.127.64.0/27 | | +| AS4201270016 | MOECAST-EXP-NET | subnet | 10.127.64.0/24 | | +| AS4201270016 | MOECAST-EXP-NET-NG | subnet | fd10:127:64::/48 | | | 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 | | @@ -270,7 +271,7 @@ 10.127.39.0/27 10.127.41.0/24 10.127.56.0/24 -10.127.64.0/27 +10.127.64.0/24 10.127.66.0/24 10.127.89.0/24 10.127.100.0/24 @@ -299,6 +300,7 @@ fd10:127:13::/48 fd10:127:23::/48 fd10:127:41::/48 fd10:127:53::/48 +fd10:127:64::/48 fd10:127:127::/48 fd10:127:233::/48 fd10:127:308::/48 @@ -318,5 +320,5 @@ fd10:127:ffff:53::/64 | IP Version | Total | Used | Free | Percent Used | Percent Free | |--------------|------------|------------|------------|----------------|----------------| -| IPv4 | 65536 | 6783 | 58753 | 10.35% | 89.65% | -| IPv6 | 7.9228e+28 | 1.9135e+25 | 7.9209e+28 | 0.02% | 99.98% | +| IPv4 | 65536 | 7007 | 58529 | 10.69% | 89.31% | +| IPv6 | 7.9228e+28 | 2.0344e+25 | 7.9208e+28 | 0.03% | 99.97% | diff --git a/neonetwork.json b/neonetwork.json index ac9ad06..a94ec86 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1618555541, - "valid": 1619765141 + "generated": 1618663097, + "valid": 1619872697 }, "people": { "leedagee": { @@ -354,7 +354,7 @@ "ja-1" ], "contact": { - "email": "liangjw@etlgr.com", + "email": "dn42@cas7.moe", "telegram": "liangjw" }, "persona": { @@ -372,12 +372,18 @@ "routes": { "ipv4": [ { - "prefix": "10.127.64.0/27", + "prefix": "10.127.64.0/24", "maxLength": 29, - "netname": "Moecast Network" + "netname": "MOECAST-EXP-NET" } ], - "ipv6": [] + "ipv6": [ + { + "prefix": "fd10:127:64::/48", + "maxLength": 64, + "netname": "MOECAST-EXP-NET-NG" + } + ] } } ] diff --git a/rfc8416.json b/rfc8416.json index b3e0679..c16add3 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -213,9 +213,9 @@ }, { "asn": 4201270016, - "prefix": "10.127.64.0/27", + "prefix": "10.127.64.0/24", "maxPrefixLength": 29, - "comment": "Moecast Network" + "comment": "MOECAST-EXP-NET" }, { "asn": 4201270018, @@ -469,6 +469,12 @@ "maxPrefixLength": 64, "comment": "leedagee" }, + { + "asn": 4201270016, + "prefix": "fd10:127:64::/48", + "maxPrefixLength": 64, + "comment": "MOECAST-EXP-NET-NG" + }, { "asn": 4201270018, "prefix": "fd10:127:6324::/48", diff --git a/roa46.json b/roa46.json index 4190356..946009f 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { - "counts": 87, - "generated": 1618555541, - "valid": 1619765141 + "counts": 88, + "generated": 1618663096, + "valid": 1619872696 }, "roas": [ { @@ -177,7 +177,7 @@ }, { "asn": "AS4201270016", - "prefix": "10.127.64.0/27", + "prefix": "10.127.64.0/24", "maxLength": 29 }, { @@ -390,6 +390,11 @@ "prefix": "fd10:127:23::/48", "maxLength": 64 }, + { + "asn": "AS4201270016", + "prefix": "fd10:127:64::/48", + "maxLength": 64 + }, { "asn": "AS4201270018", "prefix": "fd10:127:6324::/48", diff --git a/roa46_bird2.conf b/roa46_bird2.conf index 83d657c..04072af 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -34,7 +34,7 @@ route 10.127.22.8/29 max 29 as 4201270011; route 10.127.5.0/28 max 29 as 4201270012; route 10.127.13.0/24 max 29 as 4201270013; route 10.127.23.0/29 max 29 as 4201270014; -route 10.127.64.0/27 max 29 as 4201270016; +route 10.127.64.0/24 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; @@ -77,6 +77,7 @@ route fd10:127:ec39::/48 max 64 as 4201270009; 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:64::/48 max 64 as 4201270016; route fd10:127:6324::/48 max 64 as 4201270018; route fd10:127:2f2f::/48 max 64 as 4201270020; route fd10:127:aa66::/48 max 64 as 4201270021; diff --git a/roa4_bird2.conf b/roa4_bird2.conf index 3993f28..46c3c00 100644 --- a/roa4_bird2.conf +++ b/roa4_bird2.conf @@ -34,7 +34,7 @@ route 10.127.22.8/29 max 29 as 4201270011; route 10.127.5.0/28 max 29 as 4201270012; route 10.127.13.0/24 max 29 as 4201270013; route 10.127.23.0/29 max 29 as 4201270014; -route 10.127.64.0/27 max 29 as 4201270016; +route 10.127.64.0/24 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; diff --git a/roa6_bird2.conf b/roa6_bird2.conf index 54ff9c3..2016413 100644 --- a/roa6_bird2.conf +++ b/roa6_bird2.conf @@ -26,6 +26,7 @@ route fd10:127:ec39::/48 max 64 as 4201270009; 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:64::/48 max 64 as 4201270016; route fd10:127:6324::/48 max 64 as 4201270018; route fd10:127:2f2f::/48 max 64 as 4201270020; route fd10:127:aa66::/48 max 64 as 4201270021;