Intermediate changes

12 files changed, 43 insertions, 40 deletions

diff --git a/ya.conf b/ya.conf
index 597a084001..12a4e4e11a 100644
--- a/ya.conf
+++ b/ya.conf
@@ -26,8 +26,10 @@ use_command_file_in_testtool = true
 OPENSOURCE = "yes"
 USE_PREBUILT_TOOLS = "no"
 APPLE_SDK_LOCAL = "yes"
+USE_CLANG_CL = "yes"
 
 [flags]
 OPENSOURCE = "yes"
 USE_PREBUILT_TOOLS = "no"
 APPLE_SDK_LOCAL = "yes"
+USE_CLANG_CL = "yes"
diff --git a/yt/yt/core/crypto/tls.cpp b/yt/yt/core/crypto/tls.cpp
index 96a5d24457..8ec3bef4b6 100644
--- a/yt/yt/core/crypto/tls.cpp
+++ b/yt/yt/core/crypto/tls.cpp
@@ -34,11 +34,11 @@ static const TLogger Logger{"Tls"};
 
 namespace {
 
-TErrorAttribute GetOpenSSLErrors()
+TErrorAttribute GetSslErrors()
 {
     TString errorStr;
-    ERR_print_errors_cb([](const char* str, size_t len, void* ctx) {
-        TString& out = *reinterpret_cast<TString*>(ctx);
+    ERR_print_errors_cb([] (const char* str, size_t len, void* ctx) {
+        auto& out = *reinterpret_cast<TString*>(ctx);
         if (!out.empty()) {
             out += ", ";
         }
@@ -83,21 +83,21 @@ struct TSslContextImpl
         Ctx = SSL_CTX_new(TLS_method());
         if (!Ctx) {
             THROW_ERROR_EXCEPTION("SSL_CTX_new(TLS_method()) failed")
-                << GetOpenSSLErrors();
+                << GetSslErrors();
         }
         if (SSL_CTX_set_min_proto_version(Ctx, TLS1_2_VERSION) == 0) {
             THROW_ERROR_EXCEPTION("SSL_CTX_set_min_proto_version failed")
-                << GetOpenSSLErrors();
+                << GetSslErrors();
         }
         if (SSL_CTX_set_max_proto_version(Ctx, TLS1_2_VERSION) == 0) {
             THROW_ERROR_EXCEPTION("SSL_CTX_set_max_proto_version failed")
-                << GetOpenSSLErrors();
+                << GetSslErrors();
         }
 #else
         Ctx = SSL_CTX_new(TLSv1_2_method());
         if (!Ctx) {
             THROW_ERROR_EXCEPTION("SSL_CTX_new(TLSv1_2_method()) failed")
-                << GetOpenSSLErrors();
+                << GetSslErrors();
         }
 #endif
     }
@@ -157,7 +157,7 @@ public:
         Ssl_ = Ctx_->NewSsl();
         if (!Ssl_) {
             THROW_ERROR_EXCEPTION("SSL_new failed")
-                << GetOpenSSLErrors();
+                << GetSslErrors();
         }
 
         InputBIO_ = BIO_new(BIO_s_mem());
@@ -473,7 +473,7 @@ private:
                     MaybeStartUnderlyingIO(true);
                 } else {
                     Error_ = TError("SSL_do_handshake failed")
-                        << GetOpenSSLErrors();
+                        << GetSslErrors();
                     YT_LOG_DEBUG(Error_, "TLS handshake failed");
                     CheckError();
                     return;
@@ -492,7 +492,7 @@ private:
 
                 if (count < 0) {
                     Error_ = TError("SSL_write failed")
-                        << GetOpenSSLErrors();
+                        << GetSslErrors();
                     YT_LOG_DEBUG(Error_, "TLS write failed");
                     CheckError();
                     return;
@@ -524,7 +524,7 @@ private:
                     MaybeStartUnderlyingIO(true);
                 } else {
                     Error_ = TError("SSL_read failed")
-                        << GetOpenSSLErrors();
+                        << GetSslErrors();
                     YT_LOG_DEBUG(Error_, "TLS read failed");
                     CheckError();
                     return;
@@ -551,7 +551,7 @@ public:
         , Poller_(std::move(poller))
     { }
 
-    TFuture<IConnectionPtr> Dial(const TNetworkAddress& remote, TRemoteContextPtr context) override
+    TFuture<IConnectionPtr> Dial(const TNetworkAddress& remote, TDialerContextPtr context) override
     {
         return Underlying_->Dial(remote)
             .Apply(BIND([ctx = Ctx_, poller = Poller_, context = std::move(context)](const IConnectionPtr& underlying) -> IConnectionPtr {
@@ -643,7 +643,7 @@ void TSslContext::SetCipherList(const TString& list)
     if (SSL_CTX_set_cipher_list(Impl_->Ctx, list.data()) == 0) {
         THROW_ERROR_EXCEPTION("SSL_CTX_set_cipher_list failed")
             << TErrorAttribute("cipher_list", list)
-            << GetOpenSSLErrors();
+            << GetSslErrors();
     }
 }
 
@@ -652,7 +652,7 @@ void TSslContext::AddCertificateFromFile(const TString& path)
     if (SSL_CTX_use_certificate_file(Impl_->Ctx, path.c_str(), SSL_FILETYPE_PEM) != 1) {
         THROW_ERROR_EXCEPTION("SSL_CTX_use_certificate_file failed")
             << TErrorAttribute("path", path)
-            << GetOpenSSLErrors();
+            << GetSslErrors();
     }
 }
 
@@ -661,7 +661,7 @@ void TSslContext::AddCertificateChainFromFile(const TString& path)
     if (SSL_CTX_use_certificate_chain_file(Impl_->Ctx, path.c_str()) != 1) {
         THROW_ERROR_EXCEPTION("SSL_CTX_use_certificate_chain_file failed")
             << TErrorAttribute("path", path)
-            << GetOpenSSLErrors();
+            << GetSslErrors();
     }
 }
 
@@ -670,7 +670,7 @@ void TSslContext::AddPrivateKeyFromFile(const TString& path)
     if (SSL_CTX_use_PrivateKey_file(Impl_->Ctx, path.c_str(), SSL_FILETYPE_PEM) != 1) {
         THROW_ERROR_EXCEPTION("SSL_CTX_use_PrivateKey_file failed")
             << TErrorAttribute("path", path)
-            << GetOpenSSLErrors();
+            << GetSslErrors();
     }
 }
 
@@ -685,7 +685,7 @@ void TSslContext::AddCertificateChain(const TString& certificateChain)
     auto certificateObject = PEM_read_bio_X509_AUX(bio, nullptr, nullptr, nullptr);
     if (!certificateObject) {
         THROW_ERROR_EXCEPTION("PEM_read_bio_X509_AUX failed")
-            << GetOpenSSLErrors();
+            << GetSslErrors();
     }
     auto freeCertificate = Finally([&] {
         X509_free(certificateObject);
@@ -693,7 +693,7 @@ void TSslContext::AddCertificateChain(const TString& certificateChain)
 
     if (SSL_CTX_use_certificate(Impl_->Ctx, certificateObject) != 1) {
         THROW_ERROR_EXCEPTION("SSL_CTX_use_certificate failed")
-            << GetOpenSSLErrors();
+            << GetSslErrors();
     }
 
     SSL_CTX_clear_chain_certs(Impl_->Ctx);
@@ -707,14 +707,14 @@ void TSslContext::AddCertificateChain(const TString& certificateChain)
             }
 
             THROW_ERROR_EXCEPTION("PEM_read_bio_X509")
-                << GetOpenSSLErrors();
+                << GetSslErrors();
         }
 
         int result = SSL_CTX_add0_chain_cert(Impl_->Ctx, chainCertificateObject);
         if (!result) {
             X509_free(chainCertificateObject);
             THROW_ERROR_EXCEPTION("SSL_CTX_add0_chain_cert")
-                << GetOpenSSLErrors();
+                << GetSslErrors();
         }
     }
 }
@@ -730,7 +730,7 @@ void TSslContext::AddCertificate(const TString& certificate)
     auto certificateObject = PEM_read_bio_X509_AUX(bio, nullptr, nullptr, nullptr);
     if (!certificateObject) {
         THROW_ERROR_EXCEPTION("PEM_read_bio_X509_AUX")
-            << GetOpenSSLErrors();
+            << GetSslErrors();
     }
     auto freeCertificate = Finally([&] {
         X509_free(certificateObject);
@@ -738,7 +738,7 @@ void TSslContext::AddCertificate(const TString& certificate)
 
     if (SSL_CTX_use_certificate(Impl_->Ctx, certificateObject) != 1) {
         THROW_ERROR_EXCEPTION("SSL_CTX_use_certificate failed")
-            << GetOpenSSLErrors();
+            << GetSslErrors();
     }
 }
 
@@ -753,7 +753,7 @@ void TSslContext::AddPrivateKey(const TString& privateKey)
     auto privateKeyObject = PEM_read_bio_PrivateKey(bio, nullptr, nullptr, nullptr);
     if (!privateKeyObject) {
         THROW_ERROR_EXCEPTION("PEM_read_bio_PrivateKey failed")
-            << GetOpenSSLErrors();
+            << GetSslErrors();
     }
     auto freePrivateKey = Finally([&] {
         EVP_PKEY_free(privateKeyObject);
@@ -761,7 +761,7 @@ void TSslContext::AddPrivateKey(const TString& privateKey)
 
     if (SSL_CTX_use_PrivateKey(Impl_->Ctx, privateKeyObject) != 1) {
         THROW_ERROR_EXCEPTION("SSL_CTX_use_PrivateKey failed")
-            << GetOpenSSLErrors();
+            << GetSslErrors();
     }
 }
 
diff --git a/yt/yt/core/crypto/unittests/tls_ut.cpp b/yt/yt/core/crypto/unittests/tls_ut.cpp
index 288994abaf..eb7045b5a0 100644
--- a/yt/yt/core/crypto/unittests/tls_ut.cpp
+++ b/yt/yt/core/crypto/unittests/tls_ut.cpp
@@ -79,7 +79,7 @@ TEST_F(TTlsTest, SimplePingPong)
     config->SetDefaults();
     auto dialer = Context->CreateDialer(config, Poller, NetLogger);
 
-    auto context = New<TRemoteContext>();
+    auto context = New<TDialerContext>();
     context->Host = "localhost";
 
     auto asyncFirstSide = dialer->Dial(listener->GetAddress(), context);
diff --git a/yt/yt/core/http/client.cpp b/yt/yt/core/http/client.cpp
index f133c10291..24f955bcdb 100644
--- a/yt/yt/core/http/client.cpp
+++ b/yt/yt/core/http/client.cpp
@@ -128,7 +128,7 @@ private:
 
     std::pair<THttpOutputPtr, THttpInputPtr> OpenHttp(const TUrlRef& urlRef)
     {
-        auto context = New<TRemoteContext>();
+        auto context = New<TDialerContext>();
         context->Host = urlRef.Host;
         auto address = GetAddress(urlRef);
 
diff --git a/yt/yt/core/http/connection_pool.cpp b/yt/yt/core/http/connection_pool.cpp
index 3684bda591..3c60d3c921 100644
--- a/yt/yt/core/http/connection_pool.cpp
+++ b/yt/yt/core/http/connection_pool.cpp
@@ -54,7 +54,7 @@ TConnectionPool::~TConnectionPool()
 
 TFuture<IConnectionPtr> TConnectionPool::Connect(
     const TNetworkAddress& address,
-    TRemoteContextPtr context)
+    TDialerContextPtr context)
 {
     {
         auto guard = Guard(SpinLock_);
diff --git a/yt/yt/core/http/connection_pool.h b/yt/yt/core/http/connection_pool.h
index 026626967f..cacde74e14 100644
--- a/yt/yt/core/http/connection_pool.h
+++ b/yt/yt/core/http/connection_pool.h
@@ -40,7 +40,7 @@ public:
 
     TFuture<NNet::IConnectionPtr> Connect(
         const NNet::TNetworkAddress& address,
-        NNet::TRemoteContextPtr context = nullptr);
+        NNet::TDialerContextPtr context = nullptr);
 
     void Release(const NNet::IConnectionPtr& connection);
 
diff --git a/yt/yt/core/http/stream.cpp b/yt/yt/core/http/stream.cpp
index 485903b194..4189f6c257 100644
--- a/yt/yt/core/http/stream.cpp
+++ b/yt/yt/core/http/stream.cpp
@@ -525,9 +525,12 @@ void THttpInput::MaybeLogSlowProgress()
 
 bool THttpInput::IsRedirectCode(EStatusCode code) const
 {
-    return code == EStatusCode::MovedPermanently || code == EStatusCode::Found ||
-        code == EStatusCode::SeeOther || code == EStatusCode::UseProxy ||
-        code == EStatusCode::TemporaryRedirect || code == EStatusCode::PermanentRedirect;
+    return code == EStatusCode::MovedPermanently ||
+        code == EStatusCode::Found ||
+        code == EStatusCode::SeeOther ||
+        code == EStatusCode::UseProxy ||
+        code == EStatusCode::TemporaryRedirect ||
+        code == EStatusCode::PermanentRedirect;
 }
 
 std::optional<TString> THttpInput::TryGetRedirectUrl()
diff --git a/yt/yt/core/net/dialer.cpp b/yt/yt/core/net/dialer.cpp
index 2a1511a8b1..ece39cdbf4 100644
--- a/yt/yt/core/net/dialer.cpp
+++ b/yt/yt/core/net/dialer.cpp
@@ -87,7 +87,7 @@ public:
 
     TFuture<IConnectionPtr> Dial(
         const TNetworkAddress& remote,
-        TRemoteContextPtr /*context*/) override
+        TDialerContextPtr /*context*/) override
     {
         auto session = New<TDialSession>(
             remote,
diff --git a/yt/yt/core/net/dialer.h b/yt/yt/core/net/dialer.h
index 8dbd67cc43..b48c782cf5 100644
--- a/yt/yt/core/net/dialer.h
+++ b/yt/yt/core/net/dialer.h
@@ -14,16 +14,14 @@ namespace NYT::NNet {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-//! Сontext that is passed to the Dialer.
-
-struct TRemoteContext
+struct TDialerContext
     : public TRefCounted
 {
     //! Host is used for TlsDialer.
     std::optional<TString> Host;
 };
 
-DEFINE_REFCOUNTED_TYPE(TRemoteContext)
+DEFINE_REFCOUNTED_TYPE(TDialerContext)
 
 //! Dialer establishes connection to a (resolved) network address.
 
@@ -32,7 +30,7 @@ struct IDialer
 {
     virtual TFuture<IConnectionPtr> Dial(
         const TNetworkAddress& remote,
-        TRemoteContextPtr context = nullptr) = 0;
+        TDialerContextPtr context = nullptr) = 0;
 };
 
 DEFINE_REFCOUNTED_TYPE(IDialer)
diff --git a/yt/yt/core/net/mock/dialer.cpp b/yt/yt/core/net/mock/dialer.cpp
index 4b3582b1b5..7f52d02174 100644
--- a/yt/yt/core/net/mock/dialer.cpp
+++ b/yt/yt/core/net/mock/dialer.cpp
@@ -7,7 +7,7 @@ namespace NYT::NNet {
 TDialerMock::TDialerMock(IDialerPtr underlying)
     : Underlying_(std::move(underlying))
 {
-    ON_CALL(*this, Dial).WillByDefault([this] (const TNetworkAddress& address, TRemoteContextPtr /*context*/) {
+    ON_CALL(*this, Dial).WillByDefault([this] (const TNetworkAddress& address, TDialerContextPtr /*context*/) {
         return Underlying_->Dial(address);
     });
 }
diff --git a/yt/yt/core/net/mock/dialer.h b/yt/yt/core/net/mock/dialer.h
index 10a9237f09..e5913d8b7f 100644
--- a/yt/yt/core/net/mock/dialer.h
+++ b/yt/yt/core/net/mock/dialer.h
@@ -14,7 +14,7 @@ class TDialerMock
 public:
     explicit TDialerMock(IDialerPtr underlying);
 
-    MOCK_METHOD(TFuture<IConnectionPtr>, Dial, (const TNetworkAddress& remote, TRemoteContextPtr context), (override));
+    MOCK_METHOD(TFuture<IConnectionPtr>, Dial, (const TNetworkAddress& remote, TDialerContextPtr context), (override));
 
 private:
     const IDialerPtr Underlying_;
diff --git a/yt/yt/core/net/public.h b/yt/yt/core/net/public.h
index 42566ad7fa..b28a2f65d2 100644
--- a/yt/yt/core/net/public.h
+++ b/yt/yt/core/net/public.h
@@ -17,7 +17,7 @@ DECLARE_REFCOUNTED_STRUCT(IPacketConnection)
 DECLARE_REFCOUNTED_STRUCT(IConnectionReader)
 DECLARE_REFCOUNTED_STRUCT(IConnectionWriter)
 DECLARE_REFCOUNTED_STRUCT(IListener)
-DECLARE_REFCOUNTED_STRUCT(TRemoteContext)
+DECLARE_REFCOUNTED_STRUCT(TDialerContext)
 DECLARE_REFCOUNTED_STRUCT(IDialer)
 DECLARE_REFCOUNTED_STRUCT(IAsyncDialer)
 DECLARE_REFCOUNTED_STRUCT(IAsyncDialerSession)