11 files changed, 106 insertions, 84 deletions

diff --git a/network-bittorrent.cabal b/network-bittorrent.cabal
index 00ed2162..6a14b3e9 100644
--- a/network-bittorrent.cabal
+++ b/network-bittorrent.cabal
@@ -23,9 +23,13 @@ source-repository head
 library
   exposed-modules:     Data.Torrent
                      , Data.Torrent.InfoHash
+
                      , Network.BitTorrent
+
                      , Network.BitTorrent.Peer
-                     , Network.BitTorrent.PeerID
+                     , Network.BitTorrent.Peer.Addr
+                     , Network.BitTorrent.Peer.ID
+                     , Network.BitTorrent.Peer.ClientInfo
 
                      , Network.BitTorrent.Tracker
                      , Network.BitTorrent.Tracker.Protocol
@@ -34,7 +38,6 @@ library
                      , Network.BitTorrent.PeerWire
                      , Network.BitTorrent.PeerWire.Bitfield
                      , Network.BitTorrent.PeerWire.Block
-                     , Network.BitTorrent.PeerWire.ClientInfo
                      , Network.BitTorrent.PeerWire.Message
                      , Network.BitTorrent.PeerWire.Handshake
 
diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
index 5ed786d0..bd23b980 100644
--- a/src/Network/BitTorrent.hs
+++ b/src/Network/BitTorrent.hs
@@ -8,6 +8,5 @@
 module Network.BitTorrent (module BT) where
 
 import Network.BitTorrent.Peer as BT
-import Network.BitTorrent.PeerID as BT
-import Network.BitTorrent.Tracker as BT
 import Network.BitTorrent.PeerWire as BT
+import Network.BitTorrent.Tracker as BT
diff --git a/src/Network/BitTorrent/Peer.hs b/src/Network/BitTorrent/Peer.hs
index e16329d2..ff32feb5 100644
--- a/src/Network/BitTorrent/Peer.hs
+++ b/src/Network/BitTorrent/Peer.hs
@@ -5,52 +5,12 @@
 --   Stability   :  experimental
 --   Portability :  non-portable
 --
+--   Just convenient reexports for peer related modules.
+--
 module Network.BitTorrent.Peer
