roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

p2p: define DiscReason as uint8 (#24507)

Browse Source 
All other implementations store disconnect reasons as a single byte,
so go-ethereum should do it too.
This commit is contained in:
Felix Lange 2022-03-07 18:25:45 +01:00 committed by GitHub
parent a79afd9ac3
commit 870b4505a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
p2p/peer.go
View File

@ -332,11 +332,11 @@ func (p *Peer) handle(msg Msg) error {
msg.Discard() msg.Discard()
go SendItems(p.rw, pongMsg) go SendItems(p.rw, pongMsg)
case msg.Code == discMsg: case msg.Code == discMsg:
var reason [1]DiscReason
// This is the last message. We don't need to discard or // This is the last message. We don't need to discard or
// check errors because, the connection will be closed after it. // check errors because, the connection will be closed after it.
rlp.Decode(msg.Payload, &reason) var m struct{ R DiscReason }
return reason[0] rlp.Decode(msg.Payload, &m)
return m.R
case msg.Code < baseProtocolLength: case msg.Code < baseProtocolLength:
// ignore other base protocol messages // ignore other base protocol messages
return msg.Discard() return msg.Discard()

2
p2p/peer_error.go
View File

@ -54,7 +54,7 @@ func (pe *peerError) Error() string {
var errProtocolReturned = errors.New("protocol returned") var errProtocolReturned = errors.New("protocol returned")
type DiscReason uint type DiscReason uint8
const ( const (
DiscRequested DiscReason = iota DiscRequested DiscReason = iota