Merge pull request #3325 from fjl/p2p-netrestrict

Prevent relay of invalid IPs, add --netrestrict
2016-11-25 13:59:18 +01:00
parent 9c3ea0d32d e5edd3b983
commit d1a95c643e
25 changed files with 643 additions and 230 deletions
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@ -148,6 +148,7 @@ participating.
 		utils.NatspecEnabledFlag,
 		utils.NoDiscoverFlag,
 		utils.DiscoveryV5Flag,
+		utils.NetrestrictFlag,
 		utils.NodeKeyFileFlag,
 		utils.NodeKeyHexFlag,
 		utils.RPCEnabledFlag,