-       ( Peer(..)
-       , peerSockAddr, connectToPeer
-       , ppPeer
+       ( module P
        ) where
 
-import Control.Applicative
-import Data.Word
-import Data.Bits
-import Network
-import Network.Socket
-
-import Network.BitTorrent.PeerID
-import Network.BitTorrent.PeerWire.ClientInfo
-
-
-data Peer = Peer {
-      peerID   :: Maybe PeerID
-    , peerIP   :: HostAddress
-    , peerPort :: PortNumber
-    } deriving Show
-
--- TODO make platform independent, clarify htonl
--- | Convert peer info from tracker response to socket address.
---   Used for establish connection between peers.
---
-peerSockAddr :: Peer -> SockAddr
-peerSockAddr = SockAddrInet <$> (g . peerPort) <*> (htonl . peerIP)
-  where
-    htonl :: Word32 -> Word32
-    htonl d =
-       ((d .&. 0xff) `shiftL` 24) .|.
-       (((d `shiftR` 8 ) .&. 0xff) `shiftL` 16) .|.
-       (((d `shiftR` 16) .&. 0xff) `shiftL` 8)  .|.
-       ((d `shiftR` 24) .&. 0xff)
-
-    g :: PortNumber -> PortNumber
-    g = id
-
--- | Tries to connect to peer using reasonable default parameters.
-connectToPeer :: Peer -> IO Socket
-connectToPeer p = do
-  sock <- socket AF_INET Stream Network.Socket.defaultProtocol
-  connect sock (peerSockAddr p)
-  return sock
-
-ppPeer :: Peer -> String
-ppPeer p = maybe ""  (++ " at ") ((ppClientInfo . clientInfo) <$> peerID p)
-        ++ show (peerSockAddr p)
+import Network.BitTorrent.Peer.Addr as P
+import Network.BitTorrent.Peer.ClientInfo as P
+import Network.BitTorrent.Peer.ID as P
\ No newline at end of file
diff --git a/src/Network/BitTorrent/Peer/Addr.hs b/src/Network/BitTorrent/Peer/Addr.hs
new file mode 100644
index 00000000..0e6fcfb9
--- /dev/null
+++ b/src/Network/BitTorrent/Peer/Addr.hs
@@ -0,0 +1,78 @@
+-- |
+--   Copyright   :  (c) Sam T. 2013
+--   License     :  MIT
+--   Maintainer  :  pxqr.sta@gmail.com
+--   Stability   :  experimental
+--   Portability :  non-portable
+--
+{-# LANGUAGE OverloadedStrings #-}
+{-# OPTIONS  -fno-warn-orphans #-}
+module Network.BitTorrent.Peer.Addr
+       ( PeerAddr(..)
+       , peerSockAddr, connectToPeer
+       , ppPeer
+       ) where
+
+import Control.Applicative
+import Data.BEncode
+import Data.Bits
+import Data.Word
+import Network
+import Network.Socket
+
+import Network.BitTorrent.Peer.ID
+import Network.BitTorrent.Peer.ClientInfo
+
+
+data PeerAddr = PeerAddr {
+      peerID   :: Maybe PeerID
+    , peerIP   :: HostAddress
+    , peerPort :: PortNumber
+    } deriving Show
+
+instance BEncodable PortNumber where
+  toBEncode = toBEncode . fromEnum
+  fromBEncode b = toEnum <$> fromBEncode b
+
+instance BEncodable PeerAddr where
+  toBEncode (PeerAddr pid pip pport) = fromAssocs
+    [ "peer id" -->? pid
+    , "ip"      -->  pip
+    , "port"    -->  pport
+    ]
+
+  fromBEncode (BDict d) =
+    PeerAddr <$> d >--? "peer id"
+             <*> d >--  "ip"
+             <*> d >--  "port"
+
+  fromBEncode _ = decodingError "PeerAddr"
+
+
+-- TODO make platform independent, clarify htonl
+-- | Convert peer info from tracker response to socket address.
+--   Used for establish connection between peers.
+--
+peerSockAddr :: PeerAddr -> SockAddr
+peerSockAddr = SockAddrInet <$> (g . peerPort) <*> (htonl . peerIP)
+  where
+    htonl :: Word32 -> Word32
+    htonl d =
+       ((d .&. 0xff) `shiftL` 24) .|.
+       (((d `shiftR` 8 ) .&. 0xff) `shiftL` 16) .|.
+       (((d `shiftR` 16) .&. 0xff) `shiftL` 8)  .|.
+       ((d `shiftR` 24) .&. 0xff)
+
+    g :: PortNumber -> PortNumber
+    g = id
+
+-- | Tries to connect to peer using reasonable default parameters.
+connectToPeer :: PeerAddr -> IO Socket
+connectToPeer p = do
+  sock <- socket AF_INET Stream Network.Socket.defaultProtocol
+  connect sock (peerSockAddr p)
+  return sock
+
+ppPeer :: PeerAddr -> String
+ppPeer p = maybe ""  (++ " at ") ((ppClientInfo . clientInfo) <$> peerID p)
+        ++ show (peerSockAddr p)
diff --git a/src/Network/BitTorrent/PeerWire/ClientInfo.hs b/src/Network/BitTorrent/Peer/ClientInfo.hs
index 629c883f..ebbecbd7 100644
--- a/src/Network/BitTorrent/PeerWire/ClientInfo.hs
+++ b/src/Network/BitTorrent/Peer/ClientInfo.hs
@@ -12,10 +12,14 @@
 --  > See http://bittorrent.org/beps/bep_0020.html for more information.
 --
 {-# LANGUAGE OverloadedStrings #-}
-module Network.BitTorrent.PeerWire.ClientInfo
-       ( ClientInfo(..), clientInfo, ppClientInfo, unknownClient
+module Network.BitTorrent.Peer.ClientInfo
+       ( -- * Info
+         ClientInfo(..), clientInfo, ppClientInfo, unknownClient
 
+         -- * Version
        , ClientVersion, ppClientVersion
+
+         -- * Implementation
        , ClientImpl(..), ppClientImpl
 
 --       , mkEnumTyDef, mkPars, nameMap
@@ -27,7 +31,7 @@ import           Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as BC
 import Data.Serialize.Get
 
-import Network.BitTorrent.PeerID
+import Network.BitTorrent.Peer.ID
 
 
 -- | All known client versions.
diff --git a/src/Network/BitTorrent/PeerID.hs b/src/Network/BitTorrent/Peer/ID.hs
index 2c8818fe..f93409ed 100644
--- a/src/Network/BitTorrent/PeerID.hs
+++ b/src/Network/BitTorrent/Peer/ID.hs
@@ -13,7 +13,7 @@
 --   though this module exports some other goodies for custom generation.
 --
 {-# LANGUAGE OverloadedStrings, GeneralizedNewtypeDeriving #-}
-module Network.BitTorrent.PeerID
+module Network.BitTorrent.Peer.ID
        ( -- * Peer identification
          PeerID (getPeerID), ppPeerID
 
diff --git a/src/Network/BitTorrent/PeerWire.hs b/src/Network/BitTorrent/PeerWire.hs
index 9f1e02ca..db9287d8 100644
--- a/src/Network/BitTorrent/PeerWire.hs
+++ b/src/Network/BitTorrent/PeerWire.hs
@@ -12,4 +12,3 @@ import Network.BitTorrent.PeerWire.Bitfield as PW
 import Network.BitTorrent.PeerWire.Block as PW
 import Network.BitTorrent.PeerWire.Message as PW
 import Network.BitTorrent.PeerWire.Handshake as PW
-import Network.BitTorrent.PeerWire.ClientInfo as PW
diff --git a/src/Network/BitTorrent/PeerWire/Handshake.hs b/src/Network/BitTorrent/PeerWire/Handshake.hs
index 3fdb48be..e4d27f75 100644
--- a/src/Network/BitTorrent/PeerWire/Handshake.hs
+++ b/src/Network/BitTorrent/PeerWire/Handshake.hs
@@ -29,8 +29,8 @@ import Data.Torrent.InfoHash
 import Network
 import Network.Socket.ByteString
 
-import Network.BitTorrent.PeerID
-import Network.BitTorrent.PeerWire.ClientInfo
+import Network.BitTorrent.Peer.ID
+import Network.BitTorrent.Peer.ClientInfo
 
 
 data Handshake = Handshake {
diff --git a/src/Network/BitTorrent/PeerWire/Message.hs b/src/Network/BitTorrent/PeerWire/Message.hs
index 9cbc2e38..188f0572 100644
--- a/src/Network/BitTorrent/PeerWire/Message.hs
+++ b/src/Network/BitTorrent/PeerWire/Message.hs
@@ -5,7 +5,6 @@ module Network.BitTorrent.PeerWire.Message
        ) where
 
 import Control.Applicative
-import           Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 
 import Data.Serialize
diff --git a/src/Network/BitTorrent/Tracker.hs b/src/Network/BitTorrent/Tracker.hs
index 6ecf4fc2..e4bcf2cd 100644
--- a/src/Network/BitTorrent/Tracker.hs
+++ b/src/Network/BitTorrent/Tracker.hs
@@ -37,7 +37,6 @@ import Network
 import Network.URI
 
 import Network.BitTorrent.Peer
-import Network.BitTorrent.PeerID
 import Network.BitTorrent.Tracker.Protocol
 import Network.BitTorrent.Tracker.Scrape
 
@@ -137,13 +136,13 @@ completedReq ses pr = (genericReq ses pr) {
 data TSession = TSession {
     seProgress   :: TVar Progress
   , seInterval   :: IORef Int
-  , sePeers      :: TVar [Peer]
+  , sePeers      :: TVar [PeerAddr]
   }
 
-newSession :: Progress -> Int -> [Peer] -> IO TSession
+newSession :: Progress -> Int -> [PeerAddr] -> IO TSession
 newSession pr i ps = TSession <$> newTVarIO pr <*> newIORef i <*> newTVarIO ps
 
-getPeerList :: TSession -> IO [Peer]
+getPeerList :: TSession -> IO [PeerAddr]
 getPeerList = readTVarIO . sePeers
 
 getProgress :: TSession -> IO Progress
diff --git a/src/Network/BitTorrent/Tracker/Protocol.hs b/src/Network/BitTorrent/Tracker/Protocol.hs
index c0e84c24..a6c1c8b6 100644
--- a/src/Network/BitTorrent/Tracker/Protocol.hs
+++ b/src/Network/BitTorrent/Tracker/Protocol.hs
@@ -53,7 +53,6 @@ import Network.HTTP
 import Network.URI
 
 import Network.BitTorrent.Peer
-import Network.BitTorrent.PeerID
 import Network.BitTorrent.Tracker.Scrape
 
 
@@ -84,27 +83,9 @@ data TResponse =
      , respMinInterval :: Maybe Int -- ^ Minimal amount of time between requests.
      , respComplete    :: Maybe Int -- ^ Number of peers completed the torrent. (seeders)
      , respIncomplete  :: Maybe Int -- ^ Number of peers downloading the torrent.
-     , respPeers       :: [Peer]    -- ^ Peers that must be contacted.
+     , respPeers       :: [PeerAddr]    -- ^ Peers that must be contacted.
      } deriving Show
 
-instance BEncodable PortNumber where
-  toBEncode = toBEncode . fromEnum
-  fromBEncode b = toEnum <$> fromBEncode b
-
-instance BEncodable Peer where
-  toBEncode (Peer pid pip pport) = fromAssocs
-    [ "peer id" -->? pid
-    , "ip"      -->  pip
-    , "port"    -->  pport
-    ]
-
-  fromBEncode (BDict d) =
-    Peer <$> d >--? "peer id"
-         <*> d >--  "ip"
-         <*> d >--  "port"
-
-  fromBEncode _ = decodingError "Peer"
-
 instance BEncodable TResponse where
   toBEncode (Failure t)  = fromAssocs ["failure reason" --> t]
   toBEncode resp@(OK {}) = fromAssocs
@@ -125,7 +106,7 @@ instance BEncodable TResponse where
                      <*> getPeers (M.lookup "peers" d)
 
       where
-        getPeers :: Maybe BEncode -> Result [Peer]
+        getPeers :: Maybe BEncode -> Result [PeerAddr]
         getPeers (Just (BList l))     = fromBEncode (BList l)
         getPeers (Just (BString s))
             | B.length s `mod` 6 == 0 =
@@ -136,7 +117,7 @@ instance BEncodable TResponse where
             peerG = do
               pip   <- getWord32be
               pport <- getWord16be
-              return (Peer Nothing (fromIntegral pip) (fromIntegral pport))
+              return (PeerAddr Nothing (fromIntegral pip) (fromIntegral pport))
 
         getPeers _ = decodingError "Peers"