Skip to content

Commit bd9dda0

Browse files
committed
fix: do not double-check if relay packets are disco packets
1 parent eea94e4 commit bd9dda0

File tree

1 file changed

+0
-31
lines changed

1 file changed

+0
-31
lines changed

iroh/src/magicsock.rs

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,11 +1083,6 @@ impl MagicSock {
10831083
return None;
10841084
}
10851085

1086-
if self.handle_relay_disco_message(&dm.buf, &dm.url, dm.src) {
1087-
// DISCO messages are handled internally in the MagicSock, do not pass to Quinn.
1088-
return None;
1089-
}
1090-
10911086
let quic_mapped_addr = self.node_map.receive_relay(&dm.url, dm.src);
10921087

10931088
// Normalize local_ip
@@ -1108,32 +1103,6 @@ impl MagicSock {
11081103
Some((dm.src, meta, dm.buf))
11091104
}
11101105

1111-
fn handle_relay_disco_message(
1112-
&self,
1113-
msg: &[u8],
1114-
url: &RelayUrl,
1115-
relay_node_src: PublicKey,
1116-
) -> bool {
1117-
match disco::source_and_box(msg) {
1118-
Some((source, sealed_box)) => {
1119-
if relay_node_src != source {
1120-
// TODO: return here?
1121-
warn!("Received relay disco message from connection for {}, but with message from {}", relay_node_src.fmt_short(), source.fmt_short());
1122-
}
1123-
self.handle_disco_message(
1124-
source,
1125-
sealed_box,
1126-
DiscoMessageSource::Relay {
1127-
url: url.clone(),
1128-
key: relay_node_src,
1129-
},
1130-
);
1131-
true
1132-
}
1133-
None => false,
1134-
}
1135-
}
1136-
11371106
/// Handles a discovery message.
11381107
#[instrument("disco_in", skip_all, fields(node = %sender.fmt_short(), %src))]
11391108
fn handle_disco_message(&self, sender: PublicKey, sealed_box: &[u8], src: DiscoMessageSource) {

0 commit comments

Comments
 (0)