mirror of https://github.com/grpc/grpc.git
This reverts commit f0a0628795.
pull/27624/head
Mark D. Roth
3 years ago
committed by
GitHub
parent
aea060b530
commit
0611f7c9b3
35 changed files with 293 additions and 146 deletions
@ -0,0 +1,42 @@ |
|||||||
|
/*
|
||||||
|
* |
||||||
|
* 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> |
||||||
|
|
||||||
|
#include "src/core/ext/transport/chttp2/client/authority.h" |
||||||
|
|
||||||
|
grpc_channel_args* grpc_default_authority_add_if_not_present( |
||||||
|
const grpc_channel_args* args) { |
||||||
|
const bool has_default_authority = |
||||||
|
grpc_channel_args_find(args, GRPC_ARG_DEFAULT_AUTHORITY) != nullptr; |
||||||
|
grpc_arg new_args[1]; |
||||||
|
size_t num_new_args = 0; |
||||||
|
std::string default_authority; |
||||||
|
if (!has_default_authority) { |
||||||
|
const grpc_arg* server_uri_arg = |
||||||
|
grpc_channel_args_find(args, GRPC_ARG_SERVER_URI); |
||||||
|
const char* server_uri_str = grpc_channel_arg_get_string(server_uri_arg); |
||||||
|
GPR_ASSERT(server_uri_str != nullptr); |
||||||
|
default_authority = |
||||||
|
grpc_core::ResolverRegistry::GetDefaultAuthority(server_uri_str); |
||||||
|
new_args[num_new_args++] = grpc_channel_arg_string_create( |
||||||
|
const_cast<char*>(GRPC_ARG_DEFAULT_AUTHORITY), |
||||||
|
const_cast<char*>(default_authority.c_str())); |
||||||
|
} |
||||||
|
return grpc_channel_args_copy_and_add(args, new_args, num_new_args); |
||||||
|
} |
||||||
@ -0,0 +1,36 @@ |
|||||||
|
/*
|
||||||
|
* |
||||||
|
* 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 */ |
||||||
@ -0,0 +1,40 @@ |
|||||||
|
//
|
||||||
|
// Copyright 2020 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> |
||||||
|
|
||||||
|
#include "absl/strings/string_view.h" |
||||||
|
|
||||||
|
#include "src/core/lib/channel/channel_args.h" |
||||||
|
|
||||||
|
// Channel arg key for the authority override.
|
||||||
|
#define GRPC_ARG_AUTHORITY_OVERRIDE "grpc.authority_override" |
||||||
|
|
||||||
|
namespace grpc_core { |
||||||
|
|
||||||
|
grpc_arg CreateAuthorityOverrideChannelArg(const char* authority) { |
||||||
|
return grpc_channel_arg_string_create( |
||||||
|
const_cast<char*>(GRPC_ARG_AUTHORITY_OVERRIDE), |
||||||
|
const_cast<char*>(authority)); |
||||||
|
} |
||||||
|
|
||||||
|
absl::string_view FindAuthorityOverrideInArgs(const grpc_channel_args* args) { |
||||||
|
const char* found = |
||||||
|
grpc_channel_args_find_string(args, GRPC_ARG_AUTHORITY_OVERRIDE); |
||||||
|
return found == nullptr ? "" : found; |
||||||
|
} |
||||||
|
|
||||||
|
} // namespace grpc_core
|
||||||
@ -0,0 +1,37 @@ |
|||||||
|
//
|
||||||
|
// Copyright 2020 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_LIB_TRANSPORT_AUTHORITY_OVERRIDE_H |
||||||
|
#define GRPC_CORE_LIB_TRANSPORT_AUTHORITY_OVERRIDE_H |
||||||
|
|
||||||
|
#include <grpc/support/port_platform.h> |
||||||
|
|
||||||
|
#include "absl/strings/string_view.h" |
||||||
|
|
||||||
|
#include <grpc/grpc.h> |
||||||
|
|
||||||
|
namespace grpc_core { |
||||||
|
|
||||||
|
/// Returns a channel argument containing \a authority.
|
||||||
|
grpc_arg CreateAuthorityOverrideChannelArg(const char* authority); |
||||||
|
|
||||||
|
/// Returns the authority override from \a args or the empty string. The return
|
||||||
|
/// value is a string_view into the `args` data structure.
|
||||||
|
absl::string_view FindAuthorityOverrideInArgs(const grpc_channel_args* args); |
||||||
|
|
||||||
|
} // namespace grpc_core
|
||||||
|
|
||||||
|
#endif /* GRPC_CORE_LIB_TRANSPORT_AUTHORITY_OVERRIDE_H */ |
||||||
Loading…
Reference in new issue