From c65f59c83c787e14efb5a58d32807b3bcb300de5 Mon Sep 17 00:00:00 2001 From: joe Date: Sat, 16 Jun 2018 03:49:06 -0400 Subject: tox: Oops, fix endless blocking IO action in persueContact. --- Connection/Tox.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Connection/Tox.hs') diff --git a/Connection/Tox.hs b/Connection/Tox.hs index 1fe07f82..2c485edd 100644 --- a/Connection/Tox.hs +++ b/Connection/Tox.hs @@ -66,10 +66,10 @@ data StatefulTask st = StatefulTask , taskState :: TVar st } -launch :: String -> st -> ((st -> STM ()) -> IO ()) -> IO (StatefulTask st) +launch :: String -> st -> (TVar st -> IO ()) -> IO (StatefulTask st) launch lbl st f = do stvar <- newTVarIO st - tid <- forkIO (f $ writeTVar stvar) + tid <- forkIO (f stvar) labelThread tid lbl return $ StatefulTask tid stvar @@ -128,9 +128,7 @@ setToxPolicy params conmap k policy = case policy of , transitionToState = (\_ -> return ()) :: G.Status ToxProgress -> STM () } persue_methods = PersueContactMethods - { getHandshakeParams = retry -- :: STM params - , sendHandshake = \_ -> return () -- :: params -> IO () - , retryInterval = _todo :: Int + { -- TODO } freshen_methods = FreshenContactMethods { dhtkeyInterval = _todo :: Int @@ -181,10 +179,12 @@ setToxPolicy params conmap k policy = case policy of OpenToConnect -> do -- passively accept connections if they initiate. mst <- lookupForPolicyChange conmap k policy forM_ mst $ \st -> do + {- let getPolicy = readTVar $ connPolicy st accept_thread <- launch ("accept:"++show k) (G.InProgress $ toEnum 0) $ acceptContact getPolicy _accept_methods + -} atomically $ do let routing = dhtRouting params Key _ nid = k -- cgit v1.2.3