From 4d5a719f256d7dfbaab2cc9c632cd7996067508f Mon Sep 17 00:00:00 2001
From: Péter Szilágyi <peterke@gmail.com>
Date: Mon, 4 May 2015 17:35:49 +0300
Subject: cmd, eth, p2p: introduce pending peer cli arg, add tests

---
 cmd/geth/main.go   | 1 +
 cmd/mist/main.go   | 1 +
 cmd/utils/flags.go | 6 ++++++
 3 files changed, 8 insertions(+)

(limited to 'cmd')

diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 92c3b7a90..284f78c3e 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 1fdc8dfe5..0a1d650d6 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",
@@ -286,6 +291,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),
-- 
cgit 


From e45d9bb29d3c04d57fd40533b43ea7929b6a4513 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Fri, 8 May 2015 16:01:31 +0200
Subject: cmd/utils: bump default maxpeers to 25

This should improve ethereum block propagation times since
we're not not broadcasting blocks to 100% of peers.
---
 cmd/utils/flags.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd')

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index a2ff05440..b18d9851f 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -195,7 +195,7 @@ 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",
-- 
cgit 


From c8fc4cebe63073fd77d5f553a4f0cec36a4ccb4b Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 8 May 2015 17:24:41 +0200
Subject: version 0.9.17

---
 cmd/geth/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd')

diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index a5187bf76..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 (
-- 
cgit