Used partitionTransform to simplify the onion client.

1 files changed, 9 insertions, 24 deletions

diff --git a/dht/src/Network/Tox/Onion/Routes.hs b/dht/src/Network/Tox/Onion/Routes.hs
index baca693b..b20ad7dd 100644
--- a/dht/src/Network/Tox/Onion/Routes.hs
+++ b/dht/src/Network/Tox/Onion/Routes.hs
@@ -159,9 +159,8 @@ newOnionRouter :: TransportCrypto
                     -> Bool -- is tcp enabled?
                     -> IO ( OnionRouter
                           , Transport String TCP.ViaRelay B.ByteString
-                          , TVar ( ChaChaDRG
-                                 , Word64Map (Either (Maybe (Bool,TCP.RelayPacket) -> IO ())
-                                                     (Maybe (OnionMessage Identity) -> IO ()))))
+                          , Transport String (OnionDestination RouteId) (OnionMessage Encrypted)
+                          )
 newOnionRouter crypto perror tcp_enabled = do
     drg0 <- drgNew
     (rlog,pq,rm) <- atomically $ do
@@ -169,26 +168,12 @@ newOnionRouter crypto perror tcp_enabled = do
         pq <- newTVar W64.empty
         rm <- newArray (0,11) Nothing
         return (rlog,pq,rm)
-    ((tbl,(tcptbl,tcpcons,relaynet)),tcp) <- do
-        (tcptbl, client) <- TCP.newClient crypto Left $ \case
-            Left v  -> void . v . Just . (,) False
-            Right v -> \case
-                TCP.OnionPacketResponse x@(OnionAnnounceResponse n8 n24 _) -> do
-                    mod <- lookupSender' pq rlog localhost4 n8
-                    perror $ "TCP announce response from " ++ show mod
-                    forM_ mod $ \od -> do
-                        Onion.decrypt crypto x od >>= \case
-                            Right (y,_) -> do perror $ "decrypted announce response, sending " ++ show y
-                                              let
-                                                RouteId rid = fromMaybe (routeId (nodeId (onionNodeInfo od)))
-                                                                $ onionRouteSpec od
-                                                Nonce8 w8 = n8
-                                              atomically $ do
-                                                modifyTVar' pq (W64.delete w8)
-                                                modifyArray rm (fmap gotResponse) rid
-                                              void $ v $ Just y
-                            _           -> return ()
-                x -> perror $ "Unexpected TCP query result: " ++ show x
+    ((tbl,(tcptbl,tcpcons,relaynet,onionnet)),tcp) <- do
+        (tcptbl, client) <- TCP.newClient crypto
+                                    id
+                                    (. (Just . (,) False))
+                                    (lookupSender' pq rlog)
+                                    (\_ (RouteId rid) -> atomically $ fmap storedRoute <$> readArray rm rid)
 
         let addr = SockAddrInet 0 0
             tentative_udp = NodeInfo
@@ -269,7 +254,7 @@ newOnionRouter crypto perror tcp_enabled = do
                                             $ clientNet c }
                     }
                  }
-    return (or,relaynet,tcptbl)
+    return (or,relaynet,onionnet)
 
 updateTCP :: OnionRouter -> TCP.NodeInfo -> p -> IO ()
 updateTCP or addr x = do