- Fix ReleaseNotes file.

- Add missing etc/sudoers.d/rx3-network config file.

ReleaseNotes.txt

@@ -1,3 +1,43 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Network Tools V 1.1.4 - A. GIBERT - 2026/04/13
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add rx3-network.minotaur config file,
+- Add missing etc/sudoers.d/rx3-network config file,
+- Minor config files update,
+- Last release of the 1.1.x branch.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+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
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Minor fixes in config files and openvpn-status.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Network Tools V 1.1.1 - A. GIBERT - 2025/09/03
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Add a new conection state for gateways device up with no gateway client connected,
+- Improve openvpn stats reporting,
+- Improve device up api events,
+- Add network reinit() function,
+- Add reinit at each supervisor end loop.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Network Tools V 1.1.0 - A. GIBERT - 2025/08/26
 ------------------------------------------------------------------------------------------------------------------------------------

usr/local/lib/default.bash

@@ -361,7 +361,7 @@ log_print()
 
 log_trace()
 {
-    log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "TRA" $*
+    log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "TRA" "$@"
 }
 
 
@@ -374,7 +374,7 @@ log_trace()
 
 log_info()
 {
-    log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "INF" $*
+    log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "INF" "$@"
 }
 
 
@@ -387,7 +387,7 @@ log_info()
 
 log_warning()
 {
-    log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "WRN" $*
+    log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "WRN" "$@"
 }
 
 
@@ -400,5 +400,5 @@ log_warning()
 
 log_error()
 {
-    log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "ERR" $*
+    log_print "${LOG_FILE}" "${LOG_LOCK}" "${LOG_ECHO}" "ERR" "$@"
 }

usr/local/lib/dns.bash

@@ -291,6 +291,14 @@ dns_init()
 
 dns_deinit()
 {
-    :;
+    DNS_A_TAB=()
+    DNS_A_ID_LIST=""
+
+    DNS_PTR_TAB=()
+    DNS_PTR_ID_LIST=""
+
+    DNS_CACHE_UPDATED=0
+
+#    :;
 }
 

usr/local/lib/network.bash

@@ -168,6 +168,72 @@ network_common_dump()
 
 
 
+#--------------------------------------------------------------------------------------------------------------------------
+# network_common_openvpn_stats_get
+#--------------------------------------------------------------------------------------------------------------------------
+
+network_common_openvpn_stats_get()
+{
+    local device="$1"
+    local client="$2"
+
+    
+    if [[ "${client}" == "" ]]
+    then
+        client=".*"
+    else
+        if [[ "${device}" == "" ]]
+        then
+               tmp="$( echo "${NETWORK_OPENVPN_STATUS}" | grep "CLIENT_LIST,${client},")"
+               tmp="${tmp/*\//}"
+            device="${tmp/.status*/}"
+        fi
+    fi
+    
+    if [[ "${device}" != "" ]]
+    then            
+        if [[ "${NETWORK_OPENVPN_STATUS}" =~ ("${device}.status: TITLE") ]]
+        then
+            # OpenVPN Server Mode
+            
+            OIFS="${IFS}"
+            IFS=","
+            set XXX/$( echo "${NETWORK_OPENVPN_STATUS}" | grep "${device}\.status: CLIENT_LIST,${client},")  &>/dev/null
+            IFS="${OIFS}"
+
+                                   tmp="${1/XXX*\//}"
+                      ovpn_stat_device="${tmp/.status*/}"
+                 ovpn_stat_client_name="$2"
+                 ovpn_stat_address_ext="$3"
+                 ovpn_stat_address_int="$4"
+                ovpn_stat_address_int6="$5"
+              ovpn_stat_bytes_received="$6"
+                  ovpn_stat_bytes_sent="$7"
+              ovpn_stat_connected_date="$8"
+            ovpn_stat_connected_time_t="$9"
+                   ovpn_stat_user_name="$10"
+                   ovpn_stat_client_id="$11"
+                     ovpn_stat_peer_id="$12"
+                      ovpn_stat_cipher="$13"
+        else
+            # OpenVPN Client Mode
+    
+            set XXX/$( echo "${NETWORK_OPENVPN_STATUS}" | grep "${device}\.status:") &>/dev/null
+    
+                                   tmp="${1/XXX*\//}"
+                      ovpn_stat_device="${tmp/.status*/}"
+              ovpn_stat_bytes_received="${18/bytes,}"
+                  ovpn_stat_bytes_sent="${22/bytes,}"
+        fi
+    else
+        ovpn_stat_device=""
+    fi
+ }
+
+
+
+
+
 #--------------------------------------------------------------------------------------------------------------------------
 # network_ip_route_tab_load
 #--------------------------------------------------------------------------------------------------------------------------
