1 files changed, 12 insertions, 1 deletions

diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs
index 5345f8b1..c7e48920 100644
--- a/src/Network/BitTorrent/DHT/Query.hs
+++ b/src/Network/BitTorrent/DHT/Query.hs
@@ -96,7 +96,10 @@ import qualified Network.BitTorrent.DHT.Search as Search
 
 nodeHandler :: Address ip => KRPC (Query a) (Response b)
            => (NodeAddr ip -> a -> DHT ip b) -> NodeHandler ip
-nodeHandler action = handler $ \ sockAddr (Query remoteId read_only q) -> do
+nodeHandler action = handler $ \ sockAddr qry -> do
+  let remoteId  = queringNodeId qry
+      read_only = queryIsReadOnly qry
+      q         = queryParams qry
   case fromSockAddr sockAddr of
     Nothing    -> throwIO BadAddress
     Just naddr -> do
@@ -119,6 +122,7 @@ findNodeH :: Address ip => NodeHandler ip
 findNodeH = nodeHandler $ \ _ (FindNode nid) -> do
   NodeFound <$> getClosest nid
 
+#ifdef VERSION_bencoding
 -- | Default 'GetPeers' handler.
 getPeersH :: Ord ip => Address ip => NodeHandler ip
 getPeersH = nodeHandler $ \ naddr (GetPeers ih) -> do
@@ -141,6 +145,11 @@ announceH = nodeHandler $ \ naddr @ NodeAddr {..} (Announce {..}) -> do
 -- | Includes all default query handlers.
 defaultHandlers :: Ord ip => Address ip => [NodeHandler ip]
 defaultHandlers = [pingH, findNodeH, getPeersH, announceH]
+#else
+-- | Includes all default query handlers.
+defaultHandlers :: Ord ip => Address ip => [NodeHandler ip]
+defaultHandlers = [pingH, findNodeH]
+#endif
 
 {-----------------------------------------------------------------------
 --  Basic queries
@@ -165,6 +174,7 @@ findNodeQ key NodeInfo {..} = do
     <> T.pack (L.unlines $ L.map ((' ' :) . show . pPrint) closest)
   return $ Right closest
 
+#ifdef VERSION_bencoding
 getPeersQ :: Address ip => InfoHash -> Iteration ip PeerAddr
 getPeersQ topic NodeInfo {..} = do
   GotPeers {..} <- GetPeers topic <@> nodeAddr
@@ -184,6 +194,7 @@ announceQ ih p NodeInfo {..} = do
     Right _ -> do -- TODO *probably* add to peer cache
       Announced <- Announce False ih Nothing p grantedToken <@> nodeAddr
       return (Right [nodeAddr])
+#endif
 
 {-----------------------------------------------------------------------
 --  Iterative queries