Merge pull request antoniomika#57 from jonahbull/make-idle-timeout-co…

…nfigurable

Make idle timeout configurable

README.md

@@ -134,6 +134,8 @@ Usage of ./sish:
         The location of pem files for HTTPS (fullchain.pem and privkey.pem) (default "ssl/")
   -sish.httpsport int
         The port to use for https command output
+  -sish.idletimeout int
+        Number of seconds to wait for activity before closing a connection (default 5)
   -sish.keysdir string
         Directory for public keys for pubkey auth (default "pubkeys/")
   -sish.logtoclient

main.go

@@ -77,6 +77,7 @@ var (
 	versionCheck         = flag.Bool("sish.version", false, "Print version and exit")
 	tcpAlias             = flag.Bool("sish.tcpalias", false, "Whether or not to allow the use of TCP aliasing")
 	logToClient          = flag.Bool("sish.logtoclient", false, "Whether or not to log http requests to the client")
+	idleTimeout          = flag.Int("sish.idletimeout", 5, "Number of seconds to wait for activity before closing a connection")
 	bannedSubdomainList  = []string{""}
 	filter               *ipfilter.IPFilter
 )

requests.go

@@ -239,7 +239,7 @@ type IdleTimeoutConn struct {
 
 // Read is needed to implement the reader part
 func (i IdleTimeoutConn) Read(buf []byte) (int, error) {
-	err := i.Conn.SetDeadline(time.Now().Add(5 * time.Second))
+	err := i.Conn.SetDeadline(time.Now().Add(time.Duration(*idleTimeout) * time.Second))
 	if err != nil {
 		return 0, err
 	}
@@ -249,7 +249,7 @@ func (i IdleTimeoutConn) Read(buf []byte) (int, error) {
 
 // Write is needed to implement the writer part
 func (i IdleTimeoutConn) Write(buf []byte) (int, error) {
-	err := i.Conn.SetDeadline(time.Now().Add(5 * time.Second))
+	err := i.Conn.SetDeadline(time.Now().Add(time.Duration(*idleTimeout) * time.Second))
 	if err != nil {
 		return 0, err
 	}