- Add VSL support,

- Display VSL tab in VPN Admin Board,
- Support now rx3-base 1.2.0.

lib/rx3/dns.bash

@@ -46,15 +46,18 @@ fi
 # Global Variable
 #-----------------------------------------------------------------------------------------------------------------------------------
 
-declare -Ag DNS_A_TAB=()
-declare -g  DNS_A_ID_LIST=""
+declare              LIB_NAME="DNS"
+declare           LIB_VERSION="1.2.4"
 
-declare -Ag DNS_PTR_TAB=()
-declare -g  DNS_PTR_ID_LIST=""
+declare -Ag         DNS_A_TAB=()
+declare -g      DNS_A_ID_LIST=""
 
-declare -g  DNS_CACHE_FILE=""
-declare -g  DNS_CACHE_LOCK=""
-#declare -g  DNS_CACHE_LOCK="${DNS_CACHE_FILE}"
+declare -Ag       DNS_PTR_TAB=()
+declare -g    DNS_PTR_ID_LIST=""
+
+declare -g     DNS_CACHE_FILE=""
+declare -g     DNS_CACHE_LOCK=""
+#declare -g     DNS_CACHE_LOCK="${DNS_CACHE_FILE}"
 
 declare -g  DNS_CACHE_UPDATED=0
 
@@ -358,3 +361,12 @@ dns_deinit()
 #    :;
 }
 
+
+
+
+
+#--------------------------------------------------------------------------------------------------------------------------
+# Main
+#--------------------------------------------------------------------------------------------------------------------------
+
+vsl_add

lib/rx3/ip.bash

@@ -46,6 +46,9 @@ fi
 # Global Variable
 #-----------------------------------------------------------------------------------------------------------------------------------
 
+declare         LIB_NAME="IP"
+declare      LIB_VERSION="1.2.4"
+
 
 
 
@@ -143,3 +146,10 @@ ip_ip_filter()
 
 
 
+
+
+#--------------------------------------------------------------------------------------------------------------------------
+# Main
+#--------------------------------------------------------------------------------------------------------------------------
+
+vsl_add

lib/rx3/network.bash

@@ -46,34 +46,37 @@ fi
 # Global Variable
 #-----------------------------------------------------------------------------------------------------------------------------------
 
-declare -g  NETWORK_OPENVPN_STATUS
+declare                     LIB_NAME="Network"
+declare                  LIB_VERSION="1.2.4"
 
-declare -Ag NETWORK_IP_ROUTE_TAB=()
+declare -g  N  ETWORK_OPENVPN_STATUS
+
+declare -Ag     NETWORK_IP_ROUTE_TAB=()
 declare -g  NETWORK_IP_ROUTE_ID_LIST=""
-declare -Ag NETWORK_IP_ROUTE_IP_IDX=()
+declare -Ag  NETWORK_IP_ROUTE_IP_IDX=()
 
-declare -g  NETWORK_SRC_TYPE=""
-declare -Ag NETWORK_SRC_TAB=()
-declare -g  NETWORK_SRC_ID_LIST=""
-declare -Ag NETWORK_SRC_IP_IDX=""
+declare -g          NETWORK_SRC_TYPE=""
+declare -Ag          NETWORK_SRC_TAB=()
+declare -g       NETWORK_SRC_ID_LIST=""
+declare -Ag       NETWORK_SRC_IP_IDX=""
 
-declare -g  NETWORK_DST_TYPE=""
-declare -Ag NETWORK_DST_TAB=()
-declare -g  NETWORK_DST_ID_LIST=""
-declare -Ag NETWORK_DST_NAME_IDX=()
-declare -Ag NETWORK_DST_DEV_IDX=()
+declare -g          NETWORK_DST_TYPE=""
+declare -Ag          NETWORK_DST_TAB=()
+declare -g       NETWORK_DST_ID_LIST=""
+declare -Ag     NETWORK_DST_NAME_IDX=()
+declare -Ag      NETWORK_DST_DEV_IDX=()
 
-declare -g  NETWORK_CONFIG_FILE="/etc/sysconfig/rx3-network"
-declare -g  NETWORK_CONFIG_LOCK="/var/lock/network/config"
-#declare -g  NETWORK_CONFIG_LOCK="${NETWORK_CONFIG_FILE}"
+declare -g       NETWORK_CONFIG_FILE="/etc/sysconfig/rx3-network"
+declare -g       NETWORK_CONFIG_LOCK="/var/lock/network/config"
+#declare -g   NETWORK_CONFIG_LOCK="${NETWORK_CONFIG_FILE}"
 
-declare -g  NETWORK_LOG_FILE
-declare -g  NETWORK_LOG_LOCK
-#declare -g  NETWORK_LOG_LOCK="${NETWORK_LOG_FILE}"
+declare -g          NETWORK_LOG_FILE
+declare -g          NETWORK_LOG_LOCK
+#declare -g          NETWORK_LOG_LOCK="${NETWORK_LOG_FILE}"
 
-declare -g  NETWORK_LOG_TRACE="DISABLED"
+declare -g         NETWORK_LOG_TRACE="DISABLED"
 
-declare -g  NETWORK_NC_TIMEOUT
+declare -g        NETWORK_NC_TIMEOUT
 
 
 
@@ -1669,3 +1672,13 @@ network_status()
     
     iptables -t nat -L PREROUTING-VPN -v -n || true
 }
+
+
+
+
+
+#--------------------------------------------------------------------------------------------------------------------------
+# Main
+#--------------------------------------------------------------------------------------------------------------------------
+
+vsl_add

lib/rx3/vpn.bash

@@ -46,13 +46,16 @@ fi
 # Global Variable
 #-----------------------------------------------------------------------------------------------------------------------------------
 
-declare -Ag VPN_JOB_TAB=()
-declare -g  VPN_JOB_ID_LIST=""
+declare             LIB_NAME="VPN"
+declare          LIB_VERSION="1.2.4"
+
+declare -Ag      VPN_JOB_TAB=()
+declare -g   VPN_JOB_ID_LIST=""
 declare -Ag VPN_JOB_NAME_IDX=()
 
-declare -g  VPN_PID_FILE
-declare -g  VPN_STATUS_FILE
-declare -g  VPN_STATUS_LOCK
+declare -g      VPN_PID_FILE
+declare -g   VPN_STATUS_FILE
+declare -g   VPN_STATUS_LOCK
 
 
 
@@ -572,3 +575,13 @@ vpn_status()
 	printf "%-*s | %-*s | %-*s | %-*s | %-*s | %-*s | %-*s\n" 8 "${job_id}" 24 "${job_name}" 8 "${job_status}" 8 "${job_pid}" 32 "${job_date}" 15 "${dst_ip}" 8 "${job_cmd}"
     done
 }
+
+
+
+
+
+#--------------------------------------------------------------------------------------------------------------------------
+# Main
+#--------------------------------------------------------------------------------------------------------------------------
+
+vsl_add