protocols/relay: Do not close connection on upgrade timeouts

libp2p · Mar 10, 2021 · d55bd99 · d55bd99
1 parent 7956f0b
commit d55bd99
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/protocols/relay/src/handler.rs b/protocols/relay/src/handler.rs
@@ -391,10 +391,7 @@ impl ProtocolsHandler for RelayHandler {
         error: ProtocolsHandlerUpgrErr<protocol::RelayListenError>,
     ) {
         match error {
-            ProtocolsHandlerUpgrErr::Timeout => {
-                self.pending_error = Some(ProtocolsHandlerUpgrErr::Timeout);
-            }
-            ProtocolsHandlerUpgrErr::Timer => {}
+            ProtocolsHandlerUpgrErr::Timeout | ProtocolsHandlerUpgrErr::Timer => {}
             ProtocolsHandlerUpgrErr::Upgrade(upgrade::UpgradeError::Select(
                 upgrade::NegotiationError::Failed,
             )) => {}
@@ -426,10 +423,7 @@ impl ProtocolsHandler for RelayHandler {
                 request_id,
             } => {
                 match error {
-                    ProtocolsHandlerUpgrErr::Timeout => {
-                        self.pending_error = Some(ProtocolsHandlerUpgrErr::Timeout);
-                    }
-                    ProtocolsHandlerUpgrErr::Timer => {}
+                    ProtocolsHandlerUpgrErr::Timeout | ProtocolsHandlerUpgrErr::Timer => {}
                     ProtocolsHandlerUpgrErr::Upgrade(upgrade::UpgradeError::Select(
                         upgrade::NegotiationError::Failed,
                     )) => {}
@@ -509,11 +503,9 @@ impl ProtocolsHandler for RelayHandler {
                 ..
             } => {
                 let err_code = match error {
-                    ProtocolsHandlerUpgrErr::Timeout => {
-                        self.pending_error = Some(ProtocolsHandlerUpgrErr::Timeout);
+                    ProtocolsHandlerUpgrErr::Timeout | ProtocolsHandlerUpgrErr::Timer => {
                         circuit_relay::Status::HopCantOpenDstStream
                     }
-                    ProtocolsHandlerUpgrErr::Timer => circuit_relay::Status::HopCantOpenDstStream,
                     ProtocolsHandlerUpgrErr::Upgrade(upgrade::UpgradeError::Select(
                         upgrade::NegotiationError::Failed,
                     )) => circuit_relay::Status::HopCantSpeakRelay,