mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-01-08 06:15:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/config' into develop

Browse Source
This commit is contained in:
Jae Kwon
2015-10-11 18:18:53 -07:00
parent fbf4a4323b bb662b8861
commit fa956596dc
6 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
p2p/netaddress.go
View File

@@ -110,6 +110,10 @@ func (na *NetAddress) DialTimeout(timeout time.Duration) (net.Conn, error) {
}
func (na *NetAddress) Routable() bool {
if config.GetBool("local_routing") {
return na.Valid()
}
// TODO(oga) bitcoind doesn't include RFC3849 here, but should we?
return na.Valid() && !(na.RFC1918() || na.RFC3927() || na.RFC4862() ||
na.RFC4193() || na.RFC4843() || na.Local())