Show instance for RouteRecord and OnionRoute.

3 files changed, 10 insertions, 3 deletions

diff --git a/dht/OnionRouter.hs b/dht/OnionRouter.hs
index cb74f6db..1c16db6d 100644
--- a/dht/OnionRouter.hs
+++ b/dht/OnionRouter.hs
@@ -108,6 +108,7 @@ data RouteRecord = RouteRecord
     , routeVersion   :: !Int
     , routeBirthTime :: !POSIXTime
     }
+ deriving Show
 
 -- Onion paths have different timeouts depending on whether the path is
 -- confirmed or unconfirmed. Unconfirmed paths (paths that core has never
@@ -371,7 +372,7 @@ selectTrampolines or = do
         tset f = bool (left Right . right Right <$> f (trampolinesUDP or))
                       (left Left  . right Left  <$> f (trampolinesTCP or))
                       =<< readTVar (tcpMode or)
-    atomically (tset $ selectTrampolines' (onionDRG or)) >>= \case
+    atomically (tset $ internalSelectTrampolines (onionDRG or)) >>= \case
         Left ns -> do
             -- atomically $ writeTChan (routeLog or)
             routeLogger or $ unwords
@@ -426,8 +427,8 @@ choose3 drg0 cnt = ([a,b,c], drg)
 --
 -- The only write this function does to STM state is that the onionDRG random
 -- seed will be updated.
-selectTrampolines' :: TVar ChaChaDRG -> TrampolineSet ni -> STM (Either [ni] [ni])
-selectTrampolines' setDRG TrampolineSet{..} = do
+internalSelectTrampolines :: TVar ChaChaDRG -> TrampolineSet ni -> STM (Either [ni] [ni])
+internalSelectTrampolines setDRG TrampolineSet{..} = do
     cnt <- readTVar setCount
     ts <- readTVar setNodes
     drg0 <- readTVar setDRG
diff --git a/dht/src/Data/Tox/Onion.hs b/dht/src/Data/Tox/Onion.hs
index bd802c75..0338111b 100644
--- a/dht/src/Data/Tox/Onion.hs
+++ b/dht/src/Data/Tox/Onion.hs
@@ -848,6 +848,7 @@ data OnionRoute = OnionRoute
     , routeNodeC  :: NodeInfo
     , routeRelayPort :: Maybe PortNumber
     }
+ deriving Show
 
 
 wrapOnion :: Serialize (Forwarding n msg) =>
diff --git a/dht/src/Network/QueryResponse/TCP.hs b/dht/src/Network/QueryResponse/TCP.hs
index e4831fb2..fdca86b4 100644
--- a/dht/src/Network/QueryResponse/TCP.hs
+++ b/dht/src/Network/QueryResponse/TCP.hs
@@ -175,6 +175,11 @@ closeAll tcpcache stream = do
         case r of TCPSession{tcpState=st,tcpHandle=h} -> streamGoodbye st >> hClose h
                   _                                   -> return ()
 
+-- Use a cache of TCP client connections for sending (and receiving) packets.
+-- The boolean value prepended to the message allows the sender to specify
+-- whether or not a new connection will be initiated if neccessary.  If 'False'
+-- is passed, then the packet will be sent only if there already exists a
+-- connection.
 tcpTransport :: Int -- ^ maximum number of TCP links to maintain.
                 -> StreamHandshake addr x y
                 -> IO (TCPCache (SessionProtocol x y), TransportA err addr x (Bool,y))