Moved resolving duty to Connection manager.

1 files changed, 6 insertions, 12 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 34b555f5..d397730b 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -2009,8 +2009,7 @@ main = do
             sport <- getBindAddress (portxmppS opts) True{-IPv6 supported-}
 
             -- XMPP initialization
-            cw        <- newConsoleWriter
-            serverVar <- atomically $ newEmptyTMVar
+            cw <- newConsoleWriter
             let lookupBkts :: String -> Map.Map String DHT -> Maybe (String,TVar (BucketList Tox.NodeInfo))
                 lookupBkts name m = case Map.lookup name m of
                     Nothing              -> Nothing
@@ -2020,16 +2019,12 @@ main = do
                             , lookupBkts "tox6" toxdhts
                             ]
 
+            sv <- xmppServer Tcp.noCleanUp (Just sport)
+            tcp <- xmppConnections sv -- :: IO ( Manager TCPStatus T.Text )
             let tman = toxman ssvar announcer toxbkts <$> mbtox
-            state     <- newPresenceState cw tman serverVar
-
-            sv    <- xmppServer Tcp.noCleanUp (presenceHooks state (verbosity opts) (Just cport) (Just sport))
-            -- We now have a server object but it's not ready to use until
-            -- we put it into the 'server' field of our /state/ record.
+            state     <- newPresenceState cw tman sv (const tcp)
+            forkXmpp sv (presenceHooks state (verbosity opts) (Just cport) (Just sport))
             conns     <- xmppConnections  sv
-            atomically $ do
-                putTMVar serverVar  (sv,conns) -- Okay, now it's ready. :)
-                                               -- FIXME: This is error prone.
             return (Just sv, Just conns, Just state)
 
     forM_ (take 1 taddrs) $ \addrTox -> do
@@ -2151,8 +2146,7 @@ main = do
     -- Use ResourceT to clean-up XMPP server.
     waitForSignal
 
-    forM_ mstate $ \PresenceState{server=tmvar} -> do
-        xmpp <- fst <$> atomically (readTMVar tmvar)
+    forM_ mstate $ \PresenceState{server=xmpp} -> do
         quitXmpp xmpp
     stopAnnouncer announcer
     quitBt