Abstract facility to represent Tox encrypted nonces.

2 files changed, 10 insertions, 9 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
diff --git a/src/Network/DHT/Types.hs b/src/Network/DHT/Types.hs
index 73a7be65..bd2825fb 100644
--- a/src/Network/DHT/Types.hs
+++ b/src/Network/DHT/Types.hs
@@ -27,22 +27,23 @@ data TableParameters msg ip u = TableParameters
 -- of the querying node.
 data Query dht a = Query
   { queringNodeId   :: NodeId dht -- ^ node id of /quering/ node;
-  , queryIsReadOnly :: Bool   -- ^ node is read-only as per BEP 43
+  , queryExtra :: QueryExtra dht -- , queryIsReadOnly :: Bool   -- node is read-only as per BEP 43
   , queryParams     :: a      -- ^ query parameters.
   } deriving (Typeable,Generic)
 
-deriving instance (Eq (NodeId dht), Eq a ) => Eq (Query dht a)
-deriving instance (Show (NodeId dht), Show a ) => Show (Query dht a)
+deriving instance (Eq (NodeId dht), Eq (QueryExtra dht), Eq a ) => Eq (Query dht a)
+deriving instance (Show (NodeId dht), Show (QueryExtra dht), Show a ) => Show (Query dht a)
 
 -- | All responses have an \"id\" key and value containing the node ID
 -- of the responding node.
 data Response dht a = Response
   { queredNodeId :: NodeId dht -- ^ node id of /quered/ node;
+  , responseExtra :: ResponseExtra dht
   , responseVals :: a      -- ^ query result.
   } deriving (Typeable,Generic)
 
-deriving instance (Eq (NodeId dht), Eq a ) => Eq (Response dht a)
-deriving instance (Show (NodeId dht), Show a ) => Show (Response dht a)
+deriving instance (Eq (NodeId dht), Eq (ResponseExtra dht), Eq a ) => Eq (Response dht a)
+deriving instance (Show (NodeId dht), Show (ResponseExtra dht), Show a ) => Show (Response dht a)
 
 -- | The most basic query is a ping. Ping query is used to check if a
 -- quered node is still alive.