4 files changed, 14 insertions, 125 deletions

diff --git a/Roster.hs b/Roster.hs
deleted file mode 100644
index 7c40e371..00000000
--- a/Roster.hs
+++ /dev/null
@@ -1,100 +0,0 @@
-{-# LANGUAGE NamedFieldPuns #-}
-module Roster where
-
-import Control.Concurrent.STM
-import Control.Monad
-import Crypto.PubKey.Curve25519
-import qualified Data.HashMap.Strict as HashMap
-         ;import Data.HashMap.Strict (HashMap)
-import Data.Maybe
-import Network.Tox.DHT.Transport     as DHT
-import Network.Tox.NodeId
-import Network.Tox.Onion.Transport   as Onion
-import System.IO
-
-newtype Roster = Roster { accounts :: TVar (HashMap NodeId Account) }
-
-data Account = Account
-    { userSecret :: SecretKey                   -- local secret key
-    , contacts :: TVar (HashMap NodeId Contact) -- received contact info
-    }
-
-data Contact = Contact
-    { contactKeyPacket     :: Maybe (DHT.DHTPublicKey)
-    , contactFriendRequest :: Maybe (DHT.FriendRequest)
-    }
-
-mergeContact :: Contact -> Maybe Contact -> Maybe Contact
-mergeContact (Contact newk newf) (Just (Contact oldk oldf)) =
-    Just (Contact mergek mergef)
- where
-    mergek = mplus oldk $ do
-        n <- newk
-        stamp <- fmap DHT.dhtpkNonce oldk `mplus` return minBound
-        guard (stamp <= DHT.dhtpkNonce n)
-        return n
-    mergef = mplus oldf newf
-mergeContact new Nothing = Just new
-
-newRoster :: IO Roster
-newRoster = atomically $ Roster <$> newTVar HashMap.empty
-
-newAccount :: SecretKey -> STM Account
-newAccount sk = Account sk <$> newTVar HashMap.empty
-
-addRoster :: Roster -> SecretKey -> STM ()
-addRoster (Roster as) sk = do
-    a <- newAccount sk
-    modifyTVar' as $ HashMap.insert (key2id $ toPublic sk) a
-
-delRoster :: Roster -> PublicKey -> STM ()
-delRoster (Roster as) pk = modifyTVar' as $ HashMap.delete (key2id pk)
-
-updateRoster :: Roster -> Onion.AnnouncedRendezvous -> (PublicKey,Onion.OnionData) -> IO ()
-updateRoster roster Onion.AnnouncedRendezvous{remoteUserKey} (localUserKey,omsg) = do
-    hPutStrLn stderr "updateRoster!!!"
-    atomically $ do
-        as <- readTVar (accounts roster)
-        maybe (return ())
-              (updateAccount remoteUserKey omsg)
-              $ HashMap.lookup (key2id localUserKey) as
-
-
-updateAccount :: PublicKey -> Onion.OnionData -> Account -> STM ()
-updateAccount remoteUserKey (Onion.OnionDHTPublicKey dhtpk) acc = do
-    modifyTVar' (contacts acc) $ HashMap.alter (mergeContact $ Contact (Just dhtpk) Nothing)
-                                               (key2id remoteUserKey)
-
-updateAccount remoteUserKey (Onion.OnionFriendRequest fr) acc = do
-    modifyTVar' (contacts acc) $ HashMap.alter (mergeContact $ Contact Nothing (Just fr))
-                                               (key2id remoteUserKey)
-
-dnsPresentation :: Roster -> STM String
-dnsPresentation (Roster accsvar) = do
-    accs <- readTVar accsvar
-    ms <- forM accs $ \Account { userSecret = sec, contacts = cvar } -> do
-        cs <- readTVar cvar
-        return $
-            "; local key = " ++ show (key2id $ toPublic sec) ++ "\n"
-             ++ concatMap dnsPresentation1
-                          (mapMaybe (\(nid,m) -> ((,) nid) <$> contactKeyPacket m)
-                                    $ HashMap.toList cs)
-    return $ concat ms
-
-dnsPresentation1 :: (NodeId,DHTPublicKey) -> String
-dnsPresentation1 (nid,dk) = unlines
-    [ concat [ show nid, ".tox. IN CNAME ", show (key2id $ dhtpk dk), ".dht." ]
-    ]
-
-type LocalKey = NodeId
-type RemoteKey = NodeId
-
-friendRequests :: Roster -> STM (HashMap LocalKey [(RemoteKey,DHT.FriendRequest)])
-friendRequests (Roster roster) = do
-    accs <- readTVar roster
-    forM accs $ \Account { userSecret = sec, contacts = cvar } -> do
-        cs <- readTVar cvar
-        let remotes = mapMaybe (\(nid,m) -> ((,) nid) <$> contactFriendRequest m)
-                               $ HashMap.toList cs
-        return remotes
-
diff --git a/dht-client.cabal b/dht-client.cabal
index 849ebf28..1e0cd1cd 100644
--- a/dht-client.cabal
+++ b/dht-client.cabal
@@ -96,7 +96,7 @@ library
                     Control.TriadCommittee
                     Crypto.Tox
                     Text.XXD
-                    Roster
+                    Network.Tox.ContactInfo
                     Announcer
                     InterruptibleDelay
                     ByteStringOperators
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index ed7d5e63..73ae5a57 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -90,7 +90,7 @@ import qualified Network.Tox.Onion.Handlers as Tox
 import qualified Network.Tox.Crypto.Transport as Tox (CryptoMessage)
 import qualified Network.Tox.Crypto.Handlers as Tox
 import Data.Typeable
-import Roster
+import Network.Tox.ContactInfo as Tox
 import OnionRouter
 import PingMachine
 
@@ -384,7 +384,7 @@ data Session = Session
     , cryptosessions    :: Tox.NetCryptoSessions
     , toxkeys           :: TVar Tox.AnnouncedKeys
     , userkeys          :: TVar [(SecretKey,PublicKey)]
-    , roster            :: Roster
+    , roster            :: Tox.ContactInfo
     , connectionManager :: ConnectionManager
     , onionRouter       :: OnionRouter
     , announcer         :: Announcer
@@ -569,7 +569,7 @@ clientSession s@Session{..} sock cnum h = do
                         oldks <- atomically $ do
                             ks <- readTVar userkeys
                             modifyTVar userkeys ((secret,pubkey):)
-                            addRoster roster secret
+                            Tox.addContactInfo roster secret
                             return ks
                         let asString = show . Tox.key2id
                         hPutClient h $ unlines $ map (mappend "  " . show . Tox.key2id . snd) oldks
@@ -591,7 +591,7 @@ clientSession s@Session{..} sock cnum h = do
                         oldks <- atomically $ do
                             oldks <- readTVar userkeys
                             modifyTVar userkeys (pairs ++)
-                            forM pairs $ \(sk,_) -> addRoster roster sk
+                            forM pairs $ \(sk,_) -> Tox.addContactInfo roster sk
                             return oldks
                         hPutClient h $ unlines $ map (mappend "  " . show . Tox.key2id . snd) oldks
                                                   ++ map (mappend " *" . show . Tox.key2id .snd) pairs
@@ -604,7 +604,7 @@ clientSession s@Session{..} sock cnum h = do
                             pairs = map (toPair . f) mbSecs
                         ks <- atomically $ do
                             modifyTVar userkeys (filter (`notElem` pairs) )
-                            forM pairs $ \(_,pk) -> delRoster roster pk
+                            forM pairs $ \(_,pk) -> Tox.delContactInfo roster pk
                             readTVar userkeys
                         hPutClient h . showReport $ map mkrow ks
 
@@ -1332,12 +1332,12 @@ main = runResourceT $ liftBaseWith $ \resT -> do
         installHandler sigINT (CatchOnce (atomically $ writeTVar signalQuit True)) Nothing
         let defaultToxData = do
                 toxids <- atomically $ newTVar []
-                rster <- newRoster
+                rster <- Tox.newContactInfo
                 orouter <- newOnionRouter (hPutStrLn stderr)
                 return (toxids, rster, orouter)
         (toxids,rstr,orouter) <- fromMaybe defaultToxData $ do
             tox <- mbtox
-            return $ return ( userKeys (Tox.toxCryptoKeys tox), Tox.toxRoster tox, Tox.toxOnionRoutes tox )
+            return $ return ( userKeys (Tox.toxCryptoKeys tox), Tox.toxContactInfo tox, Tox.toxOnionRoutes tox )
         let session = clientSession0 $ Session
                 { netname           = concat $ take 1 $ Map.keys dhts -- initial default DHT
                 , dhts              = dhts  -- all DHTs
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index a08f66c6..dfa0ea9e 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -100,7 +100,7 @@ import qualified Network.Tox.Onion.Handlers  as Onion
 import qualified Network.Tox.Onion.Transport as Onion
 import Network.Tox.Transport
 import OnionRouter
-import Roster
+import Network.Tox.ContactInfo
 import Text.XXD
 
 newCrypto :: IO TransportCrypto
@@ -223,9 +223,6 @@ 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
@@ -237,14 +234,13 @@ data Tox = Tox
     , toxTokens         :: TVar SessionTokens
     , toxAnnouncedKeys  :: TVar Onion.AnnouncedKeys
     , toxOnionRoutes    :: OnionRouter
-    , toxRoster         :: Roster
-    , toxManager        :: Connection.Manager ConnectionStatus ConnectionKey
+    , toxContactInfo         :: ContactInfo
     }
 
 -- | initiate a netcrypto session, blocking
 netCrypto :: Tox -> SecretKey -> PublicKey -> IO NetCryptoSession
 netCrypto tox myseckey theirpubkey = do
--- convert public key to NodeInfo check Roster
+-- convert public key to NodeInfo check ContactInfo
 -- if no session:
 -- 1) send dht key, actually maybe send dht-key regardless
 -- 2) send handshakes to last seen ip's, if any
@@ -358,11 +354,11 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
                     (hookQueries orouter DHT.transactionKey)
                     (const id)
 
-    roster <- newRoster
+    roster <- newContactInfo
     return Tox
         { toxDHT            = dhtclient
         , toxOnion          = onionclient
-        , toxToRoute        = onInbound (updateRoster roster) dtacrypt
+        , toxToRoute        = onInbound (updateContactInfo roster) dtacrypt
         , toxCrypto         = addHandler (hPutStrLn stderr) (cryptoNetHandler sessionsState) cryptonet
         , toxCryptoSessions = sessionsState
         , toxCryptoKeys     = crypto
@@ -370,14 +366,7 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
         , 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
-            }
+        , toxContactInfo    = roster
         }
 
 onionTimeout :: Tox -> DHT.TransactionId -> Onion.OnionDestination RouteId -> STM (Onion.OnionDestination RouteId, Int)