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

Allow adding duplicate connections 

I believe this fixes a long-standing race condition when dropping connections to the same peer ID where Clients assume the peer has added connections in the same order. Further commits may address duplicate connections further.
This commit is contained in:
Matt Joiner 2018-06-13 10:53:11 +10:00
parent 5412eef6da
commit 90f84bda71
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
torrent.go
View File

@ -1500,25 +1500,6 @@ func (t *Torrent) addConnection(c *connection) error {
if !t.wantConns() { if !t.wantConns() {
return errors.New("don't want conns") return errors.New("don't want conns")
} }
for c0 := range t.conns {
if c.PeerID != c0.PeerID {
continue
}
// Already connected to a client with that ID.
preferOutbound := string(t.cl.peerID[:]) < string(c.PeerID[:])
// Retain the connection from initiated from lower peer ID to higher.
if c0.outgoing == preferOutbound {
return errors.New("existing connection preferred")
}
if c.outgoing != preferOutbound {
return errors.New("prefer older connection")
}
// Close the other one.
c0.Close()
// TODO: Is it safe to delete from the map while we're iterating
// over it?
t.deleteConnection(c0)
}
if len(t.conns) >= t.maxEstablishedConns { if len(t.conns) >= t.maxEstablishedConns {
c := t.worstBadConn() c := t.worstBadConn()
if t.cl.config.Debug && missinggo.CryHeard() { if t.cl.config.Debug && missinggo.CryHeard() {