1 files changed, 4 insertions, 2 deletions

diff --git a/dht/src/Network/Tox/Session.hs b/dht/src/Network/Tox/Session.hs
index ff86e502..9bd12c69 100644
--- a/dht/src/Network/Tox/Session.hs
+++ b/dht/src/Network/Tox/Session.hs
@@ -27,7 +27,7 @@ import Network.Lossless
 import Network.QueryResponse
 import Network.SessionTransports
 import Network.Tox.Crypto.Transport
-import Network.Tox.DHT.Transport    (Cookie (..), key2id, longTermKey)
+import Network.Tox.DHT.Transport    (Cookie (..), key2id, longTermKey, CookieData (..))
 import Network.Tox.Handshake
 
 -- | Alias for 'SecretKey' to document that it is used as the temporary Tox
@@ -128,6 +128,7 @@ plainHandshakeH sp saddr0 skey handshake = do
     -- TODO: this is always returning sent = Nothing
     dput XNetCrypto $ " <-- (cached) handshake baseNonce " ++ show (fmap (baseNonce . snd . snd) sent)
     forM_ sent $ \(saddr, (hd_skey,hd_sent)) -> do
+    let Cookie _ (Identity CookieData{ longTermKey = them }) = handshakeCookie handshake
     sk <- SessionKeys (spCrypto sp)
                       hd_skey
                       (sessionKey hd)
@@ -137,7 +138,8 @@ plainHandshakeH sp saddr0 skey handshake = do
     dput XNetCrypto $ prelude ++ "plainHandshakeH: session " ++ maybe "Nothing" (const "Just") m
     forM_ m $ \(sid, t) -> do
         (t2,resend,getMissing)
-            <- lossless (\cp a -> return $ fmap (,a) $ checkLossless $ runIdentity $ pktData cp)
+            <- lossless (take 8 (showKey256 them) ++ "." ++ Multi.showSessionAddr saddr)
+                        (\cp a -> return $ fmap (,a) $ checkLossless $ runIdentity $ pktData cp)
                         (\seqno p@(Pkt m :=> _) _ -> do
                             y <- encryptPacket sk $ bookKeeping seqno p
                             return OutgoingInfo