Conduit stubs to convert between Tox and XMPP messages.

1 files changed, 45 insertions, 23 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 37802e3c..5b30a7e6 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -46,6 +46,7 @@ import qualified Data.ByteString.Base16       as Base16
 import qualified Data.ByteString.Char8        as C8
 import Data.ByteString.Lazy                   (toStrict)
 import Data.Char
+import Data.Conduit (Source,Sink,Flush(..))
 import Data.Data
 import Data.Functor.Contravariant
 import Data.Hashable
@@ -85,11 +86,12 @@ import Control.TriadCommittee
 import Network.BitTorrent.DHT.Token           as Token
 import GHC.TypeLits
 
+import Connection
 import Crypto.Tox
 import Data.Word64Map                        (fitsInInt)
 import qualified Data.Word64Map              (empty)
 import Network.Kademlia.Bootstrap            (forkPollForRefresh, bootstrap)
-import Network.Tox.Crypto.Transport          (NetCrypto)
+import Network.Tox.Crypto.Transport          (NetCrypto, CryptoMessage)
 import Network.Tox.Crypto.Handlers           (cryptoNetHandler, newSessionsState, defaultUnRecHook, defaultCryptoDataHooks, NetCryptoSessions(..))
 import qualified Network.Tox.DHT.Handlers    as DHT
 import qualified Network.Tox.DHT.Transport   as DHT
@@ -221,18 +223,22 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do
             in client
     return $ either mkclient mkclient tblvar handlers
 
+data ConnectionKey    -- TODO
+data ConnectionStatus -- TODO
+
 data Tox = Tox
-    { toxDHT :: DHT.Client
-    , toxOnion :: Onion.Client RouteId
-    , toxToRoute :: Transport String Onion.AnnouncedRendezvous (PublicKey,Onion.OnionData)
-    , toxCrypto :: Transport String SockAddr NetCrypto
+    { toxDHT            :: DHT.Client
+    , 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
-    , toxAnnouncedKeys :: TVar Onion.AnnouncedKeys
-    , toxOnionRoutes :: OnionRouter
-    , toxRoster :: Roster
+    , toxCryptoKeys     :: TransportCrypto
+    , toxRouting        :: DHT.Routing
+    , toxTokens         :: TVar SessionTokens
+    , toxAnnouncedKeys  :: TVar Onion.AnnouncedKeys
+    , toxOnionRoutes    :: OnionRouter
+    , toxRoster         :: Roster
+    , toxManager        :: Connection.Manager ConnectionStatus ConnectionKey
     }
 
 getContactInfo :: Tox -> IO DHT.DHTPublicKey
@@ -289,8 +295,17 @@ getOnionAlias crypto dhtself remoteNode = atomically $ do
     return $ Onion.OnionDestination Onion.SearchingAlias alias Nothing
 
 
-newTox :: TVar Onion.AnnouncedKeys -> SockAddr -> Maybe NetCryptoSessions -> Maybe SecretKey -> IO Tox
-newTox keydb addr mbSessionsState suppliedDHTKey = do
+newTox :: TVar Onion.AnnouncedKeys   -- ^ Store of announced keys we are a rendezvous for.
+       -> SockAddr                   -- ^ Bind-address to listen on.
+       -> Maybe NetCryptoSessions    -- ^ State of all one-on-one Tox links.
+       -> Maybe SecretKey            -- ^ Optional DHT secret key to use.
+       -> ( SockAddr                            -- ^ Address of remote peer.
+            -> STM Bool                         -- ^ True if connection requires a ping.
+            -> Source IO CryptoMessage          -- ^ Inbound packets.
+            -> Sink (Flush CryptoMessage) IO () -- ^ Outbound packets.
+            -> IO () )               -- ^ Action to invoke on new connections.
+       -> IO Tox
+newTox keydb addr mbSessionsState suppliedDHTKey announceConnection = do
     udp <- {- addVerbosity <$> -} udpTransport addr
     (crypto0,sessionsState) <- case mbSessionsState of
                                  Nothing -> do
@@ -338,17 +353,24 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
 
     roster <- newRoster
     return Tox
-        { toxDHT = dhtclient
-        , toxOnion = onionclient
-        , toxToRoute = onInbound (updateRoster roster) dtacrypt
-        , toxCrypto = addHandler (hPutStrLn stderr) (cryptoNetHandler sessionsState) cryptonet
+        { toxDHT            = dhtclient
+        , toxOnion          = onionclient
+        , toxToRoute        = onInbound (updateRoster roster) dtacrypt
+        , toxCrypto         = addHandler (hPutStrLn stderr) (cryptoNetHandler sessionsState) cryptonet
         , toxCryptoSessions = sessionsState
-        , toxCryptoKeys = crypto
-        , toxRouting = mkrouting dhtclient
-        , toxTokens = toks
-        , toxAnnouncedKeys = keydb
-        , toxOnionRoutes = orouter
-        , toxRoster = roster
+        , toxCryptoKeys     = crypto
+        , toxRouting        = mkrouting dhtclient
+        , toxTokens         = toks
+        , toxAnnouncedKeys  = keydb
+        , toxOnionRoutes    = orouter
+        , toxRoster         = roster
+        , toxManager        = Connection.Manager
+            { setPolicy    = _todo -- k -> Policy -> IO ()
+            , connections  = _todo -- STM (Map k (Connection status))
+            , stringToKey  = _todo -- String -> Maybe k
+            , showProgress = _todo -- status -> String
+            , showKey      = _todo -- k -> String
+            }
         }
 
 onionTimeout :: Tox -> DHT.TransactionId -> Onion.OnionDestination RouteId -> STM (Onion.OnionDestination RouteId, Int)