Merge remote-tracking branch 'origin/master' into precogs/init

[bytom/vapor.git] / p2p / switch.go

diff --git a/p2p/switch.go b/p2p/switch.go
index 9e8ba44..075498f 100644 (file)
--- a/p2p/switch.go
+++ b/p2p/switch.go
@@ -135,6 +135,26 @@ func NewSwitch(config *cfg.Config, discv discv, lanDiscv lanDiscv, l Listener, p
        return sw, nil
 }
 
+func (sw *Switch) GetDiscv() discv {
+       return sw.discv
+}
+
+func (sw *Switch) GetNodeInfo() *NodeInfo {
+       return sw.nodeInfo
+}
+
+func (sw *Switch) GetPeers() *PeerSet {
+       return sw.peers
+}
+
+func (sw *Switch) GetReactors() map[string]Reactor {
+       return sw.reactors
+}
+
+func (sw *Switch) GetSecurity() Security {
+       return sw.security
+}
+
 // OnStart implements BaseService. It starts all the reactors, peers, and listeners.
 func (sw *Switch) OnStart() error {
        for _, reactor := range sw.reactors {
@@ -160,8 +180,6 @@ func (sw *Switch) OnStart() error {
 
 // OnStop implements BaseService. It stops all listeners, peers, and reactors.
 func (sw *Switch) OnStop() {
-       log.Info(" OnStop OnStop OnStop OnStop")
-
        if sw.Config.P2P.LANDiscover {
                sw.lanDiscv.Stop()
        }
@@ -354,7 +372,7 @@ func (sw *Switch) connectLANPeers(lanPeer mdns.LANPeerEvent) {
        for i := 0; i < len(lanPeer.IP); i++ {
                addresses = append(addresses, NewLANNetAddressIPPort(lanPeer.IP[i], uint16(lanPeer.Port)))
        }
-       sw.dialPeers(addresses)
+       sw.DialPeers(addresses)
 }
 
 func (sw *Switch) connectLANPeersRoutine() {
@@ -418,9 +436,7 @@ func (sw *Switch) dialPeerWorker(a *NetAddress, wg *sync.WaitGroup) {
        wg.Done()
 }
 
-func (sw *Switch) dialPeers(addresses []*NetAddress) {
-       log.Info("dialPeers:", addresses)
-
+func (sw *Switch) DialPeers(addresses []*NetAddress) {
        connectedPeers := make(map[string]struct{})
        for _, peer := range sw.Peers().List() {
                connectedPeers[peer.RemoteAddrHost()] = struct{}{}
@@ -456,7 +472,7 @@ func (sw *Switch) ensureKeepConnectPeers() {
                addresses = append(addresses, address)
        }
 
-       sw.dialPeers(addresses)
+       sw.DialPeers(addresses)
 }
 
 func (sw *Switch) ensureOutboundPeers() {
@@ -474,7 +490,7 @@ func (sw *Switch) ensureOutboundPeers() {
                address := NewNetAddressIPPort(nodes[i].IP, nodes[i].TCP)
                addresses = append(addresses, address)
        }
-       sw.dialPeers(addresses)
+       sw.DialPeers(addresses)
 }
 
 func (sw *Switch) ensureOutboundPeersRoutine() {