diff --git a/README.md b/README.md index 985a0d1..4ea4795 100644 --- a/README.md +++ b/README.md @@ -229,7 +229,6 @@ | 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 | MagicNeko Network IPv4 | 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 | | | AS4201270008 | icecat | subnet | fd10:127:233::/48 | | @@ -248,6 +247,7 @@ | AS4201270014 | leedagee | subnet | 10.127.23.0/29 | | | AS4201270014 | leedagee | subnet | fd10:127:23::/48 | | | AS4201270016 | Moecast Network | subnet | 10.127.64.0/27 | | +| AS4201270017 | MagicNeko Network IPv4 | subnet | 10.127.4.0/24 | | | 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 | | diff --git a/neonetwork.json b/neonetwork.json index 333fb92..823dc75 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1608921386, - "valid": 1610130986 + "generated": 1608948087, + "valid": 1610157687 }, "people": { "liangjw": { @@ -252,7 +252,13 @@ "source": "NeoNetwork", "description": "Transition the Mcnetwork community network into an intermediate ASN of the BGP network", "routes": { - "ipv4": [], + "ipv4": [ + { + "prefix": "10.127.4.0/24", + "maxLength": 29, + "netname": "MagicNeko Network IPv4" + } + ], "ipv6": [] } }, @@ -925,11 +931,6 @@ "description": "MagicNeko Network", "routes": { "ipv4": [ - { - "prefix": "10.127.4.0/24", - "maxLength": 29, - "netname": "MagicNeko Network IPv4" - }, { "prefix": "10.127.237.0/24", "maxLength": 29, diff --git a/rfc8416.json b/rfc8416.json index b6f086d..8ba2e14 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -169,12 +169,6 @@ "maxPrefixLength": 29, "comment": "AOSCNet" }, - { - "asn": 4201270008, - "prefix": "10.127.4.0/24", - "maxPrefixLength": 29, - "comment": "MagicNeko Network IPv4" - }, { "asn": 4201270008, "prefix": "10.127.237.0/24", @@ -247,6 +241,12 @@ "maxPrefixLength": 29, "comment": "Moecast Network" }, + { + "asn": 4201270017, + "prefix": "10.127.4.0/24", + "maxPrefixLength": 29, + "comment": "MagicNeko Network IPv4" + }, { "asn": 4201270018, "prefix": "10.127.100.0/24", diff --git a/roa46.json b/roa46.json index 1a068c6..7cc6cc6 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { "counts": 84, - "generated": 1608921386, - "valid": 1610130986 + "generated": 1608948087, + "valid": 1610157687 }, "roas": [ { @@ -140,11 +140,6 @@ "prefix": "10.127.7.0/24", "maxLength": 29 }, - { - "asn": "AS4201270008", - "prefix": "10.127.4.0/24", - "maxLength": 29 - }, { "asn": "AS4201270008", "prefix": "10.127.237.0/24", @@ -205,6 +200,11 @@ "prefix": "10.127.64.0/27", "maxLength": 29 }, + { + "asn": "AS4201270017", + "prefix": "10.127.4.0/24", + "maxLength": 29 + }, { "asn": "AS4201270018", "prefix": "10.127.100.0/24", diff --git a/roa46_bird2.conf b/roa46_bird2.conf index e080c90..264af23 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -27,7 +27,6 @@ route 10.127.255.53/32 max 32 as 4201270006; route 10.127.255.54/32 max 32 as 4201270006; route 10.127.8.160/27 max 29 as 4201270007; route 10.127.7.0/24 max 29 as 4201270007; -route 10.127.4.0/24 max 29 as 4201270008; route 10.127.237.0/24 max 29 as 4201270008; route 10.127.255.117/32 max 32 as 4201270008; route 10.127.255.54/32 max 32 as 4201270008; @@ -40,6 +39,7 @@ 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.4.0/24 max 29 as 4201270017; 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/roa4_bird2.conf b/roa4_bird2.conf index aee07f2..69a9168 100644 --- a/roa4_bird2.conf +++ b/roa4_bird2.conf @@ -27,7 +27,6 @@ route 10.127.255.53/32 max 32 as 4201270006; route 10.127.255.54/32 max 32 as 4201270006; route 10.127.8.160/27 max 29 as 4201270007; route 10.127.7.0/24 max 29 as 4201270007; -route 10.127.4.0/24 max 29 as 4201270008; route 10.127.237.0/24 max 29 as 4201270008; route 10.127.255.117/32 max 32 as 4201270008; route 10.127.255.54/32 max 32 as 4201270008; @@ -40,6 +39,7 @@ 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.4.0/24 max 29 as 4201270017; 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;