aboutsummaryrefslogtreecommitdiffstats
path: root/src/swarm/peer
diff options
context:
space:
mode:
Diffstat (limited to 'src/swarm/peer')
-rw-r--r--src/swarm/peer/handshake.rs11
-rw-r--r--src/swarm/peer/inbound.rs8
2 files changed, 18 insertions, 1 deletions
diff --git a/src/swarm/peer/handshake.rs b/src/swarm/peer/handshake.rs
index 4cc0cf4..ef7d379 100644
--- a/src/swarm/peer/handshake.rs
+++ b/src/swarm/peer/handshake.rs
@@ -127,6 +127,7 @@ async fn transmit_hello(state: &AppState, peer: &str) -> Result<()> {
None => 0,
};
state.lock_rtt().hello_sent(peer, Instant::now());
+ say_what_we_speak(state, peer).await;
let result = state
.transport
.send_message(
@@ -169,6 +170,15 @@ async fn transmit_hello(state: &AppState, peer: &str) -> Result<()> {
}
}
+/// Tells `peer` what this build speaks and knows, with each handshake (SPEAKS,
+/// `swarm::speaking`): a build from before SPEAKS ignores it.
+async fn say_what_we_speak(state: &AppState, peer: &str) {
+ let speaks = ParsedMessage::Speaks(crate::swarm::speaking::own());
+ if let Err(error) = state.transport.send_message(peer, &speaks).await {
+ debug!(peer = %peer, error = %format!("{error:#}"), "SPEAKS not sent");
+ }
+}
+
pub(super) async fn ensure_handshake(state: &AppState, peer: &str) {
if let Err(error) = send_hello_once(state, peer).await {
warn!(peer = %peer, error = %format!("{error:#}"), "HELLO failed; will retry");
@@ -247,6 +257,7 @@ pub(super) async fn send_hello_reply(
};
debug!(to = %peer, ready, "Sending HELLO_REPLY");
+ say_what_we_speak(state, peer).await;
state
.transport
diff --git a/src/swarm/peer/inbound.rs b/src/swarm/peer/inbound.rs
index d266e5f..e23ec14 100644
--- a/src/swarm/peer/inbound.rs
+++ b/src/swarm/peer/inbound.rs
@@ -39,6 +39,11 @@ pub(crate) async fn handle_message(
note_alive(state, &peer, &message).await;
return Ok(());
}
+ // SPEAKS only says what the peer's build speaks and knows (`swarm::speaking`).
+ if let ParsedMessage::Speaks(speaks) = message {
+ state.speaking.heard(&peer, speaks);
+ return Ok(());
+ }
// WHO and ME end at the identity layer (`transport::identity`). A sync message names
// its epoch by a tag (`EpochTag`): ours, or the sender's as we know it; one naming
// neither is of an epoch we don't sync on, and says nothing we could record.
@@ -317,7 +322,8 @@ pub(crate) async fn handle_message(
transport::ParsedMessage::Who(_)
| transport::ParsedMessage::Me(_)
| transport::ParsedMessage::Ping(_)
- | transport::ParsedMessage::Pong { .. } => {}
+ | transport::ParsedMessage::Pong { .. }
+ | transport::ParsedMessage::Speaks(_) => {}
}
Ok(())