diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2013-12-25 17:04:06 +0000 |
|---|---|---|
| committer | Daniel Gröber <dxld@darkboxed.org> | 2013-12-25 17:04:06 +0000 |
| commit | 43f068098ca6c4420ded6a1fa671436cc2b081f3 (patch) | |
| tree | e89e0cd47cfbf809489a19e16fb5641b1112a6e3 /src/Network/BitTorrent/Core/PeerAddr.hs | |
| parent | 349cd9cc63561d6e471f2be0be03fc2fae1a9371 (diff) | |
| parent | 23eb8500987043a79715e01f07e2febab6adaabc (diff) | |
Merge branch 'master' into dev
Conflicts:
src/Network/BitTorrent/Exchange/Message.hs
Diffstat (limited to 'src/Network/BitTorrent/Core/PeerAddr.hs')
| -rw-r--r-- | src/Network/BitTorrent/Core/PeerAddr.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Network/BitTorrent/Core/PeerAddr.hs b/src/Network/BitTorrent/Core/PeerAddr.hs index bc4a1078..86b88491 100644 --- a/src/Network/BitTorrent/Core/PeerAddr.hs +++ b/src/Network/BitTorrent/Core/PeerAddr.hs | |||
| @@ -254,7 +254,7 @@ peerSockAddr PeerAddr {..} = | |||
| 254 | 254 | ||
| 255 | -- | Storage used to keep track a set of known peers in client, | 255 | -- | Storage used to keep track a set of known peers in client, |
| 256 | -- tracker or DHT sessions. | 256 | -- tracker or DHT sessions. |
| 257 | newtype PeerStore a = PeerStore (HashMap InfoHash [PeerAddr a]) | 257 | newtype PeerStore ip = PeerStore (HashMap InfoHash [PeerAddr ip]) |
| 258 | 258 | ||
| 259 | -- | Empty store. | 259 | -- | Empty store. |
| 260 | instance Default (PeerStore a) where | 260 | instance Default (PeerStore a) where |