gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

p2p: add address info to peer event reporting (#19716)

Browse Source
This commit is contained in:
Martin Holst Swende
2019-07-05 20:27:13 +02:00
committed by Felix Lange
parent dcc4adfcd7
commit 7fd82a0e3e
3 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
p2p/message.go
View File

@ -252,19 +252,23 @@ func ExpectMsg(r MsgReader, code uint64, content interface{}) error {
type msgEventer struct {
MsgReadWriter
feed *event.Feed
peerID enode.ID
Protocol string
feed *event.Feed
peerID enode.ID
Protocol string
localAddress string
remoteAddress string
}
// newMsgEventer returns a msgEventer which sends message events to the given
// feed
func newMsgEventer(rw MsgReadWriter, feed *event.Feed, peerID enode.ID, proto string) *msgEventer {
func newMsgEventer(rw MsgReadWriter, feed *event.Feed, peerID enode.ID, proto, remote, local string) *msgEventer {
return &msgEventer{
MsgReadWriter: rw,
feed: feed,
peerID: peerID,
Protocol: proto,
remoteAddress: remote,
localAddress: local,
}
}
@ -276,11 +280,13 @@ func (ev *msgEventer) ReadMsg() (Msg, error) {
return msg, err
}
ev.feed.Send(&PeerEvent{
Type: PeerEventTypeMsgRecv,
Peer: ev.peerID,
Protocol: ev.Protocol,
MsgCode: &msg.Code,
MsgSize: &msg.Size,
Type: PeerEventTypeMsgRecv,
Peer: ev.peerID,
Protocol: ev.Protocol,
MsgCode: &msg.Code,
MsgSize: &msg.Size,
LocalAddress: ev.localAddress,
RemoteAddress: ev.remoteAddress,
})
return msg, nil
}
@ -293,11 +299,13 @@ func (ev *msgEventer) WriteMsg(msg Msg) error {
return err
}
ev.feed.Send(&PeerEvent{
Type: PeerEventTypeMsgSend,
Peer: ev.peerID,
Protocol: ev.Protocol,
MsgCode: &msg.Code,
MsgSize: &msg.Size,
Type: PeerEventTypeMsgSend,
Peer: ev.peerID,
Protocol: ev.Protocol,
MsgCode: &msg.Code,
MsgSize: &msg.Size,
LocalAddress: ev.localAddress,
RemoteAddress: ev.remoteAddress,
})
return nil
}