diff options
Diffstat (limited to 'src/Network')
-rw-r--r-- | src/Network/BitTorrent/DHT/Query.hs | 6 | ||||
-rw-r--r-- | src/Network/BitTorrent/Tracker/RPC/HTTP.hs | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs index d4710ecf..f7657490 100644 --- a/src/Network/BitTorrent/DHT/Query.hs +++ b/src/Network/BitTorrent/DHT/Query.hs | |||
@@ -127,17 +127,13 @@ findNodeQ key NodeInfo {..} = do | |||
127 | NodeFound closest <- FindNode (toNodeId key) <@> nodeAddr | 127 | NodeFound closest <- FindNode (toNodeId key) <@> nodeAddr |
128 | return $ Right closest | 128 | return $ Right closest |
129 | 129 | ||
130 | isLeft :: Either a b -> Bool | ||
131 | isLeft (Right _) = False | ||
132 | isLeft (Left _) = True | ||
133 | |||
134 | getPeersQ :: Address ip => InfoHash -> Iteration ip PeerAddr | 130 | getPeersQ :: Address ip => InfoHash -> Iteration ip PeerAddr |
135 | getPeersQ topic NodeInfo {..} = do | 131 | getPeersQ topic NodeInfo {..} = do |
136 | GotPeers {..} <- GetPeers topic <@> nodeAddr | 132 | GotPeers {..} <- GetPeers topic <@> nodeAddr |
137 | let dist = distance (toNodeId topic) nodeId | 133 | let dist = distance (toNodeId topic) nodeId |
138 | $(logInfoS) "getPeersQ" $ T.pack | 134 | $(logInfoS) "getPeersQ" $ T.pack |
139 | $ "distance: " <> render (pretty dist) <> " , result: " | 135 | $ "distance: " <> render (pretty dist) <> " , result: " |
140 | <> if isLeft peers then "NODES" else "PEERS" | 136 | <> case peers of { Left _ -> "NODES"; Right _ -> "PEERS" } |
141 | return peers | 137 | return peers |
142 | 138 | ||
143 | announceQ :: Address ip => InfoHash -> PortNumber -> Iteration ip NodeAddr | 139 | announceQ :: Address ip => InfoHash -> PortNumber -> Iteration ip NodeAddr |
diff --git a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs index 6e55eb04..de3fc5f5 100644 --- a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs +++ b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs | |||
@@ -37,7 +37,7 @@ import Data.ByteString.Lazy as BL | |||
37 | import Data.Default | 37 | import Data.Default |
38 | import Data.List as L | 38 | import Data.List as L |
39 | import Data.Monoid | 39 | import Data.Monoid |
40 | import Data.Typeable | 40 | import Data.Typeable hiding (Proxy) |
41 | import Network.URI | 41 | import Network.URI |
42 | import Network.HTTP.Conduit hiding | 42 | import Network.HTTP.Conduit hiding |
43 | (Manager, newManager, closeManager, withManager) | 43 | (Manager, newManager, closeManager, withManager) |