forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

p2p: remove defers

Browse source
This commit is contained in:
Felix Lange 2020-04-01 16:24:42 +02:00 committed by GitHub
parent f12380fa7e
commit 72a377704b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
p2p/server.go
View file

@ -564,8 +564,8 @@ func (srv *Server) setupDiscovery() error {
if !realaddr.IP.IsLoopback() { if !realaddr.IP.IsLoopback() {
srv.loopWG.Add(1) srv.loopWG.Add(1)
go func() { go func() {
defer srv.loopWG.Done()
nat.Map(srv.NAT, srv.quit, "udp", realaddr.Port, realaddr.Port, "ethereum discovery") nat.Map(srv.NAT, srv.quit, "udp", realaddr.Port, realaddr.Port, "ethereum discovery")
srv.loopWG.Done()
}() }()
} }
} }
@ -670,8 +670,8 @@ func (srv *Server) setupListening() error {
if !tcp.IP.IsLoopback() && srv.NAT != nil { if !tcp.IP.IsLoopback() && srv.NAT != nil {
srv.loopWG.Add(1) srv.loopWG.Add(1)
go func() { go func() {
defer srv.loopWG.Done()
nat.Map(srv.NAT, srv.quit, "tcp", tcp.Port, tcp.Port, "ethereum p2p") nat.Map(srv.NAT, srv.quit, "tcp", tcp.Port, tcp.Port, "ethereum p2p")
srv.loopWG.Done()
}() }()
} }
} }
@ -886,10 +886,8 @@ func (srv *Server) listenLoop() {
srv.log.Trace("Accepted connection", "addr", fd.RemoteAddr()) srv.log.Trace("Accepted connection", "addr", fd.RemoteAddr())
} }
go func() { go func() {
defer func() {
slots <- struct{}{}
}()
srv.SetupConn(fd, inboundConn, nil) srv.SetupConn(fd, inboundConn, nil)
slots <- struct{}{}
}() }()
} }
} }