cleanups on various module imports

[functorrent.git] / src / FuncTorrent / Server.hs

diff --git a/src/FuncTorrent/Server.hs b/src/FuncTorrent/Server.hs
index 4c3ab948dbe6004d622c018fe23819f21bba6d06..d8a18ffdd49ad8247054e2e5389660328175af00 100644 (file)
--- a/src/FuncTorrent/Server.hs
+++ b/src/FuncTorrent/Server.hs
@@ -27,7 +27,9 @@ import Network (withSocketsDo, listenOn, accept, Socket, PortID ( PortNumber ))
 import System.IO (hSetBuffering, BufferMode ( NoBuffering ))
 
 import FuncTorrent.Metainfo (Metainfo)
-import FuncTorrent.Peer (handlePeerMsgs, Peer(..), PieceMap)
+import FuncTorrent.Peer (handlePeerMsgs)
+import FuncTorrent.PeerMsgs (Peer(..))
+import FuncTorrent.PieceManager (PieceMap)
 import qualified FuncTorrent.FileSystem as FS (MsgChannel)
 
 -- server is listening on any port from 6881 - 6889
@@ -41,6 +43,6 @@ start = withSocketsDo $ do
 run :: Socket -> String -> Metainfo -> PieceMap -> FS.MsgChannel -> IO ()
 run listenSock peerid m pieceMap c = forever $ do
   (handle, ip, port) <- accept listenSock
-  let peer = Peer "" ip (fromIntegral port)
+  let peer = Peer ip (fromIntegral port)
   hSetBuffering handle NoBuffering
   forkIO $ handlePeerMsgs peer peerid m pieceMap False c