diff options
| author | Daniel A. Nagy <nagy.da@gmail.com> | 2015-05-08 23:55:53 +0800 |
|---|---|---|
| committer | Daniel A. Nagy <nagy.da@gmail.com> | 2015-05-08 23:55:53 +0800 |
| commit | 62dd9833ec768e2026bccb1cf7a8ef4263b9286d (patch) | |
| tree | 0a091d99afd7f8cf5e3a6d4522c30ceef8559a55 /cmd | |
| parent | 3a01e3e39b9ce83ecb7444319407ee8bb00e3bf6 (diff) | |
| parent | c8fc4cebe63073fd77d5f553a4f0cec36a4ccb4b (diff) | |
| download | go-tangerine-62dd9833ec768e2026bccb1cf7a8ef4263b9286d.tar go-tangerine-62dd9833ec768e2026bccb1cf7a8ef4263b9286d.tar.gz go-tangerine-62dd9833ec768e2026bccb1cf7a8ef4263b9286d.tar.bz2 go-tangerine-62dd9833ec768e2026bccb1cf7a8ef4263b9286d.tar.lz go-tangerine-62dd9833ec768e2026bccb1cf7a8ef4263b9286d.tar.xz go-tangerine-62dd9833ec768e2026bccb1cf7a8ef4263b9286d.tar.zst go-tangerine-62dd9833ec768e2026bccb1cf7a8ef4263b9286d.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/main.go | 3 | ||||
| -rw-r--r-- | cmd/mist/main.go | 1 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index ff51e8423..fd6925e6d 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -51,7 +51,7 @@ import _ "net/http/pprof" const ( ClientIdentifier = "Geth" - Version = "0.9.16" + Version = "0.9.17" ) var ( @@ -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..b18d9851f 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -195,7 +195,12 @@ var ( MaxPeersFlag = cli.IntFlag{ Name: "maxpeers", Usage: "Maximum number of network peers (network disabled if set to 0)", - Value: 16, + Value: 25, + } + 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", @@ -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), |