@@ -232,6 +298,7 @@ network_ip_route_tab_dump()
 {
     echo "NETWORK_IP_ROUTE_ID_LIST: [${NETWORK_IP_ROUTE_ID_LIST}]"
     echo
+
     
     echo "NETWORK_IP_ROUTE_IP_IDX:"
     
@@ -242,6 +309,7 @@ network_ip_route_tab_dump()
 
     echo
 
+    
     echo "NETWORK_IP_ROUTE_TAB:"
 
     for key in "${!NETWORK_IP_ROUTE_TAB[@]}"
@@ -293,8 +361,6 @@ network_dst_tab_load()
 
             
             ndtl_status="$( ip link show dev ${ndtl_device} 2>/dev/null | grep -q ",UP," && echo "1" || echo "0")"
-            
-            tab_assign NETWORK_DST_TAB      "${ndtl_id},Status"          "${ndtl_status}"
 
             
             if [[ "${ndtl_type}" == "5" ]]
@@ -303,8 +369,8 @@ network_dst_tab_load()
                      dns_value=""
             else
                 ndtl_host_name="vpn${vpn_id}.${NETWORK_DST_NAME}"
-                dns_lookup                     "A"                          "${ndtl_host_name}" "NOCACHE"
-                vpn_id=$((${vpn_id} + 1))
+                dns_lookup                 "A"                          "${ndtl_host_name}" "NOCACHE"
+                        vpn_id=$((${vpn_id} + 1))
             fi
             
             tab_assign NETWORK_DST_TAB     "${ndtl_id},Host_Name"       "${ndtl_host_name}"
@@ -312,26 +378,42 @@ network_dst_tab_load()
 
             case "${ndtl_type}"
             in
-                "0"|"1")
+                "0")
                     ndtl_bytes_received="$( cat /sys/class/net/${ndtl_device}/statistics/rx_bytes 2>/dev/null | numfmt --to=iec-i --suffix=B)"
                         ndtl_bytes_sent="$( cat /sys/class/net/${ndtl_device}/statistics/tx_bytes 2>/dev/null | numfmt --to=iec-i --suffix=B)"
-                            ;;
+                ;;
                 
-                "2")
-                    set $( echo "${NETWORK_OPENVPN_STATUS}" | grep ${ndtl_device}'\.') &>/dev/null
-
-#		    i=1; while [[ $i -lt 50 ]]; do eval "val=\${$i}"; echo "($i):[${val}]" 1>&2; i=$(( $i + 1)); done
-
-		    ndtl_bytes_received="$( echo ${18/bytes,} | numfmt --to=iec-i --suffix=B)"
-                        ndtl_bytes_sent="$( echo ${22/bytes,} | numfmt --to=iec-i --suffix=B)"
-                    ;;
+                "1"|"2")
+                    network_common_openvpn_stats_get "${ndtl_device}" ""
+                    
+                    if [[ ( "${ndtl_type}" == "1") && ( "${ndtl_status}" == "1") && ( "${ovpn_stat_client_name}" == "") ]]
+                    then
+                                ndtl_status="2"
+                        
+                        ndtl_bytes_received=""
+                            ndtl_bytes_sent=""
+                    else
+                        ndtl_bytes_received="$( echo ${ovpn_stat_bytes_received} | numfmt --to=iec-i --suffix=B)"
+                            ndtl_bytes_sent="$( echo ${ovpn_stat_bytes_sent}     | numfmt --to=iec-i --suffix=B)"
+                    fi
+                ;;
             esac
 
+            
+            
+            tab_assign NETWORK_DST_TAB      "${ndtl_id},Status"          "${ndtl_status}"
+
+
             if [[ "${ndtl_status}" == "1" ]]
             then
