1 files changed, 8 insertions, 2 deletions

diff --git a/dht/src/Data/Tox/DHT/Multi.hs b/dht/src/Data/Tox/DHT/Multi.hs
index d31ae4b8..878b47e6 100644
--- a/dht/src/Data/Tox/DHT/Multi.hs
+++ b/dht/src/Data/Tox/DHT/Multi.hs
@@ -13,7 +13,7 @@ import qualified Network.Tox.NodeId as UDP
 import qualified Network.Tox.TCP.NodeId as TCP
 import Data.Tox.Onion (OnionDestination,RouteId)
 import Data.Tox.Relay hiding (NodeInfo)
-import Network.Address (either4or6)
+import Network.Address as SockAddr (canonize)
 import Network.Tox.TCP as TCP (ViaRelay(..), tcpConnectionRequest_)
 import Network.QueryResponse as QR (Tagged(..), Client)
 
@@ -88,7 +88,7 @@ untagOnion (OnionTCP :=> Identity o) = o
 
 -- Canonical in case of 6-mapped-4 addresses.
 canonize :: DSum S Identity -> DSum S Identity
-canonize (SessionUDP :=> Identity saddr) = SessionUDP ==> either id id (either4or6 saddr)
+canonize (SessionUDP :=> Identity saddr) = SessionUDP ==> SockAddr.canonize saddr
 canonize taddr                           = taddr
 
 type NodeInfo = DSum T Identity
@@ -144,3 +144,9 @@ tcpConnectionRequest :: QR.Client err PacketNumber tid TCP.NodeInfo (Bool, Relay
 tcpConnectionRequest client pubkey ni = do
     mcon <- tcpConnectionRequest_ client pubkey ni
     return $ fmap (\conid -> TCP ==> ViaRelay (Just conid) (UDP.key2id pubkey) ni) mcon
+
+showSessionAddr :: SessionAddress -> String
+showSessionAddr (SessionUDP :=> Identity udp) =
+    show (SockAddr.canonize udp)
+showSessionAddr (SessionTCP :=> Identity (ViaRelay mcon _ tcp)) =
+    "TCP:" ++ maybe "" (\(ConId con) -> "(" ++ show con ++ ")") mcon ++ show tcp