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

Merge pull request #154 from mlmhl/connection 

bug fix: race condition between outgoing connection and incoming conn…
This commit is contained in:
Matt Joiner 2017-05-17 19:22:14 +10:00 committed by GitHub
parent 58a24196ce d8023a5e39
commit 8df5221fc8
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client.go
View File

@ -899,7 +899,7 @@ func (cl *Client) runInitiatedHandshookConn(c *connection, t *Torrent) {
cl.dopplegangerAddrs[addr] = struct{}{}
return
}
cl.runHandshookConn(c, t)
cl.runHandshookConn(c, t, true)
}
func (cl *Client) runReceivedConn(c *connection) {
@ -926,14 +926,14 @@ func (cl *Client) runReceivedConn(c *connection) {
// doppleganger.
return
}
cl.runHandshookConn(c, t)
cl.runHandshookConn(c, t, false)
}
func (cl *Client) runHandshookConn(c *connection, t *Torrent) {
func (cl *Client) runHandshookConn(c *connection, t *Torrent, outgoing bool) {
c.conn.SetWriteDeadline(time.Time{})
c.r = deadlineReader{c.conn, c.r}
completedHandshakeConnectionFlags.Add(c.connectionFlags(), 1)
if !t.addConnection(c) {
if !t.addConnection(c, outgoing) {
return
}
defer t.dropConnection(c)

13
torrent.go
View File

@ -1296,7 +1296,7 @@ func (t *Torrent) numTotalPeers() int {
}
// Returns true if the connection is added.
func (t *Torrent) addConnection(c *connection) bool {
func (t *Torrent) addConnection(c *connection, outgoing bool) bool {
if t.cl.closed.IsSet() {
return false
}
@ -1305,8 +1305,19 @@ func (t *Torrent) addConnection(c *connection) bool {
}
for c0 := range t.conns {
if c.PeerID == c0.PeerID {
// Retain the connection from lower peer ID to higher.
lower := string(t.cl.peerID[:]) < string(c.PeerID[:])
if (outgoing && lower) || (!outgoing && !lower) {
c0.Close()
t.deleteConnection(c0)
duplicateClientConns.Add(1)
log.Printf("Drop connection: %s, %s, %s", t.name(), c0.localAddr(), c0.remoteAddr())
continue
}
// Already connected to a client with that ID.
duplicateClientConns.Add(1)
log.Printf("Drop connection: %s, %s, %s", t.name(), c.localAddr(), c.remoteAddr())
return false
}
}