forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-14 16:03:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/pss: added msg to log, cleared lock error

Browse source
This commit is contained in:
lash 2017-06-25 15:49:22 +02:00
parent 4cb8412cd0
commit a009ee3d39
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
swarm/pss/pss.go
View file

@ -131,8 +131,6 @@ func (self *Pss) Protocols() []p2p.Protocol {
// Starts the PssMsg protocol // Starts the PssMsg protocol
func (self *Pss) Run(p *p2p.Peer, rw p2p.MsgReadWriter) error { func (self *Pss) Run(p *p2p.Peer, rw p2p.MsgReadWriter) error {
self.lock.Lock()
defer self.lock.Unlock()
pp := protocols.NewPeer(p, rw, pssSpec) pp := protocols.NewPeer(p, rw, pssSpec)
//addr := network.NewAddrFromNodeID(id) //addr := network.NewAddrFromNodeID(id)
//potaddr := pot.NewHashAddressFromBytes(addr.OAddr) //potaddr := pot.NewHashAddressFromBytes(addr.OAddr)
@ -326,8 +324,8 @@ func (self *Pss) Forward(msg *PssMsg) error {
log.Crit("Pss cannot use kademlia peer type") log.Crit("Pss cannot use kademlia peer type")
return false return false
} }
//sendMsg := fmt.Sprintf("MSG %x TO %x FROM %x VIA %x", digest, common.ByteLabel(msg.To), common.ByteLabel(self.BaseAddr()), common.ByteLabel(op.Address())) sendMsg := fmt.Sprintf("MSG %x TO %x FROM %x VIA %x", digest, common.ByteLabel(msg.To), common.ByteLabel(self.BaseAddr()), common.ByteLabel(op.Address()))
sendMsg := fmt.Sprintf("TO %x FROM %x VIA %x", common.ByteLabel(msg.To), common.ByteLabel(self.BaseAddr()), common.ByteLabel(op.Address())) //sendMsg := fmt.Sprintf("TO %x FROM %x VIA %x", common.ByteLabel(msg.To), common.ByteLabel(self.BaseAddr()), common.ByteLabel(op.Address()))
pp := self.fwdPool[sp.ID()] pp := self.fwdPool[sp.ID()]
if self.checkFwdCache(op.Address(), digest) { if self.checkFwdCache(op.Address(), digest) {
log.Info(fmt.Sprintf("%v: peer already forwarded to", sendMsg)) log.Info(fmt.Sprintf("%v: peer already forwarded to", sendMsg))