status-im
/
torrent
mirror of
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix usages of eachListener() and make inlineable (#599)

This commit is contained in:
YenForYang 2021-09-13 06:35:51 -05:00 committed by GitHub
parent 52e8c82999
commit 134eea8418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
client.go
View File

@ -110,10 +110,11 @@ func (cl *Client) PeerID() PeerID {
// numbers are the same, due to support for custom listeners. Returns zero if no port number is
// found.
func (cl *Client) LocalPort() (port int) {
cl.eachListener(func(l Listener) bool {
port = addrPortOrZero(l.Addr())
return port == 0
})
for i := 0; i < len(cl.listeners); i += 1 {
if port = addrPortOrZero(cl.listeners[i].Addr()); port != 0 {
return
}
}
return
}
@ -1436,13 +1437,15 @@ func (cl *Client) eachListener(f func(Listener) bool) {
}
func (cl *Client) findListener(f func(Listener) bool) (ret Listener) {
cl.eachListener(func(l Listener) bool {
ret = l
return !f(l)
})
for i := 0; i < len(cl.listeners); i += 1 {
if ret = cl.listeners[i]; f(ret) {
return
}
}
return nil
}
func (cl *Client) publicIp(peer net.IP) net.IP {
// TODO: Use BEP 10 to determine how peers are seeing us.
if peer.To4() != nil {
@ -1478,11 +1481,11 @@ func (cl *Client) publicAddr(peer net.IP) IpPort {
// ListenAddrs addresses currently being listened to.
func (cl *Client) ListenAddrs() (ret []net.Addr) {
cl.lock()
defer cl.unlock()
cl.eachListener(func(l Listener) bool {
ret = append(ret, l.Addr())
return true
})
ret = make([]net.Addr, len(cl.listeners))
for i := 0; i < len(cl.listeners); i += 1 {
ret[i] = cl.listeners[i].Addr()
}
cl.unlock()
return
}