forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-22 20:56:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix nil source on chunk

Browse source
This commit is contained in:
zelig 2015-05-13 21:49:36 +02:00
parent e2887da4c4
commit 46aa7db5fd
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bzz/dpa.go
View file

@ -61,7 +61,7 @@ type Chunk struct {
req *requestStatus // req *requestStatus //
wg *sync.WaitGroup wg *sync.WaitGroup
dbStored chan bool dbStored chan bool
source peer source *peer
} }
type ChunkStore interface { type ChunkStore interface {

4
bzz/netstore.go
View file

@ -114,7 +114,7 @@ func (self *NetStore) addStoreRequest(req *storeRequestMsgData) {
} else { } else {
return return
} }
chunk.source = req.peer chunk.source = &req.peer
self.put(chunk) self.put(chunk)
} }
@ -295,7 +295,7 @@ func (self *NetStore) store(chunk *Chunk) {
Id: uint64(id), Id: uint64(id),
} }
for _, peer := range self.hive.getPeers(chunk.Key, 0) { for _, peer := range self.hive.getPeers(chunk.Key, 0) {
if peer.Addr() != chunk.source.Addr() { if chunk.source == nil || peer.Addr() != chunk.source.Addr() {
go peer.store(req) go peer.store(req)
} }
} }

6
eth/backend.go
View file

@ -468,11 +468,7 @@ func (s *Ethereum) Start() error {
if s.DPA != nil { if s.DPA != nil {
s.DPA.Start() s.DPA.Start()
selfNode := s.net.Self() s.netStore.Start(s.net.Self())
if selfNode == nil {
panic("self is nil")
}
s.netStore.Start(selfNode)
go bzz.StartHttpServer(s.DPA) go bzz.StartHttpServer(s.DPA)
} }