1 files changed, 10 insertions, 6 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 67507634..369650f9 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -622,14 +622,17 @@ clientSession s@Session{..} sock cnum h = do
             -> cmd0 $ do
                 sessions <- concat . Map.elems <$> (atomically $ readTVar (Tox.netCryptoSessionsByKey cryptosessions))
                 let sessionsReport = mapM showPerSession sessions
-                    headers = ["SessionID", "YourKey", "TheirKey", "NextMsg", "Dropped","Handled","Unhandled"]
+                    headers = ["SessionID", "YourKey", "TheirKey", "NextMsg", "Dropped" {-,"Handled","Unhandled" -}
+                              ,"Progress" ]
                     showPerSession (Tox.NCrypto
-                                        { ncSessionId = id
+                                        { ncState = progressVar
+                                        , ncSessionId = id
                                         , ncMyPublicKey = yourkey
                                         , ncTheirPublicKey = theirkey
                                         , ncLastNMsgs = lastN
                                         , ncSockAddr = sockAddr
                                         }) = do
+                        progress <- atomically $ readTVar progressVar
                         (num,dropped) <- atomically $ liftA2 (,) (CB.getTotal lastN) (CB.getDropped lastN)
                         as <- atomically (CB.cyclicBufferViewList lastN)
                         let (h,u) = partition (fst . snd) as
@@ -640,8 +643,9 @@ clientSession s@Session{..} sock cnum h = do
                                , show (Tox.key2id theirkey)-- "TheirKey"
                                , show num                 -- "NextMsg"
                                , show dropped             -- "Dropped"
-                               , show countHandled        -- "Handled"
-                               , show countUnhandled      -- "Unhandled"
+                            -- , show countHandled        -- "Handled"
+                            -- , show countUnhandled      -- "Unhandled"
+                               , show progress
                                ]
                 if null sessions
                  then hPutClient h "No sessions."
@@ -1161,7 +1165,7 @@ clientSession s@Session{..} sock cnum h = do
                         keydb <- atomically $ readTVar toxkeys
                         now <- getPOSIXTime
                         let entries = map mkentry $ PSQ.toList (Tox.keyByAge keydb)
-                            mkentry (k :-> Down tm) = [ show cnt, show k, show (now - tm) ]
+                            mkentry (k :-> tm) = [ show cnt, show k, show (now - tm) ]
                                 where Just (_,(cnt,_)) = MM.lookup' k (Tox.keyAssoc keydb)
                         hPutClient h $ showColumns entries
 
@@ -1415,7 +1419,7 @@ announceToxJabberPeer them echan laddr saddr pingflag tsrc tsnk
         , Tcp.Connection pingflag xsrc xsnk )
      return Nothing
  where
-    xsrc = tsrc =$= toxToXmpp (T.pack $ show them ++ ".tox")
+    xsrc = tsrc =$= toxToXmpp (T.pack $ show (Tox.key2id them) ++ ".tox")
     xsnk = flushPassThrough xmppToTox =$= tsnk
 
 vShowMe :: Tox.ViewSnapshot -> Int -> B.ByteString