LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

peer: Track and return advertised protocol version

Browse source 
This adds a new field to the peer struct which stores the protocol
version advertised by the remote peer and updates the StatsSnapshot to
return the advertised version instead of the negotiated version.
This commit is contained in:
Dave Collins 2016-10-27 18:40:06 -05:00
parent 14b51fc5f8
commit a1f014c9e1
No known key found for this signature in database
GPG key ID: B8904D9D9C93D1F2
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
peer/peer.go
View file

@ -402,8 +402,9 @@ type Peer struct {
userAgent string userAgent string
services wire.ServiceFlag services wire.ServiceFlag
versionKnown bool versionKnown bool
protocolVersion uint32 advertisedProtoVer uint32 // protocol version advertised by remote
sendHeadersPreferred bool // peer sent a sendheaders message protocolVersion uint32 // negotiated protocol version
sendHeadersPreferred bool // peer sent a sendheaders message
versionSent bool versionSent bool
verAckReceived bool verAckReceived bool
@ -488,7 +489,7 @@ func (p *Peer) StatsSnapshot() *StatsSnap {
addr := p.addr addr := p.addr
userAgent := p.userAgent userAgent := p.userAgent
services := p.services services := p.services
protocolVersion := p.protocolVersion protocolVersion := p.advertisedProtoVer
p.flagsMtx.Unlock() p.flagsMtx.Unlock()
// Get a copy of all relevant flags and stats. // Get a copy of all relevant flags and stats.
@ -644,7 +645,7 @@ func (p *Peer) VerAckReceived() bool {
return verAckReceived return verAckReceived
} }
// ProtocolVersion returns the peer protocol version. // ProtocolVersion returns the negotiated peer protocol version.
// //
// This function is safe for concurrent access. // This function is safe for concurrent access.
func (p *Peer) ProtocolVersion() uint32 { func (p *Peer) ProtocolVersion() uint32 {
@ -1029,7 +1030,8 @@ func (p *Peer) handleRemoteVersionMsg(msg *wire.MsgVersion) error {
// Negotiate the protocol version. // Negotiate the protocol version.
p.flagsMtx.Lock() p.flagsMtx.Lock()
p.protocolVersion = minUint32(p.protocolVersion, uint32(msg.ProtocolVersion)) p.advertisedProtoVer = uint32(msg.ProtocolVersion)
p.protocolVersion = minUint32(p.protocolVersion, p.advertisedProtoVer)
p.versionKnown = true p.versionKnown = true
log.Debugf("Negotiated protocol version %d for peer %s", log.Debugf("Negotiated protocol version %d for peer %s",
p.protocolVersion, p) p.protocolVersion, p)