WIP: Adapting DHT to Tox network (part 3).

2 files changed, 26 insertions, 1 deletions

diff --git a/src/Network/KRPC/Manager.hs b/src/Network/KRPC/Manager.hs
index b1e93101..58ac7674 100644
--- a/src/Network/KRPC/Manager.hs
+++ b/src/Network/KRPC/Manager.hs
@@ -151,7 +151,11 @@ data Manager h = Manager
   , listenerThread     :: !(MVar ThreadId)
   , transactionCounter :: {-# UNPACK #-} !TransactionCounter
   , pendingCalls       :: {-# UNPACK #-} !PendingCalls
+#ifdef VERSION_bencoding
   , handlers           :: [Handler h KMessageOf BValue]
+#else
+  , handlers           :: [Handler h KMessageOf BC.ByteString]
+#endif
   }
 
 -- | A monad which can perform or handle queries.
@@ -185,7 +189,11 @@ sockAddrFamily (SockAddrCan _        ) = AF_CAN
 -- run 'listen'.
 newManager :: Options                       -- ^ various protocol options;
            -> SockAddr                      -- ^ address to listen on;
+#ifdef VERSION_bencoding
            -> [Handler h KMessageOf BValue] -- ^ handlers to run on incoming queries.
+#else
+           -> [Handler h KMessageOf BC.ByteString] -- ^ handlers to run on incoming queries.
+#endif
            -> IO (Manager h)                -- ^ new rpc manager.
 newManager opts @ Options {..} servAddr handlers = do
     validateOptions opts
@@ -218,7 +226,11 @@ isActive Manager {..} = liftIO $ isBound sock
 
 -- | Normally you should use Control.Monad.Trans.Resource.allocate
 -- function.
+#ifdef VERSION_bencoding
 withManager :: Options -> SockAddr -> [Handler h KMessageOf BValue]
+#else
+withManager :: Options -> SockAddr -> [Handler h KMessageOf BC.ByteString]
+#endif
             -> (Manager h -> IO a) -> IO a
 withManager opts addr hs = bracket (newManager opts addr hs) closeManager
 
@@ -420,14 +432,22 @@ handler msging body = (name, wrapper)
         Right a -> Right . seal <$> body addr a
 
 runHandler :: MonadKRPC h m
+#ifdef VERSION_bencoding
            => HandlerBody h KMessageOf BValue -> SockAddr -> KQuery -> m KResult
+#else
+           => HandlerBody h KMessageOf BC.ByteString -> SockAddr -> KQuery -> m KResult
+#endif
 runHandler h addr m = Lifted.catches wrapper failbacks
   where
     signature = querySignature (queryMethod m) (queryId m) addr
 
     wrapper = do
       $(logDebugS) "handler.quered" signature
+#ifdef VERSION_bencoding
       result <- liftHandler (h addr (Q m))
+#else
+      result <- liftHandler (h addr m)
+#endif
 
       case result of
         Left msg -> do
diff --git a/src/Network/KRPC/Message.hs b/src/Network/KRPC/Message.hs
index 19f9fc9e..2f5f6729 100644
--- a/src/Network/KRPC/Message.hs
+++ b/src/Network/KRPC/Message.hs
@@ -34,7 +34,9 @@ module Network.KRPC.Message
        , unknownMessage
 
          -- * Query
+#ifdef VERSION_bencoding
        , KQueryOf(..)
+#endif
        , KQuery
 #ifndef VERSION_bencoding
        , queryArgs
@@ -44,7 +46,9 @@ module Network.KRPC.Message
        , MethodName
 
          -- * Response
+#ifdef VERSION_bencoding
        , KResponseOf(..)
+#endif
        , KResponse
        , ReflectedIP(..)
 
@@ -357,5 +361,6 @@ instance BEncode KMessage where
     <|> E <$> fromBEncode b
     <|> decodingError "KMessage: unknown message or message tag"
 #else
-type KMessage = Tox.Message
+type KMessageOf = Tox.Message
+type KMessage = KMessageOf B.ByteString
 #endif