Allow reporting of supported protocols by remote

thomaseizinger · thomaseizinger · commit f0170b944334 · 2023-03-22T22:38:34.000+01:00
diff --git a/protocols/dcutr/src/handler/direct.rs b/protocols/dcutr/src/handler/direct.rs
@@ -93,7 +93,8 @@ impl ConnectionHandler for Handler {
             | ConnectionEvent::DialUpgradeError(_)
             | ConnectionEvent::ListenUpgradeError(_)
             | ConnectionEvent::AddressChange(_)
-            | ConnectionEvent::ProtocolsChange(_) => {}
+            | ConnectionEvent::LocalProtocolsChange(_)
+            | ConnectionEvent::RemoteProtocolsChange(_) => {}
         }
     }
 }
diff --git a/protocols/dcutr/src/handler/relayed.rs b/protocols/dcutr/src/handler/relayed.rs
@@ -419,7 +419,9 @@ impl ConnectionHandler for Handler {
             ConnectionEvent::DialUpgradeError(dial_upgrade_error) => {
                 self.on_dial_upgrade_error(dial_upgrade_error)
             }
-            ConnectionEvent::AddressChange(_) | ConnectionEvent::ProtocolsChange(_) => {}
+            ConnectionEvent::AddressChange(_)
+            | ConnectionEvent::LocalProtocolsChange(_)
+            | ConnectionEvent::RemoteProtocolsChange(_) => {}
         }
     }
 }
diff --git a/protocols/gossipsub/src/handler.rs b/protocols/gossipsub/src/handler.rs
@@ -578,7 +578,8 @@ impl ConnectionHandler for Handler {
             }
             ConnectionEvent::AddressChange(_)
             | ConnectionEvent::ListenUpgradeError(_)
-            | ConnectionEvent::ProtocolsChange(_) => {}
+            | ConnectionEvent::LocalProtocolsChange(_)
+            | ConnectionEvent::RemoteProtocolsChange(_) => {}
         }
     }
 }
diff --git a/protocols/identify/src/handler.rs b/protocols/identify/src/handler.rs
@@ -345,11 +345,12 @@ impl ConnectionHandler for Handler {
                 self.on_dial_upgrade_error(dial_upgrade_error)
             }
             ConnectionEvent::AddressChange(_) | ConnectionEvent::ListenUpgradeError(_) => {}
-            ConnectionEvent::ProtocolsChange(_) => {
+            ConnectionEvent::LocalProtocolsChange(_) => {
                 // TODO:
                 // 1. push protocol changes
                 // 2. store protocols locally and use it to answer next identify request
             }
+            ConnectionEvent::RemoteProtocolsChange(_) => {}
         }
     }
 }
diff --git a/protocols/kad/src/handler.rs b/protocols/kad/src/handler.rs
@@ -788,7 +788,8 @@ where
             }
             ConnectionEvent::AddressChange(_)
             | ConnectionEvent::ListenUpgradeError(_)
-            | ConnectionEvent::ProtocolsChange(_) => {}
+            | ConnectionEvent::LocalProtocolsChange(_)
+            | ConnectionEvent::RemoteProtocolsChange(_) => {}
         }
     }
 }
diff --git a/protocols/perf/src/client/handler.rs b/protocols/perf/src/client/handler.rs
@@ -127,7 +127,7 @@ impl ConnectionHandler for Handler {
                     .boxed(),
             ),
 
-            ConnectionEvent::AddressChange(_) | ConnectionEvent::ProtocolsChange(_) => {}
+            ConnectionEvent::AddressChange(_) | ConnectionEvent::LocalProtocolsChange(_) => {}
             ConnectionEvent::DialUpgradeError(DialUpgradeError {
                 info: Command { id, .. },
                 error,
@@ -147,6 +147,7 @@ impl ConnectionHandler for Handler {
                     },
                 }
             }
+            ConnectionEvent::RemoteProtocolsChange(_) => {}
         }
     }
 
