Abstract facility to represent Tox encrypted nonces.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/Network/DHT/Mainline.hs b/src/Network/DHT/Mainline.hs
index 6ef6d450..e5517a3a 100644
--- a/src/Network/DHT/Mainline.hs
+++ b/src/Network/DHT/Mainline.hs
@@ -155,7 +155,7 @@ read_only_key = "ro"
 instance BEncode a => BEncode (Query KMessageOf a) where
   toBEncode Query {..} = toDict $
       BDict.union ( node_id_key .=! queringNodeId
-                   .: read_only_key .=? bool Nothing (Just (1 :: Integer)) queryIsReadOnly
+                   .: read_only_key .=? bool Nothing (Just (1 :: Integer)) (queryIsReadOnly queryExtra)
                    .: endDict)
                   (dict (toBEncode queryParams))
     where
@@ -164,7 +164,7 @@ instance BEncode a => BEncode (Query KMessageOf a) where
 
   fromBEncode v = do
     Query <$> fromDict (field (req node_id_key)) v
-          <*> fromDict (fromMaybe False <$>? read_only_key) v
+          <*> fromDict (IsReadOnlyQuery . fromMaybe False <$>? read_only_key) v
           <*> fromBEncode v
 #else
 data Query a = Query a
@@ -174,11 +174,11 @@ data Query a = Query a
 instance BEncode a => BEncode (Response KMessageOf a) where
   toBEncode = toBEncode . toQuery
     where
-      toQuery (Response nid a) = Query nid False a
+      toQuery (Response nid MainlineResponseData a) = Query nid (IsReadOnlyQuery False) a
 
   fromBEncode b = fromQuery <$> fromBEncode b
     where
-      fromQuery (Query nid _ a) = Response nid a
+      fromQuery (Query nid _ a) = Response nid MainlineResponseData a
 #else
 data Response KMessageOf a = Response KMessageOf a
 #endif