Moved node-id out of Query/Response. It can be either in the

envelope (Tox) or in the query/response payload (Mainline).

2 files changed, 11 insertions, 3 deletions

diff --git a/src/Network/DatagramServer/Mainline.hs b/src/Network/DatagramServer/Mainline.hs
index 7cf96e44..89a275c1 100644
--- a/src/Network/DatagramServer/Mainline.hs
+++ b/src/Network/DatagramServer/Mainline.hs
@@ -279,10 +279,15 @@ instance Envelope KMessageOf where
     newtype NodeId KMessageOf = NodeId Word160
       deriving (Show, Eq, Ord, Typeable, Bits, FiniteBits)
 
-    newtype QueryExtra KMessageOf = IsReadOnlyQuery { queryIsReadOnly :: Bool }
+    data QueryExtra KMessageOf = MainlineQuery
+        { queringNodeId   :: NodeId KMessageOf -- ^ node id of /quering/ node;
+        , queryIsReadOnly :: Bool              -- ^ node is read-only as per BEP 43
+        }
       deriving (Show, Eq, Ord, Typeable)
 
-    data ResponseExtra KMessageOf = MainlineResponseData
+    newtype ResponseExtra KMessageOf = MainlineResponse
+        { queredNodeId :: NodeId KMessageOf -- ^ node id of /quered/ node
+        }
       deriving (Show, Eq, Ord, Typeable)
 
     envelopePayload (Q q) = queryArgs q
@@ -304,7 +309,7 @@ instance Envelope KMessageOf where
 
     uniqueTransactionId cnt = return $ TID $ Char8.pack (show cnt)
 
-    fromRoutableNode (IsReadOnlyQuery b) = not b
+    fromRoutableNode = not . queryIsReadOnly
 
 
 instance WireFormat BValue KMessageOf where
diff --git a/src/Network/DatagramServer/Tox.hs b/src/Network/DatagramServer/Tox.hs
index b323a4df..83701b6b 100644
--- a/src/Network/DatagramServer/Tox.hs
+++ b/src/Network/DatagramServer/Tox.hs
@@ -260,6 +260,9 @@ instance Envelope Message where
 
     type QueryMethod Message = MessageType
 
+    newtype QueryExtra Message = QueryNonce { qryNonce :: Nonce8 }
+    newtype ResponseExtra Message = ResponseNonce { rspNonce :: Nonce8 }
+
     envelopePayload = msgPayload
 
     envelopeTransaction = msgNonce