diff --git a/protocols/perf/src/server/handler.rs b/protocols/perf/src/server/handler.rs
@@ -104,7 +104,9 @@ impl ConnectionHandler for Handler {
             ConnectionEvent::DialUpgradeError(DialUpgradeError { info, .. }) => {
                 void::unreachable(info)
             }
-            ConnectionEvent::AddressChange(_) | ConnectionEvent::ProtocolsChange(_) => {}
+            ConnectionEvent::AddressChange(_)
+            | ConnectionEvent::LocalProtocolsChange(_)
+            | ConnectionEvent::RemoteProtocolsChange(_) => {}
             ConnectionEvent::ListenUpgradeError(ListenUpgradeError { info: (), error }) => {
                 match error {
                     ConnectionHandlerUpgrErr::Timeout => {}
diff --git a/protocols/ping/src/handler.rs b/protocols/ping/src/handler.rs
@@ -413,7 +413,8 @@ impl ConnectionHandler for Handler {
             }
             ConnectionEvent::AddressChange(_)
             | ConnectionEvent::ListenUpgradeError(_)
-            | ConnectionEvent::ProtocolsChange(_) => {}
+            | ConnectionEvent::LocalProtocolsChange(_)
+            | ConnectionEvent::RemoteProtocolsChange(_) => {}
         }
     }
 }
diff --git a/protocols/relay/src/behaviour/handler.rs b/protocols/relay/src/behaviour/handler.rs
@@ -954,7 +954,9 @@ impl ConnectionHandler for Handler {
             ConnectionEvent::DialUpgradeError(dial_upgrade_error) => {
                 self.on_dial_upgrade_error(dial_upgrade_error)
             }
-            ConnectionEvent::AddressChange(_) | ConnectionEvent::ProtocolsChange(_) => {}
+            ConnectionEvent::AddressChange(_)
+            | ConnectionEvent::LocalProtocolsChange(_)
+            | ConnectionEvent::RemoteProtocolsChange(_) => {}
         }
     }
 }
diff --git a/protocols/relay/src/priv_client/handler.rs b/protocols/relay/src/priv_client/handler.rs
@@ -613,7 +613,9 @@ impl ConnectionHandler for Handler {
             ConnectionEvent::DialUpgradeError(dial_upgrade_error) => {
                 self.on_dial_upgrade_error(dial_upgrade_error)
             }
-            ConnectionEvent::AddressChange(_) | ConnectionEvent::ProtocolsChange(_) => {}
+            ConnectionEvent::AddressChange(_)
+            | ConnectionEvent::LocalProtocolsChange(_)
+            | ConnectionEvent::RemoteProtocolsChange(_) => {}
         }
     }
 }
diff --git a/protocols/rendezvous/src/substream_handler.rs b/protocols/rendezvous/src/substream_handler.rs
@@ -397,7 +397,8 @@ where
             ConnectionEvent::AddressChange(_)
             | ConnectionEvent::ListenUpgradeError(_)
             | ConnectionEvent::DialUpgradeError(_)
-            | ConnectionEvent::ProtocolsChange(_) => {}
+            | ConnectionEvent::LocalProtocolsChange(_)
+            | ConnectionEvent::RemoteProtocolsChange(_) => {}
         }
     }
 
diff --git a/protocols/request-response/src/handler.rs b/protocols/request-response/src/handler.rs
@@ -425,7 +425,9 @@ where
             ConnectionEvent::ListenUpgradeError(listen_upgrade_error) => {
                 self.on_listen_upgrade_error(listen_upgrade_error)
             }
-            ConnectionEvent::AddressChange(_) | ConnectionEvent::ProtocolsChange(_) => {}
+            ConnectionEvent::AddressChange(_)
+            | ConnectionEvent::LocalProtocolsChange(_)
+            | ConnectionEvent::RemoteProtocolsChange(_) => {}
         }
     }
 }
diff --git a/swarm/src/behaviour/toggle.rs b/swarm/src/behaviour/toggle.rs
@@ -368,7 +368,10 @@ where
             ConnectionEvent::ListenUpgradeError(listen_upgrade_error) => {
                 self.on_listen_upgrade_error(listen_upgrade_error)
             }
-            ConnectionEvent::ProtocolsChange(_) => {
+            ConnectionEvent::LocalProtocolsChange(_) => {
+                todo!()
+            }
+            ConnectionEvent::RemoteProtocolsChange(_) => {
                 todo!()
             }
         }
diff --git a/swarm/src/connection.rs b/swarm/src/connection.rs
@@ -248,6 +248,14 @@ where
                 Poll::Ready(ConnectionHandlerEvent::Close(err)) => {
                     return Poll::Ready(Err(ConnectionError::Handler(err)));
                 }
+                Poll::Ready(ConnectionHandlerEvent::ReportRemoteProtocols { protocols }) => {
+                    handler.on_connection_event(ConnectionEvent::RemoteProtocolsChange(
+                        ProtocolsChange {
+                            protocols: &protocols,
+                        },
+                    ));
+                    continue;
+                }
             }
 
             // In case the [`ConnectionHandler`] can not make any more progress, poll the negotiating outbound streams.