-                
-                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)}')"
+                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=""
@@ -388,8 +470,19 @@ network_dst_tab_get()
 
 network_dst_tab_dump()
 {
+    echo "NETWORK_DST_TYPE:"
+
+    for key in "${!NETWORK_DST_TYPE[@]}"
+    do
+        echo "[${key}]: [${NETWORK_DST_TYPE[${key}]}]"
+    done | sort -n  
+    
+    echo
+    
+
     echo "NETWORK_DST_ID_LIST: [${NETWORK_DST_ID_LIST}]"
     echo
+
     
     echo "NETWORK_DST_NAME_IDX:"
     
@@ -400,6 +493,7 @@ network_dst_tab_dump()
 
     echo
 
+    
     echo "NETWORK_DST_DEV_IDX:"
     
     for key in "${!NETWORK_DST_DEV_IDX[@]}"
@@ -409,6 +503,7 @@ network_dst_tab_dump()
 
     echo
 
+    
     echo "NETWORK_DST_TAB:"
 
     for key in "${!NETWORK_DST_TAB[@]}"
@@ -464,12 +559,12 @@ network_dst_ip_update()
     
     if [[ "${dst_ip}" != "${dst_ip_new}" ]]
     then
-        log_info "Network" "Update ${dst_host_name}: Old: [${dst_ip}]   New: [${dst_ip_new}]"
-            
+        log_info "Network" "Update [${dst_host_name}]: Old: [${dst_ip}]   New: [${dst_ip_new}]"
+
         ${DEBUG} /usr/local/sbin/ip_host_update "${dst_host_name/.*}" "${dst_host_name#*.}" "${dst_ip_new}" 60
         tab_assign NETWORK_DST_TAB "${dst_id},IP" "${dst_ip_new}"
     else
-        log_trace "Network" "Skiping ${dst_host_name}: IP: [${dst_ip}]"
+        log_trace "Network" "Skiping [${dst_host_name}]: IP: [${dst_ip}]"
     fi
 }
 
@@ -494,7 +589,7 @@ network_dst_name_ip_update()
         network_dst_tab_get     "${dst_id}"        
         network_dst_ip_update   "${dst_ip_new}"
     else
-        log_error "Network: dst name not found: [${dst_name}]"
+        log_error "Network" "dst name not found: [${dst_name}]"
     fi
 }
 
@@ -548,53 +643,55 @@ network_src_tab_load()
 #		    [[ $nstl_host_name =~ ([0-9]+) ]]
 #		    nstl_device="${NETWORK_SRC_LOCAL_DEVICE}-${BASH_REMATCH[1]}"
 
-                    ip_num=$(ip_to_num ${nstl_ip})
-                    device_num="$(( ( ${ip_num} - ${ip_base}) / 4))"
+                          ip_num=$(ip_to_num ${nstl_ip})
+                      device_num="$(( ( ${ip_num} - ${ip_base}) / 4))"
                     
                     nstl_device="${NETWORK_SRC_LOCAL_DEVICE}-${device_num}"
-		;;&
+                    nstl_status="$( ip link show dev ${nstl_device} 2>/dev/null | grep -q ",UP," && echo "1" || echo "0")"
+
+                    if [[ "${nstl_status}" == 1 ]]
+                    then
+                        nstl_bytes_received="$( cat /sys/class/net/${nstl_device}/statistics/rx_bytes 2>/dev/null | numfmt --to=iec-i --suffix=B)"
+                            nstl_bytes_sent="$( cat /sys/class/net/${nstl_device}/statistics/tx_bytes 2>/dev/null | numfmt --to=iec-i --suffix=B)"
+                            nstl_start_date="$( stat -c %Z /sys/class/net/${nstl_device})"
+                            nstl_uptime="$( echo $(( $(date +%s) - ${nstl_start_date})) | awk '{days = int($1/86400); print days " day" (( days > 1 ) ? "s" : "") strftime(" %H:%M:%S", $1,1)}')"
+                    else
+                        nstl_bytes_received=""
+                            nstl_bytes_sent=""
+                                nstl_uptime=""
+                             nstl_last_seen=""
+                    fi        
+		;;
 		
                 "1") # Routed
