refactor(iroh-relay)!: Always allow acking pings

iroh-relay/src/client.rs

@@ -116,9 +116,6 @@ pub enum ClientError {
     /// The ping request was aborted
     #[error("ping aborted")]
     PingAborted,
-    /// This [`Client`] cannot acknowledge pings
-    #[error("cannot acknowledge pings")]
-    CannotAckPings,
     /// The given [`Url`] is invalid
     #[error("invalid url: {0}")]
     InvalidUrl(String),
@@ -169,7 +166,6 @@ pub struct ClientReceiver {
 #[derive(derive_more::Debug)]
 struct Actor {
     secret_key: SecretKey,
-    can_ack_pings: bool,
     is_preferred: bool,
     relay_conn: Option<(Conn, ConnReceiver)>,
     is_closed: bool,
@@ -210,8 +206,6 @@ impl PingTracker {
 /// Build a Client.
 #[derive(derive_more::Debug)]
 pub struct ClientBuilder {
-    /// Default is false
-    can_ack_pings: bool,
     /// Default is false
     is_preferred: bool,
     /// Default is None
@@ -237,7 +231,6 @@ impl ClientBuilder {
     /// Create a new [`ClientBuilder`]
     pub fn new(url: impl Into<RelayUrl>) -> Self {
         ClientBuilder {
-            can_ack_pings: false,
             is_preferred: false,
             address_family_selector: None,
             is_prober: false,
@@ -277,12 +270,6 @@ impl ClientBuilder {
         self
     }
 
-    /// Enable this [`Client`] to acknowledge pings.
-    pub fn can_ack_pings(mut self, can: bool) -> Self {
-        self.can_ack_pings = can;
-        self
-    }
-
     /// Indicate this client is the preferred way to communicate
     /// to the peer with this client's [`PublicKey`]
     pub fn is_preferred(mut self, is: bool) -> Self {
@@ -340,7 +327,6 @@ impl ClientBuilder {
 
         let inner = Actor {
             secret_key: key,
-            can_ack_pings: self.can_ack_pings,
             is_preferred: self.is_preferred,
             relay_conn: None,
             is_closed: false,
@@ -829,16 +815,12 @@ impl Actor {
 
     async fn send_pong(&mut self, data: [u8; 8]) -> Result<(), ClientError> {
         debug!("send_pong");
-        if self.can_ack_pings {
-            let (conn, _) = self.connect("send_pong").await?;
-            if conn.send_pong(data).await.is_err() {
-                self.close_for_reconnect().await;
-                return Err(ClientError::Send);
-            }
-            Ok(())
-        } else {
-            Err(ClientError::CannotAckPings)
+        let (conn, _) = self.connect("send_pong").await?;
+        if conn.send_pong(data).await.is_err() {
+            self.close_for_reconnect().await;
+            return Err(ClientError::Send);
         }
+        Ok(())
     }
 
     async fn close(mut self) {

iroh/src/magicsock/relay_actor.rs

@@ -525,7 +525,6 @@ impl RelayActor {
                 let ipv6_reported = ipv6_reported.clone();
                 Box::pin(async move { ipv6_reported.load(Ordering::Relaxed) })
             })
-            .can_ack_pings(true)
             .is_preferred(my_relay.as_ref() == Some(url));
 
         #[cfg(any(test, feature = "test-utils"))]