Hashable NodeId for Mainline.

1 files changed, 17 insertions, 4 deletions

diff --git a/Mainline.hs b/Mainline.hs
index 17fb32ee..80834922 100644
--- a/Mainline.hs
+++ b/Mainline.hs
@@ -52,7 +52,7 @@ import Network.QueryResponse
 import Network.Socket
 
 newtype NodeId = NodeId ByteString
- deriving (Eq,Ord,Show,ByteArrayAccess, BEncode, Bits)
+ deriving (Eq,Ord,Show,ByteArrayAccess, BEncode, Bits, Hashable)
 
 instance FiniteBits NodeId where
     finiteBitSize _ = 160
@@ -174,7 +174,7 @@ data Message a = Q { msgOrigin   :: NodeId
 
 instance BE.BEncode (Message BValue) where
     toBEncode = encodeMessage
-    fromBEncode = error "fromBEncode"
+    fromBEncode = error "TODO: fromBEncode (Mainline Message)"
 
 encodeMessage (Q origin tid a meth ro)
     = case a of
@@ -198,7 +198,9 @@ genericArgs nodeid ro =
     .: endDict
 
 encodeError     tid (Error ecode emsg)       = encodeAny tid "e" (ecode,emsg) id
+
 encodeResponse  tid rvals              rip   = encodeAny tid "r" rvals        ("ip" .=? rip   .:)
+
 encodeQuery     tid qmeth              qargs = encodeAny tid "q" qmeth        ("a"  .=! qargs .:)
 
 encodeAny tid key val aux = toDict $
@@ -286,8 +288,8 @@ newClient addr = do
                 }
     routing <- atomically $ do
         let nobkts = R.defaultBucketCount :: Int
-        tbl4 <- newTVar $ R.nullTable (comparing nodeId) tenative_info nobkts
-        tbl6 <- newTVar $ R.nullTable (comparing nodeId) tenative_info nobkts
+        tbl4 <- newTVar $ R.nullTable (comparing nodeId) (\s -> hashWithSalt s . nodeId) tenative_info nobkts
+        tbl6 <- newTVar $ R.nullTable (comparing nodeId) (\s -> hashWithSalt s . nodeId) tenative_info nobkts
         committee4 <- newTriadCommittee (const $ return ()) -- TODO: update tbl4
         committee6 <- newTriadCommittee (const $ return ()) -- TODO: update tbl6
         return $ Routing tenative_info tbl4 committee4 tbl6 committee6
@@ -518,6 +520,17 @@ instance BEncode GotPeers where
   fromBEncode = fromDict $ do
     ns4 <- fromMaybe [] <$> optional (binary getNodeInfo4 nodes_key)        -- "nodes"
     ns6 <- fromMaybe [] <$> optional (binary getNodeInfo6 nodes6_key)       -- "nodes6"
+    -- TODO: BEP 42...
+    --
+    -- Once enforced, responses to get_peers requests whose node ID does not
+    -- match its external IP should be considered to not contain a token and
+    -- thus not be eligible as storage target.  Implementations should take
+    -- care that they find the closest set of nodes which return a token and
+    -- whose IDs matches their IPs before sending a store request to those
+    -- nodes.
+    --
+    -- Sounds like something to take care of at peer-search time, so I'll
+    -- ignore it for now.
     tok <- field    (req    token_key)                                      -- "token"
     ps <- fromMaybe [] <$> optional (field (req peers_key) >>= decodePeers) -- "values"
     pure $ GotPeers ps (NodeFound ns4 ns6) tok