mirror of https://github.com/ethereum/go-ethereum
p2p: enforce connection retry limit on server side (#19684)
The dialer limits itself to one attempt every 30s. Apply the same limit in Server and reject peers which try to connect too eagerly. The check against the limit happens right after accepting the connection. Further changes in this commit ensure we pass the Server logger down to Peer instances, discovery and dialState. Unit test logging now works in all Server tests.pull/19697/head
Felix Lange
6 years ago
committed by
GitHub
parent
c0a034ec89
commit
c420dcb39c
@ -0,0 +1,33 @@ |
||||
// Copyright 2016 The go-ethereum Authors
|
||||
// This file is part of the go-ethereum library.
|
||||
//
|
||||
// The go-ethereum library is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Lesser General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// The go-ethereum library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public License
|
||||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
package netutil |
||||
|
||||
import "net" |
||||
|
||||
// AddrIP gets the IP address contained in addr. It returns nil if no address is present.
|
||||
func AddrIP(addr net.Addr) net.IP { |
||||
switch a := addr.(type) { |
||||
case *net.IPAddr: |
||||
return a.IP |
||||
case *net.TCPAddr: |
||||
return a.IP |
||||
case *net.UDPAddr: |
||||
return a.IP |
||||
default: |
||||
return nil |
||||
} |
||||
} |
||||
@ -0,0 +1,82 @@ |
||||
// Copyright 2019 The go-ethereum Authors
|
||||
// This file is part of the go-ethereum library.
|
||||
//
|
||||
// The go-ethereum library is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Lesser General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// The go-ethereum library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public License
|
||||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
package p2p |
||||
|
||||
import ( |
||||
"container/heap" |
||||
"time" |
||||
) |
||||
|
||||
// expHeap tracks strings and their expiry time.
|
||||
type expHeap []expItem |
||||
|
||||
// expItem is an entry in addrHistory.
|
||||
type expItem struct { |
||||
item string |
||||
exp time.Time |
||||
} |
||||
|
||||
// nextExpiry returns the next expiry time.
|
||||
func (h *expHeap) nextExpiry() time.Time { |
||||
return (*h)[0].exp |
||||
} |
||||
|
||||
// add adds an item and sets its expiry time.
|
||||
func (h *expHeap) add(item string, exp time.Time) { |
||||
heap.Push(h, expItem{item, exp}) |
||||
} |
||||
|
||||
// remove removes an item.
|
||||
func (h *expHeap) remove(item string) bool { |
||||
for i, v := range *h { |
||||
if v.item == item { |
||||
heap.Remove(h, i) |
||||
return true |
||||
} |
||||
} |
||||
return false |
||||
} |
||||
|
||||
// contains checks whether an item is present.
|
||||
func (h expHeap) contains(item string) bool { |
||||
for _, v := range h { |
||||
if v.item == item { |
||||
return true |
||||
} |
||||
} |
||||
return false |
||||
} |
||||
|
||||
// expire removes items with expiry time before 'now'.
|
||||
func (h *expHeap) expire(now time.Time) { |
||||
for h.Len() > 0 && h.nextExpiry().Before(now) { |
||||
heap.Pop(h) |
||||
} |
||||
} |
||||
|
||||
// heap.Interface boilerplate
|
||||
func (h expHeap) Len() int { return len(h) } |
||||
func (h expHeap) Less(i, j int) bool { return h[i].exp.Before(h[j].exp) } |
||||
func (h expHeap) Swap(i, j int) { h[i], h[j] = h[j], h[i] } |
||||
func (h *expHeap) Push(x interface{}) { *h = append(*h, x.(expItem)) } |
||||
func (h *expHeap) Pop() interface{} { |
||||
old := *h |
||||
n := len(old) |
||||
x := old[n-1] |
||||
*h = old[0 : n-1] |
||||
return x |
||||
} |
||||
@ -0,0 +1,54 @@ |
||||
// Copyright 2019 The go-ethereum Authors
|
||||
// This file is part of the go-ethereum library.
|
||||
//
|
||||
// The go-ethereum library is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Lesser General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// The go-ethereum library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public License
|
||||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
package p2p |
||||
|
||||
import ( |
||||
"testing" |
||||
"time" |
||||
) |
||||
|
||||
func TestExpHeap(t *testing.T) { |
||||
var h expHeap |
||||
|
||||
var ( |
||||
basetime = time.Unix(4000, 0) |
||||
exptimeA = basetime.Add(2 * time.Second) |
||||
exptimeB = basetime.Add(3 * time.Second) |
||||
exptimeC = basetime.Add(4 * time.Second) |
||||
) |
||||
h.add("a", exptimeA) |
||||
h.add("b", exptimeB) |
||||
h.add("c", exptimeC) |
||||
|
||||
if !h.nextExpiry().Equal(exptimeA) { |
||||
t.Fatal("wrong nextExpiry") |
||||
} |
||||
if !h.contains("a") || !h.contains("b") || !h.contains("c") { |
||||
t.Fatal("heap doesn't contain all live items") |
||||
} |
||||
|
||||
h.expire(exptimeA.Add(1)) |
||||
if !h.nextExpiry().Equal(exptimeB) { |
||||
t.Fatal("wrong nextExpiry") |
||||
} |
||||
if h.contains("a") { |
||||
t.Fatal("heap contains a even though it has already expired") |
||||
} |
||||
if !h.contains("b") || !h.contains("c") { |
||||
t.Fatal("heap doesn't contain all live items") |
||||
} |
||||
} |
||||
Loading…
Reference in new issue