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

Rework locking in Client.acceptConnections

This commit is contained in:
Matt Joiner 2016-07-06 00:38:43 +10:00
parent 326b36545b
commit 38048672a7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client.go
View File

@ -378,8 +378,6 @@ func (cl *Client) ipBlockRange(ip net.IP) (r iplist.Range, blocked bool) {
}
func (cl *Client) waitAccept() {
cl.mu.Lock()
defer cl.mu.Unlock()
for {
for _, t := range cl.torrents {
if t.wantConns() {
@ -394,10 +392,14 @@ func (cl *Client) waitAccept() {
}
func (cl *Client) acceptConnections(l net.Listener, utp bool) {
cl.mu.Lock()
defer cl.mu.Unlock()
for {
cl.waitAccept()
cl.mu.Unlock()
conn, err := l.Accept()
conn = pproffd.WrapNetConn(conn)
cl.mu.Lock()
if cl.closed.IsSet() {
if conn != nil {
conn.Close()
@ -415,11 +417,9 @@ func (cl *Client) acceptConnections(l net.Listener, utp bool) {
} else {
acceptTCP.Add(1)
}
cl.mu.RLock()
reject := cl.badPeerIPPort(
missinggo.AddrIP(conn.RemoteAddr()),
missinggo.AddrPort(conn.RemoteAddr()))
cl.mu.RUnlock()
if reject {
acceptReject.Add(1)
conn.Close()