@@ -368,7 +376,7 @@ where
                         new_protocols.sort();
 
                         if supported_protocols != &new_protocols {
-                            handler.on_connection_event(ConnectionEvent::ProtocolsChange(
+                            handler.on_connection_event(ConnectionEvent::LocalProtocolsChange(
                                 ProtocolsChange {
                                     protocols: &new_protocols,
                                 },
@@ -883,7 +891,8 @@ mod tests {
                 }
                 ConnectionEvent::AddressChange(_)
                 | ConnectionEvent::ListenUpgradeError(_)
-                | ConnectionEvent::ProtocolsChange(_) => {}
+                | ConnectionEvent::LocalProtocolsChange(_)
+                | ConnectionEvent::RemoteProtocolsChange(_) => {}
             }
         }
 
@@ -947,7 +956,7 @@ mod tests {
                 Self::OutboundOpenInfo,
             >,
         ) {
-            if let ConnectionEvent::ProtocolsChange(ProtocolsChange { protocols }) = event {
+            if let ConnectionEvent::LocalProtocolsChange(ProtocolsChange { protocols }) = event {
                 self.reported_protocols = protocols
                     .iter()
                     .map(|b| std::str::from_utf8(b).unwrap().to_owned())
diff --git a/swarm/src/dummy.rs b/swarm/src/dummy.rs
@@ -141,7 +141,8 @@ impl crate::handler::ConnectionHandler for ConnectionHandler {
             },
             ConnectionEvent::AddressChange(_)
             | ConnectionEvent::ListenUpgradeError(_)
-            | ConnectionEvent::ProtocolsChange(_) => {}
+            | ConnectionEvent::LocalProtocolsChange(_)
+            | ConnectionEvent::RemoteProtocolsChange(_) => {}
         }
     }
 }
diff --git a/swarm/src/handler.rs b/swarm/src/handler.rs
@@ -210,8 +210,10 @@ pub enum ConnectionEvent<'a, IP: InboundUpgradeSend, OP: OutboundUpgradeSend, IO
     DialUpgradeError(DialUpgradeError<OOI, OP>),
     /// Informs the handler that upgrading an inbound substream to the given protocol has failed.
     ListenUpgradeError(ListenUpgradeError<IOI, IP>),
-    /// The [`ConnectionHandler`] now supports a different set of protocols.
-    ProtocolsChange(ProtocolsChange<'a>),
+    /// The local [`ConnectionHandler`] now supports a different set of protocols.
+    LocalProtocolsChange(ProtocolsChange<'a>),
+    /// The remote [`ConnectionHandler`] now supports a different set of protocols.
+    RemoteProtocolsChange(ProtocolsChange<'a>),
 }
 
 /// [`ConnectionEvent`] variant that informs the handler about
@@ -241,7 +243,7 @@ pub struct AddressChange<'a> {
     pub new_address: &'a Multiaddr,
 }
 
-/// [`ConnectionEvent`] variant that informs the handler about a change in the address of the remote.
+/// [`ConnectionEvent`] variant that informs the handler about a change in the protocols supported on the connection.
 #[derive(Clone, Copy)]
 pub struct ProtocolsChange<'a> {
     pub protocols: &'a [Vec<u8>],
@@ -338,7 +340,7 @@ impl<TUpgrade, TInfo> SubstreamProtocol<TUpgrade, TInfo> {
 }
 
 /// Event produced by a handler.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum ConnectionHandlerEvent<TConnectionUpgrade, TOutboundOpenInfo, TCustom, TErr> {
     /// Request a new outbound substream to be opened with the remote.
     OutboundSubstreamRequest {
@@ -356,6 +358,15 @@ pub enum ConnectionHandlerEvent<TConnectionUpgrade, TOutboundOpenInfo, TCustom,
     /// [`ConnectionHandler::connection_keep_alive`].
     Close(TErr),
 
+    /// We learned that the remote supports the provided protocols on this connection.
+    ///
+    /// This list will directly be passed back to the [`ConnectionHandler`] in [`ConnectionHandler::on_connection_event`].
+    /// Due to the composed nature of [`ConnectionHandler`]s,
+    /// this mechanism effectively shares this list with all other handlers on a connection.
+    ///
+    /// Other handlers MAY use this to preemptively enable / disable themselves.
+    ReportRemoteProtocols { protocols: Vec<Vec<u8>> },
+
     /// Other event.
     Custom(TCustom),
 }
@@ -381,6 +392,9 @@ impl<TConnectionUpgrade, TOutboundOpenInfo, TCustom, TErr>
             }
             ConnectionHandlerEvent::Custom(val) => ConnectionHandlerEvent::Custom(val),
             ConnectionHandlerEvent::Close(val) => ConnectionHandlerEvent::Close(val),
+            ConnectionHandlerEvent::ReportRemoteProtocols { protocols } => {
+                ConnectionHandlerEvent::ReportRemoteProtocols { protocols }
+            }
         }
     }
 
@@ -401,6 +415,9 @@ impl<TConnectionUpgrade, TOutboundOpenInfo, TCustom, TErr>
             }
             ConnectionHandlerEvent::Custom(val) => ConnectionHandlerEvent::Custom(val),
             ConnectionHandlerEvent::Close(val) => ConnectionHandlerEvent::Close(val),
