Просмотр исходного кода

Correct representation of IP addresses in plain and csv mode (#3260)

* Correct representation of IP addresses in plain and csv mode

* Adaptation func/main.sh for correct working with IPV6 addresses
asmcc 3 лет назад
Родитель
Сommit
d128e3c770
2 измененных файлов с 3 добавлено и 3 удалено
  1. 2 2
      bin/v-list-sys-ip
  2. 1 1
      func/main.sh

+ 2 - 2
bin/v-list-sys-ip

@@ -59,7 +59,7 @@ shell_list() {
 
 # PLAIN list function
 plain_list() {
-	echo -ne "$IP\t$OWNER\t$STATUS\t$NAME\t$U_SYS_USERS\t$U_WEB_DOMAINS\t"
+	echo -ne "$ip\t$OWNER\t$STATUS\t$NAME\t$U_SYS_USERS\t$U_WEB_DOMAINS\t"
 	echo -e "$INTERFACE\t$NETMASK\t$NAT\t$TIME\t$DATE"
 }
 
@@ -67,7 +67,7 @@ plain_list() {
 csv_list() {
 	echo -n "IP,OWNER,STATUS,NAME,U_SYS_USERS,U_WEB_DOMAINS,INTERFACE"
 	echo "NETMASK,NAT,TIME,DATE"
-	echo -n "$IP,$OWNER,$STATUS,$NAME,\"$U_SYS_USERS\",$U_WEB_DOMAINS,"
+	echo -n "$ip,$OWNER,$STATUS,$NAME,\"$U_SYS_USERS\",$U_WEB_DOMAINS,"
 	echo "$INTERFACE, $NETMASK,$NAT,$TIME,$DATE"
 }
 

+ 1 - 1
func/main.sh

@@ -742,7 +742,7 @@ is_ip_format_valid() {
 
 # IPv6 format validator
 is_ipv6_format_valid() {
-	object_name=${2-ip6}
+	object_name=${2-ipv6}
 	ip_regex='([1-9]?[0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])'
 	t_ip=$(echo $1 | awk -F / '{print $1}')
 	t_cidr=$(echo $1 | awk -F / '{print $2}')