1 files changed, 24 insertions, 5 deletions

diff --git a/Roster.hs b/Roster.hs
index 94ab462d..ab2f9911 100644
--- a/Roster.hs
+++ b/Roster.hs
@@ -1,13 +1,15 @@
 {-# LANGUAGE NamedFieldPuns #-}
 module Roster where
 
-import Crypto.PubKey.Curve25519
-import Network.Tox.Onion.Transport as Onion
-import Network.Tox.DHT.Transport as DHT
-import Network.Tox.NodeId
+import System.IO
+import Control.Monad
 import Control.Concurrent.STM
+import Crypto.PubKey.Curve25519
 import qualified Data.HashMap.Strict as HashMap
-import Data.HashMap.Strict (HashMap)
+         ;import Data.HashMap.Strict (HashMap)
+import Network.Tox.DHT.Transport     as DHT
+import Network.Tox.NodeId
+import Network.Tox.Onion.Transport   as Onion
 
 newtype Roster = Roster { accounts :: TVar (HashMap NodeId Account) }
 
@@ -32,6 +34,7 @@ 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 ())
@@ -53,3 +56,19 @@ updateAccount remoteUserKey (Onion.OnionDHTPublicKey dhtpk) acc = do
 updateAccount remoteUserKey (Onion.OnionFriendRequest fr) acc = do
     -- TODO
     return ()
+
+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 (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." ]
+    ]
+