+            ConnectionHandlerEvent::ReportRemoteProtocols { protocols } => {
+                ConnectionHandlerEvent::ReportRemoteProtocols { protocols }
+            }
         }
     }
 
@@ -418,6 +435,9 @@ impl<TConnectionUpgrade, TOutboundOpenInfo, TCustom, TErr>
             }
             ConnectionHandlerEvent::Custom(val) => ConnectionHandlerEvent::Custom(map(val)),
             ConnectionHandlerEvent::Close(val) => ConnectionHandlerEvent::Close(val),
+            ConnectionHandlerEvent::ReportRemoteProtocols { protocols } => {
+                ConnectionHandlerEvent::ReportRemoteProtocols { protocols }
+            }
         }
     }
 
@@ -435,6 +455,9 @@ impl<TConnectionUpgrade, TOutboundOpenInfo, TCustom, TErr>
             }
             ConnectionHandlerEvent::Custom(val) => ConnectionHandlerEvent::Custom(val),
             ConnectionHandlerEvent::Close(val) => ConnectionHandlerEvent::Close(map(val)),
+            ConnectionHandlerEvent::ReportRemoteProtocols { protocols } => {
+                ConnectionHandlerEvent::ReportRemoteProtocols { protocols }
+            }
         }
     }
 }
diff --git a/swarm/src/handler/either.rs b/swarm/src/handler/either.rs
@@ -322,11 +322,21 @@ where
                     handler.on_connection_event(ConnectionEvent::AddressChange(address_change))
                 }
             },
-            ConnectionEvent::ProtocolsChange(supported_protocols) => match self {
-                Either::Left(handler) => handler
-                    .on_connection_event(ConnectionEvent::ProtocolsChange(supported_protocols)),
-                Either::Right(handler) => handler
-                    .on_connection_event(ConnectionEvent::ProtocolsChange(supported_protocols)),
+            ConnectionEvent::LocalProtocolsChange(supported_protocols) => match self {
+                Either::Left(handler) => handler.on_connection_event(
+                    ConnectionEvent::LocalProtocolsChange(supported_protocols),
+                ),
+                Either::Right(handler) => handler.on_connection_event(
+                    ConnectionEvent::LocalProtocolsChange(supported_protocols),
+                ),
+            },
+            ConnectionEvent::RemoteProtocolsChange(supported_protocols) => match self {
+                Either::Left(handler) => handler.on_connection_event(
+                    ConnectionEvent::RemoteProtocolsChange(supported_protocols),
+                ),
+                Either::Right(handler) => handler.on_connection_event(
+                    ConnectionEvent::RemoteProtocolsChange(supported_protocols),
+                ),
             },
         }
     }
diff --git a/swarm/src/handler/map_out.rs b/swarm/src/handler/map_out.rs
@@ -81,6 +81,9 @@ where
             ConnectionHandlerEvent::OutboundSubstreamRequest { protocol } => {
                 ConnectionHandlerEvent::OutboundSubstreamRequest { protocol }
             }
+            ConnectionHandlerEvent::ReportRemoteProtocols { protocols } => {
+                ConnectionHandlerEvent::ReportRemoteProtocols { protocols }
+            }
         })
     }
 
diff --git a/swarm/src/handler/multi.rs b/swarm/src/handler/multi.rs
@@ -318,9 +318,18 @@ where
             ConnectionEvent::ListenUpgradeError(listen_upgrade_error) => {
                 self.on_listen_upgrade_error(listen_upgrade_error)
             }
