Fill in needed parameters to toxManager.

1 files changed, 21 insertions, 16 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 091c268d..29b980b7 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE CPP                        #-}
 {-# LANGUAGE DeriveDataTypeable         #-}
 {-# LANGUAGE DeriveFoldable             #-}
@@ -12,8 +11,10 @@
 {-# LANGUAGE NamedFieldPuns             #-}
 {-# LANGUAGE PatternSynonyms            #-}
 {-# LANGUAGE RankNTypes                 #-}
+{-# LANGUAGE RecursiveDo                #-}
 {-# LANGUAGE ScopedTypeVariables        #-}
 {-# LANGUAGE TupleSections              #-}
+{-# LANGUAGE ViewPatterns               #-}
 module Network.Tox where
 
 import Debug.Trace
@@ -446,21 +447,25 @@ newTox keydb addr mbSessionsState suppliedDHTKey = 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
-    mgr <- toxManager (Parameters { dhtRouting = mkrouting 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
-
-    let sessionsState = sessionsState0 { sendHandshake     = sendMessage handshakes
-                                       , sendSessionPacket = sendMessage cryptonet
-                                       , transportCrypto   = crypto
-                                       , netCryptoPolicyByKey = policylookup
-                                       }
+    -- 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
+                                    })
 
     orouter' <- forkRouteBuilder orouter
         $ \nid ni -> fmap (\(_,ns,_)->ns)