diff --git a/clients/webassembly/src/client/config.rs b/clients/webassembly/src/client/config.rs index ca92a7de87..3bde4d46e3 100644 --- a/clients/webassembly/src/client/config.rs +++ b/clients/webassembly/src/client/config.rs @@ -8,10 +8,11 @@ use nym_client_core::config::{ Acknowledgements as ConfigAcknowledgements, CoverTraffic as ConfigCoverTraffic, - DebugConfig as ConfigDebug, ExtendedPacketSize, GatewayConnection as ConfigGatewayConnection, + DebugConfig as ConfigDebug, GatewayConnection as ConfigGatewayConnection, GatewayEndpointConfig, ReplySurbs as ConfigReplySurbs, Topology as ConfigTopology, Traffic as ConfigTraffic, }; +use nym_sphinx::params::PacketSize; use serde::{Deserialize, Serialize}; use std::time::Duration; use url::Url; @@ -82,7 +83,7 @@ impl From for ConfigTraffic { fn from(traffic: Traffic) -> Self { let use_extended_packet_size = traffic .use_extended_packet_size - .then(|| ExtendedPacketSize::Extended32); + .then(|| PacketSize::ExtendedPacket32); ConfigTraffic { average_packet_delay: Duration::from_millis(traffic.average_packet_delay_ms), @@ -91,7 +92,8 @@ impl From for ConfigTraffic { ), disable_main_poisson_packet_distribution: traffic .disable_main_poisson_packet_distribution, - use_extended_packet_size, + primary_packet_size: PacketSize::RegularPacket, + secondary_packet_size: use_extended_packet_size, } } } @@ -104,7 +106,7 @@ impl From for Traffic { as u64, disable_main_poisson_packet_distribution: traffic .disable_main_poisson_packet_distribution, - use_extended_packet_size: traffic.use_extended_packet_size.is_some(), + use_extended_packet_size: traffic.secondary_packet_size.is_some(), } } } @@ -116,6 +118,10 @@ pub struct CoverTraffic { /// it is going to take for another loop cover traffic message to be sent. pub loop_cover_traffic_average_delay_ms: u64, + /// Specifies the ratio of `primary_packet_size` to `secondary_packet_size` used in cover traffic. + /// Only applicable if `secondary_packet_size` is enabled. + pub cover_traffic_primary_size_ratio: f64, + /// Controls whether the dedicated loop cover traffic stream should be enabled. /// (and sending packets, on average, every [Self::loop_cover_traffic_average_delay]) pub disable_loop_cover_traffic_stream: bool, @@ -127,6 +133,7 @@ impl From for ConfigCoverTraffic { loop_cover_traffic_average_delay: Duration::from_millis( cover_traffic.loop_cover_traffic_average_delay_ms, ), + cover_traffic_primary_size_ratio: cover_traffic.cover_traffic_primary_size_ratio, disable_loop_cover_traffic_stream: cover_traffic.disable_loop_cover_traffic_stream, } } @@ -138,6 +145,7 @@ impl From for CoverTraffic { loop_cover_traffic_average_delay_ms: cover_traffic .loop_cover_traffic_average_delay .as_millis() as u64, + cover_traffic_primary_size_ratio: cover_traffic.cover_traffic_primary_size_ratio, disable_loop_cover_traffic_stream: cover_traffic.disable_loop_cover_traffic_stream, } }