1 files changed, 16 insertions, 22 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 515f155d..1bf6efc5 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -47,7 +47,6 @@ import System.Endian
 import Network.BitTorrent.DHT.Token           as Token
 
 import Connection
-import Connection.Tox
 import Crypto.Tox
 import Data.Word64Map                        (fitsInInt)
 import qualified Data.Word64Map              (empty)
@@ -207,7 +206,6 @@ data Tox extra  = Tox
     , toxOnionRoutes    :: OnionRouter
     , toxContactInfo    :: ContactInfo extra
     , toxAnnounceToLan  :: IO ()
-    , toxMgr            :: Manager ToxProgress Key
     }
 
 -- | initiate a netcrypto session, blocking
@@ -438,25 +436,22 @@ newToxOverTransport keydb addr mbSessionsState suppliedDHTKey udp = do
         tbl6 = DHT.routing6 $ mkrouting (error "missing client")
     dhtclient <- newClient drg dhtnet0 DHT.classify (myAddr tbl4 tbl6) (DHT.handlers crypto . mkrouting) id
                     $ \client net -> onInbound (DHT.updateRouting client (mkrouting client) orouter) net
-    -- TODO: Refactor so this recursive do is unnecessary.
-    rec (mgr,sessionsState) <- do
-        mgr <- toxManager (Parameters { dhtRouting   = mkrouting dhtclient
-                                      , roster       = roster
-                                      , sessions     = sessionsState
-                                      , dhtClient    = dhtclient
-                                      , onToxSession = return () -- TODO
-                                      })
-        let policylookup key = do
-                mp <- connections mgr
-                case Map.lookup key mp of
-                    Nothing -> return OpenToConnect
-                    Just conn -> Connection.connPolicy conn
-
-        return (mgr, sessionsState0 { sendHandshake     = sendMessage handshakes
-                                    , sendSessionPacket = sendMessage cryptonet
-                                    , transportCrypto   = crypto
-                                    , netCryptoPolicyByKey = policylookup
-                                    })
+
+    let sessionsState = sessionsState0 { sendHandshake     = sendMessage handshakes
+                                       , sendSessionPacket = sendMessage cryptonet
+                                       , transportCrypto   = crypto
+                                       -- ToxContact -> STM Policy
+                                       , netCryptoPolicyByKey = policylookup
+                                       }
+        policylookup (ToxContact me them) = do
+            macnt <- HashMap.lookup me <$> readTVar (accounts roster)
+            case macnt of
+                Nothing   -> return RefusingToConnect
+                Just acnt -> do
+                    mc <- HashMap.lookup them <$> readTVar (contacts acnt)
+                    case mc of
+                        Nothing -> return RefusingToConnect
+                        Just c  -> fromMaybe RefusingToConnect <$> readTVar (contactPolicy c)
 
     orouter' <- forkRouteBuilder orouter
         $ \nid ni -> fmap (\(_,ns,_)->ns)
@@ -487,7 +482,6 @@ newToxOverTransport keydb addr mbSessionsState suppliedDHTKey udp = do
         , toxOnionRoutes    = orouter
         , toxContactInfo    = roster
         , toxAnnounceToLan  = return ()
-        , toxMgr            = mgr
         }
 
 onionTimeout :: Tox extra -> DHT.TransactionId -> Onion.OnionDestination RouteId -> STM (Onion.OnionDestination RouteId, Int)