diff --git a/README.md b/README.md index e37ba39..483b8d7 100644 --- a/README.md +++ b/README.md @@ -189,7 +189,15 @@ | AS4201270006 | JerryXiao-Anycast | loopback | 10.127.255.53/32 | | | AS4201270006 | JerryXiao6 | subnet | fd10:127:53::/48 | | | AS4201270007 | StaphNet | subnet | 10.127.8.160/27 | | -| AS4201270007 | Staph_v6 | subnet | fd10:127:7::/48 | | +| AS4201270007 | AOSCNet | subnet | 10.127.7.0/24 | | +| AS4201270007 | Staph_v6 | subnet | fd10:127:7::/51 | | +| AS4201270007 | StaphReserve_0 | subnet | fd10:127:7:2000::/54 | | +| AS4201270007 | AOSCNet_v6 | subnet | fd10:127:7:2672::/64 | | +| AS4201270007 | StaphReserve_1 | subnet | fd10:127:7:3000::/52 | | +| AS4201270007 | StaphReserve_2 | subnet | fd10:127:7:4000::/50 | | +| AS4201270007 | StaphReserve_3 | subnet | fd10:127:7:8000::/50 | | +| AS4201270007 | StaphReserve_4 | subnet | fd10:127:7:c000::/51 | | +| AS4201270007 | StaphPeer | subnet | fd10:127:7:ffff::/64 | | | AS4201270008 | Icecat-Explosion | subnet | 10.127.4.0/24 | | | AS4201270008 | MagicNeko IX (Will not broadcast) | subnet | 10.127.237.0/24 | | | AS4201270008 | magicneko-tw | loopback | 10.127.255.117/32 | | @@ -222,6 +230,7 @@ 10.127.0.0/22 10.127.4.0/24 10.127.5.0/28 +10.127.7.0/24 10.127.8.0/26 10.127.8.160/27 10.127.8.192/26 @@ -250,7 +259,14 @@ 10.127.255.80/32 10.127.255.117/32 fd10:127::/64 -fd10:127:7::/48 +fd10:127:7::/51 +fd10:127:7:2000::/54 +fd10:127:7:2672::/64 +fd10:127:7:3000::/52 +fd10:127:7:4000::/50 +fd10:127:7:8000::/50 +fd10:127:7:c000::/51 +fd10:127:7:ffff::/64 fd10:127:10::/48 fd10:127:13::/48 fd10:127:23::/48 diff --git a/neonetwork.json b/neonetwork.json index 8c0a4c9..218bf69 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1595860847, - "valid": 1597070447 + "generated": 1596002231, + "valid": 1597211831 }, "people": { "iEdon": { @@ -922,13 +922,53 @@ "prefix": "10.127.8.160/27", "maxLength": 29, "netname": "StaphNet" + }, + { + "prefix": "10.127.7.0/24", + "maxLength": 29, + "netname": "AOSCNet" } ], "ipv6": [ { - "prefix": "fd10:127:7::/48", + "prefix": "fd10:127:7::/51", "maxLength": 64, "netname": "Staph_v6" + }, + { + "prefix": "fd10:127:7:2000::/54", + "maxLength": 64, + "netname": "StaphReserve_0" + }, + { + "prefix": "fd10:127:7:2672::/64", + "maxLength": 64, + "netname": "AOSCNet_v6" + }, + { + "prefix": "fd10:127:7:3000::/52", + "maxLength": 64, + "netname": "StaphReserve_1" + }, + { + "prefix": "fd10:127:7:4000::/50", + "maxLength": 64, + "netname": "StaphReserve_2" + }, + { + "prefix": "fd10:127:7:8000::/50", + "maxLength": 64, + "netname": "StaphReserve_3" + }, + { + "prefix": "fd10:127:7:c000::/51", + "maxLength": 64, + "netname": "StaphReserve_4" + }, + { + "prefix": "fd10:127:7:ffff::/64", + "maxLength": 64, + "netname": "StaphPeer" } ] } diff --git a/rfc8416.json b/rfc8416.json index d2859e3..f451ba8 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -133,6 +133,12 @@ "maxPrefixLength": 29, "comment": "StaphNet" }, + { + "asn": 4201270007, + "prefix": "10.127.7.0/24", + "maxPrefixLength": 29, + "comment": "AOSCNet" + }, { "asn": 4201270008, "prefix": "10.127.4.0/24", @@ -297,10 +303,52 @@ }, { "asn": 4201270007, - "prefix": "fd10:127:7::/48", + "prefix": "fd10:127:7::/51", "maxPrefixLength": 64, "comment": "Staph_v6" }, + { + "asn": 4201270007, + "prefix": "fd10:127:7:2000::/54", + "maxPrefixLength": 64, + "comment": "StaphReserve_0" + }, + { + "asn": 4201270007, + "prefix": "fd10:127:7:2672::/64", + "maxPrefixLength": 64, + "comment": "AOSCNet_v6" + }, + { + "asn": 4201270007, + "prefix": "fd10:127:7:3000::/52", + "maxPrefixLength": 64, + "comment": "StaphReserve_1" + }, + { + "asn": 4201270007, + "prefix": "fd10:127:7:4000::/50", + "maxPrefixLength": 64, + "comment": "StaphReserve_2" + }, + { + "asn": 4201270007, + "prefix": "fd10:127:7:8000::/50", + "maxPrefixLength": 64, + "comment": "StaphReserve_3" + }, + { + "asn": 4201270007, + "prefix": "fd10:127:7:c000::/51", + "maxPrefixLength": 64, + "comment": "StaphReserve_4" + }, + { + "asn": 4201270007, + "prefix": "fd10:127:7:ffff::/64", + "maxPrefixLength": 64, + "comment": "StaphPeer" + }, { "asn": 4201270008, "prefix": "fd10:127:233::/48", diff --git a/roa46.json b/roa46.json index dfd4002..90945a1 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { - "counts": 56, - "generated": 1595860847, - "valid": 1597070447 + "counts": 64, + "generated": 1596002231, + "valid": 1597211831 }, "roas": [ { @@ -110,6 +110,11 @@ "prefix": "10.127.8.160/27", "maxLength": 29 }, + { + "asn": "AS4201270007", + "prefix": "10.127.7.0/24", + "maxLength": 29 + }, { "asn": "AS4201270008", "prefix": "10.127.4.0/24", @@ -247,7 +252,42 @@ }, { "asn": "AS4201270007", - "prefix": "fd10:127:7::/48", + "prefix": "fd10:127:7::/51", + "maxLength": 64 + }, + { + "asn": "AS4201270007", + "prefix": "fd10:127:7:2000::/54", + "maxLength": 64 + }, + { + "asn": "AS4201270007", + "prefix": "fd10:127:7:2672::/64", + "maxLength": 64 + }, + { + "asn": "AS4201270007", + "prefix": "fd10:127:7:3000::/52", + "maxLength": 64 + }, + { + "asn": "AS4201270007", + "prefix": "fd10:127:7:4000::/50", + "maxLength": 64 + }, + { + "asn": "AS4201270007", + "prefix": "fd10:127:7:8000::/50", + "maxLength": 64 + }, + { + "asn": "AS4201270007", + "prefix": "fd10:127:7:c000::/51", + "maxLength": 64 + }, + { + "asn": "AS4201270007", + "prefix": "fd10:127:7:ffff::/64", "maxLength": 64 }, { diff --git a/roa46_bird2.conf b/roa46_bird2.conf index 3ee7ab6..24cd0b5 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -21,6 +21,7 @@ route 4201270006 max 10.127.8.192/26 as 29; route 4201270006 max 10.127.9.0/24 as 29; route 4201270006 max 10.127.255.53/32 as 32; route 4201270007 max 10.127.8.160/27 as 29; +route 4201270007 max 10.127.7.0/24 as 29; route 4201270008 max 10.127.4.0/24 as 29; route 4201270008 max 10.127.237.0/24 as 29; route 4201270008 max 10.127.255.117/32 as 32; @@ -48,7 +49,14 @@ route 4201270003 max fd10:127:1919::/48 as 64; route 4201270005 max fd10:127:233:1c3c::/64 as 64; route 4201270005 max fd10:127:233:1c3a::/64 as 64; route 4201270006 max fd10:127:53::/48 as 64; -route 4201270007 max fd10:127:7::/48 as 64; +route 4201270007 max fd10:127:7::/51 as 64; +route 4201270007 max fd10:127:7:2000::/54 as 64; +route 4201270007 max fd10:127:7:2672::/64 as 64; +route 4201270007 max fd10:127:7:3000::/52 as 64; +route 4201270007 max fd10:127:7:4000::/50 as 64; +route 4201270007 max fd10:127:7:8000::/50 as 64; +route 4201270007 max fd10:127:7:c000::/51 as 64; +route 4201270007 max fd10:127:7:ffff::/64 as 64; route 4201270008 max fd10:127:233::/48 as 64; route 4201270009 max fd10:127:ec39::/48 as 64; route 4201270010 max fd10:127:10::/48 as 64; diff --git a/roa4_bird2.conf b/roa4_bird2.conf index 5971df2..f99db36 100644 --- a/roa4_bird2.conf +++ b/roa4_bird2.conf @@ -21,6 +21,7 @@ route 4201270006 max 10.127.8.192/26 as 29; route 4201270006 max 10.127.9.0/24 as 29; route 4201270006 max 10.127.255.53/32 as 32; route 4201270007 max 10.127.8.160/27 as 29; +route 4201270007 max 10.127.7.0/24 as 29; route 4201270008 max 10.127.4.0/24 as 29; route 4201270008 max 10.127.237.0/24 as 29; route 4201270008 max 10.127.255.117/32 as 32; diff --git a/roa6_bird2.conf b/roa6_bird2.conf index ce985ba..8992579 100644 --- a/roa6_bird2.conf +++ b/roa6_bird2.conf @@ -9,7 +9,14 @@ route 4201270003 max fd10:127:1919::/48 as 64; route 4201270005 max fd10:127:233:1c3c::/64 as 64; route 4201270005 max fd10:127:233:1c3a::/64 as 64; route 4201270006 max fd10:127:53::/48 as 64; -route 4201270007 max fd10:127:7::/48 as 64; +route 4201270007 max fd10:127:7::/51 as 64; +route 4201270007 max fd10:127:7:2000::/54 as 64; +route 4201270007 max fd10:127:7:2672::/64 as 64; +route 4201270007 max fd10:127:7:3000::/52 as 64; +route 4201270007 max fd10:127:7:4000::/50 as 64; +route 4201270007 max fd10:127:7:8000::/50 as 64; +route 4201270007 max fd10:127:7:c000::/51 as 64; +route 4201270007 max fd10:127:7:ffff::/64 as 64; route 4201270008 max fd10:127:233::/48 as 64; route 4201270009 max fd10:127:ec39::/48 as 64; route 4201270010 max fd10:127:10::/48 as 64;