Просмотр исходного кода

net3: handle unsupported transport upgrades

ghassmo 4 лет назад
Родитель
Сommit
c8ce6b68a5
3 измененных файлов с 5 добавлено и 4 удалено
  1. 3 0
      src/error.rs
  2. 1 2
      src/net3/acceptor.rs
  3. 1 2
      src/net3/connector.rs

+ 3 - 0
src/error.rs

@@ -96,6 +96,9 @@ pub enum Error {
     #[error("Unsupported network transport: {0}")]
     UnsupportedTransport(String),
 
+    #[error("Unsupported network transport upgrade: {0}")]
+    UnsupportedTransportUpgrade(String),
+
     #[error("Connection failed")]
     ConnectFailed,
 

+ 1 - 2
src/net3/acceptor.rs

@@ -61,8 +61,7 @@ impl Acceptor {
                         let tls_listener = transport.upgrade_listener(listener)?.await?;
                         self.accept(Box::new(tls_listener), executor);
                     }
-                    // TODO hanle unsupported upgrade
-                    Some(_) => todo!(),
+                    Some(u) => return Err(Error::UnsupportedTransportUpgrade(u)),
                 }
             }
             TransportName::Tor(_upgrade) => todo!(),

+ 1 - 2
src/net3/connector.rs

@@ -58,8 +58,7 @@ impl Connector {
                         let stream = transport.upgrade_dialer(stream?)?.await;
                         Channel::new(Box::new(stream?), connect_url).await
                     }
-                    // TODO hanle unsupported upgrade
-                    Some(_) => todo!(),
+                    Some(u) => return Err(Error::UnsupportedTransportUpgrade(u)),
                 };
 
                 Ok(channel)