-            ConnectionEvent::ProtocolsChange(supported_protocols) => {
+            ConnectionEvent::LocalProtocolsChange(supported_protocols) => {
                 for h in self.handlers.values_mut() {
-                    h.on_connection_event(ConnectionEvent::ProtocolsChange(supported_protocols));
+                    h.on_connection_event(ConnectionEvent::LocalProtocolsChange(
+                        supported_protocols,
+                    ));
+                }
+            }
+            ConnectionEvent::RemoteProtocolsChange(supported_protocols) => {
+                for h in self.handlers.values_mut() {
+                    h.on_connection_event(ConnectionEvent::RemoteProtocolsChange(
+                        supported_protocols,
+                    ));
                 }
             }
         }
diff --git a/swarm/src/handler/one_shot.rs b/swarm/src/handler/one_shot.rs
@@ -219,7 +219,8 @@ where
             }
             ConnectionEvent::AddressChange(_)
             | ConnectionEvent::ListenUpgradeError(_)
-            | ConnectionEvent::ProtocolsChange(_) => {}
+            | ConnectionEvent::LocalProtocolsChange(_)
+            | ConnectionEvent::RemoteProtocolsChange(_) => {}
         }
     }
 }
diff --git a/swarm/src/handler/pending.rs b/swarm/src/handler/pending.rs
@@ -100,7 +100,8 @@ impl ConnectionHandler for PendingConnectionHandler {
             ConnectionEvent::AddressChange(_)
             | ConnectionEvent::DialUpgradeError(_)
             | ConnectionEvent::ListenUpgradeError(_)
-            | ConnectionEvent::ProtocolsChange(_) => {}
+            | ConnectionEvent::LocalProtocolsChange(_)
+            | ConnectionEvent::RemoteProtocolsChange(_) => {}
         }
     }
 }
diff --git a/swarm/src/handler/select.rs b/swarm/src/handler/select.rs
diff --git a/swarm/src/keep_alive.rs b/swarm/src/keep_alive.rs

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,8 @@ impl ConnectionHandler for Handler {`
`93`	`93`	`\| ConnectionEvent::DialUpgradeError(_)`
`94`	`94`	`\| ConnectionEvent::ListenUpgradeError(_)`
`95`	`95`	`\| ConnectionEvent::AddressChange(_)`
`96`		`- \| ConnectionEvent::ProtocolsChange(_) => {}`
	`96`	`+ \| ConnectionEvent::LocalProtocolsChange(_)`
	`97`	`+ \| ConnectionEvent::RemoteProtocolsChange(_) => {}`
`97`	`98`	`}`
`98`	`99`	`}`
`99`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,9 @@ impl ConnectionHandler for Handler {`
`419`	`419`	`ConnectionEvent::DialUpgradeError(dial_upgrade_error) => {`
`420`	`420`	`self.on_dial_upgrade_error(dial_upgrade_error)`
`421`	`421`	`}`
`422`		`- ConnectionEvent::AddressChange(_) \| ConnectionEvent::ProtocolsChange(_) => {}`
	`422`	`+ ConnectionEvent::AddressChange(_)`
	`423`	`+ \| ConnectionEvent::LocalProtocolsChange(_)`
	`424`	`+ \| ConnectionEvent::RemoteProtocolsChange(_) => {}`
`423`	`425`	`}`
`424`	`426`	`}`
`425`	`427`	`}`
Original file line number	Diff line number	Diff line change
`@@ -578,7 +578,8 @@ impl ConnectionHandler for Handler {`
`578`	`578`	`}`
`579`	`579`	`ConnectionEvent::AddressChange(_)`
`580`	`580`	`\| ConnectionEvent::ListenUpgradeError(_)`
`581`		`- \| ConnectionEvent::ProtocolsChange(_) => {}`
	`581`	`+ \| ConnectionEvent::LocalProtocolsChange(_)`
	`582`	`+ \| ConnectionEvent::RemoteProtocolsChange(_) => {}`
`582`	`583`	`}`
`583`	`584`	`}`
`584`	`585`	`}`
Original file line number	Diff line number	Diff line change
`@@ -345,11 +345,12 @@ impl ConnectionHandler for Handler {`
`345`	`345`	`self.on_dial_upgrade_error(dial_upgrade_error)`
`346`	`346`	`}`
`347`	`347`	`ConnectionEvent::AddressChange(_) \| ConnectionEvent::ListenUpgradeError(_) => {}`
`348`		`- ConnectionEvent::ProtocolsChange(_) => {`
	`348`	`+ ConnectionEvent::LocalProtocolsChange(_) => {`
