diff --git a/netstack/src/link/ethernet.rs b/netstack/src/link/ethernet.rs index 89d1ea5361..b9a4c45d35 100644 --- a/netstack/src/link/ethernet.rs +++ b/netstack/src/link/ethernet.rs @@ -882,5 +882,17 @@ impl LinkDevice for EthernetLink { fn link_state(&self) -> &'static str { if self.hardware_address.is_some() { "up" } else { "down" } } + + fn qdisc_info(&self) -> String { + match &self.qdisc_config { + QdiscConfig::None => "none\n".to_string(), + QdiscConfig::TokenBucket(tb) => { + format!("token_bucket rate={} burst={} tokens={}\n", tb.rate(), tb.burst(), tb.tokens()) + } + QdiscConfig::PriorityQueue(pq) => { + format!("priority_queue len={} max={}\n", pq.len(), pq.max_len()) + } + } + } } diff --git a/netstack/src/link/mod.rs b/netstack/src/link/mod.rs index fdff2467f2..b73401434c 100644 --- a/netstack/src/link/mod.rs +++ b/netstack/src/link/mod.rs @@ -49,6 +49,10 @@ pub trait LinkDevice { String::new() } + fn qdisc_info(&self) -> String { + "none\n".to_string() + } + fn mtu(&self) -> usize { 1500 } diff --git a/netstack/src/link/qdisc.rs b/netstack/src/link/qdisc.rs index 4c190fc05f..edc78d0b82 100644 --- a/netstack/src/link/qdisc.rs +++ b/netstack/src/link/qdisc.rs @@ -25,13 +25,11 @@ pub struct TokenBucket { impl TokenBucket { pub fn new(rate_bps: u64, burst_bytes: u64) -> Self { - Self { - rate: rate_bps, - burst: burst_bytes.max(1500), - tokens: burst_bytes.max(1500), - last_update: Instant::from_millis(0), - } + Self { rate: rate_bps, burst: burst_bytes.max(1500), tokens: burst_bytes.max(1500), last_update: Instant::from_millis(0) } } + pub fn rate(&self) -> u64 { self.rate } + pub fn burst(&self) -> u64 { self.burst } + pub fn tokens(&self) -> u64 { self.tokens } pub fn set_rate(&mut self, rate_bps: u64) { self.rate = rate_bps; @@ -67,12 +65,8 @@ pub struct PriorityQueue { } impl PriorityQueue { - pub fn new(max_len: usize) -> Self { - Self { - bands: [VecDeque::new(), VecDeque::new(), VecDeque::new()], - max_len, - } - } + pub fn new(max_len: usize) -> Self { Self { bands: [VecDeque::new(), VecDeque::new(), VecDeque::new()], max_len } } + pub fn max_len(&self) -> usize { self.max_len } fn classify(packet: &[u8]) -> usize { if packet.len() < 2 || packet[0] >> 4 != 4 { diff --git a/netstack/src/scheme/netcfg/mod.rs b/netstack/src/scheme/netcfg/mod.rs index 2cdd36f6ba..78763bebbc 100644 --- a/netstack/src/scheme/netcfg/mod.rs +++ b/netstack/src/scheme/netcfg/mod.rs @@ -458,6 +458,14 @@ fn mk_root_node( None => "Device not found\n".into(), } } + }, + "qdisc" => { + ro [devices] || { + match devices.borrow().get("eth0") { + Some(dev) => dev.qdisc_info(), + None => "Device not found\n".into(), + } + } } }, "lo" => {