all ws subcommands propagate tls options to servers (unimplemented) or ws or http client (implemented) (contributed by Matt DeBoer)

This commit is contained in:
Benjamin Sergeant
2019-09-30 18:21:20 -07:00
parent 7a26ff4de8
commit 845bbc5208
14 changed files with 51 additions and 16 deletions

View File

@ -299,4 +299,9 @@ namespace ix
std::this_thread::sleep_for(std::chrono::milliseconds(10));
}
}
void SocketServer::setTLSOptions(const SocketTLSOptions& socketTLSOptions)
{
_socketTLSOptions = socketTLSOptions;
}
} // namespace ix

View File

@ -7,6 +7,7 @@
#pragma once
#include "IXConnectionState.h"
#include "IXSocketTLSOptions.h"
#include <atomic>
#include <condition_variable>
#include <functional>
@ -51,6 +52,8 @@ namespace ix
std::pair<bool, std::string> listen();
void wait();
void setTLSOptions(const SocketTLSOptions& socketTLSOptions);
protected:
// Logging
void logError(const std::string& str);
@ -99,5 +102,7 @@ namespace ix
// Returns true if all connection threads are joined
void closeTerminatedThreads();
size_t getConnectionsThreadsCount();
SocketTLSOptions _socketTLSOptions;
};
} // namespace ix

View File

@ -6,4 +6,4 @@
#pragma once
#define IX_WEBSOCKET_VERSION "6.3.3"
#define IX_WEBSOCKET_VERSION "6.3.4"