From 745d414645872853fe1e3adab28dfb02f0b61dd0 Mon Sep 17 00:00:00 2001
From: Yawning Angel <yawning@schwanenlied.me>
Date: Sat, 17 May 2014 07:19:27 +0000
Subject: [PATCH] Change the client connection timeout to 30 sec.
This is more common than 15 seconds (It's what Firefox uses for the
request timeout).
---
obfs4.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/obfs4.go b/obfs4.go
index 52e1b02..8c4c46e 100644
--- a/obfs4.go
+++ b/obfs4.go
@@ -42,7 +42,7 @@ import (
const (
headerLength = framing.FrameOverhead + packetOverhead
- connectionTimeout = time.Duration(15) * time.Second
+ connectionTimeout = time.Duration(30) * time.Second
minCloseThreshold = 0
maxCloseThreshold = framing.MaximumSegmentLength * 5
@@ -324,6 +324,9 @@ func (c *Obfs4Conn) ServerHandshake() error {
err := c.serverHandshake(c.listener.nodeID, c.listener.keyPair)
c.listener = nil
if err != nil {
+ // XXX: Maybe make the timeout period deterministic, since random
+ // hangup intervals are also suspicious. An ok value would be someting
+ // like the Nginx client_header_timeout (60s).
c.closeAfterDelay()
}
--
GitLab