diff --git a/crates/core/src/bc_protocol.rs b/crates/core/src/bc_protocol.rs index 10811ce..9b4679d 100644 --- a/crates/core/src/bc_protocol.rs +++ b/crates/core/src/bc_protocol.rs @@ -205,6 +205,7 @@ impl BcCamera { DiscoveryMethods::Remote => (true, true, false, false), DiscoveryMethods::Map => (true, true, true, false), DiscoveryMethods::Relay => (true, true, true, true), + DiscoveryMethods::Debug => (false, true, false, false), }; let discovery = { diff --git a/crates/core/src/bc_protocol/connection/udpsource.rs b/crates/core/src/bc_protocol/connection/udpsource.rs index 70b99cb..3bc0ddc 100644 --- a/crates/core/src/bc_protocol/connection/udpsource.rs +++ b/crates/core/src/bc_protocol/connection/udpsource.rs @@ -159,7 +159,8 @@ impl BcUdpSource { recieved: Default::default(), state: State::Normal, send_buffer: Default::default(), - interval: interval(Duration::from_millis(10)), // Offical Client does ack every 10ms + ack_interval: interval(Duration::from_millis(10)), // Offical Client does ack every 10ms + resend_interval: interval(Duration::from_millis(500)), // Offical Client does resend every 500ms } } } @@ -211,8 +212,11 @@ pub(crate) struct UdpPayloadSource { send_buffer: VecDeque, /// Offical Client does ack every 10ms if we don't also do this the camera /// seems to think we have a poor connection and will abort - /// This `intveral` controls how ofen we do this - interval: Interval, + /// This `ack_interval` controls how ofen we do this + ack_interval: Interval, + /// Offical Client does resend every 500ms + /// This `resend_interval` controls how ofen we do this + resend_interval: Interval, } impl UdpPayloadSource { @@ -261,12 +265,13 @@ impl UdpPayloadSource { fn maintanence(&mut self, cx: &mut Context<'_>) { // Check for periodic resends - if self.interval.poll_tick(cx).is_ready() { + if self.resend_interval.poll_tick(cx).is_ready() { trace!("UDPSource.RecievedPacket: Resend"); for (_, resend) in self.sent.iter() { self.send_buffer.push_back(BcUdp::Data(resend.clone())); } - + } + if self.ack_interval.poll_tick(cx).is_ready() { let ack = BcUdp::Ack(self.build_send_ack()); trace!("UDPSource.RecievedPacket: QueueingAck"); self.send_buffer.push_back(ack); diff --git a/crates/core/src/bc_protocol/resolution.rs b/crates/core/src/bc_protocol/resolution.rs index aec46f6..5c169cc 100644 --- a/crates/core/src/bc_protocol/resolution.rs +++ b/crates/core/src/bc_protocol/resolution.rs @@ -32,6 +32,9 @@ pub enum DiscoveryMethods { /// /// **This also enabled `Local`, `Map` and `Remote` discovery** Relay, + #[doc(hidden)] + /// Used for debugging it is set to whatever the dev is currently testing + Debug, } /// Used to return either the SocketAddr or the UID diff --git a/src/config.rs b/src/config.rs index bfae643..2904401 100644 --- a/src/config.rs +++ b/src/config.rs @@ -11,7 +11,7 @@ lazy_static! { static ref RE_TLS_CLIENT_AUTH: Regex = Regex::new(r"^(none|request|require)$").unwrap(); static ref RE_PAUSE_MODE: Regex = Regex::new(r"^(black|still|test|none)$").unwrap(); static ref RE_DISC_SRC: Regex = - Regex::new(r"^([nN]one|[lL]ocal|[rR]emote|[Mm]ap|[rR]elay)$").unwrap(); + Regex::new(r"^([nN]one|[lL]ocal|[rR]emote|[Mm]ap|[rR]elay|[Dd]ebug)$").unwrap(); static ref RE_MAXENC_SRC: Regex = Regex::new(r"^([nN]one|[Aa][Ee][Ss]|[Bb][Cc][Ee][Nn][Cc][Rr][Yy][Pp][Tt])$").unwrap(); } diff --git a/src/utils.rs b/src/utils.rs index f232a50..20ca367 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -39,6 +39,7 @@ impl AddressOrUid { "remote" => DiscoveryMethods::Remote, "map" => DiscoveryMethods::Map, "relay" => DiscoveryMethods::Relay, + "debug" => DiscoveryMethods::Debug, n => { warn!("Unrecognised discovery method: {}. Using Local", n); DiscoveryMethods::Local