- Fix VPN job number,

- Fix VPN job date.

usr/local/lib/vpn.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 if [[ "${VPN_BASH}" != "" ]]
 then
@@ -23,6 +23,7 @@ fi
 
 declare -Ag VPN_JOB_TAB
 declare -Ag VPN_JOB_ID_LIST
+declare -Ag VPN_JOB_NAME_IDX
 
 declare -g       VPN_LOG_FILE="/var/log/network/rx3-vpn.log"
 declare -g       VPN_PID_FILE="/var/lib/network/rx3-vpn.pid"
@@ -87,7 +88,7 @@ vpn_job_tab_load()
 
             job_name="$1"
              job_pid="$2"
-	    job_date="$4 $4"
+	    job_date="$3 $4"
 	    shift; shift; shift; shift
             job_cmd="$*"
 
@@ -98,6 +99,8 @@ vpn_job_tab_load()
 	    tab_assign VPN_JOB_TAB      "${job_id},Date" "${job_date}"		
             tab_assign VPN_JOB_TAB      "${job_id},Cmd"  "${job_cmd}"
 
+            tab_assign VPN_JOB_NAME_IDX "${job_name}"    "${job_id}"
+            
 	    job_id=$(( ${job_id} + 1))	    
         fi                
     done <<< ${VPN_STATUS}
@@ -191,6 +194,8 @@ vpn_job_tab_init()
             tab_assign VPN_JOB_TAB      "${job_id},Cmd"  "/usr/sbin/openvpn --config ${config_file} --dev ${dst_device} --daemon"
 	    tab_assign VPN_JOB_TAB      "${job_id},Date" ""		
 
+            tab_assign VPN_JOB_NAME_IDX "${dst_name}"    "${job_id}"
+            
 	    vpn_config_make            "${config_file}" "${dst_device}" "${dst_config}"
 
 	    log_print "${VPN_LOG_FILE}" "${LOG}" "Loading config: Id: [${job_id}]   Name: [${dst_name}]  Cmd: [${VPN_JOB_TAB["${job_id},Cmd"]}]"
@@ -247,6 +252,15 @@ vpn_job_tab_dump()
     echo "VPN_JOB_ID_LIST: [${VPN_JOB_ID_LIST}]"
     echo
 
+    echo "VPN_JOB_NAME_IDX:"
+    
+    for key in "${!VPN_JOB_NAME_IDX[@]}"
+    do
+        echo "[${key}]: [${VPN_JOB_NAME_IDX[${key}]}]"
+    done | sort -n
+
+    echo
+    
     echo "VPN_JOB_TAB:"
 
     for key in "${!VPN_JOB_TAB[@]}"
@@ -458,12 +472,7 @@ vpn_status()
 	echo "Daemon not running"
     fi
     
-    echo "Number of VPN Jobs: (${#VPN_JOB_IDX[@]})"
-    
-#    if [ -f ${VPN_STATUS_FILE} ]
-#    then
-#	cat ${VPN_STATUS_FILE}
-#    fi
+    echo "Number of VPN Jobs: (${#VPN_JOB_NAME_IDX[@]})"
     
     echo -e "Id       | Name                     | Status   | PId      | Date                             | Command"
     echo    "--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------"