TCP cache: Use (Down POSIXTime) for MinMax priority.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/Network/Tox/TCP.hs b/src/Network/Tox/TCP.hs
index 0780f121..28bcd244 100644
--- a/src/Network/Tox/TCP.hs
+++ b/src/Network/Tox/TCP.hs
@@ -8,10 +8,9 @@ import Control.Concurrent
 import Control.Concurrent.STM
 import Data.Functor.Identity
 import Data.Serialize
-import System.IO (Handle)
 
 import Crypto.Tox
-import Data.ByteString (hPut,hGet,ByteString)
+import Data.ByteString (hPut,hGet)
 import Data.Tox.Relay
 import Network.Address (setPort,PortNumber,SockAddr)
 import Network.QueryResponse
@@ -60,8 +59,8 @@ tcpStream crypto = StreamHandshake
         nread <- newMVar (sessionBaseNonce $ runIdentity $ welcomeData welcome)
         let them = sessionPublicKey $ runIdentity $ welcomeData welcome
         return SessionProtocol
-            { streamGoodbye = \h -> return () -- No goodbye packet?  Seems rude.
-            , streamDecode = \h -> do
+            { streamGoodbye = return () -- No goodbye packet?  Seems rude.
+            , streamDecode = do
                 decode <$> hGet h 2 >>= \case
                     Left _    -> return Nothing
                     Right len -> do
@@ -74,9 +73,8 @@ tcpStream crypto = StreamHandshake
                                 return $ either (const Nothing) Just r
             , streamEncode = \y -> do
                 n24 <- takeMVar nsend
-                let bs = encode $ encrypt (noncef' n24) $ encodePlain y
+                hPut h $ encode $ encrypt (noncef' n24) $ encodePlain y
                 putMVar nsend (incrementNonce24 n24)
-                return bs -- XXX: Should we wait until this bytestring is sent before putting the nonce back in the MVar?
             }
     , streamAddr = nodeAddr
     }