fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-25 14:52:17 +00:00
Code Issues Projects Releases Wiki Activity

do not dial ourselves (ok, maybe just once)

Browse Source 
Refs #1275
This commit is contained in:
Anton Kaliaev 2018-03-21 19:41:56 +01:00
parent 59ca9bf480
commit 9a57ef9cbf
No known key found for this signature in database
GPG Key ID: 7B6881D965918214
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
p2p/node_info.go
View File

@ -2,6 +2,7 @@ package p2p
import ( import (
"fmt" "fmt"
"net"
"strings" "strings"
crypto "github.com/tendermint/go-crypto" crypto "github.com/tendermint/go-crypto"
@ -107,10 +108,17 @@ OUTER_LOOP:
return nil return nil
} }
// ID returns node's ID.
func (info NodeInfo) ID() ID { func (info NodeInfo) ID() ID {
return PubKeyToID(info.PubKey) return PubKeyToID(info.PubKey)
} }
// IP returns node listen addr's IP.
func (info NodeInfo) IP() net.IP {
hostPort := strings.SplitN(info.ListenAddr, ":", 2)
return net.ParseIP(hostPort[0])
}
// NetAddress returns a NetAddress derived from the NodeInfo - // NetAddress returns a NetAddress derived from the NodeInfo -
// it includes the authenticated peer ID and the self-reported // it includes the authenticated peer ID and the self-reported
// ListenAddr. Note that the ListenAddr is not authenticated and // ListenAddr. Note that the ListenAddr is not authenticated and

11
p2p/switch.go
View File

@ -58,6 +58,7 @@ type Switch struct {
dialing *cmn.CMap dialing *cmn.CMap
nodeInfo NodeInfo // our node info nodeInfo NodeInfo // our node info
nodeKey *NodeKey // our node privkey nodeKey *NodeKey // our node privkey
nodeIP net.IP // our IP
addrBook AddrBook addrBook AddrBook
filterConnByAddr func(net.Addr) error filterConnByAddr func(net.Addr) error
@ -148,6 +149,7 @@ func (sw *Switch) IsListening() bool {
// NOTE: Not goroutine safe. // NOTE: Not goroutine safe.
func (sw *Switch) SetNodeInfo(nodeInfo NodeInfo) { func (sw *Switch) SetNodeInfo(nodeInfo NodeInfo) {
sw.nodeInfo = nodeInfo sw.nodeInfo = nodeInfo
sw.nodeIP = nodeInfo.IP()
} }
// NodeInfo returns the switch's NodeInfo. // NodeInfo returns the switch's NodeInfo.
@ -381,6 +383,11 @@ func (sw *Switch) DialPeersAsync(addrBook AddrBook, peers []string, persistent b
// DialPeerWithAddress dials the given peer and runs sw.addPeer if it connects and authenticates successfully. // DialPeerWithAddress dials the given peer and runs sw.addPeer if it connects and authenticates successfully.
// If `persistent == true`, the switch will always try to reconnect to this peer if the connection ever fails. // If `persistent == true`, the switch will always try to reconnect to this peer if the connection ever fails.
func (sw *Switch) DialPeerWithAddress(addr *NetAddress, persistent bool) error { func (sw *Switch) DialPeerWithAddress(addr *NetAddress, persistent bool) error {
// do not dial ourselves
if addr.IP == sw.nodeIP {
return ErrSwitchConnectToSelf
}
sw.dialing.Set(string(addr.ID), addr) sw.dialing.Set(string(addr.ID), addr)
defer sw.dialing.Delete(string(addr.ID)) defer sw.dialing.Delete(string(addr.ID))
return sw.addOutboundPeerWithConfig(addr, sw.peerConfig, persistent) return sw.addOutboundPeerWithConfig(addr, sw.peerConfig, persistent)
@ -522,6 +529,10 @@ func (sw *Switch) addPeer(pc peerConn) error {
// Avoid self // Avoid self
if sw.nodeKey.ID() == peerID { if sw.nodeKey.ID() == peerID {
// overwrite current IP to avoid dialing ourselves again
// it means original nodeIP was different from public one
sw.nodeIP = peerNodeInfo.IP()
return ErrSwitchConnectToSelf return ErrSwitchConnectToSelf
} }