From 1f0a4a2c2f80b04d279bcb3fb3ccf44170f26db0 Mon Sep 17 00:00:00 2001
From: xtaci <daniel820313@gmail.com>
Date: Fri, 19 Aug 2016 12:31:51 +0800
Subject: [PATCH] change default settings

---
 client/main.go | 14 +++++++-------
 server/main.go | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/client/main.go b/client/main.go
index 02cdc973d..19fbd5902 100644
--- a/client/main.go
+++ b/client/main.go
@@ -120,7 +120,7 @@ func main() {
 		cli.StringFlag{
 			Name:  "mode",
 			Value: "fast",
-			Usage: "embeded modes: fast3, fast2, fast, normal",
+			Usage: "profiles: fast3, fast2, fast, normal",
 		},
 		cli.IntFlag{
 			Name:  "conn",
@@ -142,13 +142,9 @@ func main() {
 			Value: 1024,
 			Usage: "set receive window size(num of packets)",
 		},
-		cli.BoolFlag{
-			Name:  "nocomp",
-			Usage: "disable compression",
-		},
 		cli.IntFlag{
 			Name:  "datashard",
-			Value: 10,
+			Value: 7,
 			Usage: "set reed-solomon erasure coding - datashard",
 		},
 		cli.IntFlag{
@@ -166,6 +162,10 @@ func main() {
 			Value: 0,
 			Usage: "set DSCP(6bit)",
 		},
+		cli.BoolFlag{
+			Name:  "nocomp",
+			Usage: "disable compression",
+		},
 		cli.IntFlag{
 			Name:   "nodelay",
 			Value:  0,
@@ -266,7 +266,7 @@ func main() {
 			AcceptBacklog:          256,
 			EnableKeepAlive:        true,
 			KeepAliveInterval:      30 * time.Second,
-			ConnectionWriteTimeout: 30 * time.Second,
+			ConnectionWriteTimeout: 10 * time.Second,
 			MaxStreamWindowSize:    uint32(sockbuf),
 			LogOutput:              os.Stderr,
 		}
diff --git a/server/main.go b/server/main.go
index cb7e02db7..81c83d7cb 100644
--- a/server/main.go
+++ b/server/main.go
@@ -138,7 +138,7 @@ func main() {
 		cli.StringFlag{
 			Name:  "mode",
 			Value: "fast",
-			Usage: "embeded modes: fast3, fast2, fast, normal",
+			Usage: "profiles: fast3, fast2, fast, normal",
 		},
 		cli.IntFlag{
 			Name:  "mtu",
@@ -155,13 +155,9 @@ func main() {
 			Value: 1024,
 			Usage: "set receive window size(num of packets)",
 		},
-		cli.BoolFlag{
-			Name:  "nocomp",
-			Usage: "disable compression",
-		},
 		cli.IntFlag{
 			Name:  "datashard",
-			Value: 10,
+			Value: 7,
 			Usage: "set reed-solomon erasure coding - datashard",
 		},
 		cli.IntFlag{
@@ -179,6 +175,10 @@ func main() {
 			Value: 0,
 			Usage: "set DSCP(6bit)",
 		},
+		cli.BoolFlag{
+			Name:  "nocomp",
+			Usage: "disable compression",
+		},
 		cli.IntFlag{
 			Name:   "nodelay",
 			Value:  0,
@@ -284,7 +284,7 @@ func main() {
 			AcceptBacklog:          256,
 			EnableKeepAlive:        true,
 			KeepAliveInterval:      30 * time.Second,
-			ConnectionWriteTimeout: 30 * time.Second,
+			ConnectionWriteTimeout: 10 * time.Second,
 			MaxStreamWindowSize:    uint32(sockbuf),
 			LogOutput:              os.Stderr,
 		}