indent files

ixwebsocket/IXSocketAppleSSL.h

@@ -37,8 +37,7 @@ namespace ix
         static OSStatus writeToSocket(SSLConnectionRef connection, const void* data, size_t* len);
         static OSStatus readFromSocket(SSLConnectionRef connection, void* data, size_t* len);
 
-        OSStatus tlsHandShake(
+        OSStatus tlsHandShake(std::string& errMsg,
-            std::string& errMsg,
                               const CancellationRequest& isCancellationRequested);
 
         SSLContextRef _sslContext;

ixwebsocket/IXSocketOpenSSL.cpp

@@ -224,8 +224,7 @@ namespace ix
         return true;
     }
 
-    bool SocketOpenSSL::openSSLClientHandshake(
+    bool SocketOpenSSL::openSSLClientHandshake(const std::string& host,
-        const std::string& host,
                                                std::string& errMsg,
                                                const CancellationRequest& isCancellationRequested)
     {

ixwebsocket/IXWebSocket.cpp

@@ -160,10 +160,8 @@ namespace ix
     {
         {
             std::lock_guard<std::mutex> lock(_configMutex);
-            _ws.configure(_perMessageDeflateOptions,
+            _ws.configure(
-                          _socketTLSOptions,
+                _perMessageDeflateOptions, _socketTLSOptions, _enablePong, _pingIntervalSecs);
-                          _enablePong,
-                          _pingIntervalSecs);
         }
 
         WebSocketHttpHeaders headers(_extraHeaders);
@@ -216,10 +214,8 @@ namespace ix
     {
         {
             std::lock_guard<std::mutex> lock(_configMutex);
-            _ws.configure(_perMessageDeflateOptions,
+            _ws.configure(
-                          _socketTLSOptions,
+                _perMessageDeflateOptions, _socketTLSOptions, _enablePong, _pingIntervalSecs);
-                          _enablePong,
-                          _pingIntervalSecs);
         }
 
         WebSocketInitResult status = _ws.connectToSocket(socket, timeoutSecs);

ixwebsocket/IXWebSocketTransport.cpp

@@ -251,15 +251,14 @@ namespace ix
 
         // No timeout if state is not OPEN, otherwise computed
         // pingIntervalOrTimeoutGCD (equals to -1 if no ping and no ping timeout are set)
-        int lastingTimeoutDelayInMs =
+        int lastingTimeoutDelayInMs = (_readyState != ReadyState::OPEN) ? 0 : _pingIntervalSecs;
-            (_readyState != ReadyState::OPEN) ? 0 : _pingIntervalSecs;
 
         if (_pingIntervalSecs > 0)
         {
             // compute lasting delay to wait for next ping / timeout, if at least one set
             auto now = std::chrono::steady_clock::now();
-            lastingTimeoutDelayInMs =
+            lastingTimeoutDelayInMs = (int) std::chrono::duration_cast<std::chrono::milliseconds>(
-                (int) std::chrono::duration_cast<std::chrono::milliseconds>(now - _lastSendPingTimePoint)
+                                          now - _lastSendPingTimePoint)
                                           .count();
         }
 

test/IXCobraChatTest.cpp

@@ -126,8 +126,10 @@ namespace
         std::string filter;
         std::string position("$");
 
-        _conn.subscribe(
+        _conn.subscribe(channel,
-            channel, filter, position, [this](const Json::Value& msg, const std::string& /*position*/) {
+                        filter,
+                        position,
+                        [this](const Json::Value& msg, const std::string& /*position*/) {
                             spdlog::info("receive {}", msg.toStyledString());
 
                             if (!msg.isObject()) return;
@@ -149,7 +151,9 @@ namespace
                             _receivedQueue.push(msg);
 
                             std::stringstream ss;
-                ss << std::endl << msg_user << " > " << msg_text << std::endl << _user << " > ";
+                            ss << std::endl
+                               << msg_user << " > " << msg_text << std::endl
+                               << _user << " > ";
                             log(ss.str());
                         });
     }

test/IXCobraMetricsPublisherTest.cpp

@@ -77,8 +77,10 @@ namespace
                 std::string filter;
                 std::string position("$");
 
-                conn.subscribe(
+                conn.subscribe(channel,
-                    channel, filter, position, [](const Json::Value& msg, const std::string& /*position*/) {
+                               filter,
+                               position,
+                               [](const Json::Value& msg, const std::string& /*position*/) {
                                    log(msg.toStyledString());
 
                                    std::string id = msg["id"].asString();

test/IXCobraToSentryBotTest.cpp

@@ -150,10 +150,7 @@ TEST_CASE("Cobra_to_sentry_bot", "[cobra_bots]")
         //        -> https://github.com/openssl/openssl/issues/7967
         // https://xxxxx:yyyyyy@sentry.io/1234567
         std::stringstream oss;
-        oss << getHttpScheme()
+        oss << getHttpScheme() << "xxxxxxx:yyyyyyy@localhost:" << sentryPort << "/1234567";
-            << "xxxxxxx:yyyyyyy@localhost:" 
-            << sentryPort
-            << "/1234567";
         std::string dsn = oss.str();
 
         SocketTLSOptions tlsOptionsClient = makeClientTLSOptions();

test/IXTest.cpp

@@ -237,9 +237,7 @@ namespace ix
     std::string makeCobraEndpoint(int port, bool preferTLS)
     {
         std::stringstream ss;
-        ss << getWsScheme(preferTLS)
+        ss << getWsScheme(preferTLS) << "localhost:" << port;
-           << "localhost:"
-           << port;
         std::string endpoint = ss.str();
 
         return endpoint;

test/IXTest.h

@@ -9,8 +9,8 @@
 #include "IXGetFreePort.h"
 #include <iostream>
 #include <ixsnake/IXAppConfig.h>
-#include <ixwebsocket/IXWebSocketServer.h>
 #include <ixwebsocket/IXSocketTLSOptions.h>
+#include <ixwebsocket/IXWebSocketServer.h>
 #include <mutex>
 #include <spdlog/spdlog.h>
 #include <sstream>

ws/ws.cpp

@@ -171,9 +171,7 @@ int main(int argc, char** argv)
     connectApp->add_option("--max_wait",
                            maxWaitBetweenReconnectionRetries,
                            "Max Wait Time between reconnection retries");
-    connectApp->add_option("--ping_interval",
+    connectApp->add_option("--ping_interval", pingIntervalSecs, "Interval between sending pings");
-                           pingIntervalSecs,
-                           "Interval between sending pings");
     connectApp->add_option("--subprotocol", subprotocol, "Subprotocol");
     addTLSOptions(connectApp);
 
@@ -475,7 +473,8 @@ int main(int argc, char** argv)
     }
     else if (app.got_subcommand("cobra_metrics_to_redis"))
     {
-        ret = ix::ws_cobra_metrics_to_redis(cobraConfig, channel, filter, position, hostname, redisPort);
+        ret = ix::ws_cobra_metrics_to_redis(
+            cobraConfig, channel, filter, position, hostname, redisPort);
     }
     else if (app.got_subcommand("snake"))
     {

ws/ws_cobra_metrics_publish.cpp

@@ -30,8 +30,7 @@ namespace ix
 
         CobraMetricsPublisher cobraMetricsPublisher;
         cobraMetricsPublisher.enable(true);
-        cobraMetricsPublisher.configure(config,
+        cobraMetricsPublisher.configure(config, channel);
-                                        channel);
 
         while (!cobraMetricsPublisher.isAuthenticated())
             ;

ws/ws_cobra_subscribe.cpp

@@ -70,9 +70,15 @@ namespace ix
 
         std::string subscriptionPosition(position);
 
-        conn.setEventCallback(
+        conn.setEventCallback([&conn,
-            [&conn, &channel, &jsonWriter, &filter, &subscriptionPosition, &msgCount, &msgPerSeconds, &quiet, &fluentd](
+                               &channel,
-                ix::CobraConnectionEventType eventType,
+                               &jsonWriter,
+                               &filter,
+                               &subscriptionPosition,
+                               &msgCount,
+                               &msgPerSeconds,
+                               &quiet,
+                               &fluentd](ix::CobraConnectionEventType eventType,
                                          const std::string& errMsg,
                                          const ix::WebSocketHttpHeaders& headers,
                                          const std::string& subscriptionId,
@@ -90,11 +96,16 @@ namespace ix
             {
                 spdlog::info("Subscriber authenticated");
                 spdlog::info("Subscribing to {} at position {}", channel, subscriptionPosition);
-                    conn.subscribe(channel,
+                conn.subscribe(
+                    channel,
                     filter,
                     subscriptionPosition,
-                                   [&jsonWriter, &quiet, &msgPerSeconds, &msgCount, &fluentd, &subscriptionPosition](
+                    [&jsonWriter,
-                                       const Json::Value& msg, const std::string& position) {
+                     &quiet,
+                     &msgPerSeconds,
+                     &msgCount,
+                     &fluentd,
+                     &subscriptionPosition](const Json::Value& msg, const std::string& position) {
                         if (!quiet)
                         {
                             writeToStdout(fluentd, jsonWriter, msg, position);