- Fix uptime for gateway destinations,

- Add status filtering in the VPN Admin page.

ReleaseNotes.txt

@@ -1,3 +1,12 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Network Tools V 1.1.3 - A. GIBERT - 2025/09/19
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Fix uptime for gateway destinations,
+- Add status filtering in the VPN Admin page.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Network Tools V 1.1.2 - A. GIBERT - 2025/09/12
 ------------------------------------------------------------------------------------------------------------------------------------

usr/local/lib/network.bash

@@ -406,9 +406,14 @@ network_dst_tab_load()
 
             if [[ "${ndtl_status}" == "1" ]]
             then
-                 
+                if [[  "${ndtl_type}" == "1" ]]
+                then
+                    ndtl_start_date="${ovpn_stat_connected_date}"
+                    ndtl_uptime="$( echo $(( $(date +%s) - ${ovpn_stat_connected_time_t})) | awk '{days = int($1/86400); print days " day" (( days > 1 ) ? "s" : "") strftime(" %H:%M:%S", $1,1)}')"
+                else
                     ndtl_start_date="$( stat -c %Z /sys/class/net/${ndtl_device})"                        
                     ndtl_uptime="$( echo $(( $(date +%s) - ${ndtl_start_date})) | awk '{days = int($1/86400); print days " day" (( days > 1 ) ? "s" : "") strftime(" %H:%M:%S", $1,1)}')"
+                fi
             else
                 ndtl_start_date=""
                 ndtl_uptime=""

var/www/cgi-bin/vpn-admin_board.cgi

@@ -125,6 +125,8 @@ Destination_Status_Board()
             dst_ip="-"
         fi
 
+        if [[ ( "${status}" == "" ) || ( "${status}" == "${dst_status}") ]]
+        then
             if [[ "${format}" == "html" ]]
             then
                 echo -n "<TR><TD class="header">${dst_id}</TD><TD>${dst_name}</TD><TD>${NETWORK_DST_TYPE[${dst_type}]}</TD><TD>${dst_device}</TD>"
@@ -132,15 +134,15 @@ Destination_Status_Board()
                 case "${dst_status}"
                 in
                     "0")
-                    echo -n "<TD><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Down\" ALT=\"Down\"></TD>"
+                        echo -n "<TD><A HREF=\"?admin=${admin}&amp;user=${user}&amp;status=${dst_status}\"><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Down\" ALT=\"Down\"></A></TD>"
                     ;;
 
                     "1")
-                    echo -n "<TD><IMG SRC=\"/icons/user-online.png\" TITLE=\"Up\" ALT=\"Up\"></TD>"
+                        echo -n "<TD><A HREF=\"?admin=${admin}&amp;user=${user}&amp;status=${dst_status}\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Up\" ALT=\"Up\"></A></TD>"
                     ;;
 
                     "2")
-                    echo -n "<TD><IMG SRC=\"/icons/user-unready.png\" TITLE=\"Unready\" ALT=\"Unready\"></TD>"
+                        echo -n "<TD><A HREF=\"?admin=${admin}&amp;user=${user}&amp;status=${dst_status}\"><IMG SRC=\"/icons/user-unready.png\" TITLE=\"Unready\" ALT=\"Unready\"></A></TD>"
                     ;;
                 
                     *)
@@ -148,11 +150,11 @@ Destination_Status_Board()
                     ;;
                 esac
 
-
                 echo "<TD>${dst_ip:--}</TD><TD>${dst_host_name:--}</TD><TD>${dst_config:--}</TD><TD>${dst_table}</TD><TD>${dst_bytes_received:--}</TD><TD>${dst_bytes_sent:--}</TD><TD>${dst_uptime:--}</TD>"
             else
                 echo "${dst_id};${dst_name};${NETWORK_DST_TYPE[${dst_type}]};${dst_device};${dst_status};${dst_ip};${dst_host_name};${dst_config};${dst_table};${dst_bytes_received};${dst_bytes_sent};${dst_uptime}"
             fi
+        fi
     done
 
     if [[ "${format}" == "html" ]]
@@ -179,13 +181,13 @@ Source_Routing_Board_Line()
 
     network_src_tab_get ${src_id}
     
