(WebSocketServer) add option to disable deflate compression, exposed with the -x option to ws echo_server

ixwebsocket/IXHttpServer.cpp

@@ -42,7 +42,8 @@ namespace
 
 namespace ix
 {
-    HttpServer::HttpServer(int port, const std::string& host, int backlog, size_t maxConnections, int addressFamily)
+    HttpServer::HttpServer(
+        int port, const std::string& host, int backlog, size_t maxConnections, int addressFamily)
         : SocketServer(port, host, backlog, maxConnections, addressFamily)
         , _connectedClientsCount(0)
     {

ixwebsocket/IXSocketServer.cpp

@@ -23,11 +23,8 @@ namespace ix
     const size_t SocketServer::kDefaultMaxConnections(32);
     const int SocketServer::kDefaultAddressFamily(AF_INET);
 
-    SocketServer::SocketServer(int port,
-                               const std::string& host,
-                               int backlog,
-                               size_t maxConnections,
-                               int addressFamily)
+    SocketServer::SocketServer(
+        int port, const std::string& host, int backlog, size_t maxConnections, int addressFamily)
         : _port(port)
         , _host(host)
         , _backlog(backlog)
@@ -97,7 +94,8 @@ namespace ix
             {
                 std::stringstream ss;
                 ss << "SocketServer::listen() error calling inet_pton "
-                   << "at address " << _host << ":" << _port << " : " << strerror(Socket::getErrno());
+                   << "at address " << _host << ":" << _port << " : "
+                   << strerror(Socket::getErrno());
 
                 Socket::closeSocket(_serverFd);
                 return std::make_pair(false, ss.str());
@@ -108,7 +106,8 @@ namespace ix
             {
                 std::stringstream ss;
                 ss << "SocketServer::listen() error calling bind "
-                   << "at address " << _host << ":" << _port << " : " << strerror(Socket::getErrno());
+                   << "at address " << _host << ":" << _port << " : "
+                   << strerror(Socket::getErrno());
 
                 Socket::closeSocket(_serverFd);
                 return std::make_pair(false, ss.str());
@@ -124,7 +123,8 @@ namespace ix
             {
                 std::stringstream ss;
                 ss << "SocketServer::listen() error calling inet_pton "
-                   << "at address " << _host << ":" << _port << " : " << strerror(Socket::getErrno());
+                   << "at address " << _host << ":" << _port << " : "
+                   << strerror(Socket::getErrno());
 
                 Socket::closeSocket(_serverFd);
                 return std::make_pair(false, ss.str());
@@ -135,7 +135,8 @@ namespace ix
             {
                 std::stringstream ss;
                 ss << "SocketServer::listen() error calling bind "
-                   << "at address " << _host << ":" << _port << " : " << strerror(Socket::getErrno());
+                   << "at address " << _host << ":" << _port << " : "
+                   << strerror(Socket::getErrno());
 
                 Socket::closeSocket(_serverFd);
                 return std::make_pair(false, ss.str());

ixwebsocket/IXWebSocket.h

@@ -19,10 +19,10 @@
 #include "IXWebSocketSendInfo.h"
 #include "IXWebSocketTransport.h"
 #include <atomic>
+#include <condition_variable>
 #include <mutex>
 #include <string>
 #include <thread>
-#include <condition_variable>
 
 namespace ix
 {

ixwebsocket/IXWebSocketHandshake.cpp

@@ -12,6 +12,7 @@
 #include "IXUserAgent.h"
 #include "libwshandshake.hpp"
 #include <algorithm>
+#include <iostream>
 #include <random>
 #include <sstream>
 
@@ -335,8 +336,9 @@ namespace ix
         std::string header = headers["sec-websocket-extensions"];
         WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions(header);
 
-        // If the client has requested that extension, enable it.
-        if (webSocketPerMessageDeflateOptions.enabled())
+        // If the client has requested that extension,
+        // and the server does not prevent it, enable it.
+        if (_enablePerMessageDeflate && webSocketPerMessageDeflateOptions.enabled())
         {
             _enablePerMessageDeflate = true;
 

ixwebsocket/IXWebSocketServer.cpp

@@ -28,6 +28,7 @@ namespace ix
         : SocketServer(port, host, backlog, maxConnections, addressFamily)
         , _handshakeTimeoutSecs(handshakeTimeoutSecs)
         , _enablePong(kDefaultEnablePong)
+        , _enablePerMessageDeflate(true)
     {
     }
 
@@ -59,6 +60,11 @@ namespace ix
         _enablePong = false;
     }
 
+    void WebSocketServer::disablePerMessageDeflate()
+    {
+        _enablePerMessageDeflate = false;
+    }
+
     void WebSocketServer::setOnConnectionCallback(const OnConnectionCallback& callback)
     {
         _onConnectionCallback = callback;
@@ -73,9 +79,18 @@ namespace ix
         webSocket->disableAutomaticReconnection();
 
         if (_enablePong)
+        {
             webSocket->enablePong();
+        }
         else
+        {
             webSocket->disablePong();
+        }
+
+        if (!_enablePerMessageDeflate)
+        {
+            webSocket->disablePerMessageDeflate();
+        }
 
         // Add this client to our client set
         {

ixwebsocket/IXWebSocketServer.h

@@ -36,6 +36,7 @@ namespace ix
 
         void enablePong();
         void disablePong();
+        void disablePerMessageDeflate();
 
         void setOnConnectionCallback(const OnConnectionCallback& callback);
 
@@ -48,6 +49,7 @@ namespace ix
         // Member variables
         int _handshakeTimeoutSecs;
         bool _enablePong;
+        bool _enablePerMessageDeflate;
 
         OnConnectionCallback _onConnectionCallback;
 

ixwebsocket/IXWebSocketVersion.h

@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "8.1.1"
+#define IX_WEBSOCKET_VERSION "8.1.2"