Rename connect to tracker

Bad clash with socket library!

diff --git a/src/FuncTorrent.hs b/src/FuncTorrent.hs
index 67fc309a8922355d8c02f3aeba8eedef470e9d65..e17b024052f971e4a885b77f714cb306d063109c 100644 (file)
--- a/src/FuncTorrent.hs
+++ b/src/FuncTorrent.hs
@@ -4,7 +4,7 @@ module FuncTorrent
      Metainfo(..),
      Peer,
      TrackerResponse(..),
-     connect,
+     tracker,
      decode,
      encode,
      handShakeMsg,

diff --git a/src/FuncTorrent/Tracker.hs b/src/FuncTorrent/Tracker.hs
index 07bf7f709d59378f06f0e5de79c4da5a0d849e13..57c8f9d3b42d2607deec6ddf1672a4dc082259a8 100644 (file)
--- a/src/FuncTorrent/Tracker.hs
+++ b/src/FuncTorrent/Tracker.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 module FuncTorrent.Tracker
     (TrackerResponse(..),
-     connect,
+     tracker,
      mkArgs,
      mkTrackerResponse,
      urlEncodeHash
@@ -66,8 +66,8 @@ mkTrackerResponse resp =
           where (ip', port') = splitAt 4 peer
 
 -- | Connect to a tracker and get peer info
-connect :: Metainfo -> String -> IO ByteString
-connect m peer_id = get (head . announceList $ m) $ mkArgs m peer_id
+tracker :: Metainfo -> String -> IO ByteString
+tracker m peer_id = get (head . announceList $ m) $ mkArgs m peer_id
 
 --- | URL encode hash as per RFC1738
 --- TODO: Add tests

diff --git a/src/Main.hs b/src/Main.hs
index 791b4b58089b2ae7257aace05d0ba163f5f15879..9cb5908c00809d328ccd72bda5e1c4b10ba6a2fa 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -12,7 +12,7 @@ import FuncTorrent.Bencode (decode)
 import FuncTorrent.Logger (initLogger, logMessage, logStop)
 import FuncTorrent.Metainfo (Info(..), Metainfo(..), mkMetaInfo)
 import FuncTorrent.Peer (handShakeMsg)
-import FuncTorrent.Tracker (connect, peers, mkTrackerResponse)
+import FuncTorrent.Tracker (tracker, peers, mkTrackerResponse)
 
 logError :: ParseError -> (String -> IO ()) -> IO ()
 logError e logMsg = logMsg $ "parse error: \n" ++ show e
@@ -53,7 +53,7 @@ main = do
               log "Trying to fetch peers"
 
               log $ "Trackers: " ++ head (announceList m)
-              response <- connect m peerId
+              response <- tracker m peerId
 
               let hsMsgLen = show $ length $ handShakeMsg m peerId
               log $ "Hand-shake message length : " ++ hsMsgLen