From 6fe2d94f6b2e83e32db5bb81f0083c745cd89c57 Mon Sep 17 00:00:00 2001 From: Tyalma Date: Sun, 12 Jan 2025 22:40:45 +0100 Subject: [PATCH 1/5] Add AS4242422892 --- data/aut-num/AS4242423242 | 6 ++++++ data/inet6num/fdff:d7b0:4864::_48 | 9 +++++++++ data/inetnum/172.20.41.0_27 | 9 +++++++++ data/mntner/TYALMA-MNT | 6 ++++++ data/person/TYALMA-DN42 | 4 ++++ data/route/172.20.41.0_27 | 5 +++++ data/route6/fdff:d7b0:4864::_48 | 5 +++++ 7 files changed, 44 insertions(+) create mode 100644 data/aut-num/AS4242423242 create mode 100644 data/inet6num/fdff:d7b0:4864::_48 create mode 100644 data/inetnum/172.20.41.0_27 create mode 100644 data/mntner/TYALMA-MNT create mode 100644 data/person/TYALMA-DN42 create mode 100644 data/route/172.20.41.0_27 create mode 100644 data/route6/fdff:d7b0:4864::_48 diff --git a/data/aut-num/AS4242423242 b/data/aut-num/AS4242423242 new file mode 100644 index 000000000..95f0bf17a --- /dev/null +++ b/data/aut-num/AS4242423242 @@ -0,0 +1,6 @@ +aut-num: AS4242423242 +as-name: AS-TYALMA-DN42 +admin-c: TYALMA-DN42 +tech-c: TYALMA-DN42 +mnt-by: TYALMA-MNT +source: DN42 diff --git a/data/inet6num/fdff:d7b0:4864::_48 b/data/inet6num/fdff:d7b0:4864::_48 new file mode 100644 index 000000000..da4168b99 --- /dev/null +++ b/data/inet6num/fdff:d7b0:4864::_48 @@ -0,0 +1,9 @@ +inet6num: fdff:d7b0:4864:0000:0000:0000:0000:0000 - fdff:d7b0:4864:ffff:ffff:ffff:ffff:ffff +cidr: fdff:d7b0:4864::/48 +netname: TYALMA-NETWORK +descr: Network of TYALMA +admin-c: TYALMA-DN42 +tech-c: TYALMA-DN42 +mnt-by: TYALMA-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inetnum/172.20.41.0_27 b/data/inetnum/172.20.41.0_27 new file mode 100644 index 000000000..b69d55151 --- /dev/null +++ b/data/inetnum/172.20.41.0_27 @@ -0,0 +1,9 @@ +inetnum: 172.20.41.0 - 172.20.41.31 +cidr: 172.20.41.0/27 +netname: TYALMA-NETWORK +descr: Network of TYALMA +admin-c: TYALMA-DN42 +tech-c: TYALMA-DN42 +mnt-by: TYALMA-MNT +status: ASSIGNED +source: DN42 diff --git a/data/mntner/TYALMA-MNT b/data/mntner/TYALMA-MNT new file mode 100644 index 000000000..6b45f1557 --- /dev/null +++ b/data/mntner/TYALMA-MNT @@ -0,0 +1,6 @@ +mntner: TYALMA-MNT +admin-c: TYALMA-DN42 +tech-c: TYALMA-DN42 +mnt-by: TYALMA-MNT +auth: pgp-fingerprint BD7CEFE6FF1DA4084DCCD4BB7F434DB71B0F65D5 +source: DN42 diff --git a/data/person/TYALMA-DN42 b/data/person/TYALMA-DN42 new file mode 100644 index 000000000..c8711beb7 --- /dev/null +++ b/data/person/TYALMA-DN42 @@ -0,0 +1,4 @@ +person: Tyalma +nic-hdl: TYALMA-DN42 +mnt-by: TYALMA-MNT +source: DN42 diff --git a/data/route/172.20.41.0_27 b/data/route/172.20.41.0_27 new file mode 100644 index 000000000..7b629c1db --- /dev/null +++ b/data/route/172.20.41.0_27 @@ -0,0 +1,5 @@ +route: 172.20.41.0/27 +origin: AS4242423242 +max-length: 27 +mnt-by: TYALMA-MNT +source: DN42 diff --git a/data/route6/fdff:d7b0:4864::_48 b/data/route6/fdff:d7b0:4864::_48 new file mode 100644 index 000000000..9c62e9fbc --- /dev/null +++ b/data/route6/fdff:d7b0:4864::_48 @@ -0,0 +1,5 @@ +route6: fdff:d7b0:4864::/48 +origin: AS4242423242 +max-length: 48 +mnt-by: TYALMA-MNT +source: DN42 From c30f9717893ef1a61d0c057d8bf6628b89bf3e12 Mon Sep 17 00:00:00 2001 From: NAAIN Date: Mon, 13 Jan 2025 19:31:37 +0300 Subject: [PATCH 2/5] squashed commit: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 564357cfc новый файл: data/aut-num/AS4242421024 новый файл: data/aut-num/AS4242422444 новый файл: data/aut-num/AS4242422718 новый файл: data/dns/mrnet.dn42 изменено: data/dns/slk.dn42 новый файл: data/dns/uright.dn42 новый файл: data/inet6num/fd44:4d20:d18::_48 изменено: data/inet6num/fd6a:11d4:cacb::_48 изменено: data/inet6num/fdd0:f8f8:a076::_48 новый файл: data/inet6num/fdda:e4c9:acb3::_48 новый файл: data/inetnum/172.20.133.0_26 новый файл: data/inetnum/172.20.18.0_26 изменено: data/inetnum/172.20.190.0_26 изменено: data/inetnum/172.21.99.80_29 изменено: data/mntner/COWGL-MNT изменено: data/mntner/HIXADY-MNT новый файл: data/mntner/MRNET-MNT изменено: data/mntner/PEANUTS-MNT новый файл: data/mntner/URIGHT-MNT новый файл: data/organisation/ORG-MRNET новый файл: data/person/MRNET-DN42 новый файл: data/person/URIGHT-DN42 новый файл: data/route/172.20.133.0_26 новый файл: data/route/172.20.18.0_26 изменено: data/route/172.23.199.224_27 новый файл: data/route6/fd44:4d20:d18::_48 изменено: data/route6/fdb3:8400:afd::_48 новый файл: data/route6/fdda:e4c9:acb3::_48 8df51083d новый файл: data/dns/yobanirot.dn42 --- data/dns/yobanirot.dn42 | 7 +++++++ data/inet6num/fdd0:f8f8:a076::_48 | 1 + data/inetnum/172.21.99.80_29 | 1 + 3 files changed, 9 insertions(+) create mode 100644 data/dns/yobanirot.dn42 diff --git a/data/dns/yobanirot.dn42 b/data/dns/yobanirot.dn42 new file mode 100644 index 000000000..cd131daa4 --- /dev/null +++ b/data/dns/yobanirot.dn42 @@ -0,0 +1,7 @@ +domain: yobanirot.dn42 +admin-c: NAAIN-DN42 +tech-c: NAAIN-DN42 +mnt-by: NAAIN-MNT +nserver: ns1.yobanirot.dn42 172.21.99.81 +nserver: ns1.yobanirot.dn42 fdd0:f8f8:a076::1 +source: DN42 diff --git a/data/inet6num/fdd0:f8f8:a076::_48 b/data/inet6num/fdd0:f8f8:a076::_48 index 490c25a3c..dd6b3de88 100644 --- a/data/inet6num/fdd0:f8f8:a076::_48 +++ b/data/inet6num/fdd0:f8f8:a076::_48 @@ -8,3 +8,4 @@ tech-c: NAAIN-DN42 mnt-by: NAAIN-MNT status: ASSIGNED source: DN42 +nserver: ns1.yobanirot.dn42 diff --git a/data/inetnum/172.21.99.80_29 b/data/inetnum/172.21.99.80_29 index 32cf4f0e0..014a3014b 100644 --- a/data/inetnum/172.21.99.80_29 +++ b/data/inetnum/172.21.99.80_29 @@ -8,3 +8,4 @@ tech-c: NAAIN-DN42 mnt-by: NAAIN-MNT status: ASSIGNED source: DN42 +nserver: ns1.yobanirot.dn42 From dace8dad4e221136cda8e2a3917754231c024e24 Mon Sep 17 00:00:00 2001 From: hixady Date: Tue, 14 Jan 2025 02:48:29 +0700 Subject: [PATCH 3/5] Changed contact information --- data/aut-num/AS4242422770 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/aut-num/AS4242422770 b/data/aut-num/AS4242422770 index 1dc191e31..982d9c3db 100644 --- a/data/aut-num/AS4242422770 +++ b/data/aut-num/AS4242422770 @@ -3,6 +3,6 @@ as-name: YTTRIUM-AS descr: hixady's personal AS admin-c: HIXADY-DN42 tech-c: HIXADY-DN42 -remarks: Peering - vk.com/hixady (Location - Novosibirsk, Manual Peering) +remarks: Contact - @hixady:mozilla.org (matrix) mnt-by: HIXADY-MNT source: DN42 From d0dd92520742544fb84cf9be5867b607d2aca755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20K=C3=BCthe?= Date: Thu, 9 Jan 2025 18:10:30 +0000 Subject: [PATCH 4/5] Improve filter files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix typo Fix another typo Unify for and to Adjustment of the name according to the example in the wiki Signed-off-by: Marek Küthe --- data/filter.txt | 2 +- data/filter6.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/filter.txt b/data/filter.txt index b3f5eb8db..3d6c49fcc 100644 --- a/data/filter.txt +++ b/data/filter.txt @@ -11,7 +11,7 @@ # 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. +# 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 diff --git a/data/filter6.txt b/data/filter6.txt index 989244f28..270ed12f2 100644 --- a/data/filter6.txt +++ b/data/filter6.txt @@ -1,17 +1,17 @@ -# To FRR Rules: +# For FRR Rules: # cat filter6.txt | \ # grep -e ^[0-9] | \ -# awk '{ print "ipv prefix-list dn42v6-in seq " $1 " " $2 " " $3 " ge " $4 " le " $5}' | \ +# awk '{ print "ipv6 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: # cat filter6.txt | \ -# awk 'BEGIN {printf "function is_valid_network() {\n return net ~ [\n" } \ +# awk 'BEGIN {printf "function is_valid_network_v6() {\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. +# 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 From 441bd3c596bbf7091c782431ef50ffe6ef793df5 Mon Sep 17 00:00:00 2001 From: Stephan Jauernick Date: Sun, 12 Jan 2025 22:53:27 +0100 Subject: [PATCH 5/5] add hackint matrix range as reserved^4 --- data/inet6num/fd1a:6295:5133::_48 | 10 ++++++++++ data/organisation/ORG-HACKINT | 9 +++++++++ data/person/HACKINT-DN42 | 7 +++++++ data/route6/fd1a:6295:5133::_48 | 7 +++++++ 4 files changed, 33 insertions(+) create mode 100644 data/inet6num/fd1a:6295:5133::_48 create mode 100644 data/organisation/ORG-HACKINT create mode 100644 data/person/HACKINT-DN42 create mode 100644 data/route6/fd1a:6295:5133::_48 diff --git a/data/inet6num/fd1a:6295:5133::_48 b/data/inet6num/fd1a:6295:5133::_48 new file mode 100644 index 000000000..b22b468be --- /dev/null +++ b/data/inet6num/fd1a:6295:5133::_48 @@ -0,0 +1,10 @@ +inet6num: fd1a:6295:5133:0000:0000:0000:0000:0000 - fd1a:6295:5133:ffff:ffff:ffff:ffff:ffff +cidr: fd1a:6295:5133::/48 +netname: hackint matrix subnet +org: ORG-HACKINT +admin-c: HACKINT-DN42 +tech-c: HACKINT-DN42 +remarks: hackint uses this for mapping matrix users, do not edit! +mnt-by: DN42-MNT +status: ASSIGNED +source: DN42 diff --git a/data/organisation/ORG-HACKINT b/data/organisation/ORG-HACKINT new file mode 100644 index 000000000..7a019e59c --- /dev/null +++ b/data/organisation/ORG-HACKINT @@ -0,0 +1,9 @@ +organisation: ORG-HACKINT +org-name: hackint +e-mail: mail@hackint.org +www: hackint.org +descr: hackint - org object for hackint irc network +admin-c: HACKINT-DN42 +tech-c: HACKINT-DN42 +mnt-by: DN42-MNT +source: DN42 diff --git a/data/person/HACKINT-DN42 b/data/person/HACKINT-DN42 new file mode 100644 index 000000000..938b93f28 --- /dev/null +++ b/data/person/HACKINT-DN42 @@ -0,0 +1,7 @@ +person: HACKINT +e-mail: mail@hackint.net +contact: #hackint@hackint +remarks: this is a dummy person representing hackint, any changes to objects related to hackint should be verified to come from hackint staff +nic-hdl: HACKINT-DN42 +mnt-by: DN42-MNT +source: DN42 diff --git a/data/route6/fd1a:6295:5133::_48 b/data/route6/fd1a:6295:5133::_48 new file mode 100644 index 000000000..d75ec44bc --- /dev/null +++ b/data/route6/fd1a:6295:5133::_48 @@ -0,0 +1,7 @@ +route6: fd1a:6295:5133::/48 +descr: hackint uses this for mapping matrix users, do not edit! +origin: AS0 +admin-c: HACKINT-DN42 +tech-c: HACKINT-DN42 +mnt-by: DN42-MNT +source: DN42