Reduce SSH keep alive timeout to 10 seconds; remove debug output

psiphon/config.go

@@ -40,7 +40,7 @@ const (
 	TUNNEL_SSH_KEEP_ALIVE_PAYLOAD_MAX_BYTES      = 256
 	TUNNEL_SSH_KEEP_ALIVE_PERIOD_MIN             = 60 * time.Second
 	TUNNEL_SSH_KEEP_ALIVE_PERIOD_MAX             = 120 * time.Second
-	TUNNEL_SSH_KEEP_ALIVE_TIMEOUT                = 30 * time.Second
+	TUNNEL_SSH_KEEP_ALIVE_TIMEOUT                = 10 * time.Second
 	ESTABLISH_TUNNEL_TIMEOUT_SECONDS             = 300
 	ESTABLISH_TUNNEL_WORK_TIME_SECONDS           = 60 * time.Second
 	ESTABLISH_TUNNEL_PAUSE_PERIOD                = 5 * time.Second

psiphon/tunnel.go

@@ -609,15 +609,9 @@ func sendSshKeepAlive(sshClient *ssh.Client) error {
 
 	go func() {
 		// Random padding to frustrate fingerprinting
-
-		NoticeInfo("sending keepalive@openssh.com")
-
 		_, _, err := sshClient.SendRequest(
 			"keepalive@openssh.com", true,
 			MakeSecureRandomPadding(0, TUNNEL_SSH_KEEP_ALIVE_PAYLOAD_MAX_BYTES))
-
-		NoticeInfo("done keepalive@openssh.com")
-
 		errChannel <- err
 	}()