go/torrent-client
1
0
Fork 0
mirror of https://github.com/veggiedefender/torrent-client.git synced 2025-11-06 09:29:16 +02:00
Code Issues Releases Activity

Use clearer names for functions that send messages

Browse Source
This commit is contained in:
Jesse Li
2020-01-02 12:23:22 -05:00
parent b255ecc574
commit b3ee9f4117
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
p2p/client.go
View File

@@ -102,31 +102,31 @@ func (c *client) read() (*message.Message, error) {
return msg, err return msg, err
} }
func (c *client) request(index, begin, length int) error { func (c *client) sendRequest(index, begin, length int) error {
req := message.FormatRequest(index, begin, length) req := message.FormatRequest(index, begin, length)
_, err := c.conn.Write(req.Serialize()) _, err := c.conn.Write(req.Serialize())
return err return err
} }
func (c *client) interested() error { func (c *client) sendInterested() error {
msg := message.Message{ID: message.MsgInterested} msg := message.Message{ID: message.MsgInterested}
_, err := c.conn.Write(msg.Serialize()) _, err := c.conn.Write(msg.Serialize())
return err return err
} }
func (c *client) notInterested() error { func (c *client) sendNotInterested() error {
msg := message.Message{ID: message.MsgNotInterested} msg := message.Message{ID: message.MsgNotInterested}
_, err := c.conn.Write(msg.Serialize()) _, err := c.conn.Write(msg.Serialize())
return err return err
} }
func (c *client) unchoke() error { func (c *client) sendUnchoke() error {
msg := message.Message{ID: message.MsgUnchoke} msg := message.Message{ID: message.MsgUnchoke}
_, err := c.conn.Write(msg.Serialize()) _, err := c.conn.Write(msg.Serialize())
return err return err
} }
func (c *client) have(index int) error { func (c *client) sendHave(index int) error {
msg := message.FormatHave(index) msg := message.FormatHave(index)
_, err := c.conn.Write(msg.Serialize()) _, err := c.conn.Write(msg.Serialize())
return err return err

8
p2p/p2p.go
View File

@@ -117,7 +117,7 @@ func attemptDownloadPiece(c *client, pw *pieceWork) ([]byte, error) {
blockSize = pw.length - state.requested blockSize = pw.length - state.requested
} }
err := c.request(pw.index, state.requested, blockSize) err := c.sendRequest(pw.index, state.requested, blockSize)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -153,8 +153,8 @@ func (t *Torrent) startDownloadWorker(peer peers.Peer, workQueue chan *pieceWork
defer c.conn.Close() defer c.conn.Close()
log.Printf("Completed handshake with %s\n", peer.IP) log.Printf("Completed handshake with %s\n", peer.IP)
c.unchoke() c.sendUnchoke()
c.interested() c.sendInterested()
for pw := range workQueue { for pw := range workQueue {
if !c.hasPiece(pw.index) { if !c.hasPiece(pw.index) {
@@ -177,7 +177,7 @@ func (t *Torrent) startDownloadWorker(peer peers.Peer, workQueue chan *pieceWork
continue continue
} }
c.have(pw.index) c.sendHave(pw.index)
results <- &pieceResult{pw.index, buf} results <- &pieceResult{pw.index, buf}
} }
} }