IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve ECN display

Browse Source
This commit is contained in:
Herbert Wolverson 2023-03-13 18:12:29 +00:00
parent 07354b868d
commit d3feb64911
3 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rust/lqos_bus/src/ip_stats.rs
View File

@ -82,15 +82,15 @@ pub struct FlowTransport {
pub bytes: u64,
pub packets: u64,
pub dscp: u8,
pub congestion: bool,
pub ecn: u8,
}
pub fn tos_parser(tos: u8) -> (u8, bool) {
pub fn tos_parser(tos: u8) -> (u8, u8) {
// Format: 2 bits of ECN, 6 bits of DSCP
const ECN: u8 = 0b00000011;
const DSCP: u8 = 0b11111100;
let ecn = tos & ECN;
let dscp = (tos & DSCP) >> 2;
(dscp, ecn == 3)
(dscp, ecn)
}

38
src/rust/lqos_node_manager/static/circuit_queue.html
View File

@ -539,6 +539,16 @@
setTimeout(plotFunnels, 1000);
}
function ecn(n) {
switch (n) {
case 0: return "-";
case 1: return "L4S";
case 2: return "ECT0";
case 3: return "CE";
default: return "???";
}
}
function getFlows() {
let ip_list = "";
for (let i=0; i<ips.length; ++i) {
@ -550,12 +560,12 @@
let html = "<table class='table table-striped'>";
html += "<thead>";
html += "<th>Protocol</th>";
html += "<th>Source</th>";
html += "<th>Source Port</th>";
html += "<th>Dest</th>";
html += "<th>Dest Port</th>";
html += "<th>Packets In</th>";
html += "<th>Packets Out</th>";
html += "<th>Src</th>";
html += "<th>Src Port</th>";
html += "<th>Dst</th>";
html += "<th>Dst Port</th>";
html += "<th>Pkt In</th>";
html += "<th>Pkt Out</th>";
html += "<th>Bytes In</th>";
html += "<th>Bytes Out</th>";
html += "<th>DSCP In</th>";
@ -567,12 +577,12 @@
let rpackets = "-";
let rbytes = "-";
let rdscp = "-";
let rcongestion = false;
let rcongestion = "-";
if (data[i][1] != null) {
rpackets = data[i][1].packets;
rbytes = scaleNumber(data[i][1].bytes);
rdscp = "0x" + data[i][1].dscp.toString(16);
rcongestion = data[i][1].congestion;
rcongestion = ecn(data[i][1].ecn);
}
html += "<tr>";
html += "<td>" + data[i][0].proto + "</td>";
@ -586,16 +596,8 @@
html += "<td>" + rbytes + "</td>";
html += "<td>0x" + data[i][0].dscp.toString(16) + "</td>";
html += "<td>" + rdscp + "</td>";
if (data[i][0].congestion) {
html += "<td>❌</td>";
} else {
html += "<td>-</td>";
}
if (rcongestion) {
html += "<td>❌</td>";
} else {
html += "<td>-</td>";
}
html += "<td>" + ecn(data[i][0].ecn) + "</td>";
html += "<td>" + rcongestion + "</td>";
html += "</tr>";
}
html += "</tbody></table>";

4
src/rust/lqosd/src/throughput_tracker/heimdall_data.rs
View File

@ -96,7 +96,7 @@ pub fn get_flow_stats(ip: &str) -> BusResponse {
for value in HEIMDALL.data.iter() {
let key = value.key();
if key.src_ip == ip || key.dst_ip == ip {
let (dscp, congestion) = tos_parser(value.tos);
let (dscp, ecn) = tos_parser(value.tos);
all_flows.push(FlowTransport{
src: key.src_ip.as_ip().to_string(),
dst: key.dst_ip.as_ip().to_string(),
@ -110,7 +110,7 @@ pub fn get_flow_stats(ip: &str) -> BusResponse {
bytes: value.bytes,
packets: value.packets,
dscp,
congestion
ecn
});
}
}