-    if [[ ( "${filter}" == "") || ( "${filter}" == "owner") || ( "${filter}" == "${src_owner}") ]]
+    if [[ ( "${user}" == "") || ( "${user}" == "owner") || ( "${user}" == "${src_owner}") ]]
     then
         if [[ ( "${admin}" == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
         then
             class="default"
         else
-            if [[ "${filter}" == "owner" ]]
+            if [[ "${user}" == "owner" ]]
             then
                 class="skip"
             else
@@ -193,11 +195,16 @@ Source_Routing_Board_Line()
             fi
         fi
     else
-        # filter == user not owner of this line
+        # user == user not owner of this line
         
         class="skip"
     fi
     
+    if [[ ( "${status}" != "") && ( "${status}" != "${src_status}") ]]
+    then
+        class="skip"
+    fi
+
     
     if [[ "${class}" != "skip" ]]
     then
@@ -212,19 +219,19 @@ Source_Routing_Board_Line()
             case "${src_status}"
             in
                 "0")
-                    echo -n "<TD><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Down\" ALT=\"Down\"></TD>"
+                    echo -n "<TD><A HREF=\"?admin=${admin}&amp;user=${user}&amp;status=${src_status}\"><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Down\" ALT=\"Down\"></A></TD>"
                 ;;
 
                 "1")
-                        echo -n "<TD><IMG SRC=\"/icons/user-online.png\" TITLE=\"Up\" ALT=\"Up\"></TD>"
+                        echo -n "<TD><A HREF=\"?admin=${admin}&amp;user=${user}&amp;status=${src_status}\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Up\" ALT=\"Up\"></A></TD>"
                 ;;
 
                 "2")
-                    echo -n "<TD>-</TD>"
+                    echo -n "<TD><A HREF=\"?admin=${admin}&amp;user=${user}&amp;status=${src_status}\">-</A></TD>"
                 ;;
             esac
         else
-            echo -n "${src_id};${NETWORK_SRC_TYPE[${src_type}]};${src_ip};${src_host_name};${src_device};${status};"
+            echo -n "${src_id};${NETWORK_SRC_TYPE[${src_type}]};${src_ip};${src_host_name};${src_device};${src_status};"
         fi
 
 
