protocols/relay/: Only emit CircuitEstablished when transport notified

libp2p · Jan 14, 2022 · b1cb684 · b1cb684
1 parent 80a9e76
commit b1cb684
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/protocols/relay/src/v2/client/handler.rs b/protocols/relay/src/v2/client/handler.rs
@@ -267,6 +267,7 @@ impl ProtocolsHandler for Handler {
         info: Self::OutboundOpenInfo,
     ) {
         match (output, info) {
+            // Outbound reservation
             (
                 outbound_hop::Output::Reservation {
                     renewal_timeout,
@@ -286,6 +287,8 @@ impl ProtocolsHandler for Handler {
                 self.queued_events
                     .push_back(ProtocolsHandlerEvent::Custom(event));
             }
+
+            // Outbound circuit
             (
                 outbound_hop::Output::Circuit {
                     substream,
@@ -300,18 +303,21 @@ impl ProtocolsHandler for Handler {
                     read_buffer,
                     tx,
                 ))) {
-                    Ok(()) => self.alive_lend_out_substreams.push(rx),
+                    Ok(()) => {
+                        self.alive_lend_out_substreams.push(rx);
+                        self.queued_events.push_back(ProtocolsHandlerEvent::Custom(
+                            Event::OutboundCircuitEstablished { limit },
+                        ));
+                    },
                     Err(_) => debug!(
                         "Oneshot to `RelayedDial` future dropped. \
                          Dropping established relayed connection to {:?}.",
                         self.remote_peer_id,
                     ),
                 }
 
-                self.queued_events.push_back(ProtocolsHandlerEvent::Custom(
-                    Event::OutboundCircuitEstablished { limit },
-                ));
             }
+
             _ => unreachable!(),
         }
     }