`349`	`349`	`// TODO:`
`350`	`350`	`// 1. push protocol changes`
`351`	`351`	`// 2. store protocols locally and use it to answer next identify request`
`352`	`352`	`}`
	`353`	`+ ConnectionEvent::RemoteProtocolsChange(_) => {}`
`353`	`354`	`}`
`354`	`355`	`}`
`355`	`356`	`}`
Original file line number	Diff line number	Diff line change
`@@ -788,7 +788,8 @@ where`
`788`	`788`	`}`
`789`	`789`	`ConnectionEvent::AddressChange(_)`
`790`	`790`	`\| ConnectionEvent::ListenUpgradeError(_)`
`791`		`- \| ConnectionEvent::ProtocolsChange(_) => {}`
	`791`	`+ \| ConnectionEvent::LocalProtocolsChange(_)`
	`792`	`+ \| ConnectionEvent::RemoteProtocolsChange(_) => {}`
`792`	`793`	`}`
`793`	`794`	`}`
`794`	`795`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ impl ConnectionHandler for Handler {`
`127`	`127`	`.boxed(),`
`128`	`128`	`),`
`129`	`129`
`130`		`- ConnectionEvent::AddressChange(_) \| ConnectionEvent::ProtocolsChange(_) => {}`
	`130`	`+ ConnectionEvent::AddressChange(_) \| ConnectionEvent::LocalProtocolsChange(_) => {}`
`131`	`131`	`ConnectionEvent::DialUpgradeError(DialUpgradeError {`
`132`	`132`	`info: Command { id, .. },`
`133`	`133`	`error,`
`@@ -147,6 +147,7 @@ impl ConnectionHandler for Handler {`
`147`	`147`	`},`
`148`	`148`	`}`
`149`	`149`	`}`
	`150`	`+ ConnectionEvent::RemoteProtocolsChange(_) => {}`
`150`	`151`	`}`
`151`	`152`	`}`
`152`	`153`
Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,8 @@ impl ConnectionHandler for Handler {`
`413`	`413`	`}`
`414`	`414`	`ConnectionEvent::AddressChange(_)`
`415`	`415`	`\| ConnectionEvent::ListenUpgradeError(_)`
`416`		`- \| ConnectionEvent::ProtocolsChange(_) => {}`
	`416`	`+ \| ConnectionEvent::LocalProtocolsChange(_)`
	`417`	`+ \| ConnectionEvent::RemoteProtocolsChange(_) => {}`
`417`	`418`	`}`
`418`	`419`	`}`
`419`	`420`	`}`
Original file line number	Diff line number	Diff line change
`@@ -954,7 +954,9 @@ impl ConnectionHandler for Handler {`
`954`	`954`	`ConnectionEvent::DialUpgradeError(dial_upgrade_error) => {`
`955`	`955`	`self.on_dial_upgrade_error(dial_upgrade_error)`
`956`	`956`	`}`
`957`		`- ConnectionEvent::AddressChange(_) \| ConnectionEvent::ProtocolsChange(_) => {}`
	`957`	`+ ConnectionEvent::AddressChange(_)`
	`958`	`+ \| ConnectionEvent::LocalProtocolsChange(_)`
	`959`	`+ \| ConnectionEvent::RemoteProtocolsChange(_) => {}`
`958`	`960`	`}`
`959`	`961`	`}`
`960`	`962`	`}`
Original file line number	Diff line number	Diff line change
`@@ -613,7 +613,9 @@ impl ConnectionHandler for Handler {`
`613`	`613`	`ConnectionEvent::DialUpgradeError(dial_upgrade_error) => {`
`614`	`614`	`self.on_dial_upgrade_error(dial_upgrade_error)`
`615`	`615`	`}`
`616`		`- ConnectionEvent::AddressChange(_) \| ConnectionEvent::ProtocolsChange(_) => {}`
	`616`	`+ ConnectionEvent::AddressChange(_)`
	`617`	`+ \| ConnectionEvent::LocalProtocolsChange(_)`
	`618`	`+ \| ConnectionEvent::RemoteProtocolsChange(_) => {}`
`617`	`619`	`}`
`618`	`620`	`}`
`619`	`621`	`}`