Multi Transports: TCP for DHT/Cookies/Handshakes.

1 files changed, 10 insertions, 9 deletions

diff --git a/dht/src/Network/SessionTransports.hs b/dht/src/Network/SessionTransports.hs
index b36fbcfd..b6d02f36 100644
--- a/dht/src/Network/SessionTransports.hs
+++ b/dht/src/Network/SessionTransports.hs
@@ -16,19 +16,20 @@ import qualified Data.IntMap.Strict as IntMap
 import qualified Data.Map.Strict    as Map
          ;import Data.Map.Strict    (Map)
 
+import qualified Data.Tox.DHT.Multi as Multi
 import Network.Address (SockAddr,either4or6)
 import Network.QueryResponse
 import qualified Data.IntervalSet as S
          ;import Data.IntervalSet (IntSet)
 
 data Sessions x = Sessions
-    { sessionsByAddr  :: TVar (Map SockAddr (IntMap (x -> IO Bool)))
-    , sessionsById    :: TVar (IntMap SockAddr)
+    { sessionsByAddr  :: TVar (Map Multi.SessionAddress (IntMap (x -> IO Bool)))
+    , sessionsById    :: TVar (IntMap Multi.SessionAddress)
     , sessionIds      :: TVar IntSet
-    , sessionsSendRaw :: SockAddr -> x -> IO ()
+    , sessionsSendRaw :: Multi.SessionAddress -> x -> IO ()
     }
 
-initSessions :: (SockAddr -> x -> IO ()) -> IO (Sessions x)
+initSessions :: (Multi.SessionAddress -> x -> IO ()) -> IO (Sessions x)
 initSessions send = atomically $ do
     byaddr <- newTVar Map.empty
     byid   <- newTVar IntMap.empty
@@ -49,13 +50,13 @@ rmSession sid (Just m) = case IntMap.delete sid m of
 
 newSession :: Sessions raw
                     -> (addr -> y -> IO raw)
-                    -> (SockAddr -> raw -> IO (Maybe (x, addr)))
-                    -> SockAddr
+                    -> (Multi.SessionAddress -> raw -> IO (Maybe (x, addr)))
+                    -> Multi.SessionAddress
                     -> IO (Maybe (Int,TransportA err addr x y))
 newSession Sessions{sessionsByAddr,sessionsById,sessionIds,sessionsSendRaw} unwrap wrap addr0 = do
     mvar <- atomically newEmptyTMVar
     let saddr = -- Canonical in case of 6-mapped-4 addresses.
-               either id id $ either4or6 addr0
+                Multi.canonize addr0
         handlePacket x = do
             m <- wrap saddr x
             case m of
@@ -91,10 +92,10 @@ newSession Sessions{sessionsByAddr,sessionsById,sessionIds,sessionsSendRaw} unwr
             }
       return (sid,tr)
 
-sessionHandler :: Sessions x -> (SockAddr -> x -> IO (Maybe (x -> x)))
+sessionHandler :: Sessions x -> (Multi.SessionAddress -> x -> IO (Maybe (x -> x)))
 sessionHandler Sessions{sessionsByAddr} = \addr0 x -> do
     let addr = -- Canonical in case of 6-mapped-4 addresses.
-               either id id $ either4or6 addr0
+               Multi.canonize addr0
         dispatch []     = return ()
         dispatch (f:fs) = do b <- f x
                              when (not b) $ dispatch fs