From 938b29d418a9df2f93ee273a394f34adc99ea25d Mon Sep 17 00:00:00 2001
From: hozan23 <hozan23@proton.me>
Date: Sat, 18 Nov 2023 13:36:19 +0300
Subject: net: improve Conn API

---
 p2p/src/discovery/refresh.rs |  4 ++--
 p2p/src/io_codec.rs          | 36 +++++++++++++++++++++++++++++++++---
 p2p/src/message.rs           |  2 +-
 3 files changed, 36 insertions(+), 6 deletions(-)

(limited to 'p2p/src')

diff --git a/p2p/src/discovery/refresh.rs b/p2p/src/discovery/refresh.rs
index 1ced266..b9b7bae 100644
--- a/p2p/src/discovery/refresh.rs
+++ b/p2p/src/discovery/refresh.rs
@@ -270,11 +270,11 @@ impl RefreshService {
 
         let ping_msg = PingMsg(nonce);
         let buffer = encode(&ping_msg)?;
-        conn.send(&buffer).await?;
+        conn.write(&buffer).await?;
 
         let buf = &mut [0; PINGMSG_SIZE];
         let t = Duration::from_secs(self.config.refresh_response_timeout);
-        timeout(t, conn.recv(buf)).await??;
+        timeout(t, conn.read(buf)).await??;
 
         let (pong_msg, _) = decode::<PongMsg>(buf)?;
 
diff --git a/p2p/src/io_codec.rs b/p2p/src/io_codec.rs
index 4515832..ea62666 100644
--- a/p2p/src/io_codec.rs
+++ b/p2p/src/io_codec.rs
@@ -38,7 +38,7 @@ impl IOCodec {
     pub async fn read(&self) -> Result<NetMsg> {
         // Read 6 bytes to get the header of the incoming message
         let mut buf = [0; MSG_HEADER_SIZE];
-        self.conn.recv(&mut buf).await?;
+        self.read_exact(&mut buf).await?;
 
         // Decode the header from bytes to NetMsgHeader
         let (header, _) = decode::<NetMsgHeader>(&buf)?;
@@ -51,7 +51,7 @@ impl IOCodec {
 
         // Create a buffer to hold the message based on its length
         let mut payload = vec![0; header.payload_size as usize];
-        self.conn.recv(&mut payload).await?;
+        self.read_exact(&mut payload).await?;
 
         Ok(NetMsg { header, payload })
     }
@@ -77,7 +77,7 @@ impl IOCodec {
         // Append the message payload to the buffer
         buffer.extend_from_slice(&payload);
 
-        self.conn.send(&buffer).await?;
+        self.write_all(&buffer).await?;
         Ok(())
     }
 
@@ -99,4 +99,34 @@ impl IOCodec {
             .await
             .map_err(|_| NetError::Timeout)?
     }
+
+    /// Reads the exact number of bytes required to fill `buf`.
+    async fn read_exact(&self, mut buf: &mut [u8]) -> Result<()> {
+        while !buf.is_empty() {
+            let n = self.conn.read(buf).await?;
+            let (_, rest) = std::mem::take(&mut buf).split_at_mut(n);
+            buf = rest;
+
+            if n == 0 {
+                return Err(Error::IO(std::io::ErrorKind::UnexpectedEof.into()));
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Writes an entire buffer into the connection.
+    async fn write_all(&self, mut buf: &[u8]) -> Result<()> {
+        while !buf.is_empty() {
+            let n = self.conn.write(buf).await?;
+            let (_, rest) = std::mem::take(&mut buf).split_at(n);
+            buf = rest;
+
+            if n == 0 {
+                return Err(Error::IO(std::io::ErrorKind::UnexpectedEof.into()));
+            }
+        }
+
+        Ok(())
+    }
 }
diff --git a/p2p/src/message.rs b/p2p/src/message.rs
index d3691c2..9e73809 100644
--- a/p2p/src/message.rs
+++ b/p2p/src/message.rs
@@ -10,7 +10,7 @@ use crate::{protocol::ProtocolID, routing_table::Entry, utils::VersionInt, PeerI
 pub const MSG_HEADER_SIZE: usize = 6;
 
 /// The maximum allowed size for a message in bytes.
-pub const MAX_ALLOWED_MSG_SIZE: u32 = 1000000;
+pub const MAX_ALLOWED_MSG_SIZE: u32 = 1024 * 1024; // 1MB
 
 /// Defines the main message in the karyon p2p network.
 ///
-- 
cgit v1.2.3