- Add VPN IP destination in status,
- Add Network Dst name lookup.
This commit is contained in:
@@ -196,7 +196,7 @@ vpn_job_tab_init()
|
||||
|
||||
tab_assign VPN_JOB_NAME_IDX "${dst_name}" "${job_id}"
|
||||
|
||||
vpn_config_make "${config_file}" "${dst_device}" "${dst_config}"
|
||||
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"]}]"
|
||||
|
||||
@@ -474,23 +474,26 @@ vpn_status()
|
||||
|
||||
echo "Number of VPN Jobs: (${#VPN_JOB_NAME_IDX[@]})"
|
||||
|
||||
echo -e "Id | Name | Status | PId | Date | Command"
|
||||
echo "--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------"
|
||||
echo -e "Id | Name | Status | PId | Date | IP | Command"
|
||||
echo "--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------"
|
||||
|
||||
for job_id in ${VPN_JOB_ID_LIST}
|
||||
do
|
||||
vpn_job_tab_get "${job_id}"
|
||||
|
||||
|
||||
${DEBUG} kill -0 "${job_pid}" 2>/dev/null
|
||||
rc=$?
|
||||
|
||||
|
||||
if [[ "${job_pid}" == "0" ]] || [[ $rc != 0 ]]
|
||||
then
|
||||
job_status="Down"
|
||||
else
|
||||
job_status="Up"
|
||||
fi
|
||||
|
||||
printf "%-*s | %-*s | %-*s | %-*s | %-*s | %-*s\n" 8 "${job_id}" 24 "${job_name}" 8 "${job_status}" 8 "${job_pid}" 32 "${job_date}" 8 "${job_cmd}"
|
||||
done
|
||||
|
||||
network_dst_tab_name_lookup "${job_name}"
|
||||
network_dst_tab_get "${dst_id}"
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user