From cd5baac7ff9c19d277de65fdd599e3f663e7837b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20K=C3=BCthe?= Date: Wed, 21 Jun 2023 10:08:15 +0200 Subject: [PATCH] reformat filter files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Proper spelling of names Improve wording Correction capitalization Heading correction Update software name Signed-off-by: Marek Küthe remove reference to deleted file improve wording --- data/filter.txt | 24 ++++++++++++------------ data/filter6.txt | 7 ++++--- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/data/filter.txt b/data/filter.txt index f82acd201..b3f5eb8db 100644 --- a/data/filter.txt +++ b/data/filter.txt @@ -1,10 +1,10 @@ -# For Quagga Rules: +# For FRR Rules: # cat filter.txt | \ # grep -e ^[0-9] | \ # awk '{ print "ip prefix-list dn42-in seq " $1 " " $2 " " $3 " ge " $4 " le " $5}' | \ # sed "s_/\([0-9]\+\) ge \1_/\1_g;s_/\([0-9]\+\) le \1_/\1_g" # -# For BIRD Rules: (see also: utils/bgp-filter.rb) +# For BIRD Rules: # cat filter.txt | \ # awk 'BEGIN {printf "function is_valid_network() {\n return net ~ [\n" } \ # /^[0-9]/ && $2 ~ /permit/ {printf " %s{%s,%s},\n", $3, $4, $5};' | \ @@ -13,21 +13,21 @@ # The rules MUST be sorted by the number column first and then the first matching rule MUST be used. # ROAs MUST be checked against these rules and max-length of the ROA NUST NOT be longer than allowed by the matching rule. -#Nr Action Prefix MinLen MaxLen +#Nr Action Prefix MinLen MaxLen # Comment -0001 deny 172.22.166.0/24 24 32 # Black List due not responding to abuse mails after wiki grief. +0001 deny 172.22.166.0/24 24 32 # block List due not responding to abuse mails after wiki grief -1001 permit 172.20.0.0/24 28 32 # dn42 Anycast range -1002 permit 172.21.0.0/24 28 32 # dn42 Anycast range -1003 permit 172.22.0.0/24 28 32 # dn42 Anycast range -1004 permit 172.23.0.0/24 28 32 # dn42 Anycast range +1001 permit 172.20.0.0/24 28 32 # dn42 anycast range +1002 permit 172.21.0.0/24 28 32 # dn42 anycast range +1003 permit 172.22.0.0/24 28 32 # dn42 anycast range +1004 permit 172.23.0.0/24 28 32 # dn42 anycast range 1100 permit 172.20.0.0/14 21 29 # dn42 main net -2001 permit 10.100.0.0/14 14 32 # chaosvpn -2002 permit 10.127.0.0/16 16 32 # neonetwork -2003 permit 10.0.0.0/8 15 24 # freifunk +2001 permit 10.100.0.0/14 14 32 # ChaosVPN +2002 permit 10.127.0.0/16 16 32 # NeoNetwork +2003 permit 10.0.0.0/8 15 24 # IC-VPN / Freifunk -3001 permit 172.31.0.0/16 16 32 # chaosvpn +3001 permit 172.31.0.0/16 16 32 # ChaosVPN 9999 deny 0.0.0.0/0 0 32 # block the rest diff --git a/data/filter6.txt b/data/filter6.txt index 0b9b0c3bc..20fdb9bb0 100644 --- a/data/filter6.txt +++ b/data/filter6.txt @@ -1,16 +1,17 @@ -# To Quagga Rules: +# To FRR Rules: # cat filter6.txt | \ # grep -e ^[0-9] | \ # awk '{ print "ipv prefix-list dn42v6-in seq " $1 " " $2 " " $3 " ge " $4 " le " $5}' | \ # sed "s_/\([0-9]\+\) ge \1_/\1_g;s_/\([0-9]\+\) le \1_/\1_g" # -# For BIRD Rules: (see also: utils/bgp-filter.rb) +# For BIRD Rules: # cat filter6.txt | \ # awk 'BEGIN {printf "function is_valid_network() {\n return net ~ [\n" } \ # /^[0-9]/ && $2 ~ /permit/ {printf " %s{%s,%s},\n", $3, $4, $5};' | \ # sed "$ s/,$/\n ];\n}/" -# The rules MUST be sorted by the number column first and then the first matching rule MUST be used. # ROAs MUST be checked against these rules and max-length of the ROA NUST NOT be longer than allowed by the matching rule. +# The rules MUST be sorted by the number column first and then the first matching rule MUST be used. +# ROAs MUST be checked against these rules and max-length of the ROA NUST NOT be longer than allowed by the matching rule. # Nr Action Prefix MinLen MaxLen # Comment