From deeed8e20c95ba985a56b30ff607c84af422e1fd Mon Sep 17 00:00:00 2001 From: Septs Date: Tue, 21 Jul 2020 11:30:06 +0800 Subject: [PATCH 1/3] Regular update: 2020-07-21T03:30:06Z --- .scripts/generate-roa.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.scripts/generate-roa.sh b/.scripts/generate-roa.sh index 4b31be9..bf1038d 100755 --- a/.scripts/generate-roa.sh +++ b/.scripts/generate-roa.sh @@ -8,6 +8,8 @@ set -x export MAX_LEN_4=29 export MAX_LEN_6=64 +mkdir -p generated + .scripts/roa.py -m "$MAX_LEN_4" -M "$MAX_LEN_6" -o generated/roa46_bird2.conf .scripts/roa.py -m "$MAX_LEN_4" -M "$MAX_LEN_6" -4 -o generated/roa4_bird2.conf .scripts/roa.py -m "$MAX_LEN_4" -M "$MAX_LEN_6" -6 -o generated/roa6_bird2.conf From fa60c76b66a296ed3b09920b7e572138b50fa674 Mon Sep 17 00:00:00 2001 From: Dustrain Date: Tue, 21 Jul 2020 11:33:28 +0800 Subject: [PATCH 2/3] fix error supernet (#107) --- route/AS4201270017.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/route/AS4201270017.toml b/route/AS4201270017.toml index e89d841..18630e8 100644 --- a/route/AS4201270017.toml +++ b/route/AS4201270017.toml @@ -7,4 +7,3 @@ description = "For home devices internal network segment for testing connectivit type = "subnet" name = "CainSakura-home-devices" description = "For home devices internal network segment for testing connectivity quality, No SLA" -supernet = "fd10:127:0233::/48" From baa2c210d942e07ed32e627a6e49db30cd85b86b Mon Sep 17 00:00:00 2001 From: Jerry Date: Tue, 21 Jul 2020 11:44:55 +0800 Subject: [PATCH 3/3] check if supernet is really super --- .scripts/roa.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scripts/roa.py b/.scripts/roa.py index e3a72fa..e6ff741 100755 --- a/.scripts/roa.py +++ b/.scripts/roa.py @@ -109,7 +109,7 @@ def route_to_roa(asn_table: dict): ) assert fields["name"] assert is_neo_network(fields["prefix"]) - assert not fields["supernet"] or is_neo_network(fields["supernet"]) + assert not fields["supernet"] or (is_neo_network(fields["supernet"]) and fields["supernet"].supernet_of(fields["prefix"])) yield pick(fields, ["asn", "name", "type", "prefix", "supernet"]) entities = sorted(make_route(), key=lambda item: item["asn"])