bring crypto-sessions state into scope

2 files changed, 7 insertions, 2 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index bd9b9e09..c6643fb5 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -351,6 +351,7 @@ data Session = Session
     , dhts              :: Map.Map String DHT
     , externalAddresses :: IO [SockAddr]
     , swarms            :: Mainline.SwarmsDatabase
+    , cryptosessions    :: Tox.NetCryptoSessions
     , toxkeys           :: TVar Tox.AnnouncedKeys
     , userkeys          :: TVar [(SecretKey,PublicKey)]
     , roster            :: Roster
@@ -880,12 +881,13 @@ main = do
 
     keysdb <- Tox.newKeysDatabase
 
+    crypto <- Tox.newCrypto
+    netCryptoSessionsState <- Tox.newSessionsState crypto Tox.defaultUnRecHook Tox.defaultCryptoDataHooks
+
     (mbtox,quitTox,toxdhts,toxips,taddrs) <- case porttox opts of
         "" -> return (Nothing,return (), Map.empty, return [],[])
         toxport -> do
             addrTox <- getBindAddress toxport (ip6tox opts)
-            crypto <- Tox.newCrypto
-            netCryptoSessionsState <- Tox.newSessionsState crypto Tox.defaultUnRecHook Tox.defaultCryptoDataHooks
             tox <- Tox.newTox keysdb addrTox (Just netCryptoSessionsState)
             quitTox <- Tox.forkTox tox
 
@@ -1008,6 +1010,7 @@ main = do
                 , dhts              = dhts  -- all DHTs
                 , signalQuit        = signalQuit
                 , swarms            = swarms
+                , cryptosessions    = netCryptoSessionsState
                 , toxkeys           = keysdb
                 , userkeys          = toxids
                 , roster            = rstr
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index f73de4e9..0400f14a 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -219,6 +219,7 @@ data Tox = Tox
     , toxOnion :: Onion.Client RouteId
     , toxToRoute :: Transport String Onion.AnnouncedRendezvous (PublicKey,Onion.OnionData)
     , toxCrypto :: Transport String SockAddr NetCrypto
+    , toxCryptoSessions :: NetCryptoSessions
     , toxCryptoKeys :: TransportCrypto
     , toxRouting :: DHT.Routing
     , toxTokens :: TVar SessionTokens
@@ -319,6 +320,7 @@ newTox keydb addr mbSessionsState = do
         , toxOnion = onionclient
         , toxToRoute = onInbound (updateRoster roster) dtacrypt
         , toxCrypto = addHandler (hPutStrLn stderr) (cryptoNetHandler sessionsState) cryptonet
+        , toxCryptoSessions = sessionsState
         , toxCryptoKeys = crypto
         , toxRouting = routing
         , toxTokens = toks