From 2922938bff73c1c17989d27d042c7b5ac46aeb4a Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Tue, 1 May 2018 19:24:25 -0700
Subject: global: update snow dependency (and others while I'm at it)

---
 src/interface/peer_server.rs | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'src/interface/peer_server.rs')

diff --git a/src/interface/peer_server.rs b/src/interface/peer_server.rs
index 7832e85..9595deb 100644
--- a/src/interface/peer_server.rs
+++ b/src/interface/peer_server.rs
@@ -7,9 +7,6 @@ use peer::{Peer, SessionType, SessionTransition};
 use time::Timestamp;
 use timer::{Timer, TimerMessage};
 
-use std::convert::TryInto;
-use std::time::Duration;
-
 use byteorder::{ByteOrder, LittleEndian};
 use failure::{Error, err_msg};
 use futures::{Async, Future, Stream, Sink, Poll, unsync::mpsc};
@@ -17,6 +14,8 @@ use rand::{self, Rng};
 use udp::{Endpoint, UdpSocket, PeerServerMessage, UdpChannel};
 use tokio_core::reactor::Handle;
 
+use std::{collections::VecDeque, convert::TryInto, time::Duration};
+
 struct Channel<T> {
     tx: mpsc::Sender<T>,
     rx: mpsc::Receiver<T>,
@@ -331,7 +330,7 @@ impl PeerServer {
                             }
                         },
                         Some((_, SessionType::Current)) => {
-                            let since_last_recv = peer.sessions.current.as_ref().unwrap().last_received.elapsed(); // gross
+                            let since_last_recv = peer.sessions.current.as_ref().unwrap().last_received.elapsed(); // TODO: gross
                             if since_last_recv <= *STALE_SESSION_TIMEOUT {
                                 let wait = *STALE_SESSION_TIMEOUT - since_last_recv;
                                 self.timer.send_after(wait, Rekey(peer_ref.clone(), our_index));
@@ -439,9 +438,9 @@ impl Future for PeerServer {
                         _ => {}
                     }
                 },
-                Ok(Async::NotReady) => break,
+                Ok(Async::NotReady)    => break,
                 Ok(Async::Ready(None)) => bail!("config stream ended unexpectedly"),
-                Err(e) => bail!("config stream error: {:?}", e),
+                Err(e)                 => bail!("config stream error: {:?}", e),
             }
         }
 
@@ -451,9 +450,9 @@ impl Future for PeerServer {
                 Ok(Async::Ready(Some(message))) => {
                     let _ = self.handle_timer(message).map_err(|e| debug!("TIMER: {}", e));
                 },
-                Ok(Async::NotReady) => break,
+                Ok(Async::NotReady)    => break,
                 Ok(Async::Ready(None)) => bail!("timer stream ended unexpectedly"),
-                Err(e) => bail!("timer stream error: {:?}", e),
+                Err(e)                 => bail!("timer stream error: {:?}", e),
             }
         }
 
@@ -464,9 +463,9 @@ impl Future for PeerServer {
                     Ok(Async::Ready(Some((addr, packet)))) => {
                         let _ = self.handle_ingress_packet(addr, packet).map_err(|e| warn!("UDP ERR: {:?}", e));
                     },
-                    Ok(Async::NotReady) => break,
+                    Ok(Async::NotReady)    => break,
                     Ok(Async::Ready(None)) => bail!("incoming udp stream ended unexpectedly"),
-                    Err(e) => bail!("incoming udp stream error: {:?}", e)
+                    Err(e)                 => bail!("incoming udp stream error: {:?}", e)
                 }
             }
         }
@@ -477,9 +476,9 @@ impl Future for PeerServer {
                 Ok(Async::Ready(Some(packet))) => {
                     let _ = self.handle_egress_packet(packet).map_err(|e| warn!("UDP ERR: {:?}", e));
                 },
-                Ok(Async::NotReady) => break,
+                Ok(Async::NotReady)    => break,
                 Ok(Async::Ready(None)) => bail!("outgoing udp stream ended unexpectedly"),
-                Err(e) => bail!("outgoing udp stream error: {:?}", e),
+                Err(e)                 => bail!("outgoing udp stream error: {:?}", e),
             }
         }
 
-- 
cgit v1.2.3-59-g8ed1b