add enable_compression option

kazeburo · Aug 27, 2019 · a6a2da3 · a6a2da3
1 parent b4e6052
commit a6a2da3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/handler/handler.go b/handler/handler.go
@@ -28,28 +28,30 @@ var (
 
 // Handler handlers
 type Handler struct {
-	logger       *zap.Logger
-	upgrader     websocket.Upgrader
-	dialTimeout  time.Duration
-	writeTimeout time.Duration
-	mp           *mapping.Mapping
-	pk           *publickey.Publickey
-	dumpTCP      uint
-	sq           *seq.Seq
+	logger            *zap.Logger
+	upgrader          websocket.Upgrader
+	dialTimeout       time.Duration
+	writeTimeout      time.Duration
+	enableCompression bool
+	mp                *mapping.Mapping
+	pk                *publickey.Publickey
+	dumpTCP           uint
+	sq                *seq.Seq
 }
 
 // New new handler
 func New(
 	handshakeTimeout time.Duration,
 	dialTimeout time.Duration,
 	writeTimeout time.Duration,
+	enableCompression bool,
 	mp *mapping.Mapping,
 	pk *publickey.Publickey,
 	dumpTCP uint,
 	logger *zap.Logger) (*Handler, error) {
 
 	upgrader := websocket.Upgrader{
-		EnableCompression: true,
+		EnableCompression: enableCompression,
 		ReadBufferSize:    BufferSize,
 		WriteBufferSize:   BufferSize,
 		HandshakeTimeout:  handshakeTimeout,

diff --git a/wsgate-server.go b/wsgate-server.go
@@ -23,17 +23,18 @@ import (
 
 var (
 	// Version wsgate-server version
-	Version          string
-	showVersion      = flag.Bool("version", false, "show version")
-	listen           = flag.String("listen", "127.0.0.1:8086", "Address to listen to.")
-	handshakeTimeout = flag.Duration("handshake_timeout", 10*time.Second, "Handshake timeout.")
-	dialTimeout      = flag.Duration("dial_timeout", 10*time.Second, "Dial timeout.")
-	writeTimeout     = flag.Duration("write_timeout", 10*time.Second, "Write timeout.")
-	shutdownTimeout  = flag.Duration("shutdown_timeout", 86400*time.Second, "timeout to wait for all connections to be closed")
-	mapFile          = flag.String("map", "", "path and proxy host mapping file")
-	publicKeyFile    = flag.String("public-key", "", "public key for verifying JWT auth header")
-	jwtFreshness     = flag.Duration("jwt-freshness", 3600*time.Second, "time in seconds to allow generated jwt tokens")
-	dumpTCP          = flag.Uint("dump-tcp", 0, "Dump TCP. 0 = disable, 1 = src to dest, 2 = both")
+	Version           string
+	showVersion       = flag.Bool("version", false, "Show version")
+	listen            = flag.String("listen", "127.0.0.1:8086", "Address to listen to")
+	handshakeTimeout  = flag.Duration("handshake_timeout", 10*time.Second, "Handshake timeout")
+	dialTimeout       = flag.Duration("dial_timeout", 10*time.Second, "Dial timeout")
+	writeTimeout      = flag.Duration("write_timeout", 10*time.Second, "Write timeout")
+	shutdownTimeout   = flag.Duration("shutdown_timeout", 86400*time.Second, "Timeout to wait for all connections to be closed")
+	enableCompression = flag.Bool("enable_compression", false, "To enable WebSocket Per-Message Compression Extensions (RFC 7692)")
+	mapFile           = flag.String("map", "", "Path and proxy host mapping file")
+	publicKeyFile     = flag.String("public-key", "", "Public key for verifying JWT auth header")
+	jwtFreshness      = flag.Duration("jwt-freshness", 3600*time.Second, "Time in seconds to allow generated jwt tokens")
+	dumpTCP           = flag.Uint("dump-tcp", 0, "Dump TCP. 0 = disable, 1 = src to dest, 2 = both")
 )
 
 func printVersion() {
@@ -68,6 +69,7 @@ func main() {
 		*handshakeTimeout,
 		*dialTimeout,
 		*writeTimeout,
+		*enableCompression,
 		mp,
 		pk,
 		*dumpTCP,