-                    nstl_device=""
-		;;&
-		
-                "0"|"1") # Local + Routed
+                            nstl_device=""
                             nstl_status="2"
                     
                     nstl_bytes_received=""
                         nstl_bytes_sent=""
                             nstl_uptime=""
                          nstl_last_seen=""
-                ;;
+		;;
 
                 "2") # OpenVPN
-#                         nstl_device="tun0"
-#                    nstl_status_line="$( echo "${NETWORK_OPENVPN_STATUS}" | grep "${nstl_device}.status: CLIENT_LIST.*${nstl_ip},")"
+                    network_common_openvpn_stats_get "" "${nstl_host_name}"
 
-                    nstl_status_line="$( echo "${NETWORK_OPENVPN_STATUS}" | grep "CLIENT_LIST,.*${nstl_ip},")"
-                    
-                    if [[ "${nstl_status_line}" == "" ]]
+                    if [[ "${ovpn_stat_device}" == "" ]]
                     then
-                        nstl_device=""
-                        nstl_status="0"
+                                nstl_device=""
+                                nstl_status="0"
                         nstl_bytes_received=""
                             nstl_bytes_sent=""
                             nstl_start_date=""
                                 nstl_uptime=""
                              nstl_last_seen="$( stat -c "%x" /etc/openvpn/status/${nstl_host_name}.status 2>/dev/null | sed -e 's/\..*//')"
-
                     else
-                        nstl_status="1"
-
-                        IFS=,
-                        set ${nstl_status_line} &>/dev/null
-                        unset IFS
-
-                        nstl_device="$( echo $1 | sed -e "s%.*/%%" -e 's/.status.*//')"
-                        nstl_bytes_received=$( echo ${6} | numfmt --to=iec-i --suffix=B)
-                            nstl_bytes_sent=$( echo ${7} | numfmt --to=iec-i --suffix=B)
-                            nstl_start_date=${8}
-                                nstl_uptime=$( echo "$(($(date +%s) - $(date -d "${nstl_start_date}" +%s)))" | awk '{days = int($1/86400); print days " day" (( days > 1 ) ? "s" : "") strftime(" %H:%M:%S", $1,1)}')                       
+                                nstl_device="${ovpn_stat_device}"
+                                nstl_status="1"
+                        nstl_bytes_received=$( echo ${ovpn_stat_bytes_sent} | numfmt --to=iec-i --suffix=B)
+                            nstl_bytes_sent=$( echo ${ovpn_stat_bytes_sent} | numfmt --to=iec-i --suffix=B)
+                            nstl_start_date=${ovpn_stat_connected_date}
+                                nstl_uptime=$( echo "$(($(date +%s) - $(date -d "${nstl_start_date}" +%s)))" | awk '{days = int($1/86400); print days " day" (( days > 1 ) ? "s" : "") strftime(" %H:%M:%S", $1,1)}')
                              nstl_last_seen="$(stat -c "%x" /etc/openvpn/status/${nstl_host_name}.status 2>/dev/null | sed -e 's/\..*//')"
                     fi
                 ;;
