dlss
/
FedP2P
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Return an error from Torrent.setMetadataSize 

This should mean connections sending ridiculous metadata sizes get dropped.
This commit is contained in:
Matt Joiner 2016-05-16 18:48:56 +10:00
parent d2951c6c4b
commit c0283d3314
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client.go
View File

@ -1244,7 +1244,11 @@ func (cl *Client) connectionLoop(t *Torrent, c *connection) error {
if !ok {
log.Printf("bad metadata_size type: %T", metadata_sizeUntyped)
} else {
t.setMetadataSize(metadata_size, cl)
err = t.setMetadataSize(metadata_size)
if err != nil {
err = fmt.Errorf("error setting metadata size to %d", metadata_size)
break
}
}
}
if _, ok := c.PeerExtensionIDs["ut_metadata"]; ok {

7
torrent.go
View File

@ -275,14 +275,13 @@ func (t *Torrent) haveAllMetadataPieces() bool {
}
// TODO: Propagate errors to disconnect peer.
func (t *Torrent) setMetadataSize(bytes int64, cl *Client) {
func (t *Torrent) setMetadataSize(bytes int64) (err error) {
if t.haveInfo() {
// We already know the correct metadata size.
return
}
if bytes <= 0 || bytes > 10000000 { // 10MB, pulled from my ass.
log.Printf("%s: received bad metadata size: %d", t, bytes)
return
return errors.New("bad size")
}
if t.metadataBytes != nil && len(t.metadataBytes) == int(bytes) {
return
@ -292,7 +291,7 @@ func (t *Torrent) setMetadataSize(bytes int64, cl *Client) {
for _, c := range t.conns {
c.requestPendingMetadata()
}
return
}
// The current working name for the torrent. Either the name in the info dict,