"sessions" comamnd progress column

        Trade old "handled" and  "unhandled" count columns
        for a column which shows the state of session.

2 files changed, 9 insertions, 5 deletions

diff --git a/Connection.hs b/Connection.hs
index 7228a0e4..58b4f4e5 100644
--- a/Connection.hs
+++ b/Connection.hs
@@ -13,7 +13,7 @@ data Status status
     = Dormant
     | InProgress status
     | Established
- deriving (Eq,Ord,Functor)
+ deriving (Show,Eq,Ord,Functor)
 
 data Policy
     = RefusingToConnect
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index fabf0661..b845f9df 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."