Maintain special relay links for connectivity purposes.

1 files changed, 13 insertions, 9 deletions

diff --git a/dht/examples/dhtd.hs b/dht/examples/dhtd.hs
index 42fcc67b..0f95f562 100644
--- a/dht/examples/dhtd.hs
+++ b/dht/examples/dhtd.hs
@@ -100,6 +100,7 @@ import qualified TCPProber as TCP
 import Data.Typeable
 import Network.Tox.ContactInfo as Tox
 import Network.Tox.Onion.Routes
+import Network.Tox.RelayPinger
 import qualified Data.Word64Map as W64
 import Network.Tox.AggregateSession
 import qualified Network.Tox.Session as Tox (Session)
@@ -735,16 +736,19 @@ clientSession s@Session{..} sock cnum h = do
                     | otherwise = [show n, "error!","","",""]
                     -- otherwise = [show n, "error!",show (IntMap.lookup n rm),show (IntMap.null rm),""]
                 r = map (uncurry showRecord) rs
+            (rcnt,relays) <- currentRelays (tcpRelayPinger onionRouter)
             return $ do
-                hPutClientChunk h $ unlines [ "trampolines(UDP): " ++ show (IntMap.size uts,tcnt,icnt)
-                                                                   ++ 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)]
-                hPutClient h $ showColumns $ ["","responses","timeouts", "tcp", "age", "version"]:r
+                hPutClientChunk h $ unlines
+                    [ "trampolines(UDP): " ++ show (IntMap.size uts,tcnt,icnt)
+                                           ++ 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)]
+                hPutClientChunk h $ showColumns $ ["","responses","timeouts", "tcp", "age", "version"]:r
+                hPutClient h $ unlines $ ("relays: " ++ show rcnt) : map (mappend "  " . show) relays
 
         ("onion", s) | "udp" <- strp $ map toLower s
                      -> cmd0 $ do