interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3248 from zsfelfoldi/light-topic3 

Topic discovery bugfix
This commit is contained in:
Felix Lange 2016-11-11 06:28:33 +01:00 committed by GitHub
parent 9eb6f627fa 323c2d6775
commit 932d973e36
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
les/handler.go
View File

@ -236,7 +236,7 @@ func (pm *ProtocolManager) removePeer(id string) {
} }
func (pm *ProtocolManager) findServers() { func (pm *ProtocolManager) findServers() {
if pm.p2pServer == nil { if pm.p2pServer == nil || pm.topicDisc == nil {
return return
} }
enodes := make(chan string, 100) enodes := make(chan string, 100)
@ -259,7 +259,10 @@ func (pm *ProtocolManager) findServers() {
} }
} }
}() }()
time.Sleep(time.Second * 20) select {
case <-time.After(time.Second * 20):
case <-pm.quitSync:
}
close(stop) close(stop)
} }

3
p2p/discv5/net.go
View File

@ -863,6 +863,9 @@ func init() {
name: "verifywait", name: "verifywait",
handle: func(net *Network, n *Node, ev nodeEvent, pkt *ingressPacket) (*nodeState, error) { handle: func(net *Network, n *Node, ev nodeEvent, pkt *ingressPacket) (*nodeState, error) {
switch ev { switch ev {
case pingPacket:
net.handlePing(n, pkt)
return verifywait, nil
case pongPacket: case pongPacket:
err := net.handleKnownPong(n, pkt) err := net.handleKnownPong(n, pkt)
return known, err return known, err