Browse Source

Move WebSocket configuration to configuration.hpp

Paul-Louis Ageneau 1 year ago
parent
commit
ed5cd14bc3
2 changed files with 20 additions and 14 deletions
  1. 18 0
      include/rtc/configuration.hpp
  2. 2 14
      include/rtc/websocket.hpp

+ 18 - 0
include/rtc/configuration.hpp

@@ -88,6 +88,24 @@ struct RTC_CPP_EXPORT Configuration {
 	optional<size_t> maxMessageSize;
 };
 
+#ifdef RTC_ENABLE_WEBSOCKET
+
+struct WebSocketConfiguration {
+	bool disableTlsVerification = false; // if true, don't verify the TLS certificate
+	optional<ProxyServer> proxyServer;   // only non-authenticated http supported for now
+	std::vector<string> protocols;
+	optional<std::chrono::milliseconds> connectionTimeout; // zero to disable
+	optional<std::chrono::milliseconds> pingInterval;      // zero to disable
+	optional<int> maxOutstandingPings;
+	optional<string> caCertificatePemFile;
+	optional<string> certificatePemFile;
+	optional<string> keyPemFile;
+	optional<string> keyPemPass;
+	optional<size_t> maxMessageSize;
+};
+
+#endif
+
 } // namespace rtc
 
 #endif

+ 2 - 14
include/rtc/websocket.hpp

@@ -13,7 +13,7 @@
 
 #include "channel.hpp"
 #include "common.hpp"
-#include "configuration.hpp" // for ProxyServer
+#include "configuration.hpp"
 
 namespace rtc {
 
@@ -32,19 +32,7 @@ public:
 		Closed = 3,
 	};
 
-	struct Configuration {
-		bool disableTlsVerification = false; // if true, don't verify the TLS certificate
-		optional<ProxyServer> proxyServer;   // only non-authenticated http supported for now
-		std::vector<string> protocols;
-		optional<std::chrono::milliseconds> connectionTimeout; // zero to disable
-		optional<std::chrono::milliseconds> pingInterval;      // zero to disable
-		optional<int> maxOutstandingPings;
-		optional<string> caCertificatePemFile;
-		optional<string> certificatePemFile;
-		optional<string> keyPemFile;
-		optional<string> keyPemPass;
-		optional<size_t> maxMessageSize;
-	};
+	using Configuration = WebSocketConfiguration;
 
 	WebSocket();
 	WebSocket(Configuration config);