2 files changed, 8 insertions, 7 deletions

diff --git a/src/Network/BitTorrent/DHT/Message.hs b/src/Network/BitTorrent/DHT/Message.hs
index ac4889fe..acecf8b1 100644
--- a/src/Network/BitTorrent/DHT/Message.hs
+++ b/src/Network/BitTorrent/DHT/Message.hs
@@ -106,13 +106,13 @@ node_id_key = "id"
 -- | All queries have an \"id\" key and value containing the node ID
 -- of the querying node.
 data Query a = Query
-  { thisNodeId  :: NodeId -- ^ node id of /quering/ node;
-  , queryParams :: a      -- ^ query parameters.
+  { queringNodeId :: NodeId -- ^ node id of /quering/ node;
+  , queryParams   :: a      -- ^ query parameters.
   } deriving (Show, Eq, Typeable)
 
 instance BEncode a => BEncode (Query a) where
   toBEncode Query {..} = toDict $
-      node_id_key .=! thisNodeId .: endDict
+      node_id_key .=! queringNodeId .: endDict
       <>
       dict (toBEncode queryParams)
     where
@@ -126,7 +126,7 @@ instance BEncode a => BEncode (Query a) where
 -- | All responses have an \"id\" key and value containing the node ID
 -- of the responding node.
 data Response a = Response
-  { remoteNodeId :: NodeId -- ^ node id of /quered/ node;
+  { queredNodeId :: NodeId -- ^ node id of /quered/ node;
   , responseVals :: a      -- ^ query result.
   } deriving (Show, Eq, Typeable)
 
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index a4f10bb1..3c37ea9a 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -152,6 +152,7 @@ invalidateTokens curTime ts @ SessionTokens {..}
 
 data Node ip = Node
   { options       :: !Options
+  , thisNodeId    :: !NodeId
   , manager       :: !(Manager (DHT       ip))
   , routingTable  :: !(MVar    (Table     ip))
   , contactInfo   :: !(TVar    (PeerStore ip))
@@ -196,7 +197,7 @@ runDHT handlers opts naddr action = runResourceT $ do
     let nodeAddr = toSockAddr naddr
     (_, m) <- allocate (newManager rpcOpts nodeAddr handlers) closeManager
     myId   <- liftIO genNodeId
-    node   <- liftIO $ Node opts m
+    node   <- liftIO $ Node opts myId m
              <$> newMVar (nullTable myId (optBucketCount opts))
              <*> newTVarIO def
              <*> (newTVarIO =<< nullSessionTokens)
@@ -270,9 +271,9 @@ getTable = do
   var <- asks routingTable
   liftIO (readMVar var)
 
--- FIXME no blocking
+-- | Get id of /this/ node. This value is constant during DHT session.
 getNodeId :: DHT ip NodeId
-getNodeId = thisId <$> getTable
+getNodeId = asks thisNodeId
 
 getClosest :: Eq ip => NodeId -> DHT ip [NodeInfo ip]
 getClosest nid = do