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

UISP Integration - make squash more conservative about which sites it adjusts bandwidth. Clients only.

Browse Source
This commit is contained in:
Herbert Wolverson 2024-06-18 09:21:35 -05:00
parent 4930c47ab0
commit 2958314d5f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rust/uisp_integration/src/strategies/full/mod.rs
View File

@ -111,6 +111,10 @@ pub async fn build_full_network(
// Do Link Squashing
squash_single_aps(&mut sites)?;
if let Some(c) = sites.iter().find(|s| s.name == "CALVIN") {
println!("Stage SQUASH: {}/{}", c.max_down_mbps, c.max_up_mbps);
}
// Build Path Weights
walk_tree_for_routing(&mut sites, &root_site, &routing_overrides)?;

6
src/rust/uisp_integration/src/strategies/full/squash_single_entry_aps.rs
View File

@ -34,8 +34,10 @@ pub fn squash_single_aps(sites: &mut [UispSite]) -> Result<(), UispIntegrationEr
if s.parent_indices.contains(&squash_idx) {
s.parent_indices.remove(&squash_idx);
s.parent_indices.insert(new_parent);
s.max_up_mbps = u32::min(up, s.max_up_mbps);
s.max_down_mbps = u32::min(down, s.max_down_mbps);
if s.site_type == UispSiteType::Client {
s.max_up_mbps = u32::min(up, s.max_up_mbps);
s.max_down_mbps = u32::min(down, s.max_down_mbps);
}
}
});
sites[squash_idx].parent_indices.clear();