~ Reorganize modules.

All peer location & identification & information stuff should be placed
in Network.BitTorrent.Peer now.

1 files changed, 6 insertions, 46 deletions

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