diff --git a/README.md b/README.md index 03ed6b0..de533f1 100644 --- a/README.md +++ b/README.md @@ -209,8 +209,7 @@ | AS140913 | Magicneko Asia address occupied | subnet | fd10:127:237::/48 | | | AS140936 | SUNNET | subnet | 10.127.11.0/24 | | | AS140936 | SUNNET | subnet | fd10:127:ee11::/48 | | -| AS141706 | MagicNeko-CN office node | subnet | 10.127.233.0/24 | | -| AS141706 | MagicNeko-CN office VPN+IX Node | subnet | 10.127.234.0/24 | | +| AS141706 | MagicNeko-CN office node | subnet | 10.127.232.0/22 | | | AS141706 | Home-magicneko | subnet | fd10:127:238::/48 | | | AS141706 | Home-icecat | subnet | fd10:127:239::/48 | | | AS141706 | Catstar-VPN | subnet | fd10:127:23a::/48 | | @@ -371,8 +370,7 @@ 10.127.131.0/24 10.127.132.0/24 10.127.186.0/24 -10.127.233.0/24 -10.127.234.0/24 +10.127.232.0/22 10.127.255.4/32 10.127.255.53/32 10.127.255.54/32 @@ -493,8 +491,6 @@ fd10:127:ffff:53::/64 10.127.188.0/22 10.127.192.0/19 10.127.224.0/21 -10.127.232.0/24 -10.127.235.0/24 10.127.236.0/22 10.127.240.0/21 10.127.248.0/22 @@ -827,5 +823,5 @@ fd10:127:ffff:8000::/49 | IP Version | Total | Used | Free | Percent Used | Percent Free | |--------------|------------|------------|------------|----------------|----------------| -| IPv4 | 65536 | 10412 | 55124 | 15.89% | 84.11% | +| IPv4 | 65536 | 10924 | 54612 | 16.67% | 83.33% | | IPv6 | 7.9228e+28 | 4.4523e+25 | 7.9184e+28 | 0.06% | 99.94% | diff --git a/neonetwork.json b/neonetwork.json index 59b880f..b994575 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1648448636, - "valid": 1649658236 + "generated": 1648606627, + "valid": 1649816227 }, "people": { "186526": { @@ -1922,14 +1922,9 @@ "routes": { "ipv4": [ { - "prefix": "10.127.233.0/24", + "prefix": "10.127.232.0/22", "maxLength": 29, "netname": "MagicNeko-CN office node" - }, - { - "prefix": "10.127.234.0/24", - "maxLength": 29, - "netname": "MagicNeko-CN office VPN+IX Node" } ], "ipv6": [ diff --git a/rfc8416.json b/rfc8416.json index 44f31f8..3962305 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -45,16 +45,10 @@ }, { "asn": 141706, - "prefix": "10.127.233.0/24", + "prefix": "10.127.232.0/22", "maxPrefixLength": 29, "comment": "MagicNeko-CN office node" }, - { - "asn": 141706, - "prefix": "10.127.234.0/24", - "maxPrefixLength": 29, - "comment": "MagicNeko-CN office VPN+IX Node" - }, { "asn": 141776, "prefix": "10.127.17.0/24", diff --git a/roa46.json b/roa46.json index c38a0ee..f68e609 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { - "counts": 135, - "generated": 1648448636, - "valid": 1649658236 + "counts": 134, + "generated": 1648606626, + "valid": 1649816226 }, "roas": [ { @@ -37,12 +37,7 @@ }, { "asn": "AS141706", - "prefix": "10.127.233.0/24", - "maxLength": 29 - }, - { - "asn": "AS141706", - "prefix": "10.127.234.0/24", + "prefix": "10.127.232.0/22", "maxLength": 29 }, { diff --git a/roa46_bird2.conf b/roa46_bird2.conf index 4c456eb..0e822fa 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -6,8 +6,7 @@ route 10.127.11.0/24 max 29 as 38173; route 10.127.14.0/23 max 29 as 134098; route 10.127.4.0/24 max 29 as 140913; route 10.127.11.0/24 max 29 as 140936; -route 10.127.233.0/24 max 29 as 141706; -route 10.127.234.0/24 max 29 as 141706; +route 10.127.232.0/22 max 29 as 141706; route 10.127.17.0/24 max 29 as 141776; route 10.127.128.0/24 max 29 as 142280; route 10.127.131.0/24 max 29 as 207268; diff --git a/roa4_bird2.conf b/roa4_bird2.conf index 84d022f..743ba4c 100644 --- a/roa4_bird2.conf +++ b/roa4_bird2.conf @@ -6,8 +6,7 @@ route 10.127.11.0/24 max 29 as 38173; route 10.127.14.0/23 max 29 as 134098; route 10.127.4.0/24 max 29 as 140913; route 10.127.11.0/24 max 29 as 140936; -route 10.127.233.0/24 max 29 as 141706; -route 10.127.234.0/24 max 29 as 141706; +route 10.127.232.0/22 max 29 as 141706; route 10.127.17.0/24 max 29 as 141776; route 10.127.128.0/24 max 29 as 142280; route 10.127.131.0/24 max 29 as 207268;