forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

p2p/simulations: Disconnect peers on SimNode.Stop

Browse source 
Signed-off-by: Lewis Marshall <lewis@lmars.net>
This commit is contained in:
Lewis Marshall 2017-05-04 19:14:07 +01:00
parent 1aa80c5012
commit 6de09120d3
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
p2p/simulations/adapters/inproc.go
View file

@ -78,10 +78,11 @@ func (s *SimAdapter) NewNode(config *NodeConfig) (Node, error) {
} }
node := &SimNode{ node := &SimNode{
Id: id, Id: id,
adapter: s, adapter: s,
service: service, service: service,
peers: make(map[discover.NodeID]MsgReadWriteCloser), peers: make(map[discover.NodeID]MsgReadWriteCloser),
dropPeers: make(chan struct{}),
} }
s.nodes[id.NodeID] = node s.nodes[id.NodeID] = node
return node, nil return node, nil
@ -117,6 +118,10 @@ type SimNode struct {
peers map[discover.NodeID]MsgReadWriteCloser peers map[discover.NodeID]MsgReadWriteCloser
peerFeed event.Feed peerFeed event.Feed
client *rpc.Client client *rpc.Client
// dropPeers is used to force peer disconnects when
// the node is stopped
dropPeers chan struct{}
} }
// Addr returns the node's discovery address // Addr returns the node's discovery address
@ -142,15 +147,18 @@ func (self *SimNode) Client() (*rpc.Client, error) {
// Start starts the RPC handler and the underlying service // Start starts the RPC handler and the underlying service
func (self *SimNode) Start() error { func (self *SimNode) Start() error {
self.dropPeers = make(chan struct{})
if err := self.startRPC(); err != nil { if err := self.startRPC(); err != nil {
return err return err
} }
return self.service.Start(self) return self.service.Start(self)
} }
// Stop stops the RPC handler and the underlying service // Stop stops the RPC handler, stops the underlying service and disconnects
// any currently connected peers
func (self *SimNode) Stop() error { func (self *SimNode) Stop() error {
self.stopRPC() self.stopRPC()
close(self.dropPeers)
return self.service.Stop() return self.service.Stop()
} }
@ -288,9 +296,16 @@ func (self *SimNode) PeersInfo() (info []*p2p.PeerInfo) {
} }
// RunProtocol runs the underlying service's protocol with the peer using the // RunProtocol runs the underlying service's protocol with the peer using the
// given p2p.MsgReadWriter, emitting peer add / drop events for peer event // given MsgReadWriteCloser, emitting peer add / drop events for peer event
// subscribers // subscribers
func (self *SimNode) RunProtocol(peer *SimNode, rw p2p.MsgReadWriter) { func (self *SimNode) RunProtocol(peer *SimNode, rw MsgReadWriteCloser) {
// close the rw if the node is stopped to disconnect the peer
go func() {
<-self.dropPeers
log.Trace("dropping peer", "self.id", self.Id, "peer.id", peer.Id)
rw.Close()
}()
id := peer.Id id := peer.Id
log.Trace(fmt.Sprintf("protocol starting on peer %v (connection with %v)", self.Id, id)) log.Trace(fmt.Sprintf("protocol starting on peer %v (connection with %v)", self.Id, id))
protocol := self.service.Protocols()[0] protocol := self.service.Protocols()[0]