1 files changed, 4 insertions, 5 deletions

diff --git a/dht/src/Network/Tox/Session.hs b/dht/src/Network/Tox/Session.hs
index d34dfc7a..53d63287 100644
--- a/dht/src/Network/Tox/Session.hs
+++ b/dht/src/Network/Tox/Session.hs
@@ -106,14 +106,13 @@ sClose s = do
 -- negotiated.  It always returns Nothing which makes it convenient to use with
 -- 'Network.QueryResponse.addHandler'.
 handshakeH :: SessionParams
-              -> Multi.SessionAddress
-              -> Handshake Encrypted
-              -> IO (Maybe a)
-handshakeH sp saddr handshake = do
+              -> Arrival err Multi.SessionAddress (Handshake Encrypted)
+              -> STM (Arrival err Multi.SessionAddress (Handshake Encrypted), IO ())
+handshakeH sp (Arrival saddr handshake) = return $ (,) Discarded $ do
     decryptHandshake (spCrypto sp) handshake
         >>= either (\err -> return ())
                    (uncurry $ plainHandshakeH sp saddr)
-    return Nothing
+handshakeH _ m = return (m, return ())
 
 
 plainHandshakeH :: SessionParams