~ Hide *.Protocol modules.

6 files changed, 69 insertions, 13 deletions

diff --git a/bench/Main.hs b/bench/Main.hs
index 120f5b04..0037c66b 100644
--- a/bench/Main.hs
+++ b/bench/Main.hs
@@ -10,6 +10,8 @@ import Data.Serialize
 import Network
 
 import Network.BitTorrent as BT
+import Network.BitTorrent.Exchange.Protocol as BT
+import Network.BitTorrent.Tracker.Protocol as BT
 import Data.Bitfield as BT
 
 
diff --git a/bittorrent.cabal b/bittorrent.cabal
index cdc332ab..3b5d0a90 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -41,14 +41,19 @@ library
                      , Network.BitTorrent.Peer
 
                      , Network.BitTorrent.Tracker
-                     , Network.BitTorrent.Tracker.Protocol
                      , Network.BitTorrent.Tracker.Scrape
 
                      , Network.BitTorrent.Exchange
                      , Network.BitTorrent.Exchange.Selection
-                     , Network.BitTorrent.Exchange.Protocol
 
-  other-modules:
+  if flag(testing)
+     exposed-modules:  Network.BitTorrent.Exchange.Protocol
+                     , Network.BitTorrent.Tracker.Protocol
+
+  if !flag(testing)
+     other-modules:
+                       Network.BitTorrent.Exchange.Protocol
+                     , Network.BitTorrent.Tracker.Protocol
 
 
   build-depends:
diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
index 51ba6aac..ac9ed50a 100644
--- a/src/Network/BitTorrent.hs
+++ b/src/Network/BitTorrent.hs
@@ -5,7 +5,11 @@
 --   Stability   :  experimental
 --   Portability :  portable
 --
-module Network.BitTorrent (module BT) where
+module Network.BitTorrent
+       (module BT
+
+--       , ClientSession, newClient
+       ) where
 
 import Network.BitTorrent.Extension as BT
 import Network.BitTorrent.Peer as BT
diff --git a/src/Network/BitTorrent/Exchange.hs b/src/Network/BitTorrent/Exchange.hs
index d75fdf96..425ed2a3 100644
--- a/src/Network/BitTorrent/Exchange.hs
+++ b/src/Network/BitTorrent/Exchange.hs
@@ -6,18 +6,61 @@
 --   Portability :  portable
 --
 {-# LANGUAGE DoAndIfThenElse #-}
-module Network.BitTorrent.Exchange (module PW) where
+module Network.BitTorrent.Exchange
+       (
+         -- * Session
+         PeerSession, newLeacher, newSeeder
+       ) where
+
+import Control.Applicative
+import Control.Concurrent
+import Control.Concurrent.STM
+import Data.IORef
+import Data.Function
+import Data.Ord
+import Data.Set as S
+
+import Data.Conduit
+import Data.Conduit.Cereal
+import Data.Conduit.Network
+import Data.Serialize
 
 import Network.BitTorrent.Exchange.Selection as PW
 import Network.BitTorrent.Exchange.Protocol as PW
 
+import Network.BitTorrent.Internal
+import Network.BitTorrent.Extension
+import Network.BitTorrent.Peer
+import Data.Bitfield as BF
+import Data.Torrent
+
+{-----------------------------------------------------------------------
+    P2P monad
+-----------------------------------------------------------------------}
+
 {-
+type P2P = Reader PeerSession (ConduitM Message Message IO)
 
-newtype P2P a = P2P {
-    getP2P :: ReaderT PSession State PState (Conduit Message IO Message) a
-  }
+conduit :: Socket -> P2P a -> IO a
+conduit sock p2p =
+  sourceSocket sock   $=
+    conduitGet get    $=
+      messageLoop p2p $=
+    conduitPut put    $$
+  sinkSocket sock
 
-runP2P :: PConnection -> P2P a -> IO a
-recvMessage :: P2P Message
-sendMessage :: Message -> P2P ()
+messageLoop :: P2P () -> P2P ()
+messageLoop = undefined
+
+runP2P :: SSession -> PeerAddr -> P2P a -> IO a
+runP2P se addr p2p = withPeer se addr $ conduit messageLoop
+
+data Event = Available
+           | Want
+           | Block
+
+{-
+waitForEvent :: P2P Event
+signalEvent  :: Event -> P2P ()
+-}
 -}
\ No newline at end of file
diff --git a/src/Network/BitTorrent/Peer.hs b/src/Network/BitTorrent/Peer.hs
index 6ab80fb6..9aa924d3 100644
--- a/src/Network/BitTorrent/Peer.hs
+++ b/src/Network/BitTorrent/Peer.hs
@@ -488,7 +488,8 @@ data PeerAddr = PeerAddr {
       peerID   :: Maybe PeerID
     , peerIP   :: HostAddress
     , peerPort :: PortNumber
-    } deriving (Show, Eq)
+    } deriving (Show, Eq, Ord)
+               -- TODO verify semantic of ord and eq instances
 
 instance BEncodable PortNumber where
   toBEncode = toBEncode . fromEnum
diff --git a/tests/Main.hs b/tests/Main.hs
index 84870d66..f71f2b00 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -25,7 +25,8 @@ import Data.BEncode as BE
 import Data.Bitfield as BF
 import Data.Torrent
 import Network.BitTorrent as BT
-
+import Network.BitTorrent.Exchange.Protocol
+import Network.BitTorrent.Tracker.Protocol
 -- import Debug.Trace