dont need to validate reserved bits

menghaoyu2002 · May 26, 2024 · 5c463d7 · 5c463d7
1 parent 698e4e1
commit 5c463d7
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/src/client/mod.rs b/src/client/mod.rs
@@ -48,7 +48,7 @@ impl Debug for ClientError {
             ClientError::GetPeersError(e) => write!(f, "GetPeersError: {}", e),
             ClientError::HandshakeError(e) => write!(
                 f,
-                "HandshakeError: Peer: {}, Status: {}, Message: {} Handshake: {}",
+                "HandshakeError: Peer: {}, Status: {}, Message: {} Handshake:\n{}",
                 e.peer,
                 e.status,
                 e.message,
@@ -115,13 +115,6 @@ impl Client {
             ));
         }
 
-        // don't need to validate reserved bytes
-        // if &handshake[20..28] != [0; 8] {
-        //     return Err(ClientError::ValidateHandshakeError(
-        //         "Invalid reserved bytes".to_string(),
-        //     ));
-        // }
-
         if &handshake[28..48] != info_hash {
             return Err(ClientError::ValidateHandshakeError(
                 "Invalid info hash".to_string(),
@@ -199,12 +192,14 @@ impl Client {
 
                 match handle
                     .await
-                    .map_err(|_| ClientError::GetPeersError(String::from("Failed to get peer")))?
+                    .map_err(|e| ClientError::GetPeersError(String::from(e.to_string())))?
                 {
                     Ok((peer_id, stream)) => {
                         println!(
                             "Connected to peer {} with id {}",
-                            stream.peer_addr().unwrap(),
+                            stream.peer_addr().map_err(|_| {
+                                ClientError::GetPeersError(String::from("Failed to get peer addr"))
+                            })?,
                             peer_id
                         );
                         self.connections.push(stream);