feat(onion_client): handle friend requests

Author: kurnevsky

src/toxcore/onion/client/errors.rs

@@ -64,6 +64,9 @@ error_kind! {
         #[doc = "Failed to handle DHT `PublicKey` announce."]
         #[fail(display = "Failed to handle DHT PublicKey announce")]
         DhtPkAnnounce,
+        #[doc = "Failed to send a friend request."]
+        #[fail(display = "Failed to send a friend request")]
+        FriendRequest,
     }
 }
 

src/toxcore/onion/client/mod.rs

@@ -40,6 +40,10 @@ use crate::toxcore::time::*;
 /// key is a DHT key.
 type DhtPkTx = mpsc::UnboundedSender<(PublicKey, PublicKey)>;
 
+/// Shorthand for the transmit half of the message channel for sending friend
+/// requests when we get them. The key is a long term key.
+type FriendRequestTx = mpsc::UnboundedSender<(PublicKey, FriendRequest)>;
+
 /// Number of friend's close nodes to store.
 const MAX_ONION_FRIEND_NODES: u8 = 8;
 
@@ -303,6 +307,9 @@ struct OnionClientState {
     /// Sink to send DHT `PublicKey` when it gets known. The first key is a long
     /// term key, the second key is a DHT key.
     dht_pk_tx: OptionalSink<DhtPkTx>,
+    /// Sink to send friend requests when we get them. The key is a long term
+    /// key.
+    friend_request_tx: OptionalSink<FriendRequestTx>,
 }
 
 impl OnionClientState {
@@ -313,6 +320,7 @@ impl OnionClientState {
             announce_requests: RequestQueue::new(ANNOUNCE_TIMEOUT),
             friends: HashMap::new(),
             dht_pk_tx: OptionalSink::new(),
+            friend_request_tx: OptionalSink::new(),
         }
     }
 }
@@ -541,13 +549,15 @@ impl OnionClient {
             Ok(payload) => payload,
             Err(e) => return Either::A(future::err(e.context(HandleDataResponseErrorKind::InvalidInnerPayload).into()))
         };
-        match iner_payload {
+        let future = match iner_payload {
             OnionDataResponseInnerPayload::DhtPkAnnounce(dht_pk_announce) =>
-                Either::B(self.handle_dht_pk_announce(payload.real_pk, dht_pk_announce)
+                Either::A(self.handle_dht_pk_announce(payload.real_pk, dht_pk_announce)
                     .map_err(|e| e.context(HandleDataResponseErrorKind::DhtPkAnnounce).into())),
-            OnionDataResponseInnerPayload::FriendRequest(_) =>
-                Either::A(future::ok(()))
-        }
+            OnionDataResponseInnerPayload::FriendRequest(friend_request) =>
+                Either::B(send_to(&self.state.lock().friend_request_tx, (payload.real_pk, friend_request))
+                    .map_err(|e| e.context(HandleDataResponseErrorKind::FriendRequest).into()))
+        };
+        Either::B(future)
     }
 
     /// Add new node to random nodes pool to use them to build random paths.
@@ -988,6 +998,7 @@ mod tests {
             announce_requests: RequestQueue::new(Duration::from_secs(42)),
             friends: HashMap::new(),
             dht_pk_tx: OptionalSink::new(),
+            friend_request_tx: OptionalSink::new(),
         };
 
         let _onion_client_state_c = onion_client_state.clone();