diff options
Diffstat (limited to 'src/Network/BitTorrent')
-rw-r--r-- | src/Network/BitTorrent/PeerWire.hs | 2 | ||||
-rw-r--r-- | src/Network/BitTorrent/PeerWire/Block.hs | 113 | ||||
-rw-r--r-- | src/Network/BitTorrent/PeerWire/Handshake.hs | 127 | ||||
-rw-r--r-- | src/Network/BitTorrent/PeerWire/Protocol.hs | 242 | ||||
-rw-r--r-- | src/Network/BitTorrent/PeerWire/Selection.hs | 2 |
5 files changed, 238 insertions, 248 deletions
diff --git a/src/Network/BitTorrent/PeerWire.hs b/src/Network/BitTorrent/PeerWire.hs index 5ac4c7f3..b048fe1f 100644 --- a/src/Network/BitTorrent/PeerWire.hs +++ b/src/Network/BitTorrent/PeerWire.hs | |||
@@ -8,7 +8,5 @@ | |||
8 | {-# LANGUAGE DoAndIfThenElse #-} | 8 | {-# LANGUAGE DoAndIfThenElse #-} |
9 | module Network.BitTorrent.PeerWire (module PW) where | 9 | module Network.BitTorrent.PeerWire (module PW) where |
10 | 10 | ||
11 | import Network.BitTorrent.PeerWire.Block as PW | ||
12 | import Network.BitTorrent.PeerWire.Selection as PW | 11 | import Network.BitTorrent.PeerWire.Selection as PW |
13 | import Network.BitTorrent.PeerWire.Protocol as PW | 12 | import Network.BitTorrent.PeerWire.Protocol as PW |
14 | import Network.BitTorrent.PeerWire.Handshake as PW | ||
diff --git a/src/Network/BitTorrent/PeerWire/Block.hs b/src/Network/BitTorrent/PeerWire/Block.hs deleted file mode 100644 index dea37321..00000000 --- a/src/Network/BitTorrent/PeerWire/Block.hs +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | {-# LANGUAGE RecordWildCards #-} | ||
2 | {-# LANGUAGE OverloadedStrings #-} | ||
3 | module Network.BitTorrent.PeerWire.Block | ||
4 | ( BlockIx(..) | ||
5 | , Block(..), blockSize | ||
6 | , PieceIx | ||
7 | , BlockLIx, PieceLIx | ||
8 | , defaultBlockSize | ||
9 | , pieceIx, blockIx | ||
10 | , blockRange, ixRange, isPiece | ||
11 | , ppBlockIx, ppBlock | ||
12 | |||
13 | , putInt, getInt | ||
14 | ) where | ||
15 | |||
16 | import Control.Applicative | ||
17 | import Data.ByteString (ByteString) | ||
18 | import qualified Data.ByteString as B | ||
19 | import Data.Int | ||
20 | import Data.Serialize | ||
21 | import Text.PrettyPrint | ||
22 | |||
23 | |||
24 | type BlockLIx = Int | ||
25 | type PieceLIx = Int | ||
26 | type PieceIx = Int | ||
27 | |||
28 | data BlockIx = BlockIx { | ||
29 | -- | Zero-based piece index. | ||
30 | ixPiece :: {-# UNPACK #-} !PieceLIx | ||
31 | |||
32 | -- | Zero-based byte offset within the piece. | ||
33 | , ixOffset :: {-# UNPACK #-} !Int | ||
34 | |||
35 | -- | Block size starting from offset. | ||
36 | , ixLength :: {-# UNPACK #-} !Int | ||
37 | } deriving (Show, Eq) | ||
38 | |||
39 | getInt :: Get Int | ||
40 | getInt = fromIntegral <$> getWord32be | ||
41 | {-# INLINE getInt #-} | ||
42 | |||
43 | putInt :: Putter Int | ||
44 | putInt = putWord32be . fromIntegral | ||
45 | {-# INLINE putInt #-} | ||
46 | |||
47 | instance Serialize BlockIx where | ||
48 | {-# SPECIALIZE instance Serialize BlockIx #-} | ||
49 | get = BlockIx <$> getInt <*> getInt <*> getInt | ||
50 | {-# INLINE get #-} | ||
51 | |||
52 | put ix = do putInt (ixPiece ix) | ||
53 | putInt (ixOffset ix) | ||
54 | putInt (ixLength ix) | ||
55 | {-# INLINE put #-} | ||
56 | |||
57 | ppBlockIx :: BlockIx -> Doc | ||
58 | ppBlockIx BlockIx {..} = | ||
59 | "piece = " <> int ixPiece <> "," <+> | ||
60 | "offset = " <> int ixOffset <> "," <+> | ||
61 | "length = " <> int ixLength | ||
62 | |||
63 | data Block = Block { | ||
64 | -- | Zero-based piece index. | ||
65 | blkPiece :: PieceLIx | ||
66 | |||
67 | -- | Zero-based byte offset within the piece. | ||
68 | , blkOffset :: Int | ||
69 | |||
70 | -- | Payload. | ||
71 | , blkData :: ByteString | ||
72 | } deriving (Show, Eq) | ||
73 | |||
74 | ppBlock :: Block -> Doc | ||
75 | ppBlock = ppBlockIx . blockIx | ||
76 | |||
77 | blockSize :: Block -> Int | ||
78 | blockSize blk = B.length (blkData blk) | ||
79 | |||
80 | -- | Widely used semi-official block size. | ||
81 | defaultBlockSize :: Int | ||
82 | defaultBlockSize = 16 * 1024 | ||
83 | |||
84 | |||
85 | isPiece :: Int -> Block -> Bool | ||
86 | isPiece pieceSize (Block i offset bs) = | ||
87 | offset == 0 && B.length bs == pieceSize && i >= 0 | ||
88 | {-# INLINE isPiece #-} | ||
89 | |||
90 | pieceIx :: Int -> Int -> BlockIx | ||
91 | pieceIx i = BlockIx i 0 | ||
92 | {-# INLINE pieceIx #-} | ||
93 | |||
94 | blockIx :: Block -> BlockIx | ||
95 | blockIx = BlockIx <$> blkPiece <*> blkOffset <*> B.length . blkData | ||
96 | |||
97 | blockRange :: (Num a, Integral a) => Int -> Block -> (a, a) | ||
98 | blockRange pieceSize blk = (offset, offset + len) | ||
99 | where | ||
100 | offset = fromIntegral pieceSize * fromIntegral (blkPiece blk) | ||
101 | + fromIntegral (blkOffset blk) | ||
102 | len = fromIntegral (B.length (blkData blk)) | ||
103 | {-# INLINE blockRange #-} | ||
104 | {-# SPECIALIZE blockRange :: Int -> Block -> (Int64, Int64) #-} | ||
105 | |||
106 | ixRange :: (Num a, Integral a) => Int -> BlockIx -> (a, a) | ||
107 | ixRange pieceSize ix = (offset, offset + len) | ||
108 | where | ||
109 | offset = fromIntegral pieceSize * fromIntegral (ixPiece ix) | ||
110 | + fromIntegral (ixOffset ix) | ||
111 | len = fromIntegral (ixLength ix) | ||
112 | {-# INLINE ixRange #-} | ||
113 | {-# SPECIALIZE ixRange :: Int -> BlockIx -> (Int64, Int64) #-} | ||
diff --git a/src/Network/BitTorrent/PeerWire/Handshake.hs b/src/Network/BitTorrent/PeerWire/Handshake.hs deleted file mode 100644 index d5ee0b5b..00000000 --- a/src/Network/BitTorrent/PeerWire/Handshake.hs +++ /dev/null | |||
@@ -1,127 +0,0 @@ | |||
1 | -- | | ||
2 | -- Copyright : (c) Sam T. 2013 | ||
3 | -- License : MIT | ||
4 | -- Maintainer : pxqr.sta@gmail.com | ||
5 | -- Stability : experimental | ||
6 | -- Portability : portable | ||
7 | -- | ||
8 | -- In order to establish the connection between peers we should send | ||
9 | -- 'Handshake' message. The 'Handshake' is a required message and | ||
10 | -- must be the first message transmitted by the peer to the another | ||
11 | -- peer. | ||
12 | -- | ||
13 | {-# LANGUAGE OverloadedStrings #-} | ||
14 | {-# LANGUAGE RecordWildCards #-} | ||
15 | module Network.BitTorrent.PeerWire.Handshake | ||
16 | ( Handshake(..), handshakeCaps | ||
17 | , handshake | ||
18 | , ppHandshake | ||
19 | , defaultHandshake, defaultBTProtocol, defaultReserved | ||
20 | , handshakeMaxSize | ||
21 | ) where | ||
22 | |||
23 | import Control.Applicative | ||
24 | import Control.Monad | ||
25 | import Control.Exception | ||
26 | import Data.Word | ||
27 | import Data.ByteString (ByteString) | ||
28 | import qualified Data.ByteString as B | ||
29 | import qualified Data.ByteString.Char8 as BC | ||
30 | import Data.Serialize as S | ||
31 | import Text.PrettyPrint | ||
32 | |||
33 | import Network | ||
34 | import Network.Socket.ByteString | ||
35 | |||
36 | import Data.Torrent | ||
37 | import Network.BitTorrent.Extension | ||
38 | import Network.BitTorrent.Peer | ||
39 | |||
40 | |||
41 | |||
42 | data Handshake = Handshake { | ||
43 | -- | Identifier of the protocol. | ||
44 | hsProtocol :: ByteString | ||
45 | |||
46 | -- | Reserved bytes used to specify supported BEP's. | ||
47 | , hsReserved :: Capabilities | ||
48 | |||
49 | -- | Info hash of the info part of the metainfo file. that is | ||
50 | -- transmitted in tracker requests. Info hash of the initiator | ||
51 | -- handshake and response handshake should match, otherwise | ||
52 | -- initiator should break the connection. | ||
53 | -- | ||
54 | , hsInfoHash :: InfoHash | ||
55 | |||
56 | -- | Peer id of the initiator. This is usually the same peer id | ||
57 | -- that is transmitted in tracker requests. | ||
58 | -- | ||
59 | , hsPeerID :: PeerID | ||
60 | |||
61 | } deriving (Show, Eq) | ||
62 | |||
63 | instance Serialize Handshake where | ||
64 | put hs = do | ||
65 | putWord8 (fromIntegral (B.length (hsProtocol hs))) | ||
66 | putByteString (hsProtocol hs) | ||
67 | putWord64be (hsReserved hs) | ||
68 | put (hsInfoHash hs) | ||
69 | put (hsPeerID hs) | ||
70 | |||
71 | get = do | ||
72 | len <- getWord8 | ||
73 | Handshake <$> getBytes (fromIntegral len) | ||
74 | <*> getWord64be | ||
75 | <*> get | ||
76 | <*> get | ||
77 | |||
78 | |||
79 | handshakeCaps :: Handshake -> Capabilities | ||
80 | handshakeCaps = hsReserved | ||
81 | |||
82 | -- | Format handshake in human readable form. | ||
83 | ppHandshake :: Handshake -> Doc | ||
84 | ppHandshake Handshake {..} = | ||
85 | text (BC.unpack hsProtocol) <+> ppClientInfo (clientInfo hsPeerID) | ||
86 | |||
87 | -- | Get handshake message size in bytes from the length of protocol string. | ||
88 | handshakeSize :: Word8 -> Int | ||
89 | handshakeSize n = 1 + fromIntegral n + 8 + 20 + 20 | ||
90 | |||
91 | -- | Maximum size of handshake message in bytes. | ||
92 | handshakeMaxSize :: Int | ||
93 | handshakeMaxSize = handshakeSize 255 | ||
94 | |||
95 | -- | Default protocol string "BitTorrent protocol" as is. | ||
96 | defaultBTProtocol :: ByteString | ||
97 | defaultBTProtocol = "BitTorrent protocol" | ||
98 | |||
99 | -- | Default reserved word is 0. | ||
100 | defaultReserved :: Word64 | ||
101 | defaultReserved = 0 | ||
102 | |||
103 | -- | Length of info hash and peer id is unchecked, so it /should/ be equal 20. | ||
104 | defaultHandshake :: InfoHash -> PeerID -> Handshake | ||
105 | defaultHandshake = Handshake defaultBTProtocol defaultReserved | ||
106 | |||
107 | -- | Handshaking with a peer specified by the second argument. | ||
108 | handshake :: Socket -> Handshake -> IO Handshake | ||
109 | handshake sock hs = do | ||
110 | sendAll sock (S.encode hs) | ||
111 | |||
112 | header <- recv sock 1 | ||
113 | when (B.length header == 0) $ | ||
114 | throw $ userError "Unable to receive handshake." | ||
115 | |||
116 | let protocolLen = B.head header | ||
117 | let restLen = handshakeSize protocolLen - 1 | ||
118 | body <- recv sock restLen | ||
119 | let resp = B.cons protocolLen body | ||
120 | |||
121 | case checkIH (S.decode resp) of | ||
122 | Right hs' -> return hs' | ||
123 | Left msg -> throw $ userError msg | ||
124 | where | ||
125 | checkIH (Right hs') | ||
126 | | hsInfoHash hs /= hsInfoHash hs' = Left "Handshake info hash do not match." | ||
127 | checkIH x = x | ||
diff --git a/src/Network/BitTorrent/PeerWire/Protocol.hs b/src/Network/BitTorrent/PeerWire/Protocol.hs index a4d987e6..b40676ca 100644 --- a/src/Network/BitTorrent/PeerWire/Protocol.hs +++ b/src/Network/BitTorrent/PeerWire/Protocol.hs | |||
@@ -1,22 +1,254 @@ | |||
1 | -- | | ||
2 | -- Copyright : (c) Sam T. 2013 | ||
3 | -- License : MIT | ||
4 | -- Maintainer : pxqr.sta@gmail.com | ||
5 | -- Stability : experimental | ||
6 | -- Portability : portable | ||
7 | -- | ||
8 | -- In order to establish the connection between peers we should send | ||
9 | -- 'Handshake' message. The 'Handshake' is a required message and | ||
10 | -- must be the first message transmitted by the peer to the another | ||
11 | -- peer. | ||
12 | -- | ||
1 | {-# LANGUAGE OverloadedStrings #-} | 13 | {-# LANGUAGE OverloadedStrings #-} |
14 | {-# LANGUAGE RecordWildCards #-} | ||
2 | module Network.BitTorrent.PeerWire.Protocol | 15 | module Network.BitTorrent.PeerWire.Protocol |
3 | ( | 16 | ( -- * Inital handshake |
4 | -- * Messages | 17 | Handshake(..), ppHandshake |
5 | Message(..) | 18 | , handshake , handshakeCaps |
19 | |||
20 | -- ** Defaults | ||
21 | , defaultHandshake, defaultBTProtocol, defaultReserved | ||
22 | , handshakeMaxSize | ||
23 | |||
24 | -- * Block | ||
25 | , BlockLIx, PieceLIx | ||
26 | , BlockIx(..), ppBlockIx | ||
27 | , Block(..), ppBlock ,blockSize | ||
28 | , pieceIx, blockIx | ||
29 | , blockRange, ixRange, isPiece | ||
30 | |||
31 | -- ** Defaults | ||
32 | , defaultBlockSize | ||
33 | |||
34 | -- * Regular messages | ||
35 | , Message(..) | ||
6 | , ppMessage | 36 | , ppMessage |
7 | ) where | 37 | ) where |
8 | 38 | ||
9 | import Control.Applicative | 39 | import Control.Applicative |
40 | import Control.Monad | ||
41 | import Control.Exception | ||
42 | import Data.ByteString (ByteString) | ||
10 | import qualified Data.ByteString as B | 43 | import qualified Data.ByteString as B |
44 | import qualified Data.ByteString.Char8 as BC | ||
11 | import qualified Data.ByteString.Lazy as Lazy | 45 | import qualified Data.ByteString.Lazy as Lazy |
12 | import Data.Serialize | 46 | import Data.Serialize as S |
47 | import Data.Int | ||
48 | import Data.Word | ||
13 | import Text.PrettyPrint | 49 | import Text.PrettyPrint |
50 | |||
14 | import Network | 51 | import Network |
52 | import Network.Socket.ByteString | ||
15 | 53 | ||
16 | import Network.BitTorrent.PeerWire.Block | ||
17 | import Data.Bitfield | 54 | import Data.Bitfield |
55 | import Data.Torrent | ||
56 | import Network.BitTorrent.Extension | ||
57 | import Network.BitTorrent.Peer | ||
58 | |||
59 | |||
60 | |||
61 | {----------------------------------------------------------------------- | ||
62 | Handshake | ||
63 | -----------------------------------------------------------------------} | ||
64 | |||
65 | data Handshake = Handshake { | ||
66 | -- | Identifier of the protocol. | ||
67 | hsProtocol :: ByteString | ||
68 | |||
69 | -- | Reserved bytes used to specify supported BEP's. | ||
70 | , hsReserved :: Capabilities | ||
71 | |||
72 | -- | Info hash of the info part of the metainfo file. that is | ||
73 | -- transmitted in tracker requests. Info hash of the initiator | ||
74 | -- handshake and response handshake should match, otherwise | ||
75 | -- initiator should break the connection. | ||
76 | -- | ||
77 | , hsInfoHash :: InfoHash | ||
78 | |||
79 | -- | Peer id of the initiator. This is usually the same peer id | ||
80 | -- that is transmitted in tracker requests. | ||
81 | -- | ||
82 | , hsPeerID :: PeerID | ||
83 | |||
84 | } deriving (Show, Eq) | ||
85 | |||
86 | instance Serialize Handshake where | ||
87 | put hs = do | ||
88 | putWord8 (fromIntegral (B.length (hsProtocol hs))) | ||
89 | putByteString (hsProtocol hs) | ||
90 | putWord64be (hsReserved hs) | ||
91 | put (hsInfoHash hs) | ||
92 | put (hsPeerID hs) | ||
93 | |||
94 | get = do | ||
95 | len <- getWord8 | ||
96 | Handshake <$> getBytes (fromIntegral len) | ||
97 | <*> getWord64be | ||
98 | <*> get | ||
99 | <*> get | ||
100 | |||
101 | |||
102 | handshakeCaps :: Handshake -> Capabilities | ||
103 | handshakeCaps = hsReserved | ||
104 | |||
105 | -- | Format handshake in human readable form. | ||
106 | ppHandshake :: Handshake -> Doc | ||
107 | ppHandshake Handshake {..} = | ||
108 | text (BC.unpack hsProtocol) <+> ppClientInfo (clientInfo hsPeerID) | ||
109 | |||
110 | -- | Get handshake message size in bytes from the length of protocol string. | ||
111 | handshakeSize :: Word8 -> Int | ||
112 | handshakeSize n = 1 + fromIntegral n + 8 + 20 + 20 | ||
113 | |||
114 | -- | Maximum size of handshake message in bytes. | ||
115 | handshakeMaxSize :: Int | ||
116 | handshakeMaxSize = handshakeSize 255 | ||
117 | |||
118 | -- | Default protocol string "BitTorrent protocol" as is. | ||
119 | defaultBTProtocol :: ByteString | ||
120 | defaultBTProtocol = "BitTorrent protocol" | ||
121 | |||
122 | -- | Default reserved word is 0. | ||
123 | defaultReserved :: Word64 | ||
124 | defaultReserved = 0 | ||
125 | |||
126 | -- | Length of info hash and peer id is unchecked, so it /should/ be equal 20. | ||
127 | defaultHandshake :: InfoHash -> PeerID -> Handshake | ||
128 | defaultHandshake = Handshake defaultBTProtocol defaultReserved | ||
129 | |||
130 | -- | Handshaking with a peer specified by the second argument. | ||
131 | handshake :: Socket -> Handshake -> IO Handshake | ||
132 | handshake sock hs = do | ||
133 | sendAll sock (S.encode hs) | ||
134 | |||
135 | header <- recv sock 1 | ||
136 | when (B.length header == 0) $ | ||
137 | throw $ userError "Unable to receive handshake." | ||
138 | |||
139 | let protocolLen = B.head header | ||
140 | let restLen = handshakeSize protocolLen - 1 | ||
141 | body <- recv sock restLen | ||
142 | let resp = B.cons protocolLen body | ||
143 | |||
144 | case checkIH (S.decode resp) of | ||
145 | Right hs' -> return hs' | ||
146 | Left msg -> throw $ userError msg | ||
147 | where | ||
148 | checkIH (Right hs') | ||
149 | | hsInfoHash hs /= hsInfoHash hs' | ||
150 | = Left "Handshake info hash do not match." | ||
151 | checkIH x = x | ||
152 | |||
153 | {----------------------------------------------------------------------- | ||
154 | Blocks | ||
155 | -----------------------------------------------------------------------} | ||
156 | |||
157 | type BlockLIx = Int | ||
158 | type PieceLIx = Int | ||
159 | |||
160 | |||
161 | data BlockIx = BlockIx { | ||
162 | -- | Zero-based piece index. | ||
163 | ixPiece :: {-# UNPACK #-} !PieceLIx | ||
164 | |||
165 | -- | Zero-based byte offset within the piece. | ||
166 | , ixOffset :: {-# UNPACK #-} !Int | ||
167 | |||
168 | -- | Block size starting from offset. | ||
169 | , ixLength :: {-# UNPACK #-} !Int | ||
170 | } deriving (Show, Eq) | ||
171 | |||
172 | getInt :: Get Int | ||
173 | getInt = fromIntegral <$> getWord32be | ||
174 | {-# INLINE getInt #-} | ||
175 | |||
176 | putInt :: Putter Int | ||
177 | putInt = putWord32be . fromIntegral | ||
178 | {-# INLINE putInt #-} | ||
179 | |||
180 | instance Serialize BlockIx where | ||
181 | {-# SPECIALIZE instance Serialize BlockIx #-} | ||
182 | get = BlockIx <$> getInt <*> getInt <*> getInt | ||
183 | {-# INLINE get #-} | ||
184 | |||
185 | put ix = do putInt (ixPiece ix) | ||
186 | putInt (ixOffset ix) | ||
187 | putInt (ixLength ix) | ||
188 | {-# INLINE put #-} | ||
189 | |||
190 | ppBlockIx :: BlockIx -> Doc | ||
191 | ppBlockIx BlockIx {..} = | ||
192 | "piece = " <> int ixPiece <> "," <+> | ||
193 | "offset = " <> int ixOffset <> "," <+> | ||
194 | "length = " <> int ixLength | ||
195 | |||
196 | data Block = Block { | ||
197 | -- | Zero-based piece index. | ||
198 | blkPiece :: !PieceLIx | ||
199 | |||
200 | -- | Zero-based byte offset within the piece. | ||
201 | , blkOffset :: !Int | ||
202 | |||
203 | -- | Payload. | ||
204 | , blkData :: !ByteString | ||
205 | } deriving (Show, Eq) | ||
206 | |||
207 | ppBlock :: Block -> Doc | ||
208 | ppBlock = ppBlockIx . blockIx | ||
209 | |||
210 | blockSize :: Block -> Int | ||
211 | blockSize blk = B.length (blkData blk) | ||
212 | |||
213 | -- | Widely used semi-official block size. | ||
214 | defaultBlockSize :: Int | ||
215 | defaultBlockSize = 16 * 1024 | ||
216 | |||
217 | |||
218 | isPiece :: Int -> Block -> Bool | ||
219 | isPiece pieceSize (Block i offset bs) = | ||
220 | offset == 0 && B.length bs == pieceSize && i >= 0 | ||
221 | {-# INLINE isPiece #-} | ||
222 | |||
223 | pieceIx :: Int -> Int -> BlockIx | ||
224 | pieceIx i = BlockIx i 0 | ||
225 | {-# INLINE pieceIx #-} | ||
226 | |||
227 | blockIx :: Block -> BlockIx | ||
228 | blockIx = BlockIx <$> blkPiece <*> blkOffset <*> B.length . blkData | ||
229 | |||
230 | blockRange :: (Num a, Integral a) => Int -> Block -> (a, a) | ||
231 | blockRange pieceSize blk = (offset, offset + len) | ||
232 | where | ||
233 | offset = fromIntegral pieceSize * fromIntegral (blkPiece blk) | ||
234 | + fromIntegral (blkOffset blk) | ||
235 | len = fromIntegral (B.length (blkData blk)) | ||
236 | {-# INLINE blockRange #-} | ||
237 | {-# SPECIALIZE blockRange :: Int -> Block -> (Int64, Int64) #-} | ||
238 | |||
239 | ixRange :: (Num a, Integral a) => Int -> BlockIx -> (a, a) | ||
240 | ixRange pieceSize ix = (offset, offset + len) | ||
241 | where | ||
242 | offset = fromIntegral pieceSize * fromIntegral (ixPiece ix) | ||
243 | + fromIntegral (ixOffset ix) | ||
244 | len = fromIntegral (ixLength ix) | ||
245 | {-# INLINE ixRange #-} | ||
246 | {-# SPECIALIZE ixRange :: Int -> BlockIx -> (Int64, Int64) #-} | ||
18 | 247 | ||
19 | 248 | ||
249 | {----------------------------------------------------------------------- | ||
250 | Handshake | ||
251 | -----------------------------------------------------------------------} | ||
20 | 252 | ||
21 | -- | Messages used in communication between peers. | 253 | -- | Messages used in communication between peers. |
22 | -- | 254 | -- |
diff --git a/src/Network/BitTorrent/PeerWire/Selection.hs b/src/Network/BitTorrent/PeerWire/Selection.hs index 63cca15d..db9e04f4 100644 --- a/src/Network/BitTorrent/PeerWire/Selection.hs +++ b/src/Network/BitTorrent/PeerWire/Selection.hs | |||
@@ -34,7 +34,7 @@ module Network.BitTorrent.PeerWire.Selection | |||
34 | 34 | ||
35 | import Data.Bitfield | 35 | import Data.Bitfield |
36 | import Data.Ratio | 36 | import Data.Ratio |
37 | import Network.BitTorrent.PeerWire.Block | 37 | import Network.BitTorrent.PeerWire.Protocol |
38 | 38 | ||
39 | 39 | ||
40 | type Selector = Bitfield -- ^ Indices of client /have/ pieces. | 40 | type Selector = Bitfield -- ^ Indices of client /have/ pieces. |