Queries table: Switched MVar with callback.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/Network/Tox/TCP.hs b/src/Network/Tox/TCP.hs
index adb42514..9c1ffe48 100644
--- a/src/Network/Tox/TCP.hs
+++ b/src/Network/Tox/TCP.hs
@@ -34,6 +34,7 @@ import System.Timeout
 import ControlMaybe
 import Crypto.Tox
 import Data.ByteString (hPut,hGet,ByteString,length)
+import Data.TableMethods
 import Data.Tox.Relay
 import qualified Data.Word64Map
 import DebugTag
@@ -269,7 +270,7 @@ type RelayClient = Client String PacketNumber Nonce8 NodeInfo (Bool,RelayPacket)
 -- defaults are 'id' and 'tryPutMVar'.  The resulting customized table state
 -- will be returned to the caller along with the new client.
 newClient :: TransportCrypto
-               -> (MVar (Bool,RelayPacket) -> a) -- ^ store mvar for query
+               -> ((Maybe (Bool,RelayPacket) -> IO ()) -> a) -- ^ store mvar for query
                -> (a -> RelayPacket -> IO void)  -- ^ load mvar for query
                -> IO ( ( TVar (ChaChaDRG, Data.Word64Map.Word64Map a)
                        , TCPCache (SessionProtocol RelayPacket RelayPacket) )
@@ -299,16 +300,14 @@ newClient crypto store load = do
                             { methodParse = \x -> Left "tcp-lookuphandler?" -- :: x -> Either err a
                             , noreplyAction = \addr a -> dput XTCP $ "tcp-lookupHandler: "++show w
                             }
-            , tableMethods = transactionMethods' store (\x -> load x . snd) (contramap (\(Nonce8 w64) -> w64) w64MapMethods)
+            , tableMethods = transactionMethods' store (\x -> mapM_ (load x . snd)) (contramap (\(Nonce8 w64) -> w64) w64MapMethods)
                                 $ first (either error Nonce8 . decode) . randomBytesGenerate 8
             }
-        , clientErrorReporter = logErrors { reportTimeout = reportTimeout ignoreErrors }
+        , clientErrorReporter = logErrors
         , clientPending = map_var
         , clientAddress = \_ -> return $ NodeInfo
             { udpNodeInfo = either error id $ UDP.nodeInfo (UDP.key2id $ transportPublic crypto) (SockAddrInet 0 0)
             , tcpPort = 0
             }
         , clientResponseId = return
-        , clientEnterQuery = \_ -> return ()
-        , clientLeaveQuery = \_ _ -> return ()
         }