Multi Transports: TCP for DHT/Cookies/Handshakes.

1 files changed, 7 insertions, 6 deletions

diff --git a/dht/HandshakeCache.hs b/dht/HandshakeCache.hs
index 91f5faaf..d9ffacab 100644
--- a/dht/HandshakeCache.hs
+++ b/dht/HandshakeCache.hs
@@ -14,6 +14,7 @@ import Crypto.Hash
 import Crypto.Tox
 import qualified Data.MinMaxPSQ     as MM
          ;import Data.MinMaxPSQ     (MinMaxPSQ')
+import qualified Data.Tox.DHT.Multi as Multi
 import DPut
 import DebugTag
 import Network.Tox.Crypto.Transport (Handshake, HandshakeData (..))
@@ -26,13 +27,13 @@ data HandshakeCache = HandshakeCache
     { -- Note that currently we are storing sent handshakes keyed by the
       -- locally issued cookie nonce.
       hscTable  :: TVar (MinMaxPSQ' Nonce24 POSIXTime (SecretKey,HandshakeData))
-    , hscSend   :: SockAddr -> Handshake Encrypted -> IO ()
+    , hscSend   :: Multi.SessionAddress -> Handshake Encrypted -> IO ()
     , hscCrypto :: TransportCrypto
     , hscPendingCookies :: TVar (Map (PublicKey,PublicKey) ())
     }
 
 
-newHandshakeCache :: TransportCrypto -> (SockAddr -> Handshake Encrypted -> IO ()) -> IO HandshakeCache
+newHandshakeCache :: TransportCrypto -> (Multi.SessionAddress -> Handshake Encrypted -> IO ()) -> IO HandshakeCache
 newHandshakeCache crypto send = atomically $ do
     tbl <- newTVar MM.empty
     pcs <- newTVar Map.empty
@@ -45,7 +46,7 @@ newHandshakeCache crypto send = atomically $ do
 
 getSentHandshake :: HandshakeCache
                     -> SecretKey
-                    -> SockAddr
+                    -> Multi.SessionAddress
                     -> Cookie Identity -- locally issued
                     -> Cookie Encrypted -- remotely issued
                     -> IO (Maybe (SecretKey, HandshakeData))
@@ -57,7 +58,7 @@ getSentHandshake hscache me their_addr (Cookie n24 (Identity cd)) ecookie = do
             Just s  -> return $ return $ Just s
             Nothing -> do
                 let them = longTermKey cd
-                case nodeInfo (key2id $ dhtKey cd) their_addr of
+                case Multi.nodeInfo (key2id $ dhtKey cd) their_addr of
                     Left _ -> return $ return Nothing -- Non-internet address.
                     Right their_node -> do
                         (s,hs) <- cacheHandshakeSTM hscache me them their_node ecookie now
@@ -83,7 +84,7 @@ hashCookie (Cookie n24 encrypted)
 cacheHandshakeSTM :: HandshakeCache
                     -> SecretKey        -- ^ my ToxID key
                     -> PublicKey        -- ^ them
-                    -> NodeInfo         -- ^ their DHT node
+                    -> Multi.NodeInfo   -- ^ their DHT node
                     -> Cookie Encrypted -- ^ issued to me by them
                     -> POSIXTime        -- ^ current time
                     -> STM ((SecretKey,HandshakeData), Handshake Encrypted)
@@ -105,7 +106,7 @@ cacheHandshakeSTM hscache me them their_node ecookie timestamp = do
 cacheHandshake :: HandshakeCache
                     -> SecretKey
                     -> PublicKey
-                    -> NodeInfo
+                    -> Multi.NodeInfo
                     -> Cookie Encrypted
                     -> IO (Handshake Encrypted)
 cacheHandshake hscache me them their_node ecookie = do