Преглед изворни кода

IPV6: Listing of dns domains

bin/v-list-dns-domain

bin/v-list-dns-domains
asmcc пре 3 година
родитељ
комит
ab46ac32f3
2 измењених фајлова са 11 додато и 8 уклоњено
  1. 4 2
      bin/v-list-dns-domain
  2. 7 6
      bin/v-list-dns-domains

+ 4 - 2
bin/v-list-dns-domain

@@ -28,6 +28,7 @@ json_list() {
 	echo '{'
 	echo '{'
 	echo '    "'$DOMAIN'": {
 	echo '    "'$DOMAIN'": {
         "IP": "'$IP'",
         "IP": "'$IP'",
+        "IP6": "'$IP6'",
         "TPL": "'$TPL'",
         "TPL": "'$TPL'",
         "TTL": "'$TTL'",
         "TTL": "'$TTL'",
         "EXP": "'$EXP'",
         "EXP": "'$EXP'",
@@ -47,6 +48,7 @@ json_list() {
 shell_list() {
 shell_list() {
 	echo "DOMAIN:         $DOMAIN"
 	echo "DOMAIN:         $DOMAIN"
 	echo "IP:             $IP"
 	echo "IP:             $IP"
+	echo "IP6:            $IP6"
 	echo "TEMPLATE:       $TPL"
 	echo "TEMPLATE:       $TPL"
 	echo "TTL:            $TTL"
 	echo "TTL:            $TTL"
 	echo "EXP:            $EXP"
 	echo "EXP:            $EXP"
@@ -61,13 +63,13 @@ shell_list() {
 
 
 # PLAIN list function
 # PLAIN list function
 plain_list() {
 plain_list() {
-	echo -ne "$DOMAIN\t$IP\t$TPL\t$TTL\t$EXP\t$SOA\t$SERIAL\t$DNSSEC\t$RECORDS\t"
+	echo -ne "$DOMAIN\t$IP\t$IP6\t$TPL\t$TTL\t$EXP\t$SOA\t$SERIAL\t$DNSSEC\t$RECORDS\t"
 	echo -e "$SUSPENDED\t$TIME\t$DATE"
 	echo -e "$SUSPENDED\t$TIME\t$DATE"
 }
 }
 
 
 # CSV list function
 # CSV list function
 csv_list() {
 csv_list() {
-	echo "DOMAIN,IP,TPL,TTL,EXP,SOA,SERIAL,DNSSEC,RECORDS,SUSPENDED,TIME,DATE"
+	echo "DOMAIN,IP,IP6,TPL,TTL,EXP,SOA,SERIAL,DNSSEC,RECORDS,SUSPENDED,TIME,DATE"
 	echo -n "$DOMAIN,$IP,$TPL,$TTL,$EXP,$SOA,$SERIAL,$DNSSEC,$RECORDS,$SUSPENDED,"
 	echo -n "$DOMAIN,$IP,$TPL,$TTL,$EXP,$SOA,$SERIAL,$DNSSEC,$RECORDS,$SUSPENDED,"
 	echo "$TIME,$DATE"
 	echo "$TIME,$DATE"
 }
 }

+ 7 - 6
bin/v-list-dns-domains

@@ -32,6 +32,7 @@ json_list() {
 		parse_object_kv_list "$str"
 		parse_object_kv_list "$str"
 		echo -n '    "'$DOMAIN'": {
 		echo -n '    "'$DOMAIN'": {
         "IP": "'$IP'",
         "IP": "'$IP'",
+        "IP6": "'$IP6'",
         "TPL": "'$TPL'",
         "TPL": "'$TPL'",
         "TTL": "'$TTL'",
         "TTL": "'$TTL'",
         "EXP": "'$EXP'",
         "EXP": "'$EXP'",
@@ -57,11 +58,11 @@ json_list() {
 # SHELL list function
 # SHELL list function
 shell_list() {
 shell_list() {
 	IFS=$'\n'
 	IFS=$'\n'
-	echo "DOMAIN   IP   TPL   TTL   DNSSEC   REC   SPND   DATE"
-	echo "------   --   ---   ---   ------   ---   ----   ----"
+	echo "DOMAIN   IP   IP6  TPL   TTL   DNSSEC   REC   SPND   DATE"
+	echo "------   --   ---  ---   ---   ------   ---   ----   ----"
 	while read str; do
 	while read str; do
 		parse_object_kv_list "$str"
 		parse_object_kv_list "$str"
-		echo "$DOMAIN $IP $TPL $TTL $DNSSEC $RECORDS $SUSPENDED $DATE"
+		echo "$DOMAIN $IP $IP6 $TPL $TTL $DNSSEC $RECORDS $SUSPENDED $DATE"
 	done < <(cat $USER_DATA/dns.conf)
 	done < <(cat $USER_DATA/dns.conf)
 }
 }
 
 
@@ -70,7 +71,7 @@ plain_list() {
 	IFS=$'\n'
 	IFS=$'\n'
 	while read str; do
 	while read str; do
 		parse_object_kv_list "$str"
 		parse_object_kv_list "$str"
-		echo -ne "$DOMAIN\t$IP\t$TPL\t$TTL\t$EXP\t$SOA\t$DNSSEC\t$SERIAL\t"
+		echo -ne "$DOMAIN\t$IP\t$IP6\t$TPL\t$TTL\t$EXP\t$SOA\t$DNSSEC\t$SERIAL\t"
 		echo -e "$SRC\t$RECORDS\t$SUSPENDED\t$TIME\t$DATE"
 		echo -e "$SRC\t$RECORDS\t$SUSPENDED\t$TIME\t$DATE"
 	done < <(cat $USER_DATA/dns.conf)
 	done < <(cat $USER_DATA/dns.conf)
 }
 }
@@ -78,10 +79,10 @@ plain_list() {
 # CSV list function
 # CSV list function
 csv_list() {
 csv_list() {
 	IFS=$'\n'
 	IFS=$'\n'
-	echo "DOMAIN,IP,TPL,TTL,EXP,SOA,SERIAL,SRC,DNSSEC,RECORDS,SUSPENDED,TIME,DATE"
+	echo "DOMAIN,IP,IP6,TPL,TTL,EXP,SOA,SERIAL,SRC,DNSSEC,RECORDS,SUSPENDED,TIME,DATE"
 	while read str; do
 	while read str; do
 		parse_object_kv_list "$str"
 		parse_object_kv_list "$str"
-		echo -n "$DOMAIN,$IP,$TPL,$TTL,$EXP,$SOA,$SERIAL,"
+		echo -n "$DOMAIN,$IP,$IP6,$TPL,$TTL,$EXP,$SOA,$SERIAL,"
 		echo "$SRC,$DNSSEC,$RECORDS,$SUSPENDED,$TIME,$DATE"
 		echo "$SRC,$DNSSEC,$RECORDS,$SUSPENDED,$TIME,$DATE"
 	done < <(cat $USER_DATA/dns.conf)
 	done < <(cat $USER_DATA/dns.conf)
 }
 }