summaryrefslogtreecommitdiff
path: root/examples/dhtd.hs
diff options
context:
space:
mode:
authorJames Crayne <jim.crayne@gmail.com>2017-11-01 16:59:50 +0000
committerJames Crayne <jim.crayne@gmail.com>2017-11-01 16:59:50 +0000
commit1766abbd8e4072fa47a82c09daceeb4235f3564d (patch)
tree9bf2ae47af2a4cec249ae433f07956130b9c75ba /examples/dhtd.hs
parent6880807978615fe52a28a1ca85134e4df68b9ac4 (diff)
bring crypto-sessions state into scope
Diffstat (limited to 'examples/dhtd.hs')
-rw-r--r--examples/dhtd.hs7
1 files changed, 5 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
351 , dhts :: Map.Map String DHT 351 , dhts :: Map.Map String DHT
352 , externalAddresses :: IO [SockAddr] 352 , externalAddresses :: IO [SockAddr]
353 , swarms :: Mainline.SwarmsDatabase 353 , swarms :: Mainline.SwarmsDatabase
354 , cryptosessions :: Tox.NetCryptoSessions
354 , toxkeys :: TVar Tox.AnnouncedKeys 355 , toxkeys :: TVar Tox.AnnouncedKeys
355 , userkeys :: TVar [(SecretKey,PublicKey)] 356 , userkeys :: TVar [(SecretKey,PublicKey)]
356 , roster :: Roster 357 , roster :: Roster
@@ -880,12 +881,13 @@ main = do
880 881
881 keysdb <- Tox.newKeysDatabase 882 keysdb <- Tox.newKeysDatabase
882 883
884 crypto <- Tox.newCrypto
885 netCryptoSessionsState <- Tox.newSessionsState crypto Tox.defaultUnRecHook Tox.defaultCryptoDataHooks
886
883 (mbtox,quitTox,toxdhts,toxips,taddrs) <- case porttox opts of 887 (mbtox,quitTox,toxdhts,toxips,taddrs) <- case porttox opts of
884 "" -> return (Nothing,return (), Map.empty, return [],[]) 888 "" -> return (Nothing,return (), Map.empty, return [],[])
885 toxport -> do 889 toxport -> do
886 addrTox <- getBindAddress toxport (ip6tox opts) 890 addrTox <- getBindAddress toxport (ip6tox opts)
887 crypto <- Tox.newCrypto
888 netCryptoSessionsState <- Tox.newSessionsState crypto Tox.defaultUnRecHook Tox.defaultCryptoDataHooks
889 tox <- Tox.newTox keysdb addrTox (Just netCryptoSessionsState) 891 tox <- Tox.newTox keysdb addrTox (Just netCryptoSessionsState)
890 quitTox <- Tox.forkTox tox 892 quitTox <- Tox.forkTox tox
891 893
@@ -1008,6 +1010,7 @@ main = do
1008 , dhts = dhts -- all DHTs 1010 , dhts = dhts -- all DHTs
1009 , signalQuit = signalQuit 1011 , signalQuit = signalQuit
1010 , swarms = swarms 1012 , swarms = swarms
1013 , cryptosessions = netCryptoSessionsState
1011 , toxkeys = keysdb 1014 , toxkeys = keysdb
1012 , userkeys = toxids 1015 , userkeys = toxids
1013 , roster = rstr 1016 , roster = rstr