From 97cbacd0c9fb0d9aa1d76c29ea87404b9d3c1cc4 Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Mon, 3 Dec 2018 21:03:52 -0500 Subject: TCP Client, WIP. --- src/Network/Tox.hs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/Network/Tox.hs') diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs index 37762eb8..83a17037 100644 --- a/src/Network/Tox.hs +++ b/src/Network/Tox.hs @@ -116,11 +116,17 @@ myAddr routing4 routing6 maddr = atomically $ do newClient :: (DRG g, Show addr, Show meth) => g -> Transport String addr x - -> (Client String meth DHT.TransactionId addr x -> x -> MessageClass String meth DHT.TransactionId addr x) + -> (Client String meth DHT.TransactionId addr x + -> x + -> MessageClass String meth DHT.TransactionId addr x) -> (Maybe addr -> IO addr) - -> (Client String meth DHT.TransactionId addr x -> meth -> Maybe (MethodHandler String DHT.TransactionId addr x)) - -> (forall d. TransactionMethods d DHT.TransactionId addr x -> TransactionMethods d DHT.TransactionId addr x) - -> (Client String meth DHT.TransactionId addr x -> Transport String addr x -> Transport String addr x) + -> (Client String meth DHT.TransactionId addr x + -> meth + -> Maybe (MethodHandler String DHT.TransactionId addr x)) + -> (forall d. TransactionMethods d DHT.TransactionId addr x + -> TransactionMethods d DHT.TransactionId addr x) + -> (Client String meth DHT.TransactionId addr x + -> Transport String addr x -> Transport String addr x) -> IO (Client String meth DHT.TransactionId addr x) newClient drg net classify selfAddr handlers modifytbl modifynet = do -- If we have 8-byte keys for IntMap, then use it for transaction lookups. @@ -139,8 +145,8 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do return $ Left (word64mapT,map_var) let dispatch tbl var handlers client = DispatchMethods { classifyInbound = classify client - , lookupHandler = handlers -- var - , tableMethods = modifytbl tbl + , lookupHandler = handlers -- var + , tableMethods = modifytbl tbl } eprinter = logErrors -- printErrors stderr mkclient (tbl,var) handlers = -- cgit v1.2.3