From bad22a9e32512c78298adbf6654eac2ac3524bbe Mon Sep 17 00:00:00 2001 From: joe Date: Tue, 13 Jun 2017 00:16:32 -0400 Subject: Changed comments for haddock parsing. --- src/Network/BitTorrent/DHT/Query.hs | 10 +++++----- src/Network/DHT/Routing.hs | 4 ++-- src/Network/DatagramServer.hs | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs index ae072db0..9162abdc 100644 --- a/src/Network/BitTorrent/DHT/Query.hs +++ b/src/Network/BitTorrent/DHT/Query.hs @@ -259,7 +259,7 @@ isearch f ih = do tid <- myThreadId labelThread tid ("search."++show ih) Search.search s - -- atomically $ readTVar (Search.searchResults s) + -- atomically \$ readTVar (Search.searchResults s) return (a, s) @@ -298,11 +298,11 @@ refreshNodes nid = do $(logDebugS) "routing.refresh_bucket" (T.pack (render (pPrint nid))) nodes <- getClosest nid do - -- forM (L.take 1 nodes) $ \ addr -> do + -- forM (L.take 1 nodes) \$ \ addr -> do -- NodeFound ns <- FindNode nid <@> addr -- Expected type: ConduitM [NodeAddr ip] [NodeInfo KMessageOf ip ()] (DHT ip) () -- Actual type: ConduitM [NodeInfo KMessageOf ip ()] [NodeInfo KMessageOf ip ()] (DHT ip) () - -- nss <- sourceList [[addr]] $= search nid (findNodeQ nid) $$ C.consume + -- nss <- sourceList [[addr]] \$= search nid (findNodeQ nid) $$ C.consume nss <- sourceList [nodes] $= search nid (findNodeQ nid) $$ C.consume $(logWarnS) "refreshNodes" $ "received " <> T.pack (show (L.length (L.concat nss))) <> " nodes." _ <- queryParallel $ flip L.map (L.concat nss) $ \n -> do @@ -310,7 +310,7 @@ refreshNodes nid = do pingQ (nodeAddr n) -- pingQ takes care of inserting the node. return () - return () -- $ L.concat nss + return () -- \$ L.concat nss -- | This operation do not block but acquire exclusive access to -- routing table. @@ -398,7 +398,7 @@ queryNode' addr q = do let read_only = False -- TODO: check for NAT issues. (BEP 43) let KRPC.Method name = KRPC.method :: KRPC.Method (Query a) (Response b) (Response remoteId r, witnessed_ip) <- query' name (toSockAddr addr) (Query nid read_only q) - -- $(logDebugS) "queryNode" $ "Witnessed address: " <> T.pack (show witnessed_ip) + -- \$(logDebugS) "queryNode" $ "Witnessed address: " <> T.pack (show witnessed_ip) -- <> " by " <> T.pack (show (toSockAddr addr)) _ <- insertNode (NodeInfo remoteId addr ()) witnessed_ip return (remoteId, r, witnessed_ip) diff --git a/src/Network/DHT/Routing.hs b/src/Network/DHT/Routing.hs index 1d1aa44b..5c6abe5d 100644 --- a/src/Network/DHT/Routing.hs +++ b/src/Network/DHT/Routing.hs @@ -253,12 +253,12 @@ insertBucket curTime (TryInsert info) bucket guard (t < curTime - delta) return n -- All stale: - -- map key $ PSQ.atMost (curTime - delta) $ bktNodes bucket + -- map key \$ PSQ.atMost (curTime - delta) $ bktNodes bucket already_have = maybe False (const True) $ PSQ.lookup info (bktNodes bucket) map_ns f = bucket { bktNodes = f (bktNodes bucket) } - -- map_q f = bucket { bktQ = runIdentity $ f (bktQ bucket) } + -- map_q f = bucket { bktQ = runIdentity \$ f (bktQ bucket) } insertBucket curTime (PingResult bad_node got_response) bucket = pure ([], Bucket (upd $ bktNodes bucket) popped) diff --git a/src/Network/DatagramServer.hs b/src/Network/DatagramServer.hs index 5c77fb86..cd74f589 100644 --- a/src/Network/DatagramServer.hs +++ b/src/Network/DatagramServer.hs @@ -526,13 +526,13 @@ handleQuery meth raw q addr = void $ fork $ do let res' = either buildError Just res ctx = error "TODO TOX ToxCipherContext 2 or () for Mainline" resbs = fmap (encodeHeaders ctx) res' :: Maybe BS.ByteString --- TODO: Generalize this debug print. --- resbe = either toBEncode toBEncode res --- $(logOther "q") $ T.unlines --- [ either (const "") id $ T.decodeUtf8' (BL.toStrict $ showBEncode raw) --- , "==>" --- , either (const "") id $ T.decodeUtf8' (BL.toStrict $ showBEncode resbe) --- ] + -- TODO: Generalize this debug print. + -- resbe = either toBEncode toBEncode res + -- .(logOther "q") \$ T.unlines + -- [ either (const "") id \$ T.decodeUtf8' (BL.toStrict $ showBEncode raw) + -- , "==>" + -- , either (const "") id \$ T.decodeUtf8' (BL.toStrict $ showBEncode resbe) + -- ] maybe (return ()) (sendMessage sock addr) resbs handleResponse :: ( MonadKRPC h m raw msg @@ -568,7 +568,7 @@ listener p = do handle exceptions $ BS.recvFrom sock (optMaxMsgSize options) case parsePacket (msgProxy p) bs >>= \r -> (,) r <$> decodeHeaders ctx r of Left e -> -- XXX: Send parse failure message? - -- liftIO $ sendMessage sock addr $ encodeHeaders ctx (unknownMessage e) + -- liftIO \$ sendMessage sock addr $ encodeHeaders ctx (unknownMessage e) return () -- Without transaction id, error message isn't very useful. Right (raw,m) -> case envelopeClass m of -- cgit v1.2.3