diff --git a/pbs-api-types/src/traffic_control.rs b/pbs-api-types/src/traffic_control.rs index 0dd7ed58..210f53ac 100644 --- a/pbs-api-types/src/traffic_control.rs +++ b/pbs-api-types/src/traffic_control.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use proxmox_schema::{api, Schema, IntegerSchema, StringSchema, Updater}; use crate::{ - CIDR_SCHEMA, DAILY_DURATION_FORMAT, + HumanByte, CIDR_SCHEMA, DAILY_DURATION_FORMAT, PROXMOX_SAFE_ID_FORMAT, SINGLE_LINE_COMMENT_SCHEMA, }; @@ -38,19 +38,19 @@ pub const TRAFFIC_CONTROL_BURST_SCHEMA: Schema = IntegerSchema::new( schema: SINGLE_LINE_COMMENT_SCHEMA, }, "rate-in": { - schema: TRAFFIC_CONTROL_RATE_SCHEMA, + type: HumanByte, optional: true, }, "burst-in": { - schema: TRAFFIC_CONTROL_BURST_SCHEMA, + type: HumanByte, optional: true, }, "rate-out": { - schema: TRAFFIC_CONTROL_RATE_SCHEMA, + type: HumanByte, optional: true, }, "burst-out": { - schema: TRAFFIC_CONTROL_BURST_SCHEMA, + type: HumanByte, optional: true, }, network: { @@ -79,13 +79,13 @@ pub struct TrafficControlRule { /// Rule applies to Source IPs within this networks pub network: Vec, #[serde(skip_serializing_if="Option::is_none")] - pub rate_in: Option, + pub rate_in: Option, #[serde(skip_serializing_if="Option::is_none")] - pub burst_in: Option, + pub burst_in: Option, #[serde(skip_serializing_if="Option::is_none")] - pub rate_out: Option, + pub rate_out: Option, #[serde(skip_serializing_if="Option::is_none")] - pub burst_out: Option, + pub burst_out: Option, // fixme: expose this? // /// Bandwidth is shared accross all connections // #[serde(skip_serializing_if="Option::is_none")] diff --git a/src/cached_traffic_control.rs b/src/cached_traffic_control.rs index be554f6c..b45e564c 100644 --- a/src/cached_traffic_control.rs +++ b/src/cached_traffic_control.rs @@ -224,7 +224,10 @@ impl TrafficControlCache { Some(ref read_limiter) => { match rule.rate_in { Some(rate_in) => { - read_limiter.update_rate(rate_in, rule.burst_in.unwrap_or(rate_in)); + read_limiter.update_rate( + rate_in.as_u64(), + rule.burst_in.unwrap_or(rate_in).as_u64(), + ); } None => entry.0 = None, } @@ -235,8 +238,8 @@ impl TrafficControlCache { let limiter = create_limiter( self.use_shared_memory, &name, - rate_in, - rule.burst_in.unwrap_or(rate_in), + rate_in.as_u64(), + rule.burst_in.unwrap_or(rate_in).as_u64(), )?; entry.0 = Some(limiter); } @@ -247,7 +250,10 @@ impl TrafficControlCache { Some(ref write_limiter) => { match rule.rate_out { Some(rate_out) => { - write_limiter.update_rate(rate_out, rule.burst_out.unwrap_or(rate_out)); + write_limiter.update_rate( + rate_out.as_u64(), + rule.burst_out.unwrap_or(rate_out).as_u64(), + ); } None => entry.1 = None, } @@ -258,8 +264,8 @@ impl TrafficControlCache { let limiter = create_limiter( self.use_shared_memory, &name, - rate_out, - rule.burst_out.unwrap_or(rate_out), + rate_out.as_u64(), + rule.burst_out.unwrap_or(rate_out).as_u64(), )?; entry.1 = Some(limiter); }