X-Git-Url: https://git.rkrishnan.org/?p=functorrent.git;a=blobdiff_plain;f=src%2FFuncTorrent%2FTracker%2FUdp.hs;h=5e98879f976a082d4611def19bef7224e20077a2;hp=fe4d9e0aeb8dfcaab57ba46bb040eebfd720fa99;hb=9beb0fb9814b33725f6adfa5adabb3225a54277b;hpb=2ddd7237e3615d4a55460ca86de22a669c90232c diff --git a/src/FuncTorrent/Tracker/Udp.hs b/src/FuncTorrent/Tracker/Udp.hs index fe4d9e0..5e98879 100644 --- a/src/FuncTorrent/Tracker/Udp.hs +++ b/src/FuncTorrent/Tracker/Udp.hs @@ -39,7 +39,7 @@ import Network.Socket.ByteString (sendTo, recvFrom) import System.Random (randomIO) import System.Timeout (timeout) -import FuncTorrent.Peer (Peer(..)) +import FuncTorrent.PeerMsgs (Peer(..)) import FuncTorrent.Tracker.Types (TrackerEventState(..), TState(..)) import FuncTorrent.Utils (IP, Port, toIP, toPort, getHostname, getPort) import qualified FuncTorrent.FileSystem as FS (MsgChannel, Stats(..), getStats) @@ -200,7 +200,7 @@ getIPPortPairs = do ip <- toIP <$> getByteString 4 port <- toPort <$> getByteString 2 ipportpairs <- getIPPortPairs - return $ (Peer "" ip port) : ipportpairs + return $ (Peer ip port) : ipportpairs startSession :: String -> Port -> IO UDPTrackerHandle startSession host port = do @@ -216,7 +216,7 @@ closeSession (UDPTrackerHandle s _ _) = close s trackerLoop :: String -> Port -> String -> ByteString -> FS.MsgChannel -> TState -> IO () trackerLoop url sport peerId infohash fschan tstate = forever $ do - st <- fmap readMVar $ FS.getStats fschan + st <- readMVar <$> FS.getStats fschan up <- fmap FS.bytesRead st down <- fmap FS.bytesWritten st handle <- startSession host port