Parameterized Account to hold arbitrary information.

1 files changed, 11 insertions, 11 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 20302343..a13a4f10 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -248,7 +248,7 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do
             in client
     return $ either mkclient mkclient tblvar handlers
 
-data Tox = Tox
+data Tox extra  = Tox
     { toxDHT            :: DHT.Client
     , toxOnion          :: Onion.Client RouteId
     , toxToRoute        :: Transport String Onion.AnnouncedRendezvous (PublicKey,Onion.OnionData)
@@ -260,17 +260,17 @@ data Tox = Tox
     , toxTokens         :: TVar SessionTokens
     , toxAnnouncedKeys  :: TVar Onion.AnnouncedKeys
     , toxOnionRoutes    :: OnionRouter
-    , toxContactInfo    :: ContactInfo
+    , toxContactInfo    :: ContactInfo extra
     , toxAnnounceToLan  :: IO ()
-    , toxMgr :: Manager ToxProgress Key
+    , toxMgr            :: Manager ToxProgress Key
     }
 
 -- | initiate a netcrypto session, blocking
-netCrypto :: Tox -> SecretKey -> PublicKey{-UserKey -} -> IO [NetCryptoSession]
+netCrypto :: Tox extra -> SecretKey -> PublicKey{-UserKey -} -> IO [NetCryptoSession]
 netCrypto tox myseckey theirpubkey = netCryptoWithBackoff 1000000 tox myseckey theirpubkey
 
 -- | helper for 'netCrypto', initiate a netcrypto session, retry after specified millisecs
-netCryptoWithBackoff :: Int -> Tox -> SecretKey -> PublicKey -> IO [NetCryptoSession]
+netCryptoWithBackoff :: Int -> Tox extra -> SecretKey -> PublicKey -> IO [NetCryptoSession]
 netCryptoWithBackoff millisecs tox myseckey theirpubkey = do
     let mykeyAsId = key2id (toPublic myseckey)
     -- TODO: check status of connection here:
@@ -358,7 +358,7 @@ netCryptoWithBackoff millisecs tox myseckey theirpubkey = do
                             return []
 
 -- | Create a DHTPublicKey packet to send to a remote contact.
-getContactInfo :: Tox -> IO DHT.DHTPublicKey
+getContactInfo :: Tox extra -> IO DHT.DHTPublicKey
 getContactInfo Tox{toxCryptoKeys,toxRouting} = join $ atomically $ do
     r4 <- readTVar $ DHT.routing4 toxRouting
     r6 <- readTVar $ DHT.routing6 toxRouting
@@ -416,7 +416,7 @@ newTox :: TVar Onion.AnnouncedKeys   -- ^ Store of announced keys we are a rende
        -> SockAddr                   -- ^ Bind-address to listen on.
        -> Maybe NetCryptoSessions    -- ^ State of all one-on-one Tox links.
        -> Maybe SecretKey            -- ^ Optional DHT secret key to use.
-       -> IO Tox
+       -> IO (Tox extra)
 newTox keydb addr mbSessionsState suppliedDHTKey = do
     (udp,sock) <- {- addVerbosity <$> -} udpTransport' addr
     (crypto0,sessionsState0) <- case mbSessionsState of
@@ -506,21 +506,21 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
         , toxMgr            = mgr
         }
 
-onionTimeout :: Tox -> DHT.TransactionId -> Onion.OnionDestination RouteId -> STM (Onion.OnionDestination RouteId, Int)
+onionTimeout :: Tox extra -> DHT.TransactionId -> Onion.OnionDestination RouteId -> STM (Onion.OnionDestination RouteId, Int)
 onionTimeout Tox { toxOnionRoutes = or } (DHT.TransactionId n8 _) od = lookupTimeout or n8 od
 
 routing4nodeInfo :: DHT.Routing -> IO NodeInfo
 routing4nodeInfo (DHT.routing4 -> tv) = R.thisNode <$> readTVarIO tv
 
-dnssdAnnounce :: Tox -> IO ()
+dnssdAnnounce :: Tox extra -> IO ()
 dnssdAnnounce (toxRouting -> r) = do
     ni <- routing4nodeInfo r
     announceToxService (nodePort ni) (nodeId ni)
 
-dnssdDiscover :: Tox -> NodeInfo -> IO ()
+dnssdDiscover :: Tox extra -> NodeInfo -> IO ()
 dnssdDiscover (toxDHT -> client) ni = void $ DHT.ping client ni
 
-forkTox :: Tox -> IO (IO (), [NodeInfo] -> [NodeInfo] -> IO (), [NodeInfo] -> [NodeInfo] -> IO ())
+forkTox :: Tox extra -> IO (IO (), [NodeInfo] -> [NodeInfo] -> IO (), [NodeInfo] -> [NodeInfo] -> IO ())
 forkTox tox = do
     _ <- forkListener "toxHandshakes" (toxHandshakes tox)
     _ <- forkListener "toxToRoute" (toxToRoute tox)