New improved iterative search algorithm.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/Network/BitTorrent/Address.hs b/src/Network/BitTorrent/Address.hs
index 381ff50b..a8e12b35 100644
--- a/src/Network/BitTorrent/Address.hs
+++ b/src/Network/BitTorrent/Address.hs
@@ -696,10 +696,10 @@ newtype NodeDistance = NodeDistance BS.ByteString
   deriving (Eq, Ord)
 
 instance Pretty NodeDistance where
-  pPrint (NodeDistance bs) = foldMap bitseq $ BS.unpack bs
-    where
-      listBits w = L.map (testBit w) (L.reverse [0..finiteBitSize w - 1])
-      bitseq = foldMap (int . fromEnum) . listBits
+  pPrint (NodeDistance bs) = text $ BC.unpack (Base16.encode bs)
+
+instance Show NodeDistance where
+  show (NodeDistance bs) = BC.unpack (Base16.encode bs)
 
 -- | distance(A,B) = |A xor B| Smaller values are closer.
 distance :: NodeId -> NodeId -> NodeDistance
@@ -751,7 +751,7 @@ genBucketSample' gen (NodeId self) (q,m,b)
 data NodeAddr a = NodeAddr
   { nodeHost ::                !a
   , nodePort :: {-# UNPACK #-} !PortNumber
-  } deriving (Eq, Typeable, Functor, Foldable, Traversable)
+  } deriving (Eq, Ord, Typeable, Functor, Foldable, Traversable)
 
 instance Show a => Show (NodeAddr a) where
   showsPrec i NodeAddr {..}
@@ -1285,7 +1285,7 @@ getBindAddress listenPortString enabled6 = do
     let (x6s,x4s) = partition (\s -> addrFamily s == AF_INET6) xs
         listenAddr =
           case if enabled6 then x6s++x4s else x4s of
-            AddrInfo { addrAddress = listenAddr } : _ -> listenAddr
+            AddrInfo { addrAddress = addr } : _ -> addr
             _ -> if enabled6
                   then SockAddrInet6 (parsePort listenPortString) 0 iN6ADDR_ANY 0
                   else SockAddrInet (parsePort listenPortString) iNADDR_ANY