From 793694ce14d1f773d30c652dd55437abe8ddb36a Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Tue, 12 May 2020 21:20:53 +0800 Subject: [PATCH] DNS: up --- dns/db.10.127 | 87 +------------------------------- scripts/dns-reverse-generator.sh | 15 +----- 2 files changed, 3 insertions(+), 99 deletions(-) diff --git a/dns/db.10.127 b/dns/db.10.127 index 49700f6..11a8df1 100644 --- a/dns/db.10.127 +++ b/dns/db.10.127 @@ -40,95 +40,10 @@ $TTL 604800 ; DO NOT MANUALLY EDIT THE FOLLOWING LINES ; AUTOGENERATED -; Tunnel /30 Addresses -1.0 IN PTR ucbvax.caasih.tun30.neo. -2.0 IN PTR caasih.ucbvax.tun30.neo. -9.0 IN PTR NeoSystem.ucbvax.tun30.neo. -10.0 IN PTR ucbvax.NeoSystem.tun30.neo. -13.0 IN PTR NeoPDP-11.ucbvax.tun30.neo. -14.0 IN PTR ucbvax.NeoPDP-11.tun30.neo. -17.0 IN PTR NeoPDP-11.caasih.tun30.neo. -18.0 IN PTR caasih.NeoPDP-11.tun30.neo. -21.0 IN PTR NeoVAX.NeoSystem.tun30.neo. -22.0 IN PTR NeoSystem.NeoVAX.tun30.neo. -25.0 IN PTR MagicNeko-RU01.staph.tun30.neo. -26.0 IN PTR staph.MagicNeko-RU01.tun30.neo. -29.0 IN PTR megumiLHS.ucbvax.tun30.neo. -30.0 IN PTR ucbvax.megumiLHS.tun30.neo. -41.0 IN PTR NeoPDP-11.pan.tun30.neo. -42.0 IN PTR pan.NeoPDP-11.tun30.neo. -45.0 IN PTR NeoSystem.pan.tun30.neo. -46.0 IN PTR pan.NeoSystem.tun30.neo. -49.0 IN PTR NeoSystem.cklvax.tun30.neo. -50.0 IN PTR cklvax.NeoSystem.tun30.neo. -53.0 IN PTR NeoSystem.pan.tun30.neo. -54.0 IN PTR pan.NeoSystem.tun30.neo. -57.0 IN PTR MagicNeko-HK01.ucbvax.tun30.neo. -58.0 IN PTR ucbvax.MagicNeko-HK01.tun30.neo. -61.0 IN PTR pan.ucbvax.tun30.neo. -62.0 IN PTR ucbvax.pan.tun30.neo. -65.0 IN PTR Icecat-GroupAccessNetwork.MagicNeko-HK01.tun30.neo. -66.0 IN PTR MagicNeko-HK01.Icecat-GroupAccessNetwork.tun30.neo. -69.0 IN PTR staph.caasih.tun30.neo. -70.0 IN PTR caasih.staph.tun30.neo. -73.0 IN PTR chenx97.ucbvax.tun30.neo. -74.0 IN PTR ucbvax.chenx97.tun30.neo. -81.0 IN PTR ucbvax.JerryXiao.tun30.neo. -82.0 IN PTR JerryXiao.ucbvax.tun30.neo. -85.0 IN PTR JerryXiao.MagicNeko-JP03.tun30.neo. -86.0 IN PTR MagicNeko-JP03.JerryXiao.tun30.neo. -89.0 IN PTR MagicNeko-JP03.septs.tun30.neo. -90.0 IN PTR septs.MagicNeko-JP03.tun30.neo. -93.0 IN PTR frank-hsinchu.septs.tun30.neo. -94.0 IN PTR septs.frank-hsinchu.tun30.neo. -97.0 IN PTR septs.staph.tun30.neo. -98.0 IN PTR staph.septs.tun30.neo. -101.0 IN PTR JerryXiao.septs.tun30.neo. -102.0 IN PTR septs.JerryXiao.tun30.neo. -105.0 IN PTR megumiLHS.septs.tun30.neo. -106.0 IN PTR septs.megumiLHS.tun30.neo. -109.0 IN PTR LanTian.septs.tun30.neo. -110.0 IN PTR septs.LanTian.tun30.neo. -113.0 IN PTR ucbvax.septs.tun30.neo. -114.0 IN PTR septs.ucbvax.tun30.neo. -117.0 IN PTR santost12.ucbvax.tun30.neo. -118.0 IN PTR ucbvax.santost12.tun30.neo. -121.0 IN PTR chenx97.MagicNeko-JP03.tun30.neo. -122.0 IN PTR MagicNeko-JP03.chenx97.tun30.neo. -125.0 IN PTR MagicNeko-RU01.septs.tun30.neo. -126.0 IN PTR septs.MagicNeko-RU01.tun30.neo. -129.0 IN PTR megumiLHS.MagicNeko-JP03.tun30.neo. -130.0 IN PTR MagicNeko-JP03.megumiLHS.tun30.neo. -133.0 IN PTR frank-hsinchu.MagicNeko-JP03.tun30.neo. -134.0 IN PTR MagicNeko-JP03.frank-hsinchu.tun30.neo. -137.0 IN PTR James58899.septs.tun30.neo. -138.0 IN PTR septs.James58899.tun30.neo. -141.0 IN PTR MagicNeko-JP03.pan.tun30.neo. -142.0 IN PTR pan.MagicNeko-JP03.tun30.neo. - -; Point to Point Addresses -1.10 IN PTR LanTian.ptp.neo. -1.69 IN PTR santost12.ptp.neo. -1.69 IN PTR santost12.ptp.neo. -2.127 IN PTR dfceaef.ptp.neo. -99.51 IN PTR JerryXiao.ptp.neo. -185.8 IN PTR staph.ptp.neo. -193.8 IN PTR JerryXiao.ptp.neo. -193.8 IN PTR JerryXiao.ptp.neo. -193.8 IN PTR JerryXiao.ptp.neo. -194.8 IN PTR JerryXiao-HK1.ptp.neo. -194.8 IN PTR JerryXiao-HK1.ptp.neo. -194.8 IN PTR JerryXiao-HK1.ptp.neo. -195.8 IN PTR JerryXiao-SH1.ptp.neo. -195.8 IN PTR JerryXiao-SH1.ptp.neo. -196.8 IN PTR JerryXiao-HK2.ptp.neo. -199.11 IN PTR SUNNET.ptp.neo. -253.4 IN PTR MagicNeko-JP03.ptp.neo. -254.4 IN PTR MagicNeko-HK01.ptp.neo. - ; Loopback Addresses 1.255 IN PTR NeoPDP-11.neo 2.255 IN PTR ucbvax.neo 4.255 IN PTR pan.neo +53.255 IN PTR JerryXiao-Anycast.neo 56.255 IN PTR frank-hsinchu-1.neo 80.255 IN PTR NeoSystem.neo diff --git a/scripts/dns-reverse-generator.sh b/scripts/dns-reverse-generator.sh index 3214cd0..caf565e 100755 --- a/scripts/dns-reverse-generator.sh +++ b/scripts/dns-reverse-generator.sh @@ -2,7 +2,6 @@ set -e FILE="dns/db.10.127" -TUN30_TEMP="$(mktemp)" LO_TEMP="$(mktemp)" if [[ "$(uname)" = *BSD ]]; then @@ -36,15 +35,7 @@ echo '; AUTOGENERATED' >> "$FILE" cd route for i in *; do source "$i" - if [ "$TYPE" = "TUN30" ]; then - upstream_ip=$(ipcalc "$i" 1) - downstream_ip=$(ipcalc "$i" 2) - - ( - print_record "$upstream_ip" "$DOWNSTREAM.$UPSTREAM.tun30.neo." - print_record "$downstream_ip" "$UPSTREAM.$DOWNSTREAM.tun30.neo." - ) >> "$TUN30_TEMP" - elif [ "$TYPE" = "LO" ]; then + if [ "$TYPE" = "LO" ]; then ip="${i/,32/}" print_record "$(ipcalc "$ip" 0)" "$NAME.neo" >> "$LO_TEMP" @@ -53,10 +44,8 @@ done ) { - echo -e "\n; Tunnel /30 Addresses" - sort -n < "$TUN30_TEMP" echo -e "\n; Loopback Addresses" sort -n < "$LO_TEMP" } >> "$FILE" -rm -f "$TUN30_TEMP" "$LO_TEMP" +rm -f "$LO_TEMP"