@@ -680,6 +777,16 @@ network_src_tab_get()
 
 network_src_tab_dump()
 {
+    echo "NETWORK_SRC_TYPE:"
+
+    for key in "${!NETWORK_SRC_TYPE[@]}"
+    do
+        echo "[${key}]: [${NETWORK_SRC_TYPE[${key}]}]"
+    done | sort -n  
+    
+    echo
+    
+
     echo "NETWORK_SRC_ID_LIST: [${NETWORK_SRC_ID_LIST}]"
     echo
     
@@ -772,7 +879,7 @@ network_route_dst_init()
     local dst_id="$1"
 
     
-    network_dst_tab_get ${dst_id}
+    network_dst_tab_get "${dst_id}"
 
     if [[ ${dst_type} == "0" ]]
     then
@@ -792,8 +899,22 @@ network_route_dst_init()
     fi
 
     
-    target_device=${dst_device}
-    
+#    network_route_rx3_init ${dst_device}
+}
+
+
+
+
+
+#--------------------------------------------------------------------------------------------------------------------------
+# network_route_rx3_init
+#--------------------------------------------------------------------------------------------------------------------------
+
+network_route_rx3_init()
+{
+    local target_device="$1"
+
+
     log_trace "Network" "Add [${target_device}] Rx3 routes in VPN tables"
 	
     for dst_id in ${NETWORK_DST_ID_LIST}
@@ -806,7 +927,7 @@ network_route_dst_init()
 
             if [[ "${ip_route_device}" == "${target_device}" ]]
             then
-	        ${DEBUG} ip route add ${ip_route_ip}/${ip_route_mask} table ${dst_table} dev ${ip_route_device}
+	        ${DEBUG} ip route add ${ip_route_ip}/${ip_route_mask} dev ${ip_route_device} table ${dst_table}
             fi
         done
     done
@@ -845,6 +966,65 @@ network_route_other_init()
 
 
 
+#--------------------------------------------------------------------------------------------------------------------------
+# network_device_init
+#--------------------------------------------------------------------------------------------------------------------------
+
+network_device_init()
+{
+    local      dst_id="$1"
+    local device_name="$2"
+
+    
+    log_trace "Network" "Init dst_id: [${dst_id}]   device_name: [${device_name}]"
+    
+    if [[ "${dst_id}" == "" ]]
+    then
+        network_dst_tab_dev_lookup "${device_name}"
+    fi  
+        
+    if [[ "${dst_id}" != "" ]]
+    then
+        network_route_dst_init     "${dst_id}"
+        
+        device_name="${dst_device}"        
+    fi
+    
+    network_route_rx3_init         "${device_name}"
+}
+ 
+
+
+
+#--------------------------------------------------------------------------------------------------------------------------
+# network_device_deinit
+#--------------------------------------------------------------------------------------------------------------------------
+
+network_device_deinit()
+{
+    local      dst_id="$1"
+    local device_name="$2"
+
+    
+    log_trace "Network" "DeInit dst_id: [${dst_id}]   device_name: [${device_name}]"
+    
+    if [[ "${dst_id}" == "" ]]
+    then
+        network_dst_tab_dev_lookup "${device_name}"
+    fi  
+
+    if [[ "${dst_id}" != "" ]]
+    then
+        network_dst_tab_get        "${dst_id}"
+        
+        network_dst_ip_update      "0.0.0.0"
+    fi
+}
+ 
+
+
+
+
 #--------------------------------------------------------------------------------------------------------------------------
 # network_route_init
 #--------------------------------------------------------------------------------------------------------------------------
@@ -853,9 +1033,15 @@ network_route_init()
 {
     for dst_id in ${NETWORK_DST_ID_LIST}
     do
-        network_route_dst_init   ${dst_id}
-        network_route_other_init ${dst_id}        
+        network_device_init      "${dst_id}" ""
+        network_route_other_init "${dst_id}"
     done
+    
+#    for dst_id in ${NETWORK_DST_ID_LIST}
+#    do
+#        network_route_dst_init   ${dst_id}
+#        network_route_other_init ${dst_id}        
+#    done
 }
 
 
@@ -962,24 +1148,40 @@ network_dst_address_refresh()
     local  proxy_port=8080
 
     
-    network_dst_tab_get       "${dst_id}"
+    network_dst_tab_get "${dst_id}"
 
-    if [[ ( "${dst_host_name}" != "" ) ]]
-    then
+    if [[ ( "${dst_host_name}" != "" )]]
+    then      
         if [[ ${dst_host_name} =~ ([0-9]+) ]]
         then
             proxy_host="proxy${BASH_REMATCH[1]}.${NETWORK_DST_PROXY_NAME}"
 
-            dst_ip_new="$( nc -w ${NETWORK_NC_TIMEOUT} ${proxy_host} ${proxy_port} 2>/dev/null)"
-            
-            if is_valid_ip "${dst_ip_new}"
-            then
-                network_dst_ip_update "${dst_ip_new}"
+            if [[ ( "${dst_status}" == 1) || ( ( "${dst_status}" != 1) && ( "${dst_ip}" != "0.0.0.0")) ]]
+            then               
+                if [[ ( ( "${dst_ip}" != "0.0.0.0") && ( "${dst_status}" != 1)) ]]
+                then
+                    log_info "Network" "Reseting IP: [${dst_host_name}]: IP: [${dst_ip_new}]   Status: (${dst_status})"
+                    dst_ip_new="0.0.0.0"
+                else
+                    dst_ip_new="$( nc -w "${NETWORK_NC_TIMEOUT}" "${proxy_host}" "${proxy_port}" 2>/dev/null)"
+                 fi
+
+                if is_valid_ip "${dst_ip_new}"
+                then
+                    if [[ "${dst_ip}" != "${dst_ip_new}" ]]
+                    then
+                        network_dst_ip_update "${dst_ip_new}"
+                    else
+                        log_trace "Network" "Skiping: [${dst_host_name}]: No changes..."
+                    fi                    
+                else
+                    log_info "Network" "Skiping: [${dst_host_name}]: Invalid IP: [${dst_ip_new}]"
+                fi
             else
-                log_info "Network" "Skiping: [${dst_host_name}]: Invalid IP: [${dst_ip_new}]"
+                log_trace "Network" "Skiping: [${dst_host_name}]: Device not Up..."                
             fi
         else
-                log_info "Network" "Skiping: dst_id: [${dst_id}]: Invalid host_name: [${dst_host_name}]"
+            log_info "Network" "Skiping: dst_id: [${dst_id}]: Invalid host_name: [${dst_host_name}]"
         fi
     fi
 }
