From 9895205e1910453a3dded6697a7e3bfe622f7367 Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Thu, 24 Jul 2014 13:43:45 +1000 Subject: [PATCH] Comments and logging --- client.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/client.go b/client.go index 6b2275da..9fe3f39d 100644 --- a/client.go +++ b/client.go @@ -411,7 +411,7 @@ func (me *Client) runConnection(sock net.Conn, torrent *torrent, discovery peerS } else { d["yourip"] = yourip } - log.Printf("sending %v", d) + // log.Printf("sending %v", d) b, err := bencode.Marshal(d) if err != nil { panic(err) @@ -562,6 +562,8 @@ type peerExchangeMessage struct { Dropped []tracker.Peer `bencode:"dropped"` } +// Processes incoming bittorrent messages. The client lock is held upon entry +// and exit. func (me *Client) connectionLoop(t *torrent, c *connection) error { decoder := pp.Decoder{ R: bufio.NewReader(c.Socket), @@ -658,6 +660,7 @@ func (me *Client) connectionLoop(t *torrent, c *connection) error { err = fmt.Errorf("error decoding extended message payload: %s", err) break } + // log.Printf("got handshake: %v", d) if reqq, ok := d["reqq"]; ok { if i, ok := reqq.(int64); ok { c.PeerMaxRequests = int(i) @@ -1027,7 +1030,7 @@ newAnnounce: } err = cl.AddPeers(t.InfoHash, peers) if err != nil { - log.Print(err) + log.Printf("error adding peers to torrent %s: %s", t, err) } else { log.Printf("%s: %d new peers from %s", t, len(peers), tr) } -- 2.48.1