diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-08 21:53:40 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-08 21:53:40 +0800 |
| commit | 23454dcfcb75b9e421d0c3bfe67d33ab49633c5c (patch) | |
| tree | 547d6ff40c82f00f1a09e3263c10b7e94c81e45a /cmd | |
| parent | f819ac715858bd61094e101a199f8e1b79496dbb (diff) | |
| parent | 8735e5addda74882da66deab8cf038be1fb3ed3f (diff) | |
| download | go-tangerine-23454dcfcb75b9e421d0c3bfe67d33ab49633c5c.tar go-tangerine-23454dcfcb75b9e421d0c3bfe67d33ab49633c5c.tar.gz go-tangerine-23454dcfcb75b9e421d0c3bfe67d33ab49633c5c.tar.bz2 go-tangerine-23454dcfcb75b9e421d0c3bfe67d33ab49633c5c.tar.lz go-tangerine-23454dcfcb75b9e421d0c3bfe67d33ab49633c5c.tar.xz go-tangerine-23454dcfcb75b9e421d0c3bfe67d33ab49633c5c.tar.zst go-tangerine-23454dcfcb75b9e421d0c3bfe67d33ab49633c5c.zip | |
Merge pull request #840 from karalabe/throttled-dialing
p2p: throttled handshakes
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/main.go | 1 | ||||
| -rw-r--r-- | cmd/mist/main.go | 1 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index ff51e8423..a5187bf76 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -242,6 +242,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.JSpathFlag, utils.ListenPortFlag, utils.MaxPeersFlag, + utils.MaxPendingPeersFlag, utils.EtherbaseFlag, utils.MinerThreadsFlag, utils.MiningEnabledFlag, diff --git a/cmd/mist/main.go b/cmd/mist/main.go index 1030d6ada..9d92cc175 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -75,6 +75,7 @@ func init() { utils.LogFileFlag, utils.LogLevelFlag, utils.MaxPeersFlag, + utils.MaxPendingPeersFlag, utils.MinerThreadsFlag, utils.NATFlag, utils.NodeKeyFileFlag, diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 460068d91..a2ff05440 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -197,6 +197,11 @@ var ( Usage: "Maximum number of network peers (network disabled if set to 0)", Value: 16, } + MaxPendingPeersFlag = cli.IntFlag{ + Name: "maxpendpeers", + Usage: "Maximum number of pending connection attempts (defaults used if set to 0)", + Value: 0, + } ListenPortFlag = cli.IntFlag{ Name: "port", Usage: "Network listening port", @@ -292,6 +297,7 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config { AccountManager: GetAccountManager(ctx), VmDebug: ctx.GlobalBool(VMDebugFlag.Name), MaxPeers: ctx.GlobalInt(MaxPeersFlag.Name), + MaxPendingPeers: ctx.GlobalInt(MaxPendingPeersFlag.Name), Port: ctx.GlobalString(ListenPortFlag.Name), NAT: GetNAT(ctx), NatSpec: ctx.GlobalBool(NatspecEnabledFlag.Name), |