feat(dht): put friend_saddr_sink into the lock

Author: kurnevsky

src/toxcore/dht/server/mod.rs

@@ -118,7 +118,7 @@ pub struct Server {
     /// Tx split of a channel to send packets to this peer via UDP socket.
     pub tx: Tx,
     /// Sink to send friend's `SocketAddr` when it gets known.
-    friend_saddr_sink: Option<mpsc::UnboundedSender<PackedNode>>,
+    friend_saddr_sink: Arc<RwLock<Option<mpsc::UnboundedSender<PackedNode>>>>,
     /// Struct that stores and manages requests IDs and timeouts.
     request_queue: Arc<RwLock<RequestQueue<PublicKey>>>,
     /// Close nodes list which contains nodes close to own DHT `PublicKey`.
@@ -211,7 +211,7 @@ impl Server {
             sk,
             pk,
             tx,
-            friend_saddr_sink: None,
+            friend_saddr_sink: Default::default(),
             request_queue: Arc::new(RwLock::new(RequestQueue::new(Duration::from_secs(PING_TIMEOUT)))),
             close_nodes: Arc::new(RwLock::new(Ktree::new(&pk))),
             onion_symmetric_key: Arc::new(RwLock::new(secretbox::gen_key())),
@@ -759,7 +759,7 @@ impl Server {
         for friend in friends.values_mut() {
             friend.try_add_to_close(node);
         }
-        if let Some(ref friend_saddr_sink) = self.friend_saddr_sink {
+        if let Some(ref friend_saddr_sink) = *self.friend_saddr_sink.read() {
             if friends.contains_key(&node.pk) {
                 Either::A(send_to(friend_saddr_sink, node)
                     .map_err(|e| e.context(HandlePacketErrorKind::FriendSaddr).into()))
@@ -1466,8 +1466,8 @@ impl Server {
     }
 
     /// Set sink to send friend's `SocketAddr` when it gets known.
-    pub fn set_friend_saddr_sink(&mut self, friend_saddr_sink: mpsc::UnboundedSender<PackedNode>) {
-        self.friend_saddr_sink = Some(friend_saddr_sink);
+    pub fn set_friend_saddr_sink(&self, friend_saddr_sink: mpsc::UnboundedSender<PackedNode>) {
+        *self.friend_saddr_sink.write() = Some(friend_saddr_sink);
     }
 
     /// Get `PrecomputedKey`s cache.
@@ -1725,7 +1725,7 @@ mod tests {
 
     #[test]
     fn handle_ping_resp_not_a_friend() {
-        let (mut alice, precomp, bob_pk, _bob_sk, _rx, addr) = create_node();
+        let (alice, precomp, bob_pk, _bob_sk, _rx, addr) = create_node();
 
         let (friend_saddr_tx, friend_saddr_rx) = mpsc::unbounded();
         alice.set_friend_saddr_sink(friend_saddr_tx);
@@ -1748,7 +1748,7 @@ mod tests {
 
     #[test]
     fn handle_ping_resp_friend_saddr() {
-        let (mut alice, precomp, bob_pk, _bob_sk, _rx, addr) = create_node();
+        let (alice, precomp, bob_pk, _bob_sk, _rx, addr) = create_node();
 
         let (friend_saddr_tx, friend_saddr_rx) = mpsc::unbounded();
         alice.set_friend_saddr_sink(friend_saddr_tx);
@@ -2003,7 +2003,7 @@ mod tests {
 
     #[test]
     fn handle_nodes_resp_friend_saddr() {
-        let (mut alice, precomp, bob_pk, _bob_sk, _rx, addr) = create_node();
+        let (alice, precomp, bob_pk, _bob_sk, _rx, addr) = create_node();
 
         let (friend_saddr_tx, friend_saddr_rx) = mpsc::unbounded();
         alice.set_friend_saddr_sink(friend_saddr_tx);