Add debug for discovery. Slow resend interval

This commit is contained in:
QuantumEntangledAndy authored and Andrew King committed 2023-02-28 12:41:04 +07:00
1 parent a5a3cf9715
commit 8adae665fb
5 files changed
+16 -6

No files matched your search

+1
View File
@@ -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 = {
@@ -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<BcUdp>,
/// 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);
@@ -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
+1 -1
View File
@@ -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();
}
+1
View File
@@ -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