p2p: return zero node from Self if the server is not running

This helps with fixing the tests for cmd/geth to run without networking.
release/1.0.1
Felix Lange 10 years ago
parent 96e2b6bc07
commit 635b66acdc
  1. 7
      p2p/server.go

@ -283,6 +283,11 @@ func (srv *Server) Stop() {
// Self returns the local node's endpoint information. // Self returns the local node's endpoint information.
func (srv *Server) Self() *discover.Node { func (srv *Server) Self() *discover.Node {
srv.lock.RLock()
defer srv.lock.RUnlock()
if !srv.running {
return &discover.Node{IP: net.ParseIP("0.0.0.0")}
}
return srv.ntab.Self() return srv.ntab.Self()
} }
@ -471,7 +476,7 @@ func (srv *Server) checkPeer(id discover.NodeID) (bool, DiscReason) {
return false, DiscTooManyPeers return false, DiscTooManyPeers
case srv.peers[id] != nil: case srv.peers[id] != nil:
return false, DiscAlreadyConnected return false, DiscAlreadyConnected
case id == srv.Self().ID: case id == srv.ntab.Self().ID:
return false, DiscSelf return false, DiscSelf
default: default:
return true, 0 return true, 0

Loading…
Cancel
Save