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
+    -- TODO: Refactor so this recursive do is unnecessary.
-                                  , onToxSession = return () -- TODO
+    rec (mgr,sessionsState) <- do
-                                  })
+        mgr <- toxManager (Parameters { dhtRouting   = mkrouting dhtclient
+                                      , roster       = roster
-    let policylookup key = do
+                                      , sessions     = sessionsState
-            mp <- connections mgr
+                                      , dhtClient    = dhtclient
-            case Map.lookup key mp of
+                                      , onToxSession = return () -- TODO
-                Nothing -> return OpenToConnect
+                                      })
-                Just conn -> Connection.connPolicy conn
+        let policylookup key = do
+                mp <- connections mgr
-    let sessionsState = sessionsState0 { sendHandshake     = sendMessage handshakes
+                case Map.lookup key mp of
-                                       , sendSessionPacket = sendMessage cryptonet
+                    Nothing -> return OpenToConnect
-                                       , transportCrypto   = crypto
+                    Just conn -> Connection.connPolicy conn
-                                       , netCryptoPolicyByKey = policylookup
-                                       }
+        return (mgr, sessionsState0 { sendHandshake     = sendMessage handshakes
+                                    , sendSessionPacket = sendMessage cryptonet
+                                    , transportCrypto   = crypto
+                                    , netCryptoPolicyByKey = policylookup
+                                    })
    orouter' <- forkRouteBuilder orouter
        $ \nid ni -> fmap (\(_,ns,_)->ns)

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 @@
1	{-# LANGUAGE ViewPatterns #-}
2	{-# LANGUAGE CPP #-}	1	{-# LANGUAGE CPP #-}
3	{-# LANGUAGE DeriveDataTypeable #-}	2	{-# LANGUAGE DeriveDataTypeable #-}
4	{-# LANGUAGE DeriveFoldable #-}	3	{-# LANGUAGE DeriveFoldable #-}
@@ -12,8 +11,10 @@
12	{-# LANGUAGE NamedFieldPuns #-}	11	{-# LANGUAGE NamedFieldPuns #-}
13	{-# LANGUAGE PatternSynonyms #-}	12	{-# LANGUAGE PatternSynonyms #-}
14	{-# LANGUAGE RankNTypes #-}	13	{-# LANGUAGE RankNTypes #-}
		14	{-# LANGUAGE RecursiveDo #-}
15	{-# LANGUAGE ScopedTypeVariables #-}	15	{-# LANGUAGE ScopedTypeVariables #-}
16	{-# LANGUAGE TupleSections #-}	16	{-# LANGUAGE TupleSections #-}
		17	{-# LANGUAGE ViewPatterns #-}
17	module Network.Tox where	18	module Network.Tox where
18		19
19	import Debug.Trace	20	import Debug.Trace
@@ -446,21 +447,25 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
446	tbl6 = DHT.routing6 $ mkrouting (error "missing client")	447	tbl6 = DHT.routing6 $ mkrouting (error "missing client")
447	dhtclient <- newClient drg dhtnet0 DHT.classify (myAddr tbl4 tbl6) (DHT.handlers crypto . mkrouting) id	448	dhtclient <- newClient drg dhtnet0 DHT.classify (myAddr tbl4 tbl6) (DHT.handlers crypto . mkrouting) id
448	$ \client net -> onInbound (DHT.updateRouting client (mkrouting client) orouter) net	449	$ \client net -> onInbound (DHT.updateRouting client (mkrouting client) orouter) net
449	mgr <- toxManager (Parameters { dhtRouting = mkrouting dhtclient	450	-- TODO: Refactor so this recursive do is unnecessary.
450	, onToxSession = return () -- TODO	451	rec (mgr,sessionsState) <- do
451	})	452	mgr <- toxManager (Parameters { dhtRouting = mkrouting dhtclient
452		453	, roster = roster
453	let policylookup key = do	454	, sessions = sessionsState
454	mp <- connections mgr	455	, dhtClient = dhtclient
455	case Map.lookup key mp of	456	, onToxSession = return () -- TODO
456	Nothing -> return OpenToConnect	457	})
457	Just conn -> Connection.connPolicy conn	458	let policylookup key = do
458		459	mp <- connections mgr
459	let sessionsState = sessionsState0 { sendHandshake = sendMessage handshakes	460	case Map.lookup key mp of
460	, sendSessionPacket = sendMessage cryptonet	461	Nothing -> return OpenToConnect
461	, transportCrypto = crypto	462	Just conn -> Connection.connPolicy conn
462	, netCryptoPolicyByKey = policylookup	463
463	}	464	return (mgr, sessionsState0 { sendHandshake = sendMessage handshakes
		465	, sendSessionPacket = sendMessage cryptonet
		466	, transportCrypto = crypto
		467	, netCryptoPolicyByKey = policylookup
		468	})
464		469
465	orouter' <- forkRouteBuilder orouter	470	orouter' <- forkRouteBuilder orouter
466	$ \nid ni -> fmap (\(_,ns,_)->ns)	471	$ \nid ni -> fmap (\(_,ns,_)->ns)