From e35adcb631573753f4d7131a0868109be2a93591 Mon Sep 17 00:00:00 2001
From: Aleksandr Muravja <asm@kmail.ee>
Date: Thu, 24 Aug 2023 16:59:41 +0300
Subject: [PATCH] squashed commit:

ceed0f8e3 Giving up /29
4d9e088d7 squashed commit:
---
 data/dns/asm.dn42                                     | 2 +-
 data/dns/kyb.dn42                                     | 4 ++--
 data/inet6num/{fd21:3080::_48 => fd21:3080:3080::_48} | 6 +++---
 data/inetnum/{172.20.6.120_29 => 172.22.142.16_28}    | 4 ++--
 data/route/{172.20.6.120_29 => 172.22.142.16_28}      | 4 ++--
 data/route6/{fd21:3080::_48 => fd21:3080:3080::_48}   | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename data/inet6num/{fd21:3080::_48 => fd21:3080:3080::_48} (73%)
 rename data/inetnum/{172.20.6.120_29 => 172.22.142.16_28} (78%)
 rename data/route/{172.20.6.120_29 => 172.22.142.16_28} (60%)
 rename data/route6/{fd21:3080::_48 => fd21:3080:3080::_48} (74%)

diff --git a/data/dns/asm.dn42 b/data/dns/asm.dn42
index 78a127901..cee6e27cc 100644
--- a/data/dns/asm.dn42
+++ b/data/dns/asm.dn42
@@ -3,6 +3,6 @@ descr:              Kyberorg XPerimental/Personal network domain
 admin-c:            KYBERORG-DN42
 tech-c:             KYBERORG-DN42
 mnt-by:             KYBERORG-MNT
-nserver:            ns.asm.dn42 172.20.6.123
+nserver:            ns.asm.dn42 172.22.142.21
 nserver:            ns.asm.dn42 fd21:3087::53
 source:             DN42
diff --git a/data/dns/kyb.dn42 b/data/dns/kyb.dn42
index af0118cdd..d49690036 100644
--- a/data/dns/kyb.dn42
+++ b/data/dns/kyb.dn42
@@ -5,7 +5,7 @@ tech-c:             KYBERORG-DN42
 mnt-by:             KYBERORG-MNT
 org:                ORG-KYB
 nserver:            ns1.kyb.dn42 172.23.231.1
-nserver:            ns1.kyb.dn42 fd21:3080::1
+nserver:            ns1.kyb.dn42 fd21:3080:3080::1
 nserver:            ns9.kyb.dn42 172.23.231.11
-nserver:            ns9.kyb.dn42 fd21:3080::9:1:1
+nserver:            ns9.kyb.dn42 fd21:3080:3080:9::11
 source:             DN42
diff --git a/data/inet6num/fd21:3080::_48 b/data/inet6num/fd21:3080:3080::_48
similarity index 73%
rename from data/inet6num/fd21:3080::_48
rename to data/inet6num/fd21:3080:3080::_48
index 5aeea501f..15fc0dafd 100644
--- a/data/inet6num/fd21:3080::_48
+++ b/data/inet6num/fd21:3080:3080::_48
@@ -1,14 +1,14 @@
-inet6num:           fd21:3080:0000:0000:0000:0000:0000:0000 - fd21:3080:0000:ffff:ffff:ffff:ffff:ffff
-cidr:               fd21:3080::/48
+inet6num:           fd21:3080:3080:0000:0000:0000:0000:0000 - fd21:3080:3080:ffff:ffff:ffff:ffff:ffff
+cidr:               fd21:3080:3080::/48
 netname:            KYB-NETWORK
 descr:              Kyb HomeLab IPv6 Network Range
 remarks:            peer with me at asm@kmail.ee
 country:            EE
 admin-c:            KYBERORG-DN42
 tech-c:             KYBERORG-DN42
-org:                ORG-KYB
 nserver:            ns1.kyb.dn42
 nserver:            ns9.kyb.dn42
+org:                ORG-KYB
 mnt-by:             KYBERORG-MNT
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.20.6.120_29 b/data/inetnum/172.22.142.16_28
similarity index 78%
rename from data/inetnum/172.20.6.120_29
rename to data/inetnum/172.22.142.16_28
index 56d76b9b2..850c58356 100644
--- a/data/inetnum/172.20.6.120_29
+++ b/data/inetnum/172.22.142.16_28
@@ -1,5 +1,5 @@
-inetnum:            172.20.6.120 - 172.20.6.127
-cidr:               172.20.6.120/29
+inetnum:            172.22.142.16 - 172.22.142.31
+cidr:               172.22.142.16/28
 netname:            ASM-NETWORK
 descr:              Kyberorg XPerimental/Personal IPv4 Network Range
 remarks:            peer with me at asm@kmail.ee
diff --git a/data/route/172.20.6.120_29 b/data/route/172.22.142.16_28
similarity index 60%
rename from data/route/172.20.6.120_29
rename to data/route/172.22.142.16_28
index 615b70486..be361b17d 100644
--- a/data/route/172.20.6.120_29
+++ b/data/route/172.22.142.16_28
@@ -1,5 +1,5 @@
-route:              172.20.6.120/29
+route:              172.22.142.16/28
 origin:             AS4242423861
-max-length:         29
+max-length:         28
 mnt-by:             KYBERORG-MNT
 source:             DN42
diff --git a/data/route6/fd21:3080::_48 b/data/route6/fd21:3080:3080::_48
similarity index 74%
rename from data/route6/fd21:3080::_48
rename to data/route6/fd21:3080:3080::_48
index d3438709a..329270bbc 100644
--- a/data/route6/fd21:3080::_48
+++ b/data/route6/fd21:3080:3080::_48
@@ -1,4 +1,4 @@
-route6:             fd21:3080::/48
+route6:             fd21:3080:3080::/48
 origin:             AS4242423786
 max-length:         48
 mnt-by:             KYBERORG-MNT