diff options
author | James Crayne <jim.crayne@gmail.com> | 2018-05-30 22:56:03 +0000 |
---|---|---|
committer | James Crayne <jim.crayne@gmail.com> | 2018-05-30 22:56:03 +0000 |
commit | 39761dea4e24eb942e4cefbc70b8c8c3d90cf571 (patch) | |
tree | 819c0cc89a450e7023c43d7f4931e88ff09e5a1f /Connection/Tox.hs | |
parent | f43dab6b76a5c6022457831caac79c861a91f9ae (diff) |
This patch:
* integrates Connection.Tox and Network.Tox.Crypto.Handlers
* Network.Tox.netCrypto function uses freshCryptoSession
Diffstat (limited to 'Connection/Tox.hs')
-rw-r--r-- | Connection/Tox.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Connection/Tox.hs b/Connection/Tox.hs index 00d15aa7..1d133628 100644 --- a/Connection/Tox.hs +++ b/Connection/Tox.hs | |||
@@ -9,7 +9,7 @@ import Data.Dependent.Sum | |||
9 | import Data.Functor.Identity | 9 | import Data.Functor.Identity |
10 | import qualified Data.Map as Map | 10 | import qualified Data.Map as Map |
11 | -- import Data.Maybe | 11 | -- import Data.Maybe |
12 | import Network.Tox | 12 | -- import Network.Tox |
13 | import Network.Tox.NodeId | 13 | import Network.Tox.NodeId |
14 | import PingMachine | 14 | import PingMachine |
15 | import Text.Read | 15 | import Text.Read |
@@ -80,10 +80,10 @@ data ToxProgress | |||
80 | 80 | ||
81 | data Parameters = Parameters | 81 | data Parameters = Parameters |
82 | { -- | Various Tox transports and clients. | 82 | { -- | Various Tox transports and clients. |
83 | toxTransports :: Tox | 83 | -- toxTransports :: Tox |
84 | -- | Thread to be forked when a connection is established. | 84 | -- | Thread to be forked when a connection is established. |
85 | -- TODO: this function should accept relevant parameters. | 85 | -- TODO: this function should accept relevant parameters. |
86 | , onToxSession :: IO () | 86 | onToxSession :: IO () |
87 | } | 87 | } |
88 | 88 | ||
89 | data Key = Key NodeId{-me-} NodeId{-them-} | 89 | data Key = Key NodeId{-me-} NodeId{-them-} |