1 files changed, 12 insertions, 0 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 96cfbe0e..b4198c1d 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -72,6 +72,7 @@ import DebugUtil
 import Network.UPNP as UPNP
 import Network.Address hiding (NodeId, NodeInfo(..))
 import Network.QueryResponse
+import qualified Network.QueryResponse.TCP as TCP
 import Network.StreamServer
 import Network.Kademlia.Bootstrap (refreshBuckets,bootstrap)
 import Network.Kademlia.CommonAPI
@@ -399,6 +400,7 @@ clientSession s@Session{..} sock cnum h = do
             , ["sessions"]
             , ["session"]
             , ["netcrypto"]
+            , ["tcp"]
             , ["onion"]
             , ["g"]
             , ["p"]
@@ -673,6 +675,14 @@ clientSession s@Session{..} sock cnum h = do
                 setVerbose tag
                 hPutClient h $ "Showing " ++ show tag ++ " messages."
 
+        ("tcp",s) | "" <- strp s
+                    -> cmd0 $ join $ atomically $ do
+            tcps <- readTVar (TCP.lru $ tcpProberState onionRouter)
+            return $ do
+                now <- getPOSIXTime
+                forM (MM.toList tcps) $ \(MM.Binding (TCP.TCPAddress addr) tcp (Down tm)) -> do
+                    hPutClientChunk h $ unwords [show addr, show (now - tm), TCP.showStat tcp] ++ "\n"
+                hPutClient h $ show (MM.size tcps) ++ " active or pending connections.\n"
 
         ("onion", s) | "" <- strp $ map toLower s
                       -> cmd0 $ do
@@ -692,6 +702,7 @@ clientSession s@Session{..} sock cnum h = do
             tcp_cache <- readTVar (TCP.probeCache $ tcpProber onionRouter)
             tcp_queue <- readTVar (TCP.probeQueue $ tcpProber onionRouter)
             tcpmode <- readTVar (tcpMode onionRouter)
+            tcps <- readTVar (TCP.lru $ tcpProberState onionRouter)
             let showRecord :: Int -> Int -> [String]
                 showRecord n wanted_ver
                     | Just RouteRecord{responseCount,timeoutCount,routeVersion,routeBirthTime
@@ -709,6 +720,7 @@ clientSession s@Session{..} sock cnum h = do
                                                                    ++ if tcpmode then "" else " *"
                                             , "trampolines(TCP): " ++ show (IntMap.size tts,ttcnt,ticnt)
                                                                    ++ if tcpmode then " *" else ""
+                                            , "active TCP: " ++ show (MM.size tcps)
                                             , "pending: " ++ show (W64.size pqs)
                                             , "TCP spill,cache,queue: "
                                                 ++ show (PSQ.size tcp_spill, PSQ.size tcp_cache, PSQ.size tcp_queue)]