2 files changed, 7 insertions, 7 deletions

diff --git a/dht/src/Network/Tox/Session.hs b/dht/src/Network/Tox/Session.hs
index 0d89afc4..ff86e502 100644
--- a/dht/src/Network/Tox/Session.hs
+++ b/dht/src/Network/Tox/Session.hs
@@ -49,7 +49,7 @@ data SessionParams = SessionParams
     , spGetSentHandshake :: SecretKey -> Multi.SessionAddress
                                       -> Cookie Identity
                                       -> Cookie Encrypted
-                                      -> IO (Maybe (SessionKey, HandshakeData))
+                                      -> IO (Maybe (Multi.SessionAddress, (SessionKey, HandshakeData)))
       -- | This method is invoked on each new session and is responsible for
       -- launching any threads necessary to keep the session alive.
     , spOnNewSession     :: Session -> IO ()
@@ -116,18 +116,18 @@ plainHandshakeH :: SessionParams
                    -> SecretKey
                    -> Handshake Identity
                    -> IO ()
-plainHandshakeH sp saddr skey handshake = do
+plainHandshakeH sp saddr0 skey handshake = do
     let hd = runIdentity $ handshakeData handshake
-        prelude = show saddr ++ " --> "
+        prelude = show saddr0 ++ " --> "
     dput XNetCrypto $ unlines $ map (prelude ++)
         [ "handshake: auth=" ++ show (handshakeCookie handshake)
         , "         : issuing=" ++ show (otherCookie hd)
         , "         : baseNonce=" ++ show (baseNonce hd)
         ]
-    sent <- spGetSentHandshake sp skey saddr (handshakeCookie handshake) (otherCookie hd)
+    sent <- spGetSentHandshake sp skey saddr0 (handshakeCookie handshake) (otherCookie hd)
     -- TODO: this is always returning sent = Nothing
-    dput XNetCrypto $ " <-- (cached) handshake baseNonce " ++ show (fmap (baseNonce . snd) sent)
-    forM_ sent $ \(hd_skey,hd_sent) -> do
+    dput XNetCrypto $ " <-- (cached) handshake baseNonce " ++ show (fmap (baseNonce . snd . snd) sent)
+    forM_ sent $ \(saddr, (hd_skey,hd_sent)) -> do
     sk <- SessionKeys (spCrypto sp)
                       hd_skey
                       (sessionKey hd)
diff --git a/dht/src/Network/Tox/TCP.hs b/dht/src/Network/Tox/TCP.hs
index f8ec430b..ebb15e3b 100644
--- a/dht/src/Network/Tox/TCP.hs
+++ b/dht/src/Network/Tox/TCP.hs
@@ -368,7 +368,7 @@ newClient :: TransportCrypto
                        , RelayCache
                        , Transport String ViaRelay ByteString
                        , Transport String (OnionDestination RouteId) (OnionMessage Encrypted) )
-                     , Client String PacketNumber Nonce8 NodeInfo (Bool,RelayPacket))
+                     , RelayClient )
 newClient crypto store load lookupSender getRoute = do
     (tcpcache,net0) <- toxTCP crypto
     (relaynet,net1) <- partitionRelay net0