diff options
author | Sam T <pxqr.sta@gmail.com> | 2013-06-08 01:58:51 +0400 |
---|---|---|
committer | Sam T <pxqr.sta@gmail.com> | 2013-06-08 01:58:51 +0400 |
commit | 279433f8d80f829b9fad6b7e2e60db4f21dfc3ec (patch) | |
tree | d54845828f8f361df1786d8f911ea8d06b1b0077 | |
parent | aaf7ecf00fe34c4b581937713c3308d7e7221360 (diff) |
~ Minor changes.
-rw-r--r-- | bittorrent.cabal | 5 | ||||
-rw-r--r-- | src/Network/BitTorrent/PeerWire.hs | 11 | ||||
-rw-r--r-- | src/Network/BitTorrent/PeerWire/Protocol.hs | 2 |
3 files changed, 17 insertions, 1 deletions
diff --git a/bittorrent.cabal b/bittorrent.cabal index 4e3251d4..ddad1a61 100644 --- a/bittorrent.cabal +++ b/bittorrent.cabal | |||
@@ -78,6 +78,11 @@ library | |||
78 | , HTTP >= 4000.2 | 78 | , HTTP >= 4000.2 |
79 | , krpc | 79 | , krpc |
80 | 80 | ||
81 | -- conduits | ||
82 | , conduit == 1.* | ||
83 | , network-conduit == 1.* | ||
84 | , cereal-conduit >= 0.5 | ||
85 | |||
81 | , cryptohash | 86 | , cryptohash |
82 | , filepath >= 1 | 87 | , filepath >= 1 |
83 | , bits-atomic >= 0.1 | 88 | , bits-atomic >= 0.1 |
diff --git a/src/Network/BitTorrent/PeerWire.hs b/src/Network/BitTorrent/PeerWire.hs index b048fe1f..08e3f388 100644 --- a/src/Network/BitTorrent/PeerWire.hs +++ b/src/Network/BitTorrent/PeerWire.hs | |||
@@ -10,3 +10,14 @@ module Network.BitTorrent.PeerWire (module PW) where | |||
10 | 10 | ||
11 | import Network.BitTorrent.PeerWire.Selection as PW | 11 | import Network.BitTorrent.PeerWire.Selection as PW |
12 | import Network.BitTorrent.PeerWire.Protocol as PW | 12 | import Network.BitTorrent.PeerWire.Protocol as PW |
13 | |||
14 | {- | ||
15 | |||
16 | newtype P2P a = P2P { | ||
17 | getP2P :: ReaderT PSession State PState (Conduit Message IO Message) a | ||
18 | } | ||
19 | |||
20 | runP2P :: PConnection -> P2P a -> IO a | ||
21 | recvMessage :: P2P Message | ||
22 | sendMessage :: Message -> P2P () | ||
23 | -} \ No newline at end of file | ||
diff --git a/src/Network/BitTorrent/PeerWire/Protocol.hs b/src/Network/BitTorrent/PeerWire/Protocol.hs index b40676ca..cab54ef5 100644 --- a/src/Network/BitTorrent/PeerWire/Protocol.hs +++ b/src/Network/BitTorrent/PeerWire/Protocol.hs | |||
@@ -22,7 +22,7 @@ module Network.BitTorrent.PeerWire.Protocol | |||
22 | , handshakeMaxSize | 22 | , handshakeMaxSize |
23 | 23 | ||
24 | -- * Block | 24 | -- * Block |
25 | , BlockLIx, PieceLIx | 25 | , PieceIx, BlockLIx, PieceLIx |
26 | , BlockIx(..), ppBlockIx | 26 | , BlockIx(..), ppBlockIx |
27 | , Block(..), ppBlock ,blockSize | 27 | , Block(..), ppBlock ,blockSize |
28 | , pieceIx, blockIx | 28 | , pieceIx, blockIx |