@@ -1317,7 +1519,38 @@ network_init()
 
 network_deinit()
 {
-    dns_deinit
+    NETWORK_OPENVPN_STATUS=""
+
+    NETWORK_IP_ROUTE_TAB=()
+    NETWORK_IP_ROUTE_ID_LIST=""
+    NETWORK_IP_ROUTE_IP_IDX=()
+
+    NETWORK_SRC_TYPE=""
+    NETWORK_SRC_TAB=()
+    NETWORK_SRC_ID_LIST=""
+    NETWORK_SRC_IP_IDX=()
+
+    NETWORK_DST_TYPE=""
+    NETWORK_DST_TAB=()
+    NETWORK_DST_ID_LIST=""
+    NETWORK_DST_NAME_IDX=()
+    NETWORK_DST_DEV_IDX=()
+
+    dns_deinit    
+}
+
+
+
+
+
+#--------------------------------------------------------------------------------------------------------------------------
+# network_reinit
+#--------------------------------------------------------------------------------------------------------------------------
+
+network_reinit()
+{
+    network_deinit
+    network_init
 }
 
 

usr/local/lib/vpn.bash

@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 if [[ "${VPN_BASH}" != "" ]]
 then
@@ -348,6 +348,8 @@ vpn_supervisor()
 
  	log_trace "VPN" "Refreshing DNS entries..."
         network_dst_address_refresh_all
+
+        network_reinit
     done
 }
 

usr/local/sbin/openvpn-down

@@ -39,23 +39,8 @@ Local_Netmask="$5"
 network_init
 
 
-network_dst_tab_dev_lookup "${Dev}"
-network_dst_tab_get        "${dst_id}"
+log_info  "VPN-Down" "[${Dev}]: Local_MTU: [${Local_MTU}]   Remote_MTU: [${Remote_MTU}]   Local_Address: [${Local_Address}]   Local_Netmask: [${Local_Netmask}]   Dst_Table: [${dst_table}]   Phase: [${Phase}]   Status: [OK]"
 
-
-line="[${Dev}]: Local_MTU: [${Local_MTU}]   Remote_MTU: [${Remote_MTU}]   Local_Address: [${Local_Address}]   Local_Netmask: [${Local_Netmask}]   Dst_Table: [${dst_table}]   Phase: [${Phase}]"
-
-if [[ "${dst_table}" != "" ]]
-then
-    log_info  "VPN-Down" "$line" "   Status: [OK]"
-
-    remote_address=0.0.0.0
-
-    log_trace "VPN-Down" "[${Dev}]: set ${remote_address} to vpn${id}.vpn.rx3"
-    
-    ${DEBUG} ip_host_update vpn${id} vpn.rx3 ${remote_address} 60
-else
-    log_error "VPN-Down" "$line" "   Status: [ERROR]!"
-fi
+network_device_deinit "" "${Dev}"
 
 log_trace     "VPN-Down" "[${Dev}]: Done!"

usr/local/sbin/openvpn-status

@@ -4,7 +4,7 @@ dev=$1
 
 if [[ "$1" != "" ]]
 then
