diff options
Diffstat (limited to 'src/Network/BitTorrent')
-rw-r--r-- | src/Network/BitTorrent/DHT/Session.hs | 2 | ||||
-rw-r--r-- | src/Network/BitTorrent/Exchange/Assembler.hs | 2 | ||||
-rw-r--r-- | src/Network/BitTorrent/Exchange/Block.hs | 2 | ||||
-rw-r--r-- | src/Network/BitTorrent/Exchange/Message.hs | 10 | ||||
-rw-r--r-- | src/Network/BitTorrent/Exchange/Session.hs | 3 | ||||
-rw-r--r-- | src/Network/BitTorrent/Exchange/Session/Metadata.hs | 1 | ||||
-rw-r--r-- | src/Network/BitTorrent/Exchange/Session/Status.hs | 2 |
7 files changed, 10 insertions, 12 deletions
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs index 87a6d4ea..8fe81abd 100644 --- a/src/Network/BitTorrent/DHT/Session.hs +++ b/src/Network/BitTorrent/DHT/Session.hs | |||
@@ -91,7 +91,7 @@ import System.Random (randomIO) | |||
91 | import Text.PrettyPrint as PP hiding ((<>), ($$)) | 91 | import Text.PrettyPrint as PP hiding ((<>), ($$)) |
92 | import Text.PrettyPrint.Class | 92 | import Text.PrettyPrint.Class |
93 | 93 | ||
94 | import Data.Torrent | 94 | import Data.Torrent as Torrent |
95 | import Network.KRPC hiding (Options, def) | 95 | import Network.KRPC hiding (Options, def) |
96 | import qualified Network.KRPC as KRPC (def) | 96 | import qualified Network.KRPC as KRPC (def) |
97 | import Network.BitTorrent.Core | 97 | import Network.BitTorrent.Core |
diff --git a/src/Network/BitTorrent/Exchange/Assembler.hs b/src/Network/BitTorrent/Exchange/Assembler.hs index e5834948..e17dfbe2 100644 --- a/src/Network/BitTorrent/Exchange/Assembler.hs +++ b/src/Network/BitTorrent/Exchange/Assembler.hs | |||
@@ -67,7 +67,7 @@ import Data.Map as M | |||
67 | import Data.Maybe | 67 | import Data.Maybe |
68 | import Data.IP | 68 | import Data.IP |
69 | 69 | ||
70 | import Data.Torrent.Piece | 70 | import Data.Torrent |
71 | import Network.BitTorrent.Core | 71 | import Network.BitTorrent.Core |
72 | import Network.BitTorrent.Exchange.Block as B | 72 | import Network.BitTorrent.Exchange.Block as B |
73 | 73 | ||
diff --git a/src/Network/BitTorrent/Exchange/Block.hs b/src/Network/BitTorrent/Exchange/Block.hs index 16c124e9..ccc7a0a9 100644 --- a/src/Network/BitTorrent/Exchange/Block.hs +++ b/src/Network/BitTorrent/Exchange/Block.hs | |||
@@ -69,7 +69,7 @@ import Numeric | |||
69 | import Text.PrettyPrint as PP hiding ((<>)) | 69 | import Text.PrettyPrint as PP hiding ((<>)) |
70 | import Text.PrettyPrint.Class | 70 | import Text.PrettyPrint.Class |
71 | 71 | ||
72 | import Data.Torrent.Piece | 72 | import Data.Torrent |
73 | 73 | ||
74 | {----------------------------------------------------------------------- | 74 | {----------------------------------------------------------------------- |
75 | -- Block attributes | 75 | -- Block attributes |
diff --git a/src/Network/BitTorrent/Exchange/Message.hs b/src/Network/BitTorrent/Exchange/Message.hs index bd5c6526..5ca7c97e 100644 --- a/src/Network/BitTorrent/Exchange/Message.hs +++ b/src/Network/BitTorrent/Exchange/Message.hs | |||
@@ -118,8 +118,8 @@ import Text.PrettyPrint as PP hiding ((<>)) | |||
118 | import Text.PrettyPrint.Class | 118 | import Text.PrettyPrint.Class |
119 | 119 | ||
120 | import Data.Torrent.Bitfield | 120 | import Data.Torrent.Bitfield |
121 | import Data.Torrent | 121 | import Data.Torrent hiding (Piece (..)) |
122 | import qualified Data.Torrent.Piece as P | 122 | import qualified Data.Torrent as P (Piece (..)) |
123 | import Network.BitTorrent.Core | 123 | import Network.BitTorrent.Core |
124 | import Network.BitTorrent.Exchange.Block | 124 | import Network.BitTorrent.Exchange.Block |
125 | 125 | ||
@@ -864,7 +864,7 @@ instance PeerMessage ExtendedMetadata where | |||
864 | 864 | ||
865 | -- | All 'Piece's in 'MetadataData' messages MUST have size equal to | 865 | -- | All 'Piece's in 'MetadataData' messages MUST have size equal to |
866 | -- this value. The last trailing piece can be shorter. | 866 | -- this value. The last trailing piece can be shorter. |
867 | metadataPieceSize :: P.PieceSize | 867 | metadataPieceSize :: PieceSize |
868 | metadataPieceSize = 16 * 1024 | 868 | metadataPieceSize = 16 * 1024 |
869 | 869 | ||
870 | isLastPiece :: P.Piece a -> Int -> Bool | 870 | isLastPiece :: P.Piece a -> Int -> Bool |
@@ -877,8 +877,8 @@ isLastPiece P.Piece {..} total = succ pieceIndex == pcnt | |||
877 | -- length; otherwise serialization MUST fail. | 877 | -- length; otherwise serialization MUST fail. |
878 | isValidPiece :: P.Piece BL.ByteString -> Int -> Bool | 878 | isValidPiece :: P.Piece BL.ByteString -> Int -> Bool |
879 | isValidPiece p @ P.Piece {..} total | 879 | isValidPiece p @ P.Piece {..} total |
880 | | isLastPiece p total = P.pieceSize p <= metadataPieceSize | 880 | | isLastPiece p total = pieceSize p <= metadataPieceSize |
881 | | otherwise = P.pieceSize p == metadataPieceSize | 881 | | otherwise = pieceSize p == metadataPieceSize |
882 | 882 | ||
883 | setMetadataPayload :: BS.ByteString -> ExtendedMetadata -> ExtendedMetadata | 883 | setMetadataPayload :: BS.ByteString -> ExtendedMetadata -> ExtendedMetadata |
884 | setMetadataPayload bs (MetadataData (P.Piece pix _) t) = | 884 | setMetadataPayload bs (MetadataData (P.Piece pix _) t) = |
diff --git a/src/Network/BitTorrent/Exchange/Session.hs b/src/Network/BitTorrent/Exchange/Session.hs index 0adb08c8..cae3a2d5 100644 --- a/src/Network/BitTorrent/Exchange/Session.hs +++ b/src/Network/BitTorrent/Exchange/Session.hs | |||
@@ -45,8 +45,7 @@ import Text.PrettyPrint.Class | |||
45 | import System.Log.FastLogger (LogStr, ToLogStr (..)) | 45 | import System.Log.FastLogger (LogStr, ToLogStr (..)) |
46 | 46 | ||
47 | import Data.BEncode as BE | 47 | import Data.BEncode as BE |
48 | import Data.Torrent as T | 48 | import Data.Torrent as Torrent |
49 | import Data.Torrent.Piece as Torrent | ||
50 | import Data.Torrent.Bitfield as BF | 49 | import Data.Torrent.Bitfield as BF |
51 | import Network.BitTorrent.Internal.Types | 50 | import Network.BitTorrent.Internal.Types |
52 | import Network.BitTorrent.Core | 51 | import Network.BitTorrent.Core |
diff --git a/src/Network/BitTorrent/Exchange/Session/Metadata.hs b/src/Network/BitTorrent/Exchange/Session/Metadata.hs index bdd5b322..a4e54659 100644 --- a/src/Network/BitTorrent/Exchange/Session/Metadata.hs +++ b/src/Network/BitTorrent/Exchange/Session/Metadata.hs | |||
@@ -27,7 +27,6 @@ import Data.Tuple | |||
27 | 27 | ||
28 | import Data.BEncode as BE | 28 | import Data.BEncode as BE |
29 | import Data.Torrent as Torrent | 29 | import Data.Torrent as Torrent |
30 | import Data.Torrent.Piece as Torrent | ||
31 | import Network.BitTorrent.Core | 30 | import Network.BitTorrent.Core |
32 | import Network.BitTorrent.Exchange.Block as Block | 31 | import Network.BitTorrent.Exchange.Block as Block |
33 | import Network.BitTorrent.Exchange.Message as Message hiding (Status) | 32 | import Network.BitTorrent.Exchange.Message as Message hiding (Status) |
diff --git a/src/Network/BitTorrent/Exchange/Session/Status.hs b/src/Network/BitTorrent/Exchange/Session/Status.hs index 565c3bf3..4feff8d6 100644 --- a/src/Network/BitTorrent/Exchange/Session/Status.hs +++ b/src/Network/BitTorrent/Exchange/Session/Status.hs | |||
@@ -28,7 +28,7 @@ import Data.Map as M | |||
28 | import Data.Set as S | 28 | import Data.Set as S |
29 | import Data.Tuple | 29 | import Data.Tuple |
30 | 30 | ||
31 | import Data.Torrent.Piece | 31 | import Data.Torrent |
32 | import Data.Torrent.Bitfield as BF | 32 | import Data.Torrent.Bitfield as BF |
33 | import Network.BitTorrent.Core | 33 | import Network.BitTorrent.Core |
34 | import Network.BitTorrent.Exchange.Block as Block | 34 | import Network.BitTorrent.Exchange.Block as Block |