Skip to content

Commit 4e2b429

Browse files
committed
rename TlsOptions::VerifyMode -> TlsOptions::PeerVerifyMode to get rid of name clash
1 parent 93c3aab commit 4e2b429

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

libs/client-sdk/src/data_sources/polling_data_source.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ PollingDataSource::PollingDataSource(
7474
status_manager_(status_manager),
7575
data_source_handler_(
7676
DataSourceEventHandler(context, handler, logger, status_manager_)),
77-
requester_(ioc, http_properties.Tls().VerifyMode()),
77+
requester_(ioc, http_properties.Tls().PeerVerifyMode()),
7878
timer_(ioc),
7979
polling_interval_(
8080
std::get<
@@ -88,7 +88,7 @@ PollingDataSource::PollingDataSource(
8888
auto const& polling_config = std::get<
8989
config::shared::built::PollingConfig<config::shared::ClientSDK>>(
9090
data_source_config.method);
91-
if (http_properties.Tls().VerifyMode() ==
91+
if (http_properties.Tls().PeerVerifyMode() ==
9292
config::shared::built::TlsOptions::VerifyMode::kVerifyNone) {
9393
LD_LOG(logger_, LogLevel::kDebug) << "TLS peer verification disabled";
9494
}

libs/client-sdk/src/data_sources/streaming_data_source.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ void StreamingDataSource::Start() {
127127
client_builder.header(header.first, header.second);
128128
}
129129

130-
if (http_config_.Tls().VerifyMode() ==
130+
if (http_config_.Tls().PeerVerifyMode() ==
131131
config::shared::built::TlsOptions::VerifyMode::kVerifyNone) {
132132
client_builder.skip_verify_peer(true);
133133
}
134-
134+
135135
auto weak_self = weak_from_this();
136136

137137
client_builder.receiver([weak_self](launchdarkly::sse::Event const& event) {

libs/common/include/launchdarkly/config/shared/built/http_properties.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ class TlsOptions final {
1212
enum class VerifyMode { kVerifyPeer, kVerifyNone };
1313
TlsOptions(VerifyMode verify_mode);
1414
TlsOptions();
15-
[[nodiscard]] VerifyMode VerifyMode() const;
15+
[[nodiscard]] VerifyMode PeerVerifyMode() const;
1616

1717
private:
18-
enum VerifyMode verify_mode_;
18+
VerifyMode verify_mode_;
1919
};
2020

2121
class HttpProperties final {

libs/common/src/config/http_properties.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ TlsOptions::TlsOptions(enum TlsOptions::VerifyMode verify_mode)
99

1010
TlsOptions::TlsOptions() : TlsOptions(TlsOptions::VerifyMode::kVerifyPeer) {}
1111

12-
enum TlsOptions::VerifyMode TlsOptions::VerifyMode() const {
12+
TlsOptions::VerifyMode TlsOptions::PeerVerifyMode() const {
1313
return verify_mode_;
1414
}
1515

@@ -58,7 +58,7 @@ bool operator==(HttpProperties const& lhs, HttpProperties const& rhs) {
5858
}
5959

6060
bool operator==(TlsOptions const& lhs, TlsOptions const& rhs) {
61-
return lhs.VerifyMode() == rhs.VerifyMode();
61+
return lhs.PeerVerifyMode() == rhs.PeerVerifyMode();
6262
}
6363

6464
} // namespace launchdarkly::config::shared::built

libs/common/src/config/http_properties_builder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ TlsBuilder<SDK>::TlsBuilder() : TlsBuilder(shared::Defaults<SDK>::TLS()) {}
1111

1212
template <typename SDK>
1313
TlsBuilder<SDK>::TlsBuilder(built::TlsOptions const& tls) {
14-
verify_mode_ = tls.VerifyMode();
14+
verify_mode_ = tls.PeerVerifyMode();
1515
}
1616

1717
template <typename SDK>

libs/internal/src/events/asio_event_processor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ AsioEventProcessor<SDK>::AsioEventProcessor(
4747
workers_(io_,
4848
events_config.FlushWorkers(),
4949
events_config.DeliveryRetryDelay(),
50-
http_properties.Tls().VerifyMode(),
50+
http_properties.Tls().PeerVerifyMode(),
5151
logger),
5252
inbox_capacity_(events_config.Capacity()),
5353
inbox_size_(0),

libs/server-sdk/src/data_systems/background_sync/sources/polling/polling_data_source.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ PollingDataSource::PollingDataSource(
5252
config::built::HttpProperties const& http_properties)
5353
: logger_(logger),
5454
status_manager_(status_manager),
55-
requester_(ioc, http_properties.Tls().VerifyMode()),
55+
requester_(ioc, http_properties.Tls().PeerVerifyMode()),
5656
polling_interval_(data_source_config.poll_interval),
5757
request_(MakeRequest(data_source_config, endpoints, http_properties)),
5858
timer_(ioc),
5959
sink_(nullptr) {
60-
if (http_properties.Tls().VerifyMode() ==
60+
if (http_properties.Tls().PeerVerifyMode() ==
6161
launchdarkly::config::shared::built::TlsOptions::VerifyMode::
6262
kVerifyNone) {
6363
LD_LOG(logger_, LogLevel::kDebug) << "TLS peer verification disabled";

libs/server-sdk/src/data_systems/background_sync/sources/streaming/streaming_data_source.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void StreamingDataSource::StartAsync(
104104
client_builder.header(key, value);
105105
}
106106

107-
if (http_config_.Tls().VerifyMode() ==
107+
if (http_config_.Tls().PeerVerifyMode() ==
108108
launchdarkly::config::shared::built::TlsOptions::VerifyMode::
109109
kVerifyNone) {
110110
client_builder.skip_verify_peer(true);

0 commit comments

Comments
 (0)