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

peer: Advertise _our_ max protocol version,

Browse source
This commit is contained in:
David Hill 2016-10-25 22:50:16 -04:00
parent 54b454ed3d
commit 18bb90b4ad
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
peer/peer.go
View file

@ -829,7 +829,7 @@ func (p *Peer) localVersionMsg() (*wire.MsgVersion, error) {
msg.Services = p.cfg.Services msg.Services = p.cfg.Services
// Advertise our max supported protocol version. // Advertise our max supported protocol version.
msg.ProtocolVersion = int32(p.ProtocolVersion()) msg.ProtocolVersion = int32(p.cfg.ProtocolVersion)
// Advertise if inv messages for transactions are desired. // Advertise if inv messages for transactions are desired.
msg.DisableRelayTx = p.cfg.DisableRelayTx msg.DisableRelayTx = p.cfg.DisableRelayTx
@ -2040,12 +2040,12 @@ func (p *Peer) negotiateOutboundProtocol() error {
// newPeerBase returns a new base bitcoin peer based on the inbound flag. This // newPeerBase returns a new base bitcoin peer based on the inbound flag. This
// is used by the NewInboundPeer and NewOutboundPeer functions to perform base // is used by the NewInboundPeer and NewOutboundPeer functions to perform base
// setup needed by both types of peers. // setup needed by both types of peers.
func newPeerBase(cfg *Config, inbound bool) *Peer { func newPeerBase(origCfg *Config, inbound bool) *Peer {
// Default to the max supported protocol version. Override to the // Default to the max supported protocol version if not specified by the
// version specified by the caller if configured. // caller.
protocolVersion := uint32(MaxProtocolVersion) cfg := *origCfg // Copy to avoid mutating caller.
if cfg.ProtocolVersion != 0 { if cfg.ProtocolVersion == 0 {
protocolVersion = cfg.ProtocolVersion cfg.ProtocolVersion = uint32(MaxProtocolVersion)
} }
// Set the chain parameters to testnet if the caller did not specify any. // Set the chain parameters to testnet if the caller did not specify any.
@ -2065,9 +2065,9 @@ func newPeerBase(cfg *Config, inbound bool) *Peer {
queueQuit: make(chan struct{}), queueQuit: make(chan struct{}),
outQuit: make(chan struct{}), outQuit: make(chan struct{}),
quit: make(chan struct{}), quit: make(chan struct{}),
cfg: *cfg, // Copy so caller can't mutate. cfg: cfg, // Copy so caller can't mutate.
services: cfg.Services, services: cfg.Services,
protocolVersion: protocolVersion, protocolVersion: cfg.ProtocolVersion,
} }
return &p return &p
} }