-    cat /etc/openvpn/openvpn-status-$dev.log
+    cat /var/lib/openvpn/$dev.status
 else
-    awk '{print FILENAME ": " $0}' /etc/openvpn/openvpn-status-*.log
+    awk '{print FILENAME ": " $0}' /var/lib/openvpn/*.status
 fi

usr/local/sbin/openvpn-up

@@ -40,20 +40,9 @@ Local_Netmask="$5"
 network_init
 
 
-network_dst_tab_dev_lookup "${Dev}"
-network_dst_tab_get        "${dst_id}"
 
+log_info  "VPN-Up" "[${Dev}]: Local_MTU: [${Local_MTU}]   Remote_MTU: [${Remote_MTU}]   Local_Address: [${Local_Address}]   Local_Netmask: [${Local_Netmask}]   Phase: [${Phase}]   Status: [OK]"
 
-line="[${Dev}]: Local_MTU: [${Local_MTU}]   Remote_MTU: [${Remote_MTU}]   Local_Address: [${Local_Address}]   Local_Netmask: [${Local_Netmask}]   Dst_Table: [${dst_table}]   Dst_Id: [${dst_id}]   Phase: [${Phase}]"
-
-if [[ "${dst_table}" != "" ]]
-then
-    log_info  "VPN-Up" "$line" "   Status: [OK]"
-    log_trace "VPN-Up" "[${Dev}]: ip route add table: [${dst_table}] default dev: [${Dev}]"
-
-    network_route_dst_init ${dst_id}
-else
-    log_error "VPN-Up" "$line" "   Status: [ERROR]!"
-fi
+network_device_init "" "${Dev}"
 
 log_trace     "VPN-Up" "[${Dev}]: Done!"

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

@@ -125,20 +125,35 @@ Destination_Status_Board()
             dst_ip="-"
         fi
 
-        if [[ "${format}" == "html" ]]
+        if [[ ( "${status}" == "" ) || ( "${status}" == "${dst_status}") ]]
         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>"
-
-            if [[ "${dst_status}" == 1 ]]
+            if [[ "${format}" == "html" ]]
             then
-                echo -n "<TD><IMG SRC=\"/icons/user-online.png\" TITLE=\"Up\" ALT=\"Up\"></TD>"
-            else
-                echo -n "<TD><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Down\" ALT=\"Down\"></TD>"
-            fi
+                echo -n "<TR><TD class="header">${dst_id}</TD><TD>${dst_name}</TD><TD>${NETWORK_DST_TYPE[${dst_type}]}</TD><TD>${dst_device}</TD>"
 
-            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}"
+                case "${dst_status}"
+                in
+                    "0")
+                        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><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><A HREF=\"?admin=${admin}&amp;user=${user}&amp;status=${dst_status}\"><IMG SRC=\"/icons/user-unready.png\" TITLE=\"Unready\" ALT=\"Unready\"></A></TD>"
+                    ;;
+                
+                    *)
+                        echo -n "<TD><IMG SRC=\"\" TITLE=\"Unknown\" ALT=\"Unknown\"></TD>"
+                    ;;
+                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
 
@@ -166,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
@@ -180,10 +195,15 @@ 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" ]]
@@ -199,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
 
 
@@ -233,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
@@ -261,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
@@ -365,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
@@ -379,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
@@ -412,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;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    "<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 -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;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;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>"
@@ -484,22 +510,46 @@ Main_Board_Print()
             admin_mode=""
         fi
         
-        case "${filter}"
+        case "${user}"
         in
-            "owner")
-                filter_mode="My VPN"
+            "")
+                user_mode="All"
                 ;;
             
-            "")
-                filter_mode="All VPN"
+            "owner")
+                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>"
@@ -526,19 +576,25 @@ 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 ""
         echo "    </P>"
         
@@ -585,7 +641,8 @@ Main_Board_Print()
 
 cmd=""
 format=""
-filter=""
+user=""
+status=""
 ip=""
 vpn=""
 type=""
@@ -625,6 +682,14 @@ then
           filter=${arg}
           ;;
 
+          "user")
+          user=${arg}
+          ;;
+
+          "status")
+          status=${arg}
+          ;;
+
           "ip")
           ip=${arg}
           ;;
@@ -672,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