3 files changed, 8 insertions, 17 deletions

diff --git a/Connection/Tox.hs b/Connection/Tox.hs
index 08a930bf..1fe07f82 100644
--- a/Connection/Tox.hs
+++ b/Connection/Tox.hs
@@ -75,8 +75,7 @@ launch lbl st f = do
 
 
 data SessionTasks = SessionTasks
-    { accepting  :: StatefulTask (G.Status ToxProgress)
-    , persuing   :: StatefulTask (G.Status ToxProgress)
+    { persuing   :: StatefulTask (G.Status ToxProgress)
     , refreshing :: StatefulTask (G.Status ToxProgress)
     }
 
@@ -96,10 +95,9 @@ sessionStatus st = G.Connection
 
 combinedStatus :: SessionTasks -> STM (G.Status ToxProgress)
 combinedStatus tasks = do
-    a <- readTVar (taskState $ accepting tasks)
     p <- readTVar (taskState $ persuing tasks)
     r <- readTVar (taskState $ refreshing tasks)
-    return $ maximum [a,p,r]
+    return $ maximum [p,r]
 
 lookupForPolicyChange :: TVar (Map.Map Key SessionState)
                          -> Key -> Policy -> IO (Maybe SessionState)
@@ -145,14 +143,6 @@ setToxPolicy params conmap k policy = case policy of
         forM_ mst $ \st -> do
             let getPolicy = readTVar $ connPolicy st
             tasks <- atomically $ readTVar (sessionTasks st)
-            --TODO This check to determine whether to launch the accepting thread
-            --is probably racey.
-            astat <- threadStatus (taskThread $ accepting tasks)
-            accepting <- if astat /= ThreadRunning
-                          then launch ("accept:"++show k)
-                                (G.InProgress $ toEnum 0)
-                                $ acceptContact  getPolicy accept_methods
-                          else return $ accepting tasks
             persuing <- launch ("persue:"++show k)
                                 (G.InProgress $ toEnum 0)
                                $ persueContact  getPolicy _get_status persue_methods
@@ -160,7 +150,7 @@ setToxPolicy params conmap k policy = case policy of
                                 (G.InProgress $ toEnum 0)
                                $ freshenContact getPolicy _get_status freshen_methods
             atomically $ do
-                writeTVar (sessionTasks st) $ SessionTasks accepting persuing refreshing
+                writeTVar (sessionTasks st) $ SessionTasks persuing refreshing
                 let routing   = dhtRouting params
                     Key _ nid = k
                 registerNodeCallback routing $ NodeInfoCallback
@@ -183,12 +173,11 @@ setToxPolicy params conmap k policy = case policy of
                 unregisterNodeCallback callbackId routing nid
             atomically $ do
                 tasks <- readTVar (sessionTasks st)
-                a <- readTVar $ taskState (accepting tasks)
                 p <- readTVar $ taskState (persuing tasks)
                 r <- readTVar $ taskState (refreshing tasks)
-                case (a,p,r) of
-                    (G.Dormant,G.Dormant,G.Dormant) -> return ()
-                    _                               -> retry
+                case (p,r) of
+                    (G.Dormant,G.Dormant) -> return ()
+                    _                     -> retry
     OpenToConnect -> do -- passively accept connections if they initiate.
         mst <- lookupForPolicyChange conmap k policy
         forM_ mst $ \st -> do
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 3324c934..4d244199 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -492,6 +492,7 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
         , toxOnionRoutes    = orouter
         , toxContactInfo    = roster
         , toxAnnounceToLan  = announceToLan sock (key2id $ transportPublic crypto)
+        , toxMgr            = mgr
         }
 
 onionTimeout :: Tox -> DHT.TransactionId -> Onion.OnionDestination RouteId -> STM (Onion.OnionDestination RouteId, Int)
diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index 61b2ab3c..1acc333e 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -57,6 +57,7 @@ import Text.Printf
 import Data.Bool
 import Connection (Status(..), Policy(..))
 import Connection.Tox.Threads (ToxProgress(..))
+import Network.Tox.ContactInfo
 
 type LookupPolicyFunction = Key -> STM Policy