Tracker/Udp.hs: pass a proper peer id

diff --git a/src/FuncTorrent/Tracker/Udp.hs b/src/FuncTorrent/Tracker/Udp.hs
index f2198a3361b51351051be7de46112c3428b38c1e..2437003ec47692f5667e47dba970613823849a8b 100644 (file)
--- a/src/FuncTorrent/Tracker/Udp.hs
+++ b/src/FuncTorrent/Tracker/Udp.hs
@@ -161,12 +161,12 @@ connectResponse tid = do
         return 0
     _                      -> return 0
 
         return 0
     _                      -> return 0
 

-announceRequest :: Word64 -> ByteString -> Word64 -> Word64 -> Word64 -> Word16 -> ReaderT UDPTrackerHandle IO Word32
-announceRequest cid infohash up down left port = do
+announceRequest :: Word64 -> ByteString -> String -> Word64 -> Word64 -> Word64 -> Word16 -> ReaderT UDPTrackerHandle IO Word32
+announceRequest cid infohash peerId up down left port = do

   h <- ask
   tidi <- liftIO randomIO
   -- connId transId infohash peerId down left up event port)
   h <- ask
   tidi <- liftIO randomIO
   -- connId transId infohash peerId down left up event port)

-  let pkt = encode $ AnnounceReq cid tidi infohash "foo" down left up None port
+  let pkt = encode $ AnnounceReq cid tidi infohash peerId down left up None port

   liftIO $ sendRequest h (toStrict pkt)
   return tidi
 
   liftIO $ sendRequest h (toStrict pkt)
   return tidi
 


@@ -226,6 +226,6 @@ trackerLoop url sport peerId infohash fschan tstate = do
     t1 <- connectRequest
     cid <- connectResponse t1
     liftIO $ print cid
     t1 <- connectRequest
     cid <- connectResponse t1
     liftIO $ print cid

-    t2 <- announceRequest cid infohash (fromIntegral up) (fromIntegral down) (fromIntegral (left tstate)) (fromIntegral sport)
+    t2 <- announceRequest cid infohash peerId (fromIntegral up) (fromIntegral down) (fromIntegral (left tstate)) (fromIntegral sport)

     stats <- announceResponse t2
     liftIO $ print stats
     stats <- announceResponse t2
     liftIO $ print stats