commit fe04acbb2247a95e7f18cb541963abe38ccdf3a8 Author: David Fifield david@bamsoftware.com Date: Thu May 1 08:20:30 2014 -0700
fmt. --- latencytest/latencytest.go | 2 +- meek-client-torbrowser/linux.go | 2 +- meek-client-torbrowser/mac.go | 2 +- meek-client-torbrowser/windows.go | 4 ++-- meek-client/meek-client.go | 16 ++++++++-------- meek-server/meek-server.go | 10 +++++----- 6 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/latencytest/latencytest.go b/latencytest/latencytest.go index 4c248a2..e4ef0bf 100644 --- a/latencytest/latencytest.go +++ b/latencytest/latencytest.go @@ -24,7 +24,7 @@ var urls = [...]string{
const ( urlFetchTimeout = 10 * time.Second - numTrials = 5 + numTrials = 5 )
var context appengine.Context diff --git a/meek-client-torbrowser/linux.go b/meek-client-torbrowser/linux.go index 6e8d847..35fb748 100644 --- a/meek-client-torbrowser/linux.go +++ b/meek-client-torbrowser/linux.go @@ -6,6 +6,6 @@ package main
const ( - firefoxPath = "Browser/firefox" + firefoxPath = "Browser/firefox" firefoxProfilePath = "Data/Browser/profile.meek-http-helper" ) diff --git a/meek-client-torbrowser/mac.go b/meek-client-torbrowser/mac.go index 6a11695..dbc8c8f 100644 --- a/meek-client-torbrowser/mac.go +++ b/meek-client-torbrowser/mac.go @@ -6,6 +6,6 @@ package main
const ( - firefoxPath = "../Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox" + firefoxPath = "../Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox" firefoxProfilePath = "../Data/Browser/profile.meek-http-helper" ) diff --git a/meek-client-torbrowser/windows.go b/meek-client-torbrowser/windows.go index 3ac9113..8a3c90f 100644 --- a/meek-client-torbrowser/windows.go +++ b/meek-client-torbrowser/windows.go @@ -6,6 +6,6 @@ package main
const ( - firefoxPath string = "Browser/firefox.exe" - firefoxProfilePath = "Data/Browser/profile.meek-http-helper" + firefoxPath string = "Browser/firefox.exe" + firefoxProfilePath = "Data/Browser/profile.meek-http-helper" ) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 10aa597..8f0f319 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -21,15 +21,15 @@ import ( import "git.torproject.org/pluggable-transports/goptlib.git"
const ( - ptMethodName = "meek" - sessionIdLength = 32 - maxPayloadLength = 0x10000 - initPollInterval = 100 * time.Millisecond - maxPollInterval = 5 * time.Second - pollIntervalMultiplier = 1.5 + ptMethodName = "meek" + sessionIdLength = 32 + maxPayloadLength = 0x10000 + initPollInterval = 100 * time.Millisecond + maxPollInterval = 5 * time.Second + pollIntervalMultiplier = 1.5 maxHelperResponseLength = 10000000 - helperReadTimeout = 60 * time.Second - helperWriteTimeout = 2 * time.Second + helperReadTimeout = 60 * time.Second + helperWriteTimeout = 2 * time.Second )
var ptInfo pt.ClientInfo diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index 3ea445f..b77b765 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -20,14 +20,14 @@ import ( import "git.torproject.org/pluggable-transports/goptlib.git"
const ( - ptMethodName = "meek" + ptMethodName = "meek" minSessionIdLength = 32 - maxPayloadLength = 0x10000 + maxPayloadLength = 0x10000 // How long we try to read something back from the ORPort before returning the // response. turnaroundTimeout = 10 * time.Millisecond // Passed as ReadTimeout and WriteTimeout when constructing the http.Server. - readWriteTimeout = 10 * time.Second + readWriteTimeout = 10 * time.Second maxSessionStaleness = 120 * time.Second )
@@ -236,8 +236,8 @@ func startServer(ln net.Listener) (net.Listener, error) { state := NewState() go state.ExpireSessions() server := &http.Server{ - Handler: state, - ReadTimeout: readWriteTimeout, + Handler: state, + ReadTimeout: readWriteTimeout, WriteTimeout: readWriteTimeout, } go func() {