IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2024-11-28 10:53:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of 3 more Strings from tc cake parser

Browse Source 
DiffServ had a missing (underused) option
AckFilter &
FlowMode now use the nifty dashyenum thing
Bandwidth unlimited is all that we are using cake for today

Only FWmark left to go (which is in hex and I do not know how to
parse with and without the 0x prefix)
This commit is contained in:
Dave Taht 2023-01-17 15:33:04 -08:00
parent e0552ec55b
commit c5947fff56
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/rust/lqos_queue_tracker/src/queue_types/tc_cake.rs
View File

@ -4,7 +4,10 @@ use serde::{Deserialize, Serialize};
use serde_json::Value;
use crate::string_table_enum;
string_table_enum!(DiffServ, besteffort, diffserv3, diffserv4, diffserv8);
string_table_enum!(DiffServ, besteffort, diffserv3, diffserv4, diffserv8, precedence);
dashy_table_enum!(AckFilter, none, ack_filter, ack_filter_aggressive);
dashy_table_enum!(FlowMode, flowblind, srchost, dsthost, hosts, dual_srchost, dual_dsthost, triple_isolate);
string_table_enum!(BandWidth, unlimited ); // in the present implementation with htb, always unlimited
#[derive(Default, Clone, Debug, Serialize, Deserialize)]
pub struct TcCake {
@ -34,8 +37,8 @@ struct TcCakeOptions {
rtt: u64,
bandwidth: String,
diffserv: DiffServ,
flowmode: String,
ack_filter: String,
flowmode: FlowMode,
ack_filter: AckFilter,
nat: bool,
wash: bool,
ingress: bool,
@ -117,13 +120,13 @@ impl TcCakeOptions {
let mut result = Self::default();
for (key, value) in map.iter() {
match key.as_str() {
"bandwidth" => result.bandwidth = value.as_str().unwrap().to_string(),
"bandwidth" => result.bandwidth = BandWidth::from_str(value.as_str().unwrap()),
"diffserv" => result.diffserv = DiffServ::from_str(value.as_str().unwrap()),
"flowmode" => result.flowmode = value.as_str().unwrap().to_string(),
"flowmode" => result.flowmode = FlowMode::from_str(value.as_str().unwrap()),
"nat" => result.nat = value.as_bool().unwrap(),
"wash" => result.wash = value.as_bool().unwrap(),
"ingress" => result.ingress = value.as_bool().unwrap(),
"ack-filter" => result.ack_filter = value.as_str().unwrap().to_string(),
"ack-filter" => result.ack_filter = AckFilter::from_str(value.as_str().unwrap()),
"split_gso" => result.split_gso = value.as_bool().unwrap(),
"rtt" => result.rtt = value.as_u64().unwrap(),
"raw" => result.raw = value.as_bool().unwrap(),