diff options
author | Andrew Cady <d@jerkface.net> | 2018-06-09 01:34:43 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2018-06-09 01:34:43 -0400 |
commit | 626820b99b76b4e4fa0b36e8e92e05d8176c4f43 (patch) | |
tree | 5ced91907da9ff6b9d391ca013533912366ae29c /bittorrent/src/Network/BitTorrent/Tracker/Session.hs | |
parent | 031d0e35f0532e4573497926a692ced50ba2f4b0 (diff) | |
parent | fb0c6758ec415c5cda5cc7c182e1f83906f365fb (diff) |
Merge branch 'dht-presence' of blackbird:bittorrent
Diffstat (limited to 'bittorrent/src/Network/BitTorrent/Tracker/Session.hs')
-rw-r--r-- | bittorrent/src/Network/BitTorrent/Tracker/Session.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bittorrent/src/Network/BitTorrent/Tracker/Session.hs b/bittorrent/src/Network/BitTorrent/Tracker/Session.hs index aa4a832f..db6ebaff 100644 --- a/bittorrent/src/Network/BitTorrent/Tracker/Session.hs +++ b/bittorrent/src/Network/BitTorrent/Tracker/Session.hs | |||
@@ -98,7 +98,7 @@ data TrackerSession = TrackerSession | |||
98 | statusSent :: !(Maybe Status) | 98 | statusSent :: !(Maybe Status) |
99 | 99 | ||
100 | -- | Can be used to retrieve peer set. | 100 | -- | Can be used to retrieve peer set. |
101 | , trackerPeers :: Cached [PeerAddr IP] | 101 | , trackerPeers :: Cached [PeerAddr] |
102 | 102 | ||
103 | -- | Can be used to show brief swarm stats in client GUI. | 103 | -- | Can be used to show brief swarm stats in client GUI. |
104 | , trackerScrape :: Cached LastScrape | 104 | , trackerScrape :: Cached LastScrape |
@@ -129,7 +129,7 @@ nextStatus Completed = Nothing -- must keep previous status | |||
129 | seconds :: Int -> NominalDiffTime | 129 | seconds :: Int -> NominalDiffTime |
130 | seconds n = realToFrac (toEnum n :: Uni) | 130 | seconds n = realToFrac (toEnum n :: Uni) |
131 | 131 | ||
132 | cachePeers :: AnnounceInfo -> IO (Cached [PeerAddr IP]) | 132 | cachePeers :: AnnounceInfo -> IO (Cached [PeerAddr]) |
133 | cachePeers AnnounceInfo {..} = | 133 | cachePeers AnnounceInfo {..} = |
134 | newCached (seconds respInterval) | 134 | newCached (seconds respInterval) |
135 | (seconds (fromMaybe respInterval respMinInterval)) | 135 | (seconds (fromMaybe respInterval respMinInterval)) |
@@ -264,7 +264,7 @@ notify mgr ses event = do | |||
264 | -- TODO run announce if sesion have no peers | 264 | -- TODO run announce if sesion have no peers |
265 | -- | The returned list of peers can have duplicates. | 265 | -- | The returned list of peers can have duplicates. |
266 | -- This function /may/ block. Use async if needed. | 266 | -- This function /may/ block. Use async if needed. |
267 | askPeers :: Manager -> Session -> IO [PeerAddr IP] | 267 | askPeers :: Manager -> Session -> IO [PeerAddr] |
268 | askPeers _mgr ses = do | 268 | askPeers _mgr ses = do |
269 | list <- readMVar (sessionTrackers ses) | 269 | list <- readMVar (sessionTrackers ses) |
270 | L.concat <$> collect (tryTakeData . trackerPeers) list | 270 | L.concat <$> collect (tryTakeData . trackerPeers) list |