feat(net_crypto): send packets via TCP

Author: kurnevsky

src/toxcore/net_crypto/crypto_connection.rs

@@ -65,7 +65,7 @@ pub const REQUEST_PACKETS_COMPARE_CONSTANT: f64 = 0.125 * 100.0;
 /// Packet that should be sent every second. Depending on `ConnectionStatus` it
 /// can be `CookieRequest` or `CryptoHandshake`
 #[derive(Clone, Debug, Eq, PartialEq)]
-enum StatusPacketEnum {
+pub enum StatusPacketEnum {
     /// `CookieRequest` packet
     CookieRequest(CookieRequest),
     /// `CryptoHandshake` packet
@@ -78,7 +78,7 @@ enum StatusPacketEnum {
 pub struct StatusPacket {
     /// Packet that should be sent every second. Depending on `ConnectionStatus`
     /// it can be `CookieRequest` or `CryptoHandshake`
-    packet: StatusPacketEnum,
+    pub packet: StatusPacketEnum,
     /// When packet was sent last time
     pub sent_time: Instant,
     /// How many times packet was sent
@@ -104,14 +104,6 @@ impl StatusPacket {
         }
     }
 
-    /// Get `Packet` that should be sent every second
-    pub fn dht_packet(&self) -> Packet {
-        match self.packet {
-            StatusPacketEnum::CookieRequest(ref packet) => Packet::CookieRequest(packet.clone()),
-            StatusPacketEnum::CryptoHandshake(ref packet) => Packet::CryptoHandshake(packet.clone()),
-        }
-    }
-
     /// Check if one second is elapsed since last time when the packet was sent
     fn is_time_elapsed(&self) -> bool {
         clock_elapsed(self.sent_time) > CRYPTO_SEND_PACKET_INTERVAL
@@ -431,15 +423,15 @@ impl CryptoConnection {
 
     /// Get `CookieRequest` or `CryptoHandshake` if it should be sent depending
     /// on connection status and update sent counter
-    pub fn packet_to_send(&mut self) -> Option<Packet> {
+    pub fn packet_to_send(&mut self) -> Option<StatusPacketEnum> {
         match self.status {
             ConnectionStatus::CookieRequesting { ref mut packet, .. }
             | ConnectionStatus::HandshakeSending { ref mut packet, .. }
             | ConnectionStatus::NotConfirmed { ref mut packet, .. } => {
                 if packet.should_be_sent() {
                     packet.num_sent += 1;
                     packet.sent_time = clock_now();
-                    Some(packet.dht_packet())
+                    Some(packet.packet.clone())
                 } else {
                     None
                 }

src/toxcore/net_crypto/errors.rs

@@ -232,3 +232,19 @@ error_kind! {
         SendToConnectionStatus,
     }
 }
+
+error_kind! {
+    #[doc = "Error that can happen during a packet sending."]
+    #[derive(Debug)]
+    SendPacketError,
+    #[doc = "The specific kind of error that can occur."]
+    #[derive(Debug, Eq, PartialEq, Fail)]
+    SendPacketErrorKind {
+        #[doc = "Failed to send TCP packet."]
+        #[fail(display = "Failed to send TCP packet")]
+        Tcp,
+        #[doc = "Failed to send UDP packet."]
+        #[fail(display = "Failed to send UDP packet")]
+        Udp,
+    }
+}