@@ -246,7 +253,7 @@ Source_Routing_Board_Line()
 
                         if [[ ( ${admin} == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
                         then
-                            echo -n "<A HREF=\"?cmd=route_set&amp;admin=${admin}&amp;filter=${filter}&amp;ip=${src_ip}&amp;vpn=${dst_id}\"><IMG SRC=\"/icons/user-invisible.png\" TITLE=\"Activate\" ALT=\"Activate\"></A>"
+                            echo -n "<A HREF=\"?cmd=route_set&amp;admin=${admin}&amp;user=${user}&amp;status=${status}&amp;ip=${src_ip}&amp;vpn=${dst_id}\"><IMG SRC=\"/icons/user-invisible.png\" TITLE=\"Activate\" ALT=\"Activate\"></A>"
                         else
                             echo -n "&nbsp;"
                         fi
@@ -274,7 +281,7 @@ Source_Routing_Board_Line()
                 echo -n "<TD>${src_port_range}</TD><TD>-</TD><TD>-</TD>"
             fi
 
-            echo "<TD><A HREF=\"?admin=${admin}&amp;filter=${src_owner}\">${src_owner}</A></TD><TD>${src_bytes_received:--}</TD><TD>${src_bytes_sent:--}</TD><TD>${src_uptime:--}</TD><TD>${src_last_seen:--}</TD></TR>"
+            echo "<TD><A HREF=\"?admin=${admin}&amp;user=${src_owner}&amp;status=${status}\">${src_owner}</A></TD><TD>${src_bytes_received:--}</TD><TD>${src_bytes_sent:--}</TD><TD>${src_uptime:--}</TD><TD>${src_last_seen:--}</TD></TR>"
         else
             echo "${src_port_range};${src_port_start};${src_port_end};${src_owner};${src_bytes_received};${src_bytes_sent};${src_uptime};${src_last_seen}"
         fi
@@ -378,13 +385,13 @@ VPN_OpenVPN_Board()
     
         if [[ "${src_type}" == 2 ]]
         then
-          if [[ ( "${filter}" == "") || ( "${filter}" == "owner") || ( "${filter}" == "${src_owner}") ]]
+          if [[ ( "${user}" == "") || ( "${user}" == "owner") || ( "${user}" == "${src_owner}") ]]
           then
               if [[ ( "${admin}" == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
               then
                   class="default"
               else
-                  if [[ "${filter}" == "owner" ]]
+                  if [[ "${user}" == "owner" ]]
                   then
                       class="skip"
                   else
@@ -392,30 +399,36 @@ VPN_OpenVPN_Board()
                   fi
               fi
           else
-              # filter == user not owner of this line
+              # user == user not owner of this line
               
               class="skip"
           fi
           
+          if [[ ( "${status}" != "") && ( "${status}" != "${src_status}") ]]
+          then
+              class="skip"
+          fi
+
+          
           if [[ "${class}" != "skip" ]]
           then
               if [[ "${format}" == "html" ]]
               then
                   echo -n "        <TR class=\"${class}\"><TD class=\"header\">${idx}</TD><TD>${src_ip}</TD><TD>${src_host_name}</TD>"
-                  echo -n "<TD><A HREF=\"?cmd=config_download&amp;admin=${admin}&amp;filter=${filter}&amp;ip=${src_ip}&amp;defroute=true&amp;type=ext\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration Default Route External Certificates\" ALT=\"Configuration External Certificates\"></A></TD>"
+                  echo -n "<TD><A HREF=\"?cmd=config_download&amp;admin=${admin}&amp;user=${user}&amp;status=${status}&amp;ip=${src_ip}&amp;defroute=true&amp;type=ext\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration Default Route External Certificates\" ALT=\"Configuration External Certificates\"></A></TD>"
 
                   if [[ ( "${admin}" == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
                   then
-                      echo -n "<TD><A HREF=\"?cmd=config_download&amp;admin=${admin}&amp;filter=${filter}&amp;ip=${src_ip}&amp;defroute=true&amp;type=inline\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration Default Route Inline Certificates\" ALT=\"Configuration Inline Certificates\"></A></TD>"
+                      echo -n "<TD><A HREF=\"?cmd=config_download&amp;admin=${admin}&amp;user=${user}&amp;status=${status}&amp;ip=${src_ip}&amp;defroute=true&amp;type=inline\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration Default Route Inline Certificates\" ALT=\"Configuration Inline Certificates\"></A></TD>"
                   else
                       echo -n "<TD><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration Inline Certificates\" ALT=\"Configuration Inline Certificates\"></TD>"
                   fi
 
-                  echo -n "<TD><A HREF=\"?cmd=config_download&amp;admin=${admin}&amp;filter=${filter}&amp;ip=${src_ip}&amp;defroute=false&amp;type=ext\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration NoDefault Route External Certificates\" ALT=\"Configuration External Certificates\"></A></TD>"
+                  echo -n "<TD><A HREF=\"?cmd=config_download&amp;admin=${admin}&amp;user=${user}&amp;status=${status}&amp;ip=${src_ip}&amp;defroute=false&amp;type=ext\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration NoDefault Route External Certificates\" ALT=\"Configuration External Certificates\"></A></TD>"
 
                   if [[ ( "${admin}" == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
                   then
-                      echo -n "<TD><A HREF=\"?cmd=config_download&amp;admin=${admin}&amp;filter=${filter}&amp;ip=${src_ip}&amp;defroute=false&amp;type=inline\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration NoDefault Route Inline Certificates\" ALT=\"Configuration Inline Certificates\"></A></TD>"
+                      echo -n "<TD><A HREF=\"?cmd=config_download&amp;admin=${admin}&amp;user=${user}&amp;status=${status}&amp;ip=${src_ip}&amp;defroute=false&amp;type=inline\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration NoDefault Route Inline Certificates\" ALT=\"Configuration Inline Certificates\"></A></TD>"
                   else
                       echo -n "<TD><IMG SRC=\"/icons/user-online.png\" TITLE=\"Configuration Inline Certificates\" ALT=\"Configuration Inline Certificates\"></TD>"
                   fi
@@ -425,17 +438,17 @@ VPN_OpenVPN_Board()
 
               if [[ "${format}" == "html" ]]
               then
-                  echo -n "<TD><A HREF=\"?cmd=cert_download&amp;admin=${admin}&amp;filter=${filter}&amp;ip=${src_ip}&amp;type=ca\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"CA Certificate\" ALT=\"CA Certificate\"></A></TD>"
+                  echo -n "<TD><A HREF=\"?cmd=cert_download&amp;admin=${admin}&amp;user=${user}&amp;status=${status}&amp;ip=${src_ip}&amp;type=ca\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"CA Certificate\" ALT=\"CA Certificate\"></A></TD>"
 
                   if [[ ( "${admin}" == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
                   then
-                      echo -n "<TD><A HREF=\"?cmd=cert_download&amp;admin=${admin}&amp;filter=${filter}&amp;ip=${src_ip}&amp;type=tc\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"TC Certificate\" ALT=\"TC Certificate\"></A></TD>"
+                      echo -n "<TD><A HREF=\"?cmd=cert_download&amp;admin=${admin}&amp;user=${user}&amp;status=${status}&amp;ip=${src_ip}&amp;type=tc\" ><IMG SRC=\"/icons/user-online.png\" TITLE=\"TC Certificate\" ALT=\"TC Certificate\"></A></TD>"
 
                       if [[ -f /etc/openvpn/tls/certs/${src_host_name}.crt ]]
                       then
-                          echo -n "<TD><A HREF=\"?cmd=cert_download&amp;admin=${admin}&amp;filter=${filter}&amp;ip=${src_ip}&amp;type=key\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Private Key\" ALT=\"Private Key\"></A></TD>"
+                          echo -n "<TD><A HREF=\"?cmd=cert_download&amp;admin=${admin}&amp;user=${user}&amp;status=${status}&amp;ip=${src_ip}&amp;type=key\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Private Key\" ALT=\"Private Key\"></A></TD>"
-                          echo -n "<TD><A HREF=\"?cmd=cert_download&amp;admin=${admin}&amp;filter=${filter}&amp;ip=${src_ip}&amp;type=csr\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Certificate Signing Request\" ALT=\"Certificat Signing Request\"></A></TD>"
+                          echo -n "<TD><A HREF=\"?cmd=cert_download&amp;admin=${admin}&amp;user=${user}&amp;status=${status}&amp;ip=${src_ip}&amp;type=csr\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Certificate Signing Request\" ALT=\"Certificat Signing Request\"></A></TD>"
-                          echo    "<TD><A HREF=\"?cmd=cert_download&amp;admin=${admin}&amp;filter=${filter}&amp;ip=${src_ip}&amp;type=crt\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Public Certificate\" ALT=\"Public Certificate\"></A></TD></TR>"
+                          echo    "<TD><A HREF=\"?cmd=cert_download&amp;admin=${admin}&amp;user=${user}&amp;status=${status}&amp;ip=${src_ip}&amp;type=crt\"><IMG SRC=\"/icons/user-online.png\" TITLE=\"Public Certificate\" ALT=\"Public Certificate\"></A></TD></TR>"
                       else
                           echo -n "<TD><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Private Key\" ALT=\"Private Key\"></TD>"
                           echo -n "<TD><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Certificat Signing Request\" ALT=\"Certificat Signing Request\"></TD>"
@@ -497,22 +510,46 @@ Main_Board_Print()
             admin_mode=""
         fi
         
-        case "${filter}"
+        case "${user}"
         in
-            "owner")
+            "")
-                filter_mode="My VPN"
+                user_mode="All"
                 ;;
             
-            "")
+            "owner")
-                filter_mode="All VPN"
+                user_mode="My"
                 ;;
             
             *)
-                filter_mode="${filter} VPN"
+                user_mode="${user}"
                 ;;            
         esac
 
-        echo "    <H1>VPN Admin Board: ${filter_mode}${admin_mode}</H1>"
+        case "${status}"
+        in
+            "")
+                status_mode="All"
+                ;;
+            
+            "0")
+                status_mode="Down"
+                ;;
+            
+            "1")
+                status_mode="UP"
+                ;;
+            
+            "2")
+                status_mode="Not Conected"
+                ;;
+            
+            *)
+                status_mode="Unkwown"
+                ;;            
+        esac
+
+        
+        echo "    <H1>VPN Admin Board: ${user_mode} VPN - ${status_mode} Status${admin_mode}</H1>"
 
 
         echo "    <P>"
@@ -539,17 +576,23 @@ Main_Board_Print()
         then
             if [[ "${admin}" == "true" ]]
             then
-                echo -n "<A HREF=\"?filter=${filter}\">Non Admin Mode</A>"
+                echo -n "<A HREF=\"?user=${user}&amp;status=${status}\">Non Admin Mode</A>"
             else
-                echo -n "<A HREF=\"?admin=true&amp;filter=${filter}\">Admin Mode</A>"
+                echo -n "<A HREF=\"?admin=true&amp;user=${user}&amp;status=${status}\">Admin Mode</A>"
             fi
 
             echo -n "&nbsp;&nbsp;&nbsp;"
         fi
 
-        if [[ "${filter}" != "" ]]
+        if [[ "${user}" != "" ]]
         then
-            echo -n "<A HREF=\"?admin=${admin}\">All VPN</A>"
+            echo -n "<A HREF=\"?admin=${admin}&amp;status=${status}\">All VPN</A>"
+            echo -n "&nbsp;&nbsp;&nbsp;"
+        fi
+
+        if [[ "${status}" != "" ]]
+        then
+            echo -n "<A HREF=\"?admin=${admin}&amp;user=${user}\">All Status</A>"
         fi
         
         echo ""
@@ -598,7 +641,8 @@ Main_Board_Print()
 
 cmd=""
 format=""
-filter=""
+user=""
+status=""
 ip=""
 vpn=""
 type=""
@@ -638,6 +682,14 @@ then
           filter=${arg}
           ;;
 
+          "user")
+          user=${arg}
+          ;;
+
+          "status")
+          status=${arg}
+          ;;
+
           "ip")
           ip=${arg}
           ;;
@@ -685,7 +737,7 @@ if [[ ( ${admin} == "true") && ( " ${ADMIN_USER_LIST} " != *" ${REMOTE_USER} "*)
 then
     cmd_status="${cmd}: Admin NOT_AUTHORIZED"
 
-    redirect="?filter=${filter}"
+    redirect="?user=${user}&up=${up}"
     
     Header_Print
     Footer_Print