diff --git a/data/aut-num/AS4242421122 b/data/aut-num/AS4242421122 new file mode 100755 index 000000000..8618fa41e --- /dev/null +++ b/data/aut-num/AS4242421122 @@ -0,0 +1,7 @@ +aut-num: AS4242421122 +as-name: YH14141-AS +descr: A Study AS for a china student +admin-c: YH14141-DN42 +tech-c: YH14141-DN42 +mnt-by: YH14141-MNT +source: DN42 \ No newline at end of file diff --git a/data/aut-num/AS4242423665 b/data/aut-num/AS4242423665 index e6949477d..04a3050f7 100644 --- a/data/aut-num/AS4242423665 +++ b/data/aut-num/AS4242423665 @@ -3,18 +3,18 @@ as-name: AS-RHYSPERRY111-DN42 admin-c: RHYSPERRY111-DN42 tech-c: RHYSPERRY111-DN42 mnt-by: RHYSPERRY111-MNT -remarks: ================= -remarks: = RHYS' DN42 AS = -remarks: ================= -remarks: -remarks: Hi, I'm open for peering with anyone! -remarks: Just shoot an email over to -remarks: rhysperry111@gmail.com with your -remarks: wireguard connection details, your ASN -remarks: and tunnel IPs. To test clearnet ping -remarks: you can use rhysperry.com -remarks: -remarks: I only peer over wireguard, and -remarks: connections are throttled to 5mb/s, but -remarks: that's about it +remarks: ================= +remarks: = RHYS' DN42 AS = +remarks: ================= +remarks: +remarks: Hi, I'm open for peering with anyone! +remarks: Just shoot an email over to +remarks: rhysperry111@gmail.com with your +remarks: wireguard connection details, your ASN +remarks: and tunnel IPs. To test clearnet ping +remarks: you can use rhysperry.com +remarks: +remarks: I only peer over wireguard, and +remarks: connections are throttled to 5mb/s, but +remarks: that's about it source: DN42 diff --git a/data/filter.txt b/data/filter.txt index 3d6c49fcc..5d1d90057 100644 --- a/data/filter.txt +++ b/data/filter.txt @@ -1,33 +1,2 @@ -# 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: -# 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};' | \ -# 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 MUST NOT be longer than allowed by the matching rule. - -#Nr Action Prefix MinLen MaxLen # Comment - -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 -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 # IC-VPN / Freifunk - -3001 permit 172.31.0.0/16 16 32 # ChaosVPN - -9999 deny 0.0.0.0/0 0 32 # block the rest - +# For FRR Rules: +# For BIRD Rules: diff --git a/data/inet6num/fde0:93fa:7a0::_48 b/data/inet6num/fde0:93fa:7a0::_48 index ab9dc7796..e47b80a42 100644 --- a/data/inet6num/fde0:93fa:7a0::_48 +++ b/data/inet6num/fde0:93fa:7a0::_48 @@ -4,7 +4,7 @@ descr: DN42 IXP Networks remarks: Parent prefix for internet exchange point networks remarks: For use simply allocate sub-prefix and document the sub-prefix in the registry remarks: -remarks: usecase are any shared layer-2 domain that more than 2 people can connect to +remarks: usecase are any shared layer-2 domain that more than 2 people can connect to policy: open mnt-by: DN42-MNT source: DN42 diff --git a/data/inet6num/fdf2:72b:870::_48 b/data/inet6num/fdf2:72b:870::_48 new file mode 100644 index 000000000..0c2e323e1 --- /dev/null +++ b/data/inet6num/fdf2:72b:870::_48 @@ -0,0 +1,10 @@ +inet6num: fdf2:72b:870:: - fdf2:72b:870:ffff:ffff:ffff:ffff:ffff +cidr: fdf2:72b:870::/48 +netname: YH14141-IPV6-NET +descr: DN42 Experimental IPv6 Network for yh14141 +country: CN +admin-c: YH14141-DN42 +tech-c: YH14141-DN42 +mnt-by: YH14141-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inetnum/172.20.6.24_29 b/data/inetnum/172.20.6.24_29 new file mode 100644 index 000000000..e2980b116 --- /dev/null +++ b/data/inetnum/172.20.6.24_29 @@ -0,0 +1,11 @@ +inetnum: 172.20.6.24 - 172.20.6.31 +cidr: 172.20.6.24/29 +netname: YH14141-NET +descr: DN42 Network for yh14141 +country: CN +admin-c: YH14141-DN42 +tech-c: YH14141-DN42 +mnt-by: YH14141-MNT +status: ASSIGNED +source: DN42 +remarks: Peer with me at yhr3500394466@163.com \ No newline at end of file diff --git a/data/mntner/YH14141-MNT b/data/mntner/YH14141-MNT new file mode 100644 index 000000000..2496f3a80 --- /dev/null +++ b/data/mntner/YH14141-MNT @@ -0,0 +1,7 @@ +mntner: YH14141-MNT +admin-c: YH14141-DN42 +tech-c: YH14141-DN42 +mnt-by: YH14141-MNT +auth: pgp-fingerprint 99CC124C0C07B6DFEB89D2B24DD5C14866E4A013 +auth: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDe5jGZle9IrfGlocsZbxpLQIfjh2f1U1guYQJe/sVZw root@ser656714389870 +source: DN42 \ No newline at end of file diff --git a/data/person/TESTNET-DN42 b/data/person/TESTNET-DN42 index 5d4618281..fdb02b2be 100644 --- a/data/person/TESTNET-DN42 +++ b/data/person/TESTNET-DN42 @@ -1,8 +1,8 @@ person: Frank Wils e-mail: admin@7879810.xyz remarks: ------------------------------------- -remarks: Feel free to contact via email -remarks: admin () 7879810.xyz +remarks: Feel free to contact via email +remarks: admin () 7879810.xyz remarks: ------------------------------------- nic-hdl: TESTNET-DN42 mnt-by: TESTNET-MNT diff --git a/data/person/YH14141-DN42 b/data/person/YH14141-DN42 new file mode 100644 index 000000000..98b7d92d7 --- /dev/null +++ b/data/person/YH14141-DN42 @@ -0,0 +1,5 @@ +person: YH14141 +nic-hdl: YH14141-DN42 +e-mail: yhr3500394466@163.com +mnt-by: YH14141-MNT +source: DN42 \ No newline at end of file diff --git a/data/route/172.20.6.24_29 b/data/route/172.20.6.24_29 new file mode 100644 index 000000000..995f225eb --- /dev/null +++ b/data/route/172.20.6.24_29 @@ -0,0 +1,5 @@ +route: 172.20.6.24/29 +origin: AS4242421122 +mnt-by: YH14141-MNT +source: DN42 +max-length: 29 \ No newline at end of file diff --git a/data/route/172.21.79.128_27 b/data/route/172.21.79.128_27 index d9d0e2a9e..6079a016d 100644 --- a/data/route/172.21.79.128_27 +++ b/data/route/172.21.79.128_27 @@ -1,6 +1,6 @@ route: 172.21.79.128/27 descr: Telegram to me:@C1oudF1are -remarks: Mail: genshinminecraft114514@gmail.com +remarks: Mail: genshinminecraft114514@gmail.com remarks: Web Blog: https://c1oudf1are.link origin: AS4242421304 mnt-by: GENSHINMINECRAFT-MNT diff --git a/data/route6/fd42:4242:2601:ac12::_64 b/data/route6/fd42:4242:2601:ac12::_64 index 8ee63ae90..fc0deb830 100644 --- a/data/route6/fd42:4242:2601:ac12::_64 +++ b/data/route6/fd42:4242:2601:ac12::_64 @@ -4,7 +4,7 @@ descr: collector.dn42 remarks: This subnet of the burble.dn42 network hosts the global route collector. A special routing policy exists for the collector to reduce transit traffic - through low bandwidth nodes. + through low bandwidth nodes. origin: AS4242422601 mnt-by: BURBLE-MNT source: DN42 diff --git a/data/route6/fd42:4242:2601:ffff::_64 b/data/route6/fd42:4242:2601:ffff::_64 index 45dc8fc36..21137698a 100644 --- a/data/route6/fd42:4242:2601:ffff::_64 +++ b/data/route6/fd42:4242:2601:ffff::_64 @@ -4,24 +4,17 @@ max-length: 112 remarks: This object is designed to test ROA scripts in a number of ways. -+ The expected output for this route should be: roa fd42:4242:2601:ffff::/64 max 64 as 0; -+ This is not a blank line + ----- + -+ The first test is to include a number of syntax corner cases, designed to trip up parsers -+ The first max-length line should be clamped to the maximums defined in filter6.txt -+ The second max-length is part of the remark and should be ignored. -+ max-length: 48 -+ origin: AS0 mnt-by: BURBLE-MNT source: DN42 diff --git a/data/route6/fd70:e301:5918::_48 b/data/route6/fd70:e301:5918::_48 index 6c4db71d1..edb2bb18e 100644 --- a/data/route6/fd70:e301:5918::_48 +++ b/data/route6/fd70:e301:5918::_48 @@ -1,7 +1,7 @@ route6: fd70:e301:5918::/48 descr: Sunshine's IP space remarks: Allowed to use by both my main AS and testing AS -remarks: My network is open to peering; +remarks: My network is open to peering; origin: AS4242421660 mnt-by: SUNSHINE-MNT source: DN42 diff --git a/data/route6/fdf2:72b:870::_48 b/data/route6/fdf2:72b:870::_48 new file mode 100644 index 000000000..d66aa0f16 --- /dev/null +++ b/data/route6/fdf2:72b:870::_48 @@ -0,0 +1,7 @@ +route6: fdf2:72b:870::/48 +descr: YH14141 IPv6 backbone network +origin: AS4242421122 +mnt-by: YH14141-MNT +created: 2024-02-03T04:02:00Z +last-modified: 2024-02-03T04:02:00Z +source: DN42 diff --git a/data/schema/SCHEMA-SCHEMA b/data/schema/SCHEMA-SCHEMA index 1d94c4a67..1277eb845 100644 --- a/data/schema/SCHEMA-SCHEMA +++ b/data/schema/SCHEMA-SCHEMA @@ -23,39 +23,30 @@ mnt-by: DN42-MNT source: DN42 remarks: # option descriptions Attribute names must match /[a-zA-Z]([a-zA-Z0-9_\-]*[a-zA-Z0-9])?/. -+ required : object required to have at least one optional : object not required to have at least one -+ single : only one of this type allowed multiple : more than one of this type allowed -+ primary : use field as lookup key for lookup * only one allowed per schema * does not allow newlines -+ schema : use field name as the name of the schema * only one allowed per schema * does not allow newlines -+ lookup : schema match to use for related record -+ \> option specs : defines the option specifications for the key. * must come last in option list -+ [label] string value. A positional string argument required. Text inside brackets represent a label for the string and must match the same rules as attribute names. If follwed by '...' values are gathered as an array. -+ {enum1|enum2|} enumeration. One option in pipe('|') deliniation is allowed. If there is a trailing pipe it means the enum is optional. Enum values must match the same rules as attribute names. -+ 'literal' Literal value. literal text value which must not contain any whitespace or single quotes.