Maintain a separate TCP-capable trampoline set for onion routing.

1 files changed, 9 insertions, 4 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index e4e32f28..163226cb 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -678,9 +678,13 @@ clientSession s@Session{..} sock cnum h = do
             now <- getPOSIXTime
             join $ atomically $ do
             rm <- IntMap.fromList . catMaybes . map (\(i,m) -> fmap (i,) m) <$> getAssocs (routeMap onionRouter)
-            ts <- readTVar $ trampolineNodes onionRouter
-            tcnt <- readTVar $ trampolineCount onionRouter
-            icnt <- HashMap.size <$> readTVar (trampolineIds onionRouter)
+            let trampstate t = do
+                    ts <- readTVar $ setNodes t
+                    tcnt <- readTVar $ setCount t
+                    icnt <- HashMap.size <$> readTVar (setIDs t)
+                    return (ts,tcnt,icnt)
+            (ts,tcnt,icnt) <- trampstate (trampolinesUDP onionRouter)
+            (tts,ttcnt,ticnt) <- trampstate (trampolinesTCP onionRouter)
             rs <- getAssocs (pendingRoutes onionRouter)
             pqs <- readTVar (pendingQueries onionRouter)
             tcp_spill <- readTVar (TCP.probeSpill $ tcpProber onionRouter)
@@ -696,7 +700,8 @@ clientSession s@Session{..} sock cnum h = do
                     | otherwise = [show n, "error!","","",""]
                 r = map (uncurry showRecord) rs
             return $ do
-                hPutClientChunk h $ unlines [ "trampolines: " ++ show (IntMap.size ts,tcnt,icnt)
+                hPutClientChunk h $ unlines [ "trampolines(UDP): " ++ show (IntMap.size ts,tcnt,icnt)
+                                            , "trampolines(TCP): " ++ show (IntMap.size tts,ttcnt,ticnt)
                                             , "pending: " ++ show (W64.size pqs)
                                             , "TCP spill,cache,queue: "
                                                 ++ show (PSQ.size tcp_spill, PSQ.size tcp_cache, PSQ.size tcp_queue)]