2 files changed, 30 insertions, 2 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index cb507f71..c3c0ed15 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -31,7 +31,7 @@ import Data.Torrent (InfoHash)
 import Network.BitTorrent.Address
 import Network.BitTorrent.DHT
 import Network.BitTorrent.DHT.Query
-import Network.BitTorrent.DHT.Message (FindNode(..),NodeFound(..))
+import Network.BitTorrent.DHT.Message (FindNode(..),NodeFound(..),GetPeers(..),GotPeers(..))
 import Network.KRPC.Manager (QueryFailure(..))
 import Network.KRPC.Message (ReflectedIP(..))
 import qualified Network.BitTorrent.DHT.Routing as R
@@ -228,6 +228,19 @@ clientSession st signalQuit sock n h = do
                             hPutClient h $ unlines rs
                         Left er -> return $ hPutClient h er
 
+        ("get-peers", s) -> cmd $ do
+                    let (hs,as) = second (dropWhile isSpace) $ break isSpace s
+                        parse = do ih <- readEither hs
+                                   a <- readEither as
+                                   return (ih :: InfoHash, a :: NodeAddr IPv4)
+                    case parse of
+                        Right (ih,a) -> do
+                            result <- try $ queryNode' (a ::NodeAddr IPv4) $ GetPeers ih
+                            let rs = either (pure . ( (,) "error" ) . showQueryFail) reportPeers result
+                            return $ do
+                            hPutClient h $ showReport rs
+                        Left er -> return $ hPutClient h er
+
         _    -> cmd0 $ hPutClient h "error."
 
 defaultPort = error "TODO defaultPort"
@@ -237,11 +250,21 @@ showQueryFail e = show e
 
 consip (ReflectedIP ip) xs = ("(external-ip " ++ show ip ++ ")") : xs
 
+consip' (ReflectedIP ip) xs = ("to", show ip) : xs
+
 reportPong (info,myip) = maybe id consip myip [show $ pPrint info]
 
 reportNodes :: (NodeId, NodeFound IPv4, Maybe ReflectedIP) -> [String]
 reportNodes (nid,NodeFound ns,myip) = maybe id consip myip $ show (pPrint nid) : map (show . pPrint) ns
 
+reportPeers :: (NodeId, GotPeers IPv4, Maybe ReflectedIP) -> [(String,String)]
+reportPeers (nid,GotPeers r tok,myip)
+    = maybe id consip' myip $ ("from", show (pPrint nid))
+     : ("token", show tok)
+     : case r of
+        Right ps -> map ( ( (,) "peer" ) . show . pPrint ) ps
+        Left ns  -> map ( ( (,) "node" ) . show . pPrint ) ns
+
 main :: IO ()
 main = do
     args <- getArgs
diff --git a/src/Network/BitTorrent/DHT/Token.hs b/src/Network/BitTorrent/DHT/Token.hs
index 7aaaf2b7..3f71aabe 100644
--- a/src/Network/BitTorrent/DHT/Token.hs
+++ b/src/Network/BitTorrent/DHT/Token.hs
@@ -40,8 +40,10 @@ module Network.BitTorrent.DHT.Token
 import Control.Monad.State
 import Data.BEncode (BEncode)
 import Data.ByteString as BS
+import Data.ByteString.Char8 as B8
 import Data.ByteString.Lazy as BL
 import Data.ByteString.Lazy.Builder as BS
+import qualified Data.ByteString.Base16 as Base16
 import Data.Default
 import Data.List as L
 import Data.Hashable
@@ -55,7 +57,10 @@ import Network.BitTorrent.Address
 
 -- | An opaque value.
 newtype Token = Token BS.ByteString
-  deriving (Show, Eq, BEncode, IsString)
+  deriving (Eq, BEncode, IsString)
+
+instance Show Token where
+    show (Token bs) = B8.unpack $ Base16.encode bs
 
 -- | Meaningless token, for testing purposes only.
 instance Default Token where