Skip to content

Commit 7f985bb

Browse files
dignifiedquiredignifiedquire
committed
refactor: quic -> qad
1 parent b300905 commit 7f985bb

File tree

5 files changed

+49
-53
lines changed

5 files changed

+49
-53
lines changed

‎iroh/src/net_report.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ mod tests {
476476
report.relay_latency.update_relay(
477477
relay_url(id),
478478
Duration::from_secs(d),
479-
ProbeProto::QuicIpv4,
479+
ProbeProto::QadIpv4,
480480
);
481481
}
482482

‎iroh/src/net_report/options.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ mod imp {
6161
let mut protocols = BTreeSet::new();
6262
if let Some(ref quic) = self.quic_config {
6363
if quic.ipv4 {
64-
protocols.insert(ProbeProto::QuicIpv4);
64+
protocols.insert(ProbeProto::QadIpv4);
6565
}
6666
if quic.ipv6 {
67-
protocols.insert(ProbeProto::QuicIpv6);
67+
protocols.insert(ProbeProto::QadIpv6);
6868
}
6969
}
7070
if self.https {

‎iroh/src/net_report/report.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ impl Report {
6969
#[cfg(not(wasm_browser))]
7070
if matches!(
7171
probe_report.probe.proto(),
72-
ProbeProto::QuicIpv4 | ProbeProto::QuicIpv6
72+
ProbeProto::QadIpv4 | ProbeProto::QadIpv6
7373
) {
7474
self.udp = true;
7575

@@ -124,9 +124,9 @@ impl RelayLatencies {
124124
let list = match probe {
125125
ProbeProto::Https => &mut self.https,
126126
#[cfg(not(wasm_browser))]
127-
ProbeProto::QuicIpv4 => &mut self.ipv4,
127+
ProbeProto::QadIpv4 => &mut self.ipv4,
128128
#[cfg(not(wasm_browser))]
129-
ProbeProto::QuicIpv6 => &mut self.ipv6,
129+
ProbeProto::QadIpv6 => &mut self.ipv6,
130130
};
131131
let old_latency = list.entry(url).or_insert(latency);
132132
if latency < *old_latency {
@@ -143,11 +143,11 @@ impl RelayLatencies {
143143
}
144144
#[cfg(not(wasm_browser))]
145145
for (url, latency) in other.ipv4.iter() {
146-
self.update_relay(url.clone(), *latency, ProbeProto::QuicIpv4);
146+
self.update_relay(url.clone(), *latency, ProbeProto::QadIpv4);
147147
}
148148
#[cfg(not(wasm_browser))]
149149
for (url, latency) in other.ipv6.iter() {
150-
self.update_relay(url.clone(), *latency, ProbeProto::QuicIpv6);
150+
self.update_relay(url.clone(), *latency, ProbeProto::QadIpv6);
151151
}
152152
}
153153

‎iroh/src/net_report/reportgen.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ async fn run_probe(
590590
}
591591

592592
#[cfg(not(wasm_browser))]
593-
Probe::QuicIpv4 { ref node, .. } | Probe::QuicIpv6 { ref node, .. } => {
593+
Probe::QadIpv4 { ref node, .. } | Probe::QadIpv6 { ref node, .. } => {
594594
debug!("sending QUIC address discovery probe");
595595
let relay_addr = get_relay_addr(&socket_state.dns_resolver, &relay_node, probe.proto())
596596
.await
@@ -644,8 +644,8 @@ async fn run_quic_probe(
644644
ip_mapped_addrs: Option<IpMappedAddresses>,
645645
) -> Result<ProbeReport, ProbeError> {
646646
match probe.proto() {
647-
ProbeProto::QuicIpv4 => debug_assert!(relay_addr.is_ipv4()),
648-
ProbeProto::QuicIpv6 => debug_assert!(relay_addr.is_ipv6()),
647+
ProbeProto::QadIpv4 => debug_assert!(relay_addr.is_ipv4()),
648+
ProbeProto::QadIpv6 => debug_assert!(relay_addr.is_ipv6()),
649649
_ => debug_assert!(false, "wrong probe"),
650650
}
651651
let relay_addr = maybe_to_mapped_addr(ip_mapped_addrs, relay_addr);
@@ -665,7 +665,7 @@ async fn run_quic_probe(
665665
.await
666666
.map_err(|e| ProbeError::Error(e, probe.clone()))?;
667667
let mut result = ProbeReport::new(probe.clone());
668-
if matches!(probe, Probe::QuicIpv4 { .. }) {
668+
if matches!(probe, Probe::QadIpv4 { .. }) {
669669
result.ipv4_can_send = true;
670670
} else {
671671
result.ipv6_can_send = true;
@@ -766,7 +766,7 @@ async fn check_captive_portal(
766766
fn get_port(relay_node: &RelayNode, proto: &ProbeProto) -> Result<u16> {
767767
match proto {
768768
#[cfg(not(wasm_browser))]
769-
ProbeProto::QuicIpv4 | ProbeProto::QuicIpv6 => {
769+
ProbeProto::QadIpv4 | ProbeProto::QadIpv6 => {
770770
if let Some(ref quic) = relay_node.quic {
771771
if quic.port == 0 {
772772
Ok(DEFAULT_RELAY_QUIC_PORT)
@@ -806,8 +806,8 @@ async fn get_relay_addr(
806806
let port = get_port(relay_node, &proto)?;
807807

808808
match proto {
809-
ProbeProto::QuicIpv4 => relay_lookup_ipv4_staggered(dns_resolver, relay_node, port).await,
810-
ProbeProto::QuicIpv6 => relay_lookup_ipv6_staggered(dns_resolver, relay_node, port).await,
809+
ProbeProto::QadIpv4 => relay_lookup_ipv4_staggered(dns_resolver, relay_node, port).await,
810+
ProbeProto::QadIpv6 => relay_lookup_ipv6_staggered(dns_resolver, relay_node, port).await,
811811
ProbeProto::Https => Err(anyhow!("Not implemented")),
812812
}
813813
}
@@ -999,7 +999,7 @@ mod tests {
999999
};
10001000
let url = relay.url.clone();
10011001
let port = server.quic_addr().unwrap().port();
1002-
let probe = Probe::QuicIpv4 {
1002+
let probe = Probe::QadIpv4 {
10031003
delay: Duration::from_secs(0),
10041004
node: relay,
10051005
};

‎iroh/src/net_report/reportgen/probes.rs

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ pub enum ProbeProto {
5151
Https,
5252
/// QUIC Address Discovery Ipv4
5353
#[cfg(not(wasm_browser))]
54-
QuicIpv4,
54+
QadIpv4,
5555
/// QUIC Address Discovery Ipv6
5656
#[cfg(not(wasm_browser))]
57-
QuicIpv6,
57+
QadIpv6,
5858
}
5959

6060
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, derive_more::Display)]
@@ -66,13 +66,13 @@ pub(crate) enum Probe {
6666
},
6767
#[display("QAD Ipv4 after {delay:?} to {node}")]
6868
#[cfg(not(wasm_browser))]
69-
QuicIpv4 {
69+
QadIpv4 {
7070
delay: Duration,
7171
node: Arc<RelayNode>,
7272
},
7373
#[display("QAD Ipv6 after {delay:?} to {node}")]
7474
#[cfg(not(wasm_browser))]
75-
QuicIpv6 {
75+
QadIpv6 {
7676
delay: Duration,
7777
node: Arc<RelayNode>,
7878
},
@@ -83,8 +83,8 @@ impl Probe {
8383
match self {
8484
#[cfg(not(wasm_browser))]
8585
Probe::Https { delay, .. }
86-
| Probe::QuicIpv4 { delay, .. }
87-
| Probe::QuicIpv6 { delay, .. } => *delay,
86+
| Probe::QadIpv4 { delay, .. }
87+
| Probe::QadIpv6 { delay, .. } => *delay,
8888
#[cfg(wasm_browser)]
8989
Probe::Https { delay, .. } => *delay,
9090
}
@@ -94,26 +94,26 @@ impl Probe {
9494
match self {
9595
Probe::Https { .. } => ProbeProto::Https,
9696
#[cfg(not(wasm_browser))]
97-
Probe::QuicIpv4 { .. } => ProbeProto::QuicIpv4,
97+
Probe::QadIpv4 { .. } => ProbeProto::QadIpv4,
9898
#[cfg(not(wasm_browser))]
99-
Probe::QuicIpv6 { .. } => ProbeProto::QuicIpv6,
99+
Probe::QadIpv6 { .. } => ProbeProto::QadIpv6,
100100
}
101101
}
102102

103103
pub(crate) fn node(&self) -> &Arc<RelayNode> {
104104
match self {
105105
#[cfg(not(wasm_browser))]
106106
Probe::Https { node, .. }
107-
| Probe::QuicIpv4 { node, .. }
108-
| Probe::QuicIpv6 { node, .. } => node,
107+
| Probe::QadIpv4 { node, .. }
108+
| Probe::QadIpv6 { node, .. } => node,
109109
#[cfg(wasm_browser)]
110110
Probe::Https { node, .. } => node,
111111
}
112112
}
113113

114114
#[cfg(not(wasm_browser))]
115115
pub(super) fn is_udp(&self) -> bool {
116-
matches!(self, Self::QuicIpv4 { .. } | Self::QuicIpv6 { .. })
116+
matches!(self, Self::QadIpv4 { .. } | Self::QadIpv6 { .. })
117117
}
118118

119119
#[cfg(wasm_browser)]
@@ -215,23 +215,23 @@ impl ProbePlan {
215215
let mut max_high_prio_delay: Option<Duration> = None;
216216

217217
for relay_node in relay_map.nodes() {
218-
let mut quic_ipv4_probes = ProbeSet::new(ProbeProto::QuicIpv4);
219-
let mut quic_ipv6_probes = ProbeSet::new(ProbeProto::QuicIpv6);
218+
let mut quic_ipv4_probes = ProbeSet::new(ProbeProto::QadIpv4);
219+
let mut quic_ipv6_probes = ProbeSet::new(ProbeProto::QadIpv6);
220220

221221
for attempt in 0..3 {
222222
let delay = DEFAULT_INITIAL_RETRANSMIT * attempt as u32;
223223

224224
if if_state.have_v4 {
225225
quic_ipv4_probes
226-
.push(Probe::QuicIpv4 {
226+
.push(Probe::QadIpv4 {
227227
delay,
228228
node: relay_node.clone(),
229229
})
230230
.expect("adding QuicIpv4 probe to a QuicIpv4 probe set");
231231
}
232232
if if_state.have_v6 {
233233
quic_ipv6_probes
234-
.push(Probe::QuicIpv6 {
234+
.push(Probe::QadIpv6 {
235235
delay,
236236
node: relay_node.clone(),
237237
})
@@ -357,23 +357,23 @@ impl ProbePlan {
357357
.map(|l| l * 120 / 100) // increases latency by 20%, why?
358358
.unwrap_or(DEFAULT_ACTIVE_RETRANSMIT_DELAY);
359359

360-
let mut quic_ipv4_probes = ProbeSet::new(ProbeProto::QuicIpv4);
361-
let mut quic_ipv6_probes = ProbeSet::new(ProbeProto::QuicIpv6);
360+
let mut quic_ipv4_probes = ProbeSet::new(ProbeProto::QadIpv4);
361+
let mut quic_ipv6_probes = ProbeSet::new(ProbeProto::QadIpv6);
362362

363363
for attempt in 0..attempts {
364364
let delay = (retransmit_delay * attempt as u32)
365365
+ (ACTIVE_RETRANSMIT_EXTRA_DELAY * attempt as u32);
366366
if do4 {
367367
quic_ipv4_probes
368-
.push(Probe::QuicIpv4 {
368+
.push(Probe::QadIpv4 {
369369
delay,
370370
node: relay_node.clone(),
371371
})
372372
.expect("adding QuicIpv4 probe to a QuicAddrIpv4 probe set");
373373
}
374374
if do6 {
375375
quic_ipv6_probes
376-
.push(Probe::QuicIpv6 {
376+
.push(Probe::QadIpv6 {
377377
delay,
378378
node: relay_node.clone(),
379379
})
@@ -484,7 +484,7 @@ impl ProbePlan {
484484
fn has_priority_probes(&self) -> bool {
485485
#[cfg(not(wasm_browser))]
486486
for probe in &self.set {
487-
if matches!(probe.proto, ProbeProto::QuicIpv4 | ProbeProto::QuicIpv6) {
487+
if matches!(probe.proto, ProbeProto::QadIpv4 | ProbeProto::QadIpv6) {
488488
return true;
489489
}
490490
}
@@ -579,11 +579,7 @@ mod tests {
579579
}
580580

581581
fn default_protocols() -> BTreeSet<ProbeProto> {
582-
BTreeSet::from([
583-
ProbeProto::QuicIpv4,
584-
ProbeProto::QuicIpv6,
585-
ProbeProto::Https,
586-
])
582+
BTreeSet::from([ProbeProto::QadIpv4, ProbeProto::QadIpv6, ProbeProto::Https])
587583
}
588584

589585
#[tokio::test]
@@ -596,14 +592,14 @@ mod tests {
596592

597593
let mut expected_plan: ProbePlan = [
598594
probeset! {
599-
proto: ProbeProto::QuicIpv4,
595+
proto: ProbeProto::QadIpv4,
600596
relay: relay_node_1.clone(),
601597
delays: [Duration::ZERO,
602598
Duration::from_millis(100),
603599
Duration::from_millis(200)],
604600
},
605601
probeset! {
606-
proto: ProbeProto::QuicIpv6,
602+
proto: ProbeProto::QadIpv6,
607603
relay: relay_node_1.clone(),
608604
delays: [Duration::ZERO,
609605
Duration::from_millis(100),
@@ -617,14 +613,14 @@ mod tests {
617613
Duration::from_millis(500)],
618614
},
619615
probeset! {
620-
proto: ProbeProto::QuicIpv4,
616+
proto: ProbeProto::QadIpv4,
621617
relay: relay_node_2.clone(),
622618
delays: [Duration::ZERO,
623619
Duration::from_millis(100),
624620
Duration::from_millis(200)],
625621
},
626622
probeset! {
627-
proto: ProbeProto::QuicIpv6,
623+
proto: ProbeProto::QadIpv6,
628624
relay: relay_node_2.clone(),
629625
delays: [Duration::ZERO,
630626
Duration::from_millis(100),
@@ -704,12 +700,12 @@ mod tests {
704700
latencies.update_relay(
705701
relay_node_1.url.clone(),
706702
Duration::from_millis(2),
707-
ProbeProto::QuicIpv4,
703+
ProbeProto::QadIpv4,
708704
);
709705
latencies.update_relay(
710706
relay_node_2.url.clone(),
711707
Duration::from_millis(2),
712-
ProbeProto::QuicIpv4,
708+
ProbeProto::QadIpv4,
713709
);
714710
let last_report = Report {
715711
udp: true,
@@ -735,15 +731,15 @@ mod tests {
735731
);
736732
let mut expected_plan: ProbePlan = [
737733
probeset! {
738-
proto: ProbeProto::QuicIpv4,
734+
proto: ProbeProto::QadIpv4,
739735
relay: relay_node_1.clone(),
740736
delays: [Duration::ZERO,
741737
Duration::from_micros(52_400),
742738
Duration::from_micros(104_800),
743739
Duration::from_micros(157_200)],
744740
},
745741
probeset! {
746-
proto: ProbeProto::QuicIpv6,
742+
proto: ProbeProto::QadIpv6,
747743
relay: relay_node_1.clone(),
748744
delays: [Duration::ZERO,
749745
Duration::from_micros(52_400),
@@ -759,13 +755,13 @@ mod tests {
759755
Duration::from_micros(364_400)],
760756
},
761757
probeset! {
762-
proto: ProbeProto::QuicIpv4,
758+
proto: ProbeProto::QadIpv4,
763759
relay: relay_node_2.clone(),
764760
delays: [Duration::ZERO,
765761
Duration::from_micros(52_400)],
766762
},
767763
probeset! {
768-
proto: ProbeProto::QuicIpv6,
764+
proto: ProbeProto::QadIpv6,
769765
relay: relay_node_2.clone(),
770766
delays: [Duration::ZERO,
771767
Duration::from_micros(52_400)],
@@ -801,10 +797,10 @@ mod tests {
801797
) -> Report {
802798
let mut latencies = RelayLatencies::default();
803799
if let Some(latency_1) = latency_1 {
804-
latencies.update_relay(url_1.clone(), latency_1, ProbeProto::QuicIpv4);
800+
latencies.update_relay(url_1.clone(), latency_1, ProbeProto::QadIpv4);
805801
}
806802
if let Some(latency_2) = latency_2 {
807-
latencies.update_relay(url_2.clone(), latency_2, ProbeProto::QuicIpv4);
803+
latencies.update_relay(url_2.clone(), latency_2, ProbeProto::QadIpv4);
808804
}
809805
Report {
810806
udp: true,

0 commit comments

Comments
 (0)