1 files changed, 11 insertions, 7 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 89604919..6437e94f 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -105,6 +105,7 @@ import Network.Tox.ContactInfo as Tox
 import OnionRouter
 import PingMachine
 import Data.PacketQueue
+import qualified Data.Word64Map as W64
 
 -- Presence imports.
 import ConsoleWriter
@@ -818,16 +819,19 @@ clientSession s@Session{..} sock cnum h = do
             tcnt <- readTVar $ trampolineCount onionRouter
             icnt <- HashMap.size <$> readTVar (trampolineIds onionRouter)
             rs <- mapM readTVar (pendingRoutes onionRouter)
-            let showRecord :: Int -> Bool -> [String]
-                showRecord n True = [show n, "pending", ""]
-                showRecord n False
-                    | Just RouteRecord{responseCount,timeoutCount} <- IntMap.lookup n rm
-                                = [show n, show responseCount, show timeoutCount]
+            pqs <- readTVar (pendingQueries onionRouter)
+            let showRecord :: Int -> Int -> [String]
+                showRecord n wanted_ver
+                    | Just RouteRecord{responseCount,timeoutCount,routeVersion} <- IntMap.lookup n rm
+                                = if routeVersion >= wanted_ver
+                                    then [show n, show responseCount, show timeoutCount, show (routeVersion,wanted_ver) ]
+                                    else [show n, show responseCount, show timeoutCount, show (routeVersion,wanted_ver) ++ "(pending)" ]
                     | otherwise = [show n, "error!",""]
                 r = map (uncurry showRecord) $ IntMap.toAscList rs
             return $ do
-                hPutClientChunk h $ "trampolines: " ++ show (IntMap.size ts,tcnt,icnt) ++ "\n"
-                hPutClient h $ showColumns $ ["","responses","timeouts"]:r
+                hPutClientChunk h $ unlines [ "trampolines: " ++ show (IntMap.size ts,tcnt,icnt)
+                                            , "pending: " ++ show (W64.size pqs) ]
+                hPutClient h $ showColumns $ ["","responses","timeouts", "version"]:r
 
         -- necrypto <FRIEND-TOXID>
         -- establish a netcrypto session with specified person