Merge pull request #542 from rustaceanrob/26-1-1-proxy-transport

net: Use V1 transport when connecting by proxy

Author: rustaceanrob

src/network/mod.rs

@@ -187,6 +187,10 @@ impl ConnectionType {
             }
         }
     }
+
+    fn is_proxy(&self) -> bool {
+        matches!(self, ConnectionType::Socks5Proxy(_))
+    }
 }
 
 #[derive(Debug, Clone)]

src/network/peer.rs

@@ -72,14 +72,18 @@ impl Peer {
         }
     }
 
-    pub async fn run(&mut self, connection: TcpStream) -> Result<(), PeerError> {
+    pub async fn run(
+        &mut self,
+        connection: TcpStream,
+        is_proxy_connection: bool,
+    ) -> Result<(), PeerError> {
         let start_time = Instant::now();
         let (tx, mut rx) = mpsc::channel(32);
         let (reader, mut writer) = connection.into_split();
         let mut reader = BufReader::new(reader);
         // If a peer signals for V2 we will use it, otherwise just use plaintext.
         let (mut outbound_messages, mut peer_reader) =
-            if self.source.service_flags().has(ServiceFlags::P2P_V2) {
+            if self.source.service_flags().has(ServiceFlags::P2P_V2) && !is_proxy_connection {
                 let handshake_result = tokio::time::timeout(
                     V2_HANDSHAKE_TIMEOUT,
                     self.try_handshake(&mut writer, &mut reader),

src/network/peer_map.rs

@@ -141,7 +141,8 @@ impl PeerMap {
                 return Err(e);
             }
         };
-        let handle = tokio::spawn(async move { peer.run(connection).await });
+        let is_proxy = self.connector.is_proxy();
+        let handle = tokio::spawn(async move { peer.run(connection, is_proxy).await });
         self.map.insert(
             self.current_id,
             ManagedPeer {