- Contunue gatway support implementation.

usr/local/lib/network.bash

@@ -263,6 +263,7 @@ network_ip_route_tab_dump()
 network_dst_tab_load()
 {
     ndtl_id=0
+     vpn_id=0
 
 
     log_trace "Network" "Loading Dst tab..."
@@ -290,44 +291,56 @@ network_dst_tab_load()
 
             var_assign NETWORK_TABLE_LIST  "${ndtl_table}"              INC
 
-            tab_assign NETWORK_DST_TAB     "${ndtl_id},Status"          "$( ip link show dev ${ndtl_device} 2>/dev/null | grep -q ",UP," && echo 1 || echo 0)"
             
-            ndtl_host_name="vpn${ndtl_id}.${NETWORK_DST_NAME}"
+            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}" == "1" ]]
+            then
+                ndtl_host_name=""
+                     dns_value=""
+            else
+                ndtl_host_name="vpn${vpn_id}.${NETWORK_DST_NAME}"
+                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}"
-            dns_lookup                     "A"                          "${ndtl_host_name}" "NOCACHE"
             tab_assign NETWORK_DST_TAB     "${ndtl_id},IP"              "${dns_value}"
 
             case "${ndtl_type}"
             in
-                "0")
+                "0"|"1")
-                    set $(ip -s link show ${ndtl_device} 2>/dev/null ) &>/dev/null
+                    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)"
+                            ;;
                 
-                    ndtl_bytes_received="$( echo ${27} | numfmt --to=iec-i --suffix=B)"
+                "2")
-                        ndtl_bytes_sent="$( echo ${40} | numfmt --to=iec-i --suffix=B)"
+                    set $( echo "${NETWORK_OPENVPN_STATUS}" | grep ${ndtl_device}'\.') &>/dev/null
-                            ndtl_uptime=""
-                    ;;
-
-                "1")
-                    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)"
-                        ndtl_start_date="$( grep "ext-client-${ndtl_device}.conf" /var/log/rx3-vpn.status 2>/dev/null | sed -e "s/.*Date: \[//" -e "s/\].*//")"
-
-                        if [[ "${ndtl_start_date}" == "" ]]
-                        then
-                            ndtl_uptime=""
-                        else
-                            ndtl_uptime=$( echo "$(($(date +%s) - $(date -d "${ndtl_start_date}" +%s)))" | awk '{days = int($1/86400); print days " day" (( days > 1 ) ? "s" : "") strftime(" %H:%M:%S", $1,1)}')
-                        fi
                     ;;
             esac
 
+            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)}')"
+            else
+                ndtl_start_date=""
+                ndtl_uptime=""
+            fi
+
+            
             tab_assign NETWORK_DST_TAB      "${ndtl_id},Bytes_Received"  "${ndtl_bytes_received}"
             tab_assign NETWORK_DST_TAB      "${ndtl_id},Bytes_Sent"      "${ndtl_bytes_sent}"
+            tab_assign NETWORK_DST_TAB      "${ndtl_id},Start_Date"      "${ndtl_start_date}"
             tab_assign NETWORK_DST_TAB      "${ndtl_id},Uptime"          "${ndtl_uptime}"
                 
             tab_assign NETWORK_DST_NAME_IDX "${ndtl_name}"               "${ndtl_id}"

usr/local/lib/vpn.bash

@@ -200,7 +200,7 @@ vpn_job_tab_init()
     do
         network_dst_tab_get ${dst_id}
         
-        if [[ "${dst_type}" == "1" ]] && [[ "${dst_config}" != "" ]]
+        if [[ "${dst_type}" == "2" ]] && [[ "${dst_config}" != "" ]]
         then
             config_file="${VPN_CONFIG_FILE/DEVICE/${dst_device}}"
 

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

@@ -109,10 +109,10 @@ Destination_Status_Board()
         echo "    <H2>Destination Status Board</H2>"
         echo ""
         echo "    <TABLE BORDER=\"1\" WIDTH=\"100%\">"
-        echo "      <TR class=\"header\"><TD class=\"header\">#</TD><TD>Name</TD><TD>Type</TD><TD>Device</TD><TD>IP</TD><TD>Host Name</TD><TD>Config</TD><TD>Table</TD><TD>Status</TD><TD>Bytes In</TD><TD>Bytes Out</TD><TD>UpTime</TD></TR>"
+        echo "      <TR class=\"header\"><TD class=\"header\">#</TD><TD>Name</TD><TD>Type</TD><TD>Device</TD><TD>Status</TD><TD>IP</TD><TD>Host Name</TD><TD>Config</TD><TD>Table</TD><TD>Bytes In</TD><TD>Bytes Out</TD><TD>UpTime</TD></TR>"
     else
         echo "TABLE: Destination_Status_Board"
-        echo "#;Name;Type;Device;IP;Host Name;Config;Table;Status;Bytes In;Bytes Out;UpTime"
+        echo "#;Name;Type;Device;Status;IP;Host Name;Config;Table;Bytes In;Bytes Out;UpTime"
     fi
 
 
@@ -127,18 +127,18 @@ Destination_Status_Board()
 
         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><TD>${dst_ip}</TD><TD>${dst_host_name}</TD><TD>${dst_config:--}</TD><TD>${dst_table}</TD><TD>"
+            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 ]]
             then
-                echo -n "<IMG SRC=\"/icons/user-online.png\" TITLE=\"Up\" ALT=\"Up\"></TD>"
+                echo -n "<TD><IMG SRC=\"/icons/user-online.png\" TITLE=\"Up\" ALT=\"Up\"></TD>"
             else
-                echo -n "<IMG SRC=\"/icons/user-busy.png\" TITLE=\"Down\" ALT=\"Down\"></TD>"
+                echo -n "<TD><IMG SRC=\"/icons/user-busy.png\" TITLE=\"Down\" ALT=\"Down\"></TD>"
             fi
 
-            echo "<TD>${dst_bytes_received:--}</TD><TD>${dst_bytes_sent:--}</TD><TD>${dst_uptime:--}</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_ip};${dst_host_name};${dst_config};${dst_table};${dst_status};${dst_bytes_received};${dst_bytes_sent};${dst_uptime}"
+            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
     done
 
@@ -219,32 +219,35 @@ Source_Routing_Board_Line()
         do
             network_dst_tab_get ${dst_id}
 
-            if [[ "${format}" == "html" ]]
+            if [[ ( "${admin}" == "true") || ( "${dst_type}" != 1) ]]
             then
-                echo -n "<TD><TABLE class=\"${class}\" BORDER=\"0\" WIDTH=\"100%\"><TR><TD class=\"half\">"
+                if [[ "${format}" == "html" ]]
-              
-                if [[ "${dst_table}" == "${src_table}" ]]
                 then
-                    echo -n "<IMG SRC=\"/icons/user-online.png\" TITLE=\"Up\" ALT=\"Up\"></TD><TD>&nbsp;"
+                    echo -n "<TD><TABLE class=\"${class}\" BORDER=\"0\" WIDTH=\"100%\"><TR><TD class=\"half\">"
-                else
-                    echo -n "<IMG SRC=\"/icons/user-busy.png\" TITLE=\"Down\" ALT=\"Down\"></TD><TD>"
                     
-                    if [[ ( ${admin} == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
+                    if [[ "${dst_table}" == "${src_table}" ]]
                     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 "<IMG SRC=\"/icons/user-online.png\" TITLE=\"Up\" ALT=\"Up\"></TD><TD>&nbsp;"
                     else
-                        echo -n "&nbsp;"
+                        echo -n "<IMG SRC=\"/icons/user-busy.png\" TITLE=\"Down\" ALT=\"Down\"></TD><TD>"
+
+                        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>"
+                        else
+                            echo -n "&nbsp;"
+                        fi
                     fi
-                fi
 
-                echo -n "</TD></TR></TABLE></TD>"
+                    echo -n "</TD></TR></TABLE></TD>"
-            else
-
-                if [[ "${dst_table}" == "${src_table}" ]]
-                then
-                    echo -n "1;"
                 else
-                    echo -n "0;"
+
+                    if [[ "${dst_table}" == "${src_table}" ]]
+                    then
+                        echo -n "1;"
+                    else
+                        echo -n "0;"
+                    fi
                 fi
             fi
         done
@@ -294,11 +297,14 @@ Source_Routing_Board()
     do
         network_dst_tab_get ${dst_id}
 
-        if [[ "${format}" == "html" ]]
+        if [[ ( "${admin}" == "true") || ( "${dst_type}" != 1) ]]
         then
-            echo -n "<TD>${dst_name}</TD>"
+            if [[ "${format}" == "html" ]]
-        else
+            then
-            echo -n "${dst_name};"
+                echo -n "<TD>${dst_name}</TD>"
+            else
+                echo -n "${dst_name};"
+            fi
         fi
     done
     
@@ -684,10 +690,10 @@ else
             network_src_tab_ip_lookup "${ip}"
             network_src_tab_get       "${src_id}"
             
-            if [[ ( ${admin} == "true") || ( "${REMOTE_USER}" == "${src_owner}") ]]
+            network_dst_tab_get       "${vpn}"
-            then
-                network_dst_tab_get "${vpn}"
             
+            if [[ ( ${admin} == "true") || ( ( "${REMOTE_USER}" == "${src_owner}") && ( "${dst_type}" != 1)) ]]
+            then
                 sudo /usr/local/sbin/rx3_net_adm table_set ${ip} ${dst_table} 1>&2
                 
                 if [[ "$?" == 0 ]]
@@ -697,7 +703,7 @@ else
                     cmd_status="route_set: KO"
                 fi
             else
-                cmd_status="route_set: NOT_AUTHORIZED [${REMOTE_USER}]/[${src_owner}]"
+                cmd_status="route_set: NOT_AUTHORIZED [${REMOTE_USER}]/[${src_owner}]/[${dst_type}]"
             fi
             
             redirect="?admin=${admin}&amp;filter=${filter}"