diff --git a/README.md b/README.md index a231388..8949fcb 100644 --- a/README.md +++ b/README.md @@ -177,7 +177,7 @@ | AS4201270000 | pan hub | subnet | 10.127.3.0/24 | | | AS4201270000 | Neo_Chen ZeroTier-One Hub | subnet | 10.127.16.0/24 | | | AS4201270000 | NeoPDP-11 | loopback | 10.127.255.1/32 | | -| AS4201270000 | ucbvax | loopback | 10.127.255.50/32 | | +| AS4201270000 | ucbvax | loopback | 10.127.255.2/32 | | | AS4201270000 | pan | loopback | 10.127.255.4/32 | | | AS4201270000 | NeoSystem | loopback | 10.127.255.80/32 | | | AS4201270000 | NeoNetwork Origin | subnet | fd10:127:5f37:59df::/64 | | @@ -195,10 +195,12 @@ | AS4201270006 | JerryXiao-Home | subnet | 10.127.9.0/24 | | | AS4201270006 | JerryXiao-School | subnet | 10.127.8.64/26 | | | AS4201270006 | JerryXiao-Anycast | loopback | 10.127.255.53/32 | | +| AS4201270006 | JerryXiao-Anycast | loopback | 10.127.255.2/32 | | | AS4201270006 | JerryXiao6 | subnet | fd10:127:53::/48 | | | AS4201270007 | StaphNet | subnet | 10.127.8.160/27 | | | AS4201270007 | AOSCNet | subnet | 10.127.7.0/24 | | | AS4201270007 | staphdns | loopback | 10.127.255.2/32 | | +| AS4201270007 | staphdns | loopback | 10.127.255.53/32 | | | 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 | | @@ -269,7 +271,6 @@ 10.127.255.1/32 10.127.255.2/32 10.127.255.4/32 -10.127.255.50/32 10.127.255.53/32 10.127.255.56/32 10.127.255.80/32 diff --git a/dns/db.10.127 b/dns/db.10.127 index 5bc237e..328ce94 100644 --- a/dns/db.10.127 +++ b/dns/db.10.127 @@ -152,9 +152,11 @@ $TTL 604800 ; Loopback Addresses 1.255 IN PTR NeoPDP-11.neo. +2.255 IN PTR ucbvax.neo. 2.255 IN PTR staphdns.neo. +2.255 IN PTR JerryXiao-Anycast.neo. 4.255 IN PTR pan.neo. -50.255 IN PTR ucbvax.neo. +53.255 IN PTR staphdns.neo. 53.255 IN PTR JerryXiao-Anycast.neo. 56.255 IN PTR frank-hsinchu-1.neo. 80.255 IN PTR NeoSystem.neo. diff --git a/neonetwork.json b/neonetwork.json index 7b7343b..e644baf 100644 --- a/neonetwork.json +++ b/neonetwork.json @@ -1,7 +1,7 @@ { "metadata": { - "generated": 1600493342, - "valid": 1601702942 + "generated": 1600493489, + "valid": 1601703089 }, "people": { "frank": { @@ -583,7 +583,7 @@ "netname": "NeoPDP-11" }, { - "prefix": "10.127.255.50/32", + "prefix": "10.127.255.2/32", "maxLength": 32, "netname": "ucbvax" }, @@ -816,6 +816,11 @@ "prefix": "10.127.255.53/32", "maxLength": 32, "netname": "JerryXiao-Anycast" + }, + { + "prefix": "10.127.255.2/32", + "maxLength": 32, + "netname": "JerryXiao-Anycast" } ], "ipv6": [ @@ -1020,6 +1025,11 @@ "prefix": "10.127.255.2/32", "maxLength": 32, "netname": "staphdns" + }, + { + "prefix": "10.127.255.53/32", + "maxLength": 32, + "netname": "staphdns" } ], "ipv6": [ diff --git a/rfc8416.json b/rfc8416.json index ee5e33b..dbb995b 100644 --- a/rfc8416.json +++ b/rfc8416.json @@ -69,7 +69,7 @@ }, { "asn": 4201270000, - "prefix": "10.127.255.50/32", + "prefix": "10.127.255.2/32", "maxPrefixLength": 32, "comment": "ucbvax" }, @@ -139,6 +139,12 @@ "maxPrefixLength": 32, "comment": "JerryXiao-Anycast" }, + { + "asn": 4201270006, + "prefix": "10.127.255.2/32", + "maxPrefixLength": 32, + "comment": "JerryXiao-Anycast" + }, { "asn": 4201270007, "prefix": "10.127.8.160/27", @@ -157,6 +163,12 @@ "maxPrefixLength": 32, "comment": "staphdns" }, + { + "asn": 4201270007, + "prefix": "10.127.255.53/32", + "maxPrefixLength": 32, + "comment": "staphdns" + }, { "asn": 4201270008, "prefix": "10.127.4.0/24", diff --git a/roa46.json b/roa46.json index 9d87a0b..2ee1ac0 100644 --- a/roa46.json +++ b/roa46.json @@ -1,8 +1,8 @@ { "metadata": { - "counts": 71, - "generated": 1600493342, - "valid": 1601702942 + "counts": 73, + "generated": 1600493489, + "valid": 1601703089 }, "roas": [ { @@ -57,7 +57,7 @@ }, { "asn": "AS4201270000", - "prefix": "10.127.255.50/32", + "prefix": "10.127.255.2/32", "maxLength": 32 }, { @@ -115,6 +115,11 @@ "prefix": "10.127.255.53/32", "maxLength": 32 }, + { + "asn": "AS4201270006", + "prefix": "10.127.255.2/32", + "maxLength": 32 + }, { "asn": "AS4201270007", "prefix": "10.127.8.160/27", @@ -130,6 +135,11 @@ "prefix": "10.127.255.2/32", "maxLength": 32 }, + { + "asn": "AS4201270007", + "prefix": "10.127.255.53/32", + "maxLength": 32 + }, { "asn": "AS4201270008", "prefix": "10.127.4.0/24", diff --git a/roa46_bird2.conf b/roa46_bird2.conf index 0730c87..ab76572 100644 --- a/roa46_bird2.conf +++ b/roa46_bird2.conf @@ -10,7 +10,7 @@ route 10.127.2.0/24 max 29 as 4201270000; route 10.127.3.0/24 max 29 as 4201270000; route 10.127.16.0/24 max 29 as 4201270000; route 10.127.255.1/32 max 32 as 4201270000; -route 10.127.255.50/32 max 32 as 4201270000; +route 10.127.255.2/32 max 32 as 4201270000; route 10.127.255.4/32 max 32 as 4201270000; route 10.127.255.80/32 max 32 as 4201270000; route 10.127.41.0/24 max 29 as 4201270001; @@ -22,9 +22,11 @@ route 10.127.8.192/26 max 29 as 4201270006; route 10.127.9.0/24 max 29 as 4201270006; route 10.127.8.64/26 max 29 as 4201270006; route 10.127.255.53/32 max 32 as 4201270006; +route 10.127.255.2/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.255.2/32 max 32 as 4201270007; +route 10.127.255.53/32 max 32 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; diff --git a/roa4_bird2.conf b/roa4_bird2.conf index 21a0e5b..fee5785 100644 --- a/roa4_bird2.conf +++ b/roa4_bird2.conf @@ -10,7 +10,7 @@ route 10.127.2.0/24 max 29 as 4201270000; route 10.127.3.0/24 max 29 as 4201270000; route 10.127.16.0/24 max 29 as 4201270000; route 10.127.255.1/32 max 32 as 4201270000; -route 10.127.255.50/32 max 32 as 4201270000; +route 10.127.255.2/32 max 32 as 4201270000; route 10.127.255.4/32 max 32 as 4201270000; route 10.127.255.80/32 max 32 as 4201270000; route 10.127.41.0/24 max 29 as 4201270001; @@ -22,9 +22,11 @@ route 10.127.8.192/26 max 29 as 4201270006; route 10.127.9.0/24 max 29 as 4201270006; route 10.127.8.64/26 max 29 as 4201270006; route 10.127.255.53/32 max 32 as 4201270006; +route 10.127.255.2/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.255.2/32 max 32 as 4201270007; +route 10.127.255.53/32 max 32 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;