diff options
author | 2018-03-27 11:23:49 -0700 | |
---|---|---|
committer | 2018-03-27 11:23:49 -0700 | |
commit | 49f625f232bc859cbb59a0de37bbd1d66b8b8ec7 (patch) | |
tree | 26f51d623313387dde12788c572daa5884a4609b /src/core | |
parent | e44efe099de238a8f5ddc613baad2d3b4fd9438d (diff) |
more comments
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/ext/filters/client_channel/authority.h | 36 | ||||
-rw-r--r-- | src/core/lib/security/security_connector/security_connector.cc | 2 |
2 files changed, 1 insertions, 37 deletions
diff --git a/src/core/ext/filters/client_channel/authority.h b/src/core/ext/filters/client_channel/authority.h deleted file mode 100644 index 642584ef56..0000000000 --- a/src/core/ext/filters/client_channel/authority.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * - * 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. - * - */ - -#ifndef GRPC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_AUTHORITY_H -#define GRPC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_AUTHORITY_H - -#include <grpc/support/port_platform.h> - -#include <grpc/grpc.h> - -#include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/client_channel/resolver_registry.h" -#include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gprpp/memory.h" - -/// Returns a copy of \a args with the default authority channel arg set if it -/// wasn't already present. -grpc_channel_args* grpc_default_authority_add_if_not_present( - const grpc_channel_args* args); - -#endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_AUTHORITY_H */ diff --git a/src/core/lib/security/security_connector/security_connector.cc b/src/core/lib/security/security_connector/security_connector.cc index 0066d3f09f..980c9e9248 100644 --- a/src/core/lib/security/security_connector/security_connector.cc +++ b/src/core/lib/security/security_connector/security_connector.cc @@ -550,7 +550,7 @@ grpc_channel_security_connector* grpc_fake_channel_security_connector_create( c->expected_targets = gpr_strdup(expected_targets); c->is_lb_channel = grpc_core::FindTargetAuthorityTableInArgs(args) != nullptr; const grpc_arg* target_name_override_arg = - grpc_channel_args_find(args, GRPC_FAKE_SECURITY_TARGET_NAME_OVERRIDE_ARG); + grpc_channel_args_find(args, GRPC_SSL_TARGET_NAME_OVERRIDE_ARG); if (target_name_override_arg != nullptr) { c->target_name_override = gpr_strdup(grpc_channel_arg_get_string(target_name_override_arg)); |