grpc 1.51.0 → 1.52.0.pre2

data/src/core/plugin_registry/grpc_plugin_registry.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2016 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2016 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -27,7 +27,8 @@
 
 namespace grpc_event_engine {
 namespace experimental {
-extern void RegisterEventEngineChannelArgPreconditioning(grpc_core::CoreConfiguration::Builder* builder);
+extern void RegisterEventEngineChannelArgPreconditioning(
+    grpc_core::CoreConfiguration::Builder* builder);
 }  // namespace experimental
 }  // namespace grpc_event_engine
 
@@ -69,7 +70,8 @@ extern void RegisterBinderResolver(CoreConfiguration::Builder* builder);
 #endif
 
 void BuildCoreConfiguration(CoreConfiguration::Builder* builder) {
-  grpc_event_engine::experimental::RegisterEventEngineChannelArgPreconditioning(builder);
+  grpc_event_engine::experimental::RegisterEventEngineChannelArgPreconditioning(
+      builder);
   // The order of the handshaker registration is crucial here.
   // We want TCP connect handshaker to be registered last so that it is added to
   // the start of the handshaker list.

data/src/core/plugin_registry/grpc_plugin_registry_extra.cc

@@ -24,6 +24,7 @@
 namespace grpc_core {
 #ifndef GRPC_NO_XDS
 extern void RbacFilterRegister(CoreConfiguration::Builder* builder);
+extern void StatefulSessionFilterRegister(CoreConfiguration::Builder* builder);
 extern void RegisterXdsChannelStackModifier(
     CoreConfiguration::Builder* builder);
 extern void RegisterChannelDefaultCreds(CoreConfiguration::Builder* builder);
@@ -35,6 +36,8 @@ extern void RegisterXdsClusterImplLbPolicy(CoreConfiguration::Builder* builder);
 extern void RegisterCdsLbPolicy(CoreConfiguration::Builder* builder);
 extern void RegisterXdsClusterResolverLbPolicy(
     CoreConfiguration::Builder* builder);
+extern void RegisterXdsOverrideHostLbPolicy(
+    CoreConfiguration::Builder* builder);
 extern void RegisterXdsWrrLocalityLbPolicy(CoreConfiguration::Builder* builder);
 extern void RegisterFileWatcherCertificateProvider(
     CoreConfiguration::Builder* builder);
@@ -46,6 +49,7 @@ void RegisterExtraFilters(CoreConfiguration::Builder* builder) {
   // rbac_filter is being guarded with GRPC_NO_XDS to avoid a dependency on the
   // re2 library by default
   RbacFilterRegister(builder);
+  StatefulSessionFilterRegister(builder);
   RegisterXdsChannelStackModifier(builder);
   RegisterChannelDefaultCreds(builder);
   RegisterXdsResolver(builder);
@@ -54,6 +58,7 @@ void RegisterExtraFilters(CoreConfiguration::Builder* builder) {
   RegisterXdsClusterImplLbPolicy(builder);
   RegisterCdsLbPolicy(builder);
   RegisterXdsClusterResolverLbPolicy(builder);
+  RegisterXdsOverrideHostLbPolicy(builder);
   RegisterXdsWrrLocalityLbPolicy(builder);
   RegisterFileWatcherCertificateProvider(builder);
 #endif

data/src/core/tsi/alts/crypt/aes_gcm.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2018 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2018 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -35,13 +35,13 @@ constexpr size_t kKdfCounterLen = 6;
 constexpr size_t kKdfCounterOffset = 2;
 constexpr size_t kRekeyAeadKeyLen = kAes128GcmKeyLength;
 
-/* Struct for additional data required if rekeying is enabled. */
+// Struct for additional data required if rekeying is enabled.
 struct gsec_aes_gcm_aead_rekey_data {
   uint8_t kdf_counter[kKdfCounterLen];
   uint8_t nonce_mask[kAesGcmNonceLength];
 };
 
-/* Main struct for AES_GCM crypter interface. */
+// Main struct for AES_GCM crypter interface.
 struct gsec_aes_gcm_aead_crypter {
   gsec_aead_crypter crypter;
   size_t key_length;
@@ -79,7 +79,7 @@ static void aes_gcm_format_errors(const char* error_msg, char** error_details) {
   }
   char* openssl_errors = aes_gcm_get_openssl_errors();
   if (openssl_errors != nullptr && error_msg != nullptr) {
-    size_t len = strlen(error_msg) + strlen(openssl_errors) + 2; /* ", " */
+    size_t len = strlen(error_msg) + strlen(openssl_errors) + 2;  // ", "
     *error_details = static_cast<char*>(gpr_malloc(len + 1));
     snprintf(*error_details, len + 1, "%s, %s", error_msg, openssl_errors);
     gpr_free(openssl_errors);

data/src/core/tsi/alts/crypt/gsec.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2018 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2018 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -52,7 +52,7 @@ grpc_status_code gsec_aead_crypter_encrypt(
         crypter, nonce, nonce_length, &aad_vec, 1, &plaintext_vec, 1,
         ciphertext_vec, bytes_written, error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -70,7 +70,7 @@ grpc_status_code gsec_aead_crypter_encrypt_iovec(
         plaintext_vec_length, ciphertext_vec, ciphertext_bytes_written,
         error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -90,7 +90,7 @@ grpc_status_code gsec_aead_crypter_decrypt(
         crypter, nonce, nonce_length, &aad_vec, 1, &ciphertext_vec, 1,
         plaintext_vec, bytes_written, error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -108,7 +108,7 @@ grpc_status_code gsec_aead_crypter_decrypt_iovec(
         ciphertext_vec_length, plaintext_vec, plaintext_bytes_written,
         error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -122,7 +122,7 @@ grpc_status_code gsec_aead_crypter_max_ciphertext_and_tag_length(
         crypter, plaintext_length, max_ciphertext_and_tag_length_to_return,
         error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -136,7 +136,7 @@ grpc_status_code gsec_aead_crypter_max_plaintext_length(
         crypter, ciphertext_and_tag_length, max_plaintext_length_to_return,
         error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -149,7 +149,7 @@ grpc_status_code gsec_aead_crypter_nonce_length(
     return crypter->vtable->nonce_length(crypter, nonce_length_to_return,
                                          error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -162,7 +162,7 @@ grpc_status_code gsec_aead_crypter_key_length(const gsec_aead_crypter* crypter,
     return crypter->vtable->key_length(crypter, key_length_to_return,
                                        error_details);
   }
-  /* An error occurred */
+  // An error occurred
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }
@@ -175,7 +175,7 @@ grpc_status_code gsec_aead_crypter_tag_length(const gsec_aead_crypter* crypter,
     return crypter->vtable->tag_length(crypter, tag_length_to_return,
                                        error_details);
   }
-  /* An error occurred. */
+  // An error occurred.
   maybe_copy_error_msg(vtable_error_msg, error_details);
   return GRPC_STATUS_INVALID_ARGUMENT;
 }