Rx3/network_tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

- Fix missing source device.

Browse Source
This commit is contained in:
Arnaud G. GIBERT
2025-06-29 19:50:03 +02:00
parent b1bf71003d
commit db09f104fc
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
usr/local/lib/network.bash
View File

@@ -304,6 +304,7 @@ network_src_tab_load()
tab_assign NETWORK_SRC_TAB "${nstl_id},Port_Start" "${nstl_port_start}" tab_assign NETWORK_SRC_TAB "${nstl_id},Port_Start" "${nstl_port_start}"
tab_assign NETWORK_SRC_TAB "${nstl_id},Port_Range" "${nstl_port_range}" tab_assign NETWORK_SRC_TAB "${nstl_id},Port_Range" "${nstl_port_range}"
tab_assign NETWORK_SRC_TAB "${nstl_id},Device" "${nstl_device}"
tab_assign NETWORK_SRC_TAB "${nstl_id},Status" "${nstl_status}" tab_assign NETWORK_SRC_TAB "${nstl_id},Status" "${nstl_status}"
tab_assign NETWORK_SRC_TAB "${nstl_id},Bytes_Received" "${nstl_bytes_received}" tab_assign NETWORK_SRC_TAB "${nstl_id},Bytes_Received" "${nstl_bytes_received}"
tab_assign NETWORK_SRC_TAB "${nstl_id},Bytes_Sent" "${nstl_bytes_sent}" tab_assign NETWORK_SRC_TAB "${nstl_id},Bytes_Sent" "${nstl_bytes_sent}"
@@ -346,6 +347,7 @@ network_src_tab_get()
src_port_end="" src_port_end=""
fi fi
src_device=${NETWORK_SRC_TAB["${src_id},Device"]}
src_status=${NETWORK_SRC_TAB["${src_id},Status"]} src_status=${NETWORK_SRC_TAB["${src_id},Status"]}
src_bytes_received=${NETWORK_SRC_TAB["${src_id},Bytes_Received"]} src_bytes_received=${NETWORK_SRC_TAB["${src_id},Bytes_Received"]}
src_bytes_sent=${NETWORK_SRC_TAB["${src_id},Bytes_Sent"]} src_bytes_sent=${NETWORK_SRC_TAB["${src_id},Bytes_Sent"]}

10
var/www/cgi-bin/vpn-admin_board.cgi
View File

@@ -192,7 +192,9 @@ Source_Routing_Board_Line()
echo -n "<TD>${NETWORK_SRC_TYPE[${src_type}]}</TD><TD>${src_ip}</TD><TD>${host_name}</TD>" echo -n "<TD>${NETWORK_SRC_TYPE[${src_type}]}</TD><TD>${src_ip}</TD><TD>${host_name}</TD>"
case "${src_status}" echo -n "<TD>${src_device}</TD>"
case "${src_status:--}"
in in
"0") "0")
echo -n "<TD><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>"
@@ -206,10 +208,8 @@ Source_Routing_Board_Line()
echo -n "<TD>-</TD>" echo -n "<TD>-</TD>"
;; ;;
esac esac
echo -n "<TD>${src_device}</TD>"
else else
echo -n "${src_id};${NETWORK_SRC_TYPE[${src_type}]};${src_ip};${host_name};${status};${src_device};" echo -n "${src_id};${NETWORK_SRC_TYPE[${src_type}]};${src_ip};${host_name};${src_device};${status};"
fi fi
@@ -281,7 +281,7 @@ Source_Routing_Board()
echo " <H2>Source Routing Board</H2>" echo " <H2>Source Routing Board</H2>"
echo "" echo ""
echo " <TABLE BORDER=\"1\" WIDTH=\"100%\">" echo " <TABLE BORDER=\"1\" WIDTH=\"100%\">"
echo -n " <TR class="header"><TD class="header">#</TD><TD>Type</TD><TD>IP</TD><TD>Host Name</TD><TD>Status</TD><TD>Device</TD>" echo -n " <TR class="header"><TD class="header">#</TD><TD>Type</TD><TD>IP</TD><TD>Host Name</TD><TD>Device</TD><TD>Status</TD>"
else else
echo "TABLE: Source_Routing_Board" echo "TABLE: Source_Routing_Board"
echo -n "#;Type;IP;Host Name;Status;Device;" echo -n "#;Type;IP